Changeset 1268

Timestamp:

04/17/08 22:07:51 (7 months ago)

Author:

rob

Message:

Refs #408: added a single storage spot for last search

Location:

trunk/peppy

Files:

• actions/minibuffer.py (modified) (1 diff)
• plugins/find_replace.py (modified) (7 diffs)

trunk/peppy/actions/minibuffer.py

@@ -96 +96 @@
         self.win.SetFocus()
     
+    def closePreHook(self):
+        """Hook called when minibuffer is about to be closed to allow it to
+        save any persistent data.
+        """
+        pass
+    
     def close(self):
         """
         Destroy the minibuffer widgets.
         """
+        self.closePreHook()
         self.win.Destroy()
         self.win=None

trunk/peppy/plugins/find_replace.py

@@ -26 +26 @@
     backward = "Find Backward"
     
-    def __init__(self, parent, frame, stc, initial='', direction=1):
+    def __init__(self, parent, frame, stc, storage=None, direction=1):
         wx.Panel.__init__(self, parent, style=wx.NO_BORDER|wx.TAB_TRAVERSAL)
         self.frame = frame
         self.stc = stc
+        if isinstance(storage, dict):
+            self.storage = storage
+        else:
+            self.storage = {}
         
         sizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -46 +50 @@
         self.text.Bind(wx.EVT_TEXT_ENTER, self.OnEnter)
         self.text.Bind(wx.EVT_TEXT, self.OnChar)
-
-        if initial:
-            self.text.ChangeValue(initial)
     
     def setDirection(self, dir=1):
@@ -186 +187 @@
         self.OnNotFound()
 
-
+    def repeat(self, direction):
+        if not self.getSearchString():
+            if 'last_search' in self.storage:
+                self.text.ChangeValue(self.storage['last_search'])
+                self.text.SetInsertionPointEnd()
+                return
+            
+        if direction < 0:
+            self.setDirection(-1)
+            self.OnFindP(None)
+        else:
+            self.setDirection(1)
+            self.OnFindN(None)
+    
+    def saveState(self):
+        last = self.getSearchString()
+        if last:
+            self.storage['last_search'] = last
 
 
@@ -193 +211 @@
     Adapter for PyPE findbar.  Maps findbar callbacks to our stuff.
     """
+    search_storage = {}
+    
     def createWindow(self):
         # Create the find bar widget.
@@ -199 +219 @@
         else:
             dir = 1
-        self.win = FindBar(self.mode.wrapper, self.mode.frame, self.mode, direction=dir)
+        self.win = FindBar(self.mode.wrapper, self.mode.frame, self.mode, self.search_storage, direction=dir)
     
     def repeat(self, action):
@@ -205 +225 @@
         dprint(action)
         if action.__class__ == FindPrevText:
-            self.win.setDirection(-1)
-            self.win.OnFindP(None)
-        else:
-            self.win.setDirection(1)
-            self.win.OnFindN(None)
+            self.win.repeat(-1)
+        else:
+            self.win.repeat(1)
 
     def focus(self):
@@ -215 +233 @@
         # to the text ctrl or combo box of the pype findbar.
         self.win.text.SetFocus()
+    
+    def closePreHook(self):
+        self.win.saveState()
+        self.dprint(self.search_storage)