commit-gnue
[Top][All Lists]
Advanced

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

[gnue] r10338 - in trunk/gnue-forms: . src src/GFObjects src/uidrivers/_


From: reinhard
Subject: [gnue] r10338 - in trunk/gnue-forms: . src src/GFObjects src/uidrivers/_base/widgets src/uidrivers/wx/widgets
Date: Fri, 27 Jan 2012 11:21:10 -0600 (CST)

Author: reinhard
Date: 2012-01-27 11:21:10 -0600 (Fri, 27 Jan 2012)
New Revision: 10338

Modified:
   trunk/gnue-forms/
   trunk/gnue-forms/src/GFObjects/GFEntry.py
   trunk/gnue-forms/src/GFObjects/GFObj.py
   trunk/gnue-forms/src/GFParser.py
   trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
   trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
Log:
Text color and background color of entries can be set in form definition.



Property changes on: trunk/gnue-forms
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2011-12-19 09:05:02.894999981 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

   + timestamp: 2012-01-27 18:20:17.644999981 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - defaults/default.gfd       
address@hidden:trunk%2Fgnue-forms:defaults%2Fdefault.gfd

   + src/GFObjects/GFEntry.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py
src/GFObjects/GFObj.py  
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFObj.py
src/GFParser.py address@hidden:trunk%2Fgnue-forms:src%2FGFParser.py
src/uidrivers/_base/widgets/_base.py    
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2F_base%2Fwidgets%2F_base.py
src/uidrivers/wx/widgets/entry.py       
address@hidden:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.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
3151 address@hidden
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden
3173 address@hidden
3174 address@hidden
3175 address@hidden
3176 address@hidden
3177 address@hidden
3178 address@hidden
3179 address@hidden
3180 address@hidden
3181 address@hidden
3182 address@hidden
3183 address@hidden
3184 address@hidden
3185 address@hidden
3186 address@hidden
3187 address@hidden
3188 address@hidden
3189 address@hidden
3190 address@hidden
3191 address@hidden
3192 address@hidden
3193 address@hidden
3194 address@hidden
3195 address@hidden
3196 address@hidden
3197 address@hidden
3198 address@hidden
3199 address@hidden
3200 address@hidden
3201 address@hidden
3202 address@hidden
3203 address@hidden
3204 address@hidden
3205 address@hidden
3206 address@hidden
3207 address@hidden
3208 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
3152 address@hidden
3153 address@hidden
3154 address@hidden
3155 address@hidden
3156 address@hidden
3157 address@hidden
3158 address@hidden
3159 address@hidden
3160 address@hidden
3161 address@hidden
3162 address@hidden
3163 address@hidden
3164 address@hidden
3165 address@hidden
3166 address@hidden
3167 address@hidden
3168 address@hidden
3169 address@hidden
3170 address@hidden
3171 address@hidden
3172 address@hidden
3173 address@hidden
3174 address@hidden
3175 address@hidden
3176 address@hidden
3177 address@hidden
3178 address@hidden
3179 address@hidden
3180 address@hidden
3181 address@hidden
3182 address@hidden
3183 address@hidden
3184 address@hidden
3185 address@hidden
3186 address@hidden
3187 address@hidden
3188 address@hidden
3189 address@hidden
3190 address@hidden
3191 address@hidden
3192 address@hidden
3193 address@hidden
3194 address@hidden
3195 address@hidden
3196 address@hidden
3197 address@hidden
3198 address@hidden
3199 address@hidden
3200 address@hidden
3201 address@hidden
3202 address@hidden
3203 address@hidden
3204 address@hidden
3205 address@hidden
3206 address@hidden
3207 address@hidden
3208 address@hidden
3209 address@hidden

Name: bzr:text-parents
   - defaults/default.gfd       address@hidden

   + src/GFObjects/GFEntry.py   address@hidden
src/GFObjects/GFObj.py  address@hidden
src/GFParser.py address@hidden
src/uidrivers/_base/widgets/_base.py    
svn-v3-single1-dHJ1bmsvZ251ZS1mb3Jtcw..:3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:9956
src/uidrivers/wx/widgets/entry.py       address@hidden


Modified: trunk/gnue-forms/src/GFObjects/GFEntry.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFEntry.py   2011-12-19 08:06:08 UTC (rev 
10337)
+++ trunk/gnue-forms/src/GFObjects/GFEntry.py   2012-01-27 17:21:10 UTC (rev 
10338)
@@ -44,9 +44,9 @@
         # Default attributes (these may be replaced by parser)
         self.style = "default"
         self.label = None
+        self.color = None
+        self.background_color = None
 
