Changeset 351

Timestamp:

07/02/12 11:37:23 (12 months ago)

Author:

mbutscher

Message:

branches/mbutscher/work:
* Vi improvements (Ross' repSVN:

533b0ba5dd4f899f4d73f3ac3e17ceeea421477a,
8061c1f34cf07d09d6bef8b8e7746c1f9568aa40)

• Add :reloadplugins cmd to allow live reloading of vi plugins (calls
  reloadMenuPlugins so suffers from the same problems)
  

Location:

branches/mbutscher/work/lib/pwiki

Files:

• ViHelper.py (modified) (13 diffs)
• WikiTxtCtrl.py (modified) (3 diffs)

branches/mbutscher/work/lib/pwiki/ViHelper.py

@@ -232 +232 @@
                 continue
 
+    def ReloadPlugins(self, name):
+        self.RegisterPlugins()
+        self.LoadPlugins(name)
 
     def LoadSettings(self):
@@ -495 +498 @@
         selected_text = None
         if self.mode == ViHelper.VISUAL:
+            # TODO: fix line selection mode
             selected_text = self.GetSelectionDetails(selection_type)
 
@@ -1083 +1087 @@
         searchString = self.tfInput.GetValue()
 
-        foundPos = -2
+        foundPos = -26
         if accP in ((wx.ACCEL_NORMAL, wx.WXK_NUMPAD_ENTER),
                 (wx.ACCEL_NORMAL, wx.WXK_RETURN)):
@@ -1300 +1304 @@
             "tabparents" : (self.GetParentPages, self.OpenWikiPageNewTab),
             "bgparents" : (self.GetParentPages, self.OpenWikiPageBackgroundTab),
+            "w" : (self.Pass, self.SaveCurrentPage),
             "write" : (self.Pass, self.SaveCurrentPage),
             "open" : (self.GetWikiPages, self.OpenWikiPageCurrentTab),
@@ -1314 +1319 @@
             # TODO: rewrite with vi like confirmation
             "deletepage" : (self.GetDefinedWikiPages, self.ctrl.presenter.getMainControl().showWikiWordDeleteDialog),
-            "dlpage" : (self.GetDefinedWikiPages, self.ctrl.presenter.getMainControl().showWikiWordDeleteDialog),
-
-            "renamepage" : (self.GetDefinedWikiPages, self.Pass),
+            "delpage" : (self.GetDefinedWikiPages, self.ctrl.presenter.getMainControl().showWikiWordDeleteDialog),
+
+            #"renamepage" : (self.GetDefinedWikiPages, self.Pass),
 
             # Currently bdelete and bwipeout are currently synonymous
@@ -1325 +1330 @@
             "tabonly" : (self.GetTabs, self.CloseOtherTabs),
             "exit" : (self.Pass, self.CloseWiki),
+
+            "reloadplugins" : (self.Pass, self.ReloadPlugins),
             }
 
@@ -1591 +1598 @@
         self.data = []
 
+    def ReloadPlugins(self, args=None):
+        """
+        Reload plugins globally using reloadMenuPlugins() and then
+        on a per tab basis
+        """
+        self.ctrl.presenter.getMainControl().reloadMenuPlugins()
+
+        # NOTE: should probably unify names
+        for scName, name in (("textedit", "editor"), ("preview", "preview")):
+            for tab in self.ctrl.presenter.getMainControl().getMainAreaPanel().getPresenters():
+                # Try and reload key bindings for each presenter on each tab
+                # (if they exist)
+                try:
+                    tab.getSubControl(scName).vi.ReloadPlugins(name)
+                except AttributeError:
+                    pass
+
+        
+
     def OpenPageInGoogle(self, text_input=None):
         if type(text_input) == tuple:
@@ -1840 +1866 @@
         self.selection_range = None
 
+        self.block_kill_focus = False
         wx.EVT_KILL_FOCUS(self.ctrls.viInputTextField, self.OnKillFocus)
 
