Changeset 1488

Timestamp:

07/11/08 08:03:25 (2 months ago)

Author:

rob

Message:

Fixed the bad SetFocus? call by placing both the removeFromParent and performAction methods in CallAfters?
* added the performAction method to call the action's processMinibuffer

Location:

trunk/peppy

Files:

• actions/minibuffer.py (modified) (4 diffs)
• frame.py (modified) (2 diffs)
• main.py (modified) (2 diffs)
• major.py (modified) (1 diff)

trunk/peppy/actions/minibuffer.py

@@ -185 +185 @@
         if self.mode:
             wx.CallAfter(self.mode.removeMinibuffer, self)
-        
+    
+    def performAction(self, value):
+        """Execute the processMinibuffer method of the action"""
+        error = self.action.processMinibuffer(self, self.mode, value)
+        if error is not None:
+            self.mode.frame.SetStatusText(error)
 
 
@@ -235 +240 @@
             self.finish_callback()
         else:
-            self.mode.removeMinibuffer(detach_only=True)
+            # Remove the minibuffer and perform the action in CallAfters so
+            # the tab focus doesn't get confused.  If you try to perform these
+            # actions directly, the focus will return to the original tab if
+            # the action causes a new tab to be created.  Moving everything to
+            # CallAfters prevents this.
+            wx.CallAfter(self.removeFromParent)
             if text is not None:
-                error = self.action.processMinibuffer(self, self.mode, text)
-                if error is not None:
-                    self.mode.frame.SetStatusText(error)
-            self.close()
-            #self.removeFromParent()
+                wx.CallAfter(self.performAction, text)
+        
 
 class IntMinibuffer(TextMinibuffer):
@@ -390 +397 @@
         #self.text.SetInsertionPointEnd()
 
+        # FIXME: Using the EVT_SET_FOCUS doesn't seem to work to set the cursor
+        # to the end of the text.  It doesn't seem to get called at all, so
+        # the only way to do it appears to be to co-opt the Panel's SetFocus
+        # method
         self.win.saveSetFocus = self.win.SetFocus
         self.win.SetFocus = self.SetFocus
         
     def SetFocus(self):
-        dprint(self)
+        #dprint(self)
         self.win.saveSetFocus()
         self.text.SetInsertionPointEnd()
     
     def OnFocus(self, evt):
-        dprint()
+        #dprint()
         self.text.SetInsertionPointEnd()
 
@@ -486 +497 @@
                 return
         
-        error = self.action.processMinibuffer(self, self.mode, results)
-        if error is not None:
-            self.mode.frame.SetStatusText(error)
-        self.removeFromParent()
+        wx.CallAfter(self.removeFromParent)
+        wx.CallAfter(self.performAction, results)

trunk/peppy/frame.py

@@ -77 +77 @@
 
 class MyNotebook(wx.aui.AuiNotebook, debugmixin):
-    debuglevel = 1
     
     def __init__(self, parent, size=wx.DefaultSize):
@@ -325 +324 @@
 
 class BufferFrame(wx.Frame, ClassPrefs, debugmixin):
-    debuglevel = 1
     frameid=0
     load_error_count = 0

trunk/peppy/main.py

@@ -28 +28 @@
 from peppy.lib.textutil import piglatin
 
-OrigCallAfter = wx.CallAfter
-def NewCallAfter(*args, **kwargs):
-    dprint("CallAfter: args=%s kwargs=%s" % (str(args), str(kwargs)))
-    OrigCallAfter(*args, **kwargs)
-    #wx.GetApp().cooperativeYield()
-wx.CallAfter = NewCallAfter
+# Debug method to display when CallAfters are being made.
+#OrigCallAfter = wx.CallAfter
+#def NewCallAfter(*args, **kwargs):
+#    dprint("CallAfter: args=%s kwargs=%s" % (str(args), str(kwargs)))
+#    OrigCallAfter(*args, **kwargs)
+#    #wx.GetApp().cooperativeYield()
+#wx.CallAfter = NewCallAfter
 
 #### py2exe support
@@ -1006 +1007 @@
         # Gnome filemanager puts '//' at the beginning of absolute pathnames
         sys.argv = [arg[1:] if arg.startswith("//") else arg for arg in sys.argv]
-        dprint(sys.argv)
+        #dprint(sys.argv)
     
     peppy = Peppy(redirect=False)

trunk/peppy/major.py

@@ -222 +222 @@
             self.minibuffer = None
             self.Layout()
-            dprint("active major mode = %s, trying to remove minibuffer from %s" % (self.editwin.frame.getActiveMajorMode(), self.editwin))
+            #dprint("active major mode = %s, trying to remove minibuffer from %s" % (self.editwin.frame.getActiveMajorMode(), self.editwin))
             if self.editwin.frame.getActiveMajorMode() == self.editwin:
                 self.editwin.focus()
-            else:
-                dprint("active major mode = %s, tried to remove minibuffer from %s" % (self.editwin.frame.getActiveMajorMode(), self.editwin))
+            #else:
+                #dprint("active major mode = %s, tried to remove minibuffer from %s" % (self.editwin.frame.getActiveMajorMode(), self.editwin))