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 <[email protected]> properties: branch-nick: forms + timestamp: 2010-11-12 16:59:54.292999983 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - src/GFObjects/GFEntry.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py src/GFObjects/GFImage.py 3...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFImage.py src/GFObjects/GFTabStop.py 3...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.py src/uidrivers/wx/widgets/entry.py 10...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.py src/uidrivers/wx/widgets/image.py 10...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fimage.py + src/GFParser.py 1...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFParser.py src/uidrivers/wx/widgets/button.py 10...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fbutton.py Name: bzr:revision-id:v4 - 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] + 3116 [email protected] 3117 [email protected] 3118 [email protected] 3119 [email protected] 3120 [email protected] 3121 [email protected] 3122 [email protected] 3123 [email protected] 3124 [email protected] 3125 [email protected] 3126 [email protected] 3127 [email protected] 3128 [email protected] 3129 [email protected] 3130 [email protected] 3131 [email protected] 3132 [email protected] 3133 [email protected] 3134 [email protected] 3135 [email protected] 3136 [email protected] 3137 [email protected] 3138 [email protected] 3139 [email protected] 3140 [email protected] 3141 [email protected] 3142 [email protected] 3143 [email protected] 3144 [email protected] 3145 [email protected] 3146 [email protected] 3147 [email protected] 3148 [email protected] 3149 [email protected] 3150 [email protected] 3151 [email protected] 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 [email protected] src/GFObjects/GFTabStop.py [email protected] src/uidrivers/wx/widgets/entry.py [email protected] src/uidrivers/wx/widgets/image.py [email protected] + src/GFParser.py [email protected] src/uidrivers/wx/widgets/button.py [email protected] 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): _______________________________________________ commit-gnue mailing list [email protected] http://lists.gnu.org/mailman/listinfo/commit-gnue