@@ -1911 +1938 @@
         Called if a user clicks outside of the viInputPanel
         """
-        if self.search:
+        if self.search and not self.block_kill_focus:
             self.Close()
 
@@ -1924 +1951 @@
         return self.ctrls.viInputTextField.GetValue()
 
-    def SetInput(self, text):
+    def SetInput(self, text, clear=False):
         # Check if we just want to change the cmd argument
-        current_text = self.GetInput().split(" ")
-        if len(current_text) > 1:
-            text = "{0} {1}".format(current_text[0], text)
+        if not clear:
+            current_text = self.GetInput().split(" ")
+            if len(current_text) > 1:
+                text = "{0} {1}".format(current_text[0], text)
         
         if text:
@@ -1958 +1986 @@
         """
         if self.search:
-            text = self.GetInput()
-
-            if len(text) < 1:
-                return
-
-            self.search_args[u"text"] = text
-
-            # would .copy() be better?
-            temp_search_args = dict(self.search_args)
-
-            temp_search_args[u"select_text"] = True
-
-            # TODO: set flags from config?
-            result = self.ctrl.vi._SearchText(**temp_search_args)
-
-            if not result:
-                self.ctrl.vi.visualBell("RED")
-                self.ctrls.viInputTextField.SetBackgroundColour(ViInputDialog.COLOR_YELLOW)
-            else:
-                self.ctrls.viInputTextField.SetBackgroundColour(ViInputDialog.COLOR_GREEN)
+            self.RunSearch()
 
         # cmd
@@ -1996 +2005 @@
             else:
                 self.ctrls.viInputTextField.SetBackgroundColour(ViInputDialog.COLOR_RED)
+
+    def RunSearch(self):
+        text = self.GetInput()
+
+        if len(text) < 1:
+            return
+
+        self.search_args[u"text"] = text
+
+        # would .copy() be better?
+        temp_search_args = dict(self.search_args)
+
+        temp_search_args[u"select_text"] = True
+
+        self.block_kill_focus = True
+        # TODO: set flags from config?
+        result = self.ctrl.vi._SearchText(**temp_search_args)
+        self.FocusInputField()
+        self.block_kill_focus = False
+
+        if not result:
+            self.ctrl.vi.visualBell("RED")
+            self.ctrls.viInputTextField.SetBackgroundColour(ViInputDialog.COLOR_YELLOW)
+        else:
+            self.ctrls.viInputTextField.SetBackgroundColour(ViInputDialog.COLOR_GREEN)
 
     def ExecuteCmd(self, text_input):
@@ -2120 +2154 @@
         # Arrow keys can be used to navigate the cmd_lie history
         elif accP == (wx.ACCEL_NORMAL, wx.WXK_UP):
-            self.SetInput(self.cmd_history.GoBackwardsInHistory())
+            self.SetInput(self.cmd_history.GoBackwardsInHistory(), clear=True)
 
         elif accP == (wx.ACCEL_NORMAL, wx.WXK_DOWN):
-            self.SetInput(self.cmd_history.GoForwardInHistory())
+            self.SetInput(self.cmd_history.GoForwardInHistory(), clear=True)
 
         elif accP == (wx.ACCEL_NORMAL, wx.WXK_TAB):

branches/mbutscher/work/lib/pwiki/WikiTxtCtrl.py

@@ -3932 +3932 @@
                 }
 
