Author: reinhard Date: 2010-11-12 09:49:37 -0600 (Fri, 12 Nov 2010) New Revision: 10234
Modified: trunk/gnue-forms/ trunk/gnue-forms/src/GFObjects/GFEntry.py trunk/gnue-forms/src/GFObjects/GFImage.py trunk/gnue-forms/src/GFObjects/GFTabStop.py trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py trunk/gnue-forms/src/uidrivers/wx/widgets/image.py Log: Introduced new trigger to be fired when the user clicks on a non-editable entry in a grid or on an image. Property changes on: trunk/gnue-forms ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2010-11-02 16:55:20.941999912 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms + timestamp: 2010-11-12 16:40:24.926000118 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - MANIFEST.in 3...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:MANIFEST.in setup.py 2...@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:setup.py + 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 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] + 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] Name: bzr:text-parents - MANIFEST.in svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9685 setup.py svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:10078 + 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] Modified: trunk/gnue-forms/src/GFObjects/GFEntry.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFEntry.py 2010-11-02 15:58:30 UTC (rev 10233) +++ trunk/gnue-forms/src/GFObjects/GFEntry.py 2010-11-12 15:49:37 UTC (rev 10234) @@ -51,6 +51,7 @@ 'POST-FOCUSOUT' : 'Post-FocusOut', 'PRE-FOCUSIN' : 'Pre-FocusIn', 'POST-FOCUSIN' : 'Post-FocusIn', + 'ON-CLICK' : 'On-Click', 'ON-NEXT-ENTRY' : 'On-Next-Entry', 'ON-PREVIOUS-ENTRY': 'On-Previous-Entry'} Modified: trunk/gnue-forms/src/GFObjects/GFImage.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFImage.py 2010-11-02 15:58:30 UTC (rev 10233) +++ trunk/gnue-forms/src/GFObjects/GFImage.py 2010-11-12 15:49:37 UTC (rev 10234) @@ -45,7 +45,11 @@ self.type = "URL" self.label = None + # Trigger exposure + self._validTriggers = { + 'ON-CLICK': 'On-Click'} + # ------------------------------------------------------------------------- # Get the current value # ------------------------------------------------------------------------- @@ -75,5 +79,3 @@ return (self.label is not None and self.style != 'checkbox') has_label = property(__get_has_label) - - Modified: trunk/gnue-forms/src/GFObjects/GFTabStop.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFTabStop.py 2010-11-02 15:58:30 UTC (rev 10233) +++ trunk/gnue-forms/src/GFObjects/GFTabStop.py 2010-11-12 15:49:37 UTC (rev 10234) @@ -198,6 +198,19 @@ # ------------------------------------------------------------------------- + + def _event_click(self): + """ + The user has clicked on a non-editable entry in a grid or on an image + widget. + + The "On-Click" trigger of the element is fired. + """ + + self.processTrigger("On-Click") + + + # ------------------------------------------------------------------------- # Number of rows of this widgets has changed # ------------------------------------------------------------------------- Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py =================================================================== --- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2010-11-02 15:58:30 UTC (rev 10233) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2010-11-12 15:49:37 UTC (rev 10234) @@ -221,10 +221,10 @@ if self.in_grid: label = wx.StaticText(parent, -1) - # Bind the LEFT_UP event to both, the panel and the label widget, + # Bind the LEFT_DOWN event to both, the panel and the label widget, # so clicking an empty cell works too - parent.Bind(wx.EVT_LEFT_UP, self.__on_label_click) - label.Bind(wx.EVT_LEFT_UP, self.__on_label_click) + parent.Bind(wx.EVT_LEFT_DOWN, self.__on_label_click) + label.Bind(wx.EVT_LEFT_DOWN, self.__on_label_click) elif self._gfObject.label: # Replace blanks by non-breaking space to avoid random linebreaks @@ -263,7 +263,8 @@ # database cursor to the record behind this entry. self._gfObject._event_jump_records( self.widgets.index(item)) - return + self._gfObject._event_click() + break event.Skip() Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/image.py =================================================================== --- trunk/gnue-forms/src/uidrivers/wx/widgets/image.py 2010-11-02 15:58:30 UTC (rev 10233) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/image.py 2010-11-12 15:49:37 UTC (rev 10234) @@ -146,6 +146,7 @@ self.image_size = self.__get_default_size() self.widget = ImageViewer(parent, self.image_size, self._gfObject.fit) + self.widget.Bind(wx.EVT_LEFT_DOWN, self.__on_click) if self._gfObject.label: # Replace blanks by non-breaking space to avoid random linebreaks @@ -177,6 +178,16 @@ return (width, height) + # ------------------------------------------------------------------------- + # Event handlers + # ------------------------------------------------------------------------- + + def __on_click(self, event): + + self._gfObject._event_click() + event.Skip() + + # ------------------------------------------------------------------------ # Set the widget's PIL # ------------------------------------------------------------------------ _______________________________________________ commit-gnue mailing list [email protected] http://lists.gnu.org/mailman/listinfo/commit-gnue
