[gnue] r9337 - in trunk/gnue-forms: defaults src src/GFObjects src/uidrivers/wx26/widgets

[reinhard]

Author: reinhard
Date: 2007-01-26 16:00:32 -0600 (Fri, 26 Jan 2007)
New Revision: 9337

Modified:
   trunk/gnue-forms/defaults/default.gfd
   trunk/gnue-forms/src/GFObjects/commanders.py
   trunk/gnue-forms/src/GFParser.py
   trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
Log:
Added hotkeys to menus.


Modified: trunk/gnue-forms/defaults/default.gfd
===================================================================
--- trunk/gnue-forms/defaults/default.gfd       2007-01-26 20:28:29 UTC (rev 
9336)
+++ trunk/gnue-forms/defaults/default.gfd       2007-01-26 22:00:32 UTC (rev 
9337)
@@ -17,12 +17,6 @@
   </action>
 
   <!-- Focus management -->
-  <action name="__next_entry__" label="Next Entry">
-    form.next_entry()
-  </action>
-  <action name="__previous_entry__" label="Previous Entry">
-    form.previous_entry()
-  </action>
   <action name="__next_block__" label="Next Block">
     form.next_block()
   </action>
@@ -99,43 +93,50 @@
 
   <menu name="__main__" label="Main Menu">
     <menu name="__file__" label="File">
-      <menuitem name="__commit__" action="__commit__"/>
-      <menuitem name="__rollback__" action="__rollback__"/>
+      <menuitem name="__commit__" action="__commit__" hotkey="F6"/>
+      <menuitem name="__rollback__" action="__rollback__" hotkey="F11"/>
       <menuitem name="__sep0__"/>
-      <menuitem name="__printout__" action="__printout__"/>
+      <menuitem name="__printout__" action="__printout__" hotkey="CTRL+P"/>
       <menuitem name="__sep1__"/>
-      <menuitem name="__close__" action="__close__"/>
+      <menuitem name="__close__" action="__close__" hotkey="CTRL+Q"/>
     </menu>
     <menu name="__edit__" label="Edit">
-      <menuitem name="__cut__" action="__cut__"/>
-      <menuitem name="__copy__" action="__copy__"/>
-      <menuitem name="__paste__" action="__paste__"/>
-      <menuitem name="__select_all__" action="__select_all__"/>
+      <menuitem name="__cut__" action="__cut__" hotkey="CTRL+X"/>
+      <menuitem name="__copy__" action="__copy__" hotkey="CTRL+C"/>
+      <menuitem name="__paste__" action="__paste__" hotkey="CTRL+V"/>
+      <menuitem name="__select_all__" action="__select_all__" hotkey="CTRL+A"/>
       <menuitem name="__sep0__"/>
-      <menuitem name="__new_record__" action="__new_record__"/>
+      <menuitem name="__new_record__" action="__new_record__" hotkey="F12"/>
       <menuitem name="__sep1__"/>
-      <menuitem name="__delete_record__" action="__delete_record__"/>
-      <menuitem name="__undelete_record__" action="__undelete_record__"/>
+      <menuitem name="__delete_record__" action="__delete_record__"
+        action_off="__undelete_record__" hotkey="F5"/>
     </menu>
     <menu name="__navigation__" label="Navigation">
-      <menuitem name="__next_entry__" action="__next_entry__"/>
-      <menuitem name="__previous_entry__" action="__previous_entry__"/>
-      <menuitem name="__next_block__" action="__next_block__"/>
-      <menuitem name="__previous_block__" action="__previous_block__"/>
-      <menuitem name="__next_page__" action="__next_page__"/>
-      <menuitem name="__previous_page__" action="__previous_page__"/>
+      <menuitem name="__previous_block__" action="__previous_block__"
+        hotkey="PGUP"/>
+      <menuitem name="__next_block__" action="__next_block__"
+        hotkey="PGDN"/>
+      <menuitem name="__previous_page__" action="__previous_page__"
+        hotkey="CTRL+PGUP"/>
+      <menuitem name="__next_page__" action="__next_page__"
+        hotkey="CTRL+PGDN"/>
       <menuitem name="__sep0__"/>