+        self.LoadKeybindings()
+        self.LoadPlugins(u"editor")
+        self.GenerateKeyBindings()
+
+        self.SINGLE_LINE_WHITESPACE = [9, 11, 12, 32]
+        self.WORD_BREAK =   '!"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~'
+        self.WORD_BREAK_INCLUDING_WHITESPACE = \
+                            '!"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~ \n\r'
+        self.SENTENCE_ENDINGS = (".", "!", "?", "\n\n")
+        self.SENTENCE_ENDINGS_SUFFIXS = '\'")]'
+
+        self.BRACES = {
+                        u"(" : u")",
+                        u"[" : u"]",
+                        u"{" : u"}",
+                        u"<" : u">",
+                        u"<<" : u">>",
+                      }
+        self.REVERSE_BRACES = dict((v,k) for k, v in self.BRACES.iteritems())
+
+
+        self.SURROUND_REPLACEMENTS = {
+                        ")" : ("(", ")"),
+                        "b" : ("(", ")"),
+                        "}" : ("{", "}"),
+                        "B" : ("{", "}"),
+                        "]" : ("[", "]"),
+                        "r" : ("[", "]"),
+                        ">" : ("<", ">"),
+                        "a" : ("<", ">"),
+
+                        "(" : ("( ", " )"),
+                        "{" : ("{ ", " }"),
+                        "[" : ("[ ", " ]"),
+
+                        # TODO
+                        #"t" : ("<{0}>", "</{0}>"),
+                        #"<" : ("<{0}>", "</{0}>"),
+
+                        "'" : ("'", "'"),
+                        '"' : ('"', '"'),
+                        "`" : ("`", "`"),
+
+                        }
+
+
+
+
+        self._undo_state = 0
+        self._undo_pos = -1
+        self._undo_start_position = None
+        self._undo_positions = []
+
+        self._line_column_pos = 0
+
+        self._visual_start_pos = None
+
+        self.isLinux = isLinux()
+
+    def LoadKeybindings(self):
+        """
+        Function called to load keybindings.
+
+        Must call GenerateKeyBindings after this.
+        """
     # Format
     # key code : (command type, (function, arguments), repeatable, selection_type)
@@ -4262 +4327 @@
         self.keys[3] = {}
 
-            
-        self.LoadPlugins(u"editor")
-
+
+    def GenerateKeyBindings(self):
 
         #self._motion_chains = self.GenerateMotionKeyChains(self.keys)
@@ -4273 +4337 @@
         # Used for rewriting menu shortcuts
         self.viKeyAccels = self.GenerateKeyAccelerators(self.keys)
-
-
-        self.SINGLE_LINE_WHITESPACE = [9, 11, 12, 32]
-        self.WORD_BREAK =   '!"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~'
-        self.WORD_BREAK_INCLUDING_WHITESPACE = \
-                            '!"#$%&\'()*+,-./:;<=>?@[\\]^`{|}~ \n\r'
-        self.SENTENCE_ENDINGS = (".", "!", "?", "\n\n")
-        self.SENTENCE_ENDINGS_SUFFIXS = '\'")]'
-
-        self.BRACES = {
-                        u"(" : u")",
-                        u"[" : u"]",
-                        u"{" : u"}",
-                        u"<" : u">",
-                        u"<<" : u">>",
-                      }
-        self.REVERSE_BRACES = dict((v,k) for k, v in self.BRACES.iteritems())
-
-
-        self.SURROUND_REPLACEMENTS = {
-                        ")" : ("(", ")"),
-                        "b" : ("(", ")"),
-                        "}" : ("{", "}"),
-                        "B" : ("{", "}"),
-                        "]" : ("[", "]"),
-                        "r" : ("[", "]"),
-                        ">" : ("<", ">"),
-                        "a" : ("<", ">"),
-
-                        "(" : ("( ", " )"),
-                        "{" : ("{ ", " }"),
-                        "[" : ("[ ", " ]"),
-
-                        # TODO
-                        #"t" : ("<{0}>", "</{0}>"),
-                        #"<" : ("<{0}>", "</{0}>"),
-
-                        "'" : ("'", "'"),
-                        '"' : ('"', '"'),
-                        "`" : ("`", "`"),
-
-                        }
-
-
-
-
-        self._undo_state = 0
-        self._undo_pos = -1
-        self._undo_start_position = None
-        self._undo_positions = []
-
-        self._line_column_pos = 0
-
-        self._visual_start_pos = None
-
-        self.isLinux = isLinux()