[gnue] r10235 - in trunk/gnue-forms: . src src/uidrivers/wx/widgets

[reinhard]

Author: reinhard
Date: 2010-11-12 10:23:07 -0600 (Fri, 12 Nov 2010)
New Revision: 10235

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFParser.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
Log:
Allow grid_link for buttons, too, just like for entries.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-11-12 16:40:24.926000118 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2010-11-12 16:59:54.292999983 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFEntry.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py
src/GFObjects/GFImage.py        
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFImage.py
src/GFObjects/GFTabStop.py      
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py
src/uidrivers/wx/widgets/entry.py       
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.py
src/uidrivers/wx/widgets/image.py       
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fimage.py

   + src/GFParser.py    address@hidden:trunk%2Fgnue-forms:src%2FGFParser.py
src/uidrivers/wx/widgets/button.py      
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fbutton.py

Name: bzr:revision-id:v4
   - 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden

   + 3116 address@hidden
3117 address@hidden
3118 address@hidden
3119 address@hidden
3120 address@hidden
3121 address@hidden
3122 address@hidden
3123 address@hidden
3124 address@hidden
3125 address@hidden
3126 address@hidden
3127 address@hidden
3128 address@hidden
3129 address@hidden
3130 address@hidden
3131 address@hidden
3132 address@hidden
3133 address@hidden
3134 address@hidden
3135 address@hidden
3136 address@hidden
3137 address@hidden
3138 address@hidden
3139 address@hidden
3140 address@hidden
3141 address@hidden
3142 address@hidden
3143 address@hidden
3144 address@hidden
3145 address@hidden
3146 address@hidden
3147 address@hidden
3148 address@hidden
3149 address@hidden
3150 address@hidden
3151 address@hidden

Name: bzr:text-parents
   - src/GFObjects/GFEntry.py   
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10149
src/GFObjects/GFImage.py        address@hidden
src/GFObjects/GFTabStop.py      address@hidden
src/uidrivers/wx/widgets/entry.py       address@hidden
src/uidrivers/wx/widgets/image.py       address@hidden

   + src/GFParser.py    address@hidden
src/uidrivers/wx/widgets/button.py      address@hidden


Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2010-11-12 15:49:37 UTC (rev 10234)
+++ trunk/gnue-forms/src/GFParser.py    2010-11-12 16:23:07 UTC (rev 10235)
@@ -1066,7 +1066,14 @@
                'Description': 'The text that should appear on the button' },
             'action': {
                'Typecast': GTypecast.name,
-               'Description': 'Action to be executed when the button is 
fired'}},
+               'Description': 'Action to be executed when the button is 
fired'},
+            'grid_link': {
+               'Typecast': GTypecast.name,
+               'Label': _('Grid Link'),
+               'Description': "If a button is linked to a grid, the user will "
+                        "be able to use the cursor up/down and page up/down "
+                        "keys to move around in the grid while the focus "
+                        "actually is in this button."}},
          'Positionable': True,
          'ParentTags': ('page','vbox','hbox','box','gridline'),
          'Label': u_('Button'),

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/button.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2010-11-12 15:49:37 UTC 
(rev 10234)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/button.py 2010-11-12 16:23:07 UTC 
(rev 10235)
@@ -78,8 +78,9 @@
 
         return self.widget
 
-
     # -------------------------------------------------------------------------
+    # Event handlers
+    # -------------------------------------------------------------------------
 
     def __on_char (self, event):
 
@@ -88,15 +89,24 @@
         if keycode in [wx.WXK_SPACE, wx.WXK_RETURN]:
             self._gfObject._event_fire()
 
-        else:
-            # For all other keys ask the keymapper if he could do something
-            # usefull
+        # Handle cursor up/down and page up/down.
+        if not (event.ShiftDown() or event.CmdDown() or event.AltDown()):
+            if keycode == wx.WXK_UP:
+                self._gfObject._event_line_up()
+            elif keycode == wx.WXK_DOWN:
+                self._gfObject._event_line_down()
+            elif keycode in (wx.WXK_PRIOR, wx.WXK_PAGEUP):
+                self._gfObject._event_page_up()
+            elif keycode in (wx.WXK_NEXT, wx.WXK_PAGEDOWN):
+                self._gfObject._event_page_down()
+
+        command = None
+
+        if keycode == wx.WXK_TAB:
             (command, args) = GFKeyMapper.KeyMapper.getEvent(keycode,
                     event.ShiftDown(), event.CmdDown(), event.AltDown())
-
             if command:
                 self._request(command, triggerName=args)
-
             else:
                 event.Skip()
 
@@ -117,7 +127,6 @@
         else:
             event.Skip()
 
-
     # -------------------------------------------------------------------------
 
     def __on_button (self, event):
@@ -127,7 +136,6 @@
             self._gfObject._event_set_focus(widget)
         self._gfObject._event_fire()
 
-
     # -------------------------------------------------------------------------
 
     def __on_set_focus (self, event):