-      <menuitem name="__first_record__" action="__first_record__"/>
-      <menuitem name="__prev_record__" action="__prev_record__"/>
-      <menuitem name="__next_record__" action="__next_record__"/>
-      <menuitem name="__last_record__" action="__last_record__"/>
-      <menuitem name="__ask_record__" action="__ask_record__"/>
+      <menuitem name="__first_record__" action="__first_record__"
+        hotkey="CTRL+UP"/>
+      <menuitem name="__prev_record__" action="__prev_record__" hotkey="UP"/>
+      <menuitem name="__next_record__" action="__next_record__" hotkey="DOWN"/>
+      <menuitem name="__last_record__" action="__last_record__"
+        hotkey="CTRL+DOWN"/>
+      <menuitem name="__ask_record__" action="__ask_record__" hotkey="F3"/>
     </menu>
     <menu name="__filter__" label="Filter">
-      <menuitem name="__init_query__" action="__init_query__"/>
-      <menuitem name="__cancel_query__" action="__cancel_query__"/>
-      <menuitem name="__copy_query__" action="__copy_query__"/>
-      <menuitem name="__execute_query__" action="__execute_query__"/>
+      <menuitem name="__init_query__" action="__init_query__" hotkey="F8"/>
+      <menuitem name="__cancel_query__" action="__cancel_query__"
+        hotkey="SHIFT+F9"/>
+      <menuitem name="__copy_query__" action="__copy_query__"
+        hotkey="SHIFT+F8"/>
+      <menuitem name="__execute_query__" action="__execute_query__"
+        hotkey="F9"/>
     </menu>
     <menu name="__help__" label="Help">
       <menuitem name="__show_about__" action="__show_about__"/>

Modified: trunk/gnue-forms/src/GFObjects/commanders.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/commanders.py        2007-01-26 20:28:29 UTC 
(rev 9336)
+++ trunk/gnue-forms/src/GFObjects/commanders.py        2007-01-26 22:00:32 UTC 
(rev 9337)
@@ -274,9 +274,18 @@
 class GFMenuItem(GFCommander):
     """
     An item in a menu that fires an action when selected.
+
+    A menu item can also have a hotkey assigned to it.
     """
 
     # -------------------------------------------------------------------------
+    # Attributes
+    # -------------------------------------------------------------------------
+
+    hotkey = None
+
+
+    # -------------------------------------------------------------------------
     # Constructor
     # -------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2007-01-26 20:28:29 UTC (rev 9336)
+++ trunk/gnue-forms/src/GFParser.py    2007-01-26 22:00:32 UTC (rev 9337)
@@ -174,6 +174,10 @@
                             "item is switched to off"),
                         'Typecast'   : GTypecast.name,
                         'References' : 'trigger.name'},
+                    'hotkey': {
+                        'Label'      : u_("Hotkey"),
+                        'Description': u_("Hotkey to assign to this menu 
item"),
+                        'Typecast'   : GTypecast.text},
                     'state': {
                         'Label'      : u_("State"),
                         'Description': u_(

Modified: trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2007-01-26 
20:28:29 UTC (rev 9336)
+++ trunk/gnue-forms/src/uidrivers/wx26/widgets/menuitem.py     2007-01-26 
22:00:32 UTC (rev 9337)
@@ -48,6 +48,7 @@
         icon = self._gfObject.icon
         label = self._gfObject.label
         description = self._gfObject.description
+        hotkey = self._gfObject.hotkey
         check = (self._gfObject.action_off is not None)
 
         if check:
@@ -56,9 +57,12 @@
             kind = wx.ITEM_NORMAL
 
         if label is not None:
-            widget = wx.MenuItem(event.container, wx.ID_ANY,
-                    label, description or u"",
-                    kind)
+            if hotkey is not None:
+                text = label + u"\t" + hotkey
+            else:
+                text = label
+            widget = wx.MenuItem(event.container, wx.ID_ANY, text,
+                    description or u"", kind)
     
             if icon:
                 image = wx.Image(icon, wx.BITMAP_TYPE_PNG)
@@ -68,6 +72,8 @@
 
             event.container.AppendItem(widget)
 
+            # FIXME: GFMenuItems should better call _ui_disable_() if the menu
+            # items should not start up enabled.
             if not self._gfObject._ui_enabled:
                 widget.Enable(False)
         else: