Changeset 1471 for trunk/peppy/mainmenu.py

Timestamp:

07/08/08 12:20:56 (5 months ago)

Author:

rob

Message:

Fixed #480: added DescribeKey? action
* modified keystroke processing to send an action to a callback rather than processing the action
* updated the keystroke definition to use the built-in keystrokes from wx itself rather than a hard-coded list here in the source
* changed some default key bindings to C-h for Help

Files:

• trunk/peppy/mainmenu.py (modified) (4 diffs)

trunk/peppy/mainmenu.py

@@ -799 +799 @@
     tooltip = "Describe an action by name"
     default_menu = ("&Help", -200)
+    key_bindings = {'emacs': "C-h a", }
 
     def __init__(self, *args, **kwargs):
@@ -825 +826 @@
 
 
+class DescribeKey(SelectAction):
+    """Look up the action from the keystroke"""
+    name = "&Describe Key"
+    alias = "describe-key"
+    default_menu = ("&Help", 201)
+    key_bindings = {'emacs': "C-h k", }
+
+    def action(self, index=-1, multiplier=1):
+        self.frame.keys.setReportNext(self.displayAction)
+
+    def displayAction(self, action):
+        if action:
+            dprint("looking up docs for %s" % action)
+            Publisher().sendMessage('peppy.log.info', action.getHelp())
+            self.frame.SetStatusText("Keystroke found.")
+        else:
+            self.frame.SetStatusText("Unbound keystroke.")
+
+
 class CancelMinibuffer(SelectAction):
     alias = "cancel-minibuffer"
@@ -841 +861 @@
     tooltip = "Show help for the currently active minibuffer"
     default_menu = ("&Help", 210)
-    key_bindings = {'emacs': "M-S-/ m", }
+    key_bindings = {'emacs': "C-h m", }
     
     def isEnabled(self):
@@ -903 +923 @@
                 NewWindow, DeleteWindow, WindowList,
                 
-                ExecuteActionByName, DescribeAction, HelpMinibuffer,
+                ExecuteActionByName, DescribeAction, DescribeKey, HelpMinibuffer,
                 
                 CancelMinibuffer,