-        self.__background_color = None
-
         # Trigger exposure
         self._validTriggers = {
             'PRE-FOCUSOUT'     : 'Pre-FocusOut',
@@ -72,6 +72,9 @@
             'navigable':{
                 'get': self.triggerGetNavigable,
                 'set': self.triggerSetNavigable},
+            'color': {
+                'get': self.__set_color,
+                'set': self.__set_color},
             'background_color': {
                 'get': self.__set_background_color,
                 'set': self.__set_background_color}})
@@ -113,6 +116,20 @@
 
 
     # -------------------------------------------------------------------------
+    # Initialize user interface
+    # -------------------------------------------------------------------------
+
+    def _initialize_ui_(self):
+
+        if self.color is not None:
+            for index in range (0, self._rows):
+                self.uiWidget._ui_set_color_(index, self.color)
+        if self.background_color is not None:
+            for index in range (0, self._rows):
+                self.uiWidget._ui_set_background_color_(index, 
self.background_color)
+
+
+    # -------------------------------------------------------------------------
     # Determine whether this widget is enabled or disabled
     # -------------------------------------------------------------------------
 
@@ -194,19 +211,35 @@
     # Color
     # -------------------------------------------------------------------------
 
+    def __get_color(self):
+
+        return self.color
+
+    # -------------------------------------------------------------------------
+
+    def __set_color(self, color):
+
+        if color != self.color:
+            if self.uiWidget is not None:
+                for index in range (0, self._rows):
+                    self.uiWidget._ui_set_color_(index, color)
+            self.color = color
+
+    # -------------------------------------------------------------------------
+
     def __get_background_color(self):
 
-        return self.__background_color
+        return self.background_color
 
     # -------------------------------------------------------------------------
 
     def __set_background_color(self, color):
 
-        if color != self.__background_color:
+        if color != self.background_color:
             if self.uiWidget is not None:
                 for index in range (0, self._rows):
                     self.uiWidget._ui_set_background_color_(index, color)
-            self.__background_color = color
+            self.background_color = color
 
 
     # =========================================================================

Modified: trunk/gnue-forms/src/GFObjects/GFObj.py
===================================================================
--- trunk/gnue-forms/src/GFObjects/GFObj.py     2011-12-19 08:06:08 UTC (rev 
10337)
+++ trunk/gnue-forms/src/GFObjects/GFObj.py     2012-01-27 17:21:10 UTC (rev 
10338)
@@ -201,6 +201,20 @@
 
 
     # -------------------------------------------------------------------------
+    # Initialize user interface properties
+    # -------------------------------------------------------------------------
+
+    def _initialize_ui_(self):
+        """
+        Descendants can implement this function to call _ui_set_... methods for
+        all properties that were initialized before the actual UI widgets are
+        created.
+        """
+
+        pass
+
+
+    # -------------------------------------------------------------------------
     # Indicate whether this widget makes use of the separate label column
     # -------------------------------------------------------------------------
 

Modified: trunk/gnue-forms/src/GFParser.py
===================================================================
--- trunk/gnue-forms/src/GFParser.py    2011-12-19 08:06:08 UTC (rev 10337)
+++ trunk/gnue-forms/src/GFParser.py    2012-01-27 17:21:10 UTC (rev 10338)
@@ -730,6 +730,14 @@
                'Required': False,
                'References': 'block.name',
                'Description': 'The name of the block that this ties to.' },
+            'color': {
+               'Typecast': GTypecast.text,
+               'Required': False,
+               'Description': 'Text color'},
+            'background_color': {
+               'Typecast': GTypecast.text,
+               'Required': False,
+               'Description': 'Background color'},
             'focusorder': {
                'Typecast': GTypecast.whole,
                'Label': _('Focus Order'),

Modified: trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2011-12-19 
08:06:08 UTC (rev 10337)
+++ trunk/gnue-forms/src/uidrivers/_base/widgets/_base.py       2012-01-27 
17:21:10 UTC (rev 10338)
@@ -179,7 +179,9 @@
                 widget = self.create_widget(self._creationEvent, spacer)
                 self.widgets.append(widget)
 
+            self._gfObject._initialize_ui_()
 
+
     # -------------------------------------------------------------------------
     # Create an instance of the ui widget
     # -------------------------------------------------------------------------

Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py
===================================================================
--- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2011-12-19 08:06:08 UTC 
(rev 10337)
+++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py  2012-01-27 17:21:10 UTC 
(rev 10338)
@@ -756,6 +756,20 @@
 
 
     # -------------------------------------------------------------------------
+    # Set the foreground color
+    # -------------------------------------------------------------------------
+
+    def _ui_set_color_(self, index, color):
+        
+        widget = self.widgets[index]
+        if color is not None:
+            widget.SetForegroundColour(color)
+        else:
+            widget.SetForegroundColour(wx.NullColour)
+        widget.Refresh()
+
+
+    # -------------------------------------------------------------------------
     # Set the background color
     # -------------------------------------------------------------------------
 




reply via email to

[Prev in Thread] Current Thread [Next in Thread]