[gnue] r10234 - in trunk/gnue-forms: . src/GFObjects src/uidrivers/wx/wi

commit-gnue

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[gnue] r10234 - in trunk/gnue-forms: . src/GFObjects src/uidrivers/wx/wi

From:	reinhard
Subject:	[gnue] r10234 - in trunk/gnue-forms: . src/GFObjects src/uidrivers/wx/widgets
Date:	Fri, 12 Nov 2010 09:49:38 -0600 (CST)

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 <address@hidden>
properties: 
        branch-nick: forms

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

Name: bzr:file-ids
   - MANIFEST.in        address@hidden:trunk%2Fgnue-forms:MANIFEST.in
setup.py        address@hidden:trunk%2Fgnue-forms:setup.py

   + 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

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

   + 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

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        address@hidden
src/GFObjects/GFTabStop.py      address@hidden
src/uidrivers/wx/widgets/entry.py       address@hidden
src/uidrivers/wx/widgets/image.py       address@hidden


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
     # ------------------------------------------------------------------------

[Prev in Thread]

Current Thread

[Next in Thread]

[gnue] r10234 - in trunk/gnue-forms: . src/GFObjects src/uidrivers/wx/widgets, reinhard <=

Prev by Date: [gnue] r10233 - in trunk/gnue-forms: . images images/default images/gnome images/kde3
Next by Date: [gnue] r10235 - in trunk/gnue-forms: . src src/uidrivers/wx/widgets
Previous by thread: [gnue] r10233 - in trunk/gnue-forms: . images images/default images/gnome images/kde3
Next by thread: [gnue] r10235 - in trunk/gnue-forms: . src src/uidrivers/wx/widgets
Index(es):
- Date
- Thread