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 <[email protected]> properties: branch-nick: forms + timestamp: 2012-01-27 18:20:17.644999981 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - defaults/default.gfd 9272@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:defaults%2Fdefault.gfd + src/GFObjects/GFEntry.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFEntry.py src/GFObjects/GFObj.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFObj.py src/GFParser.py 106@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFParser.py src/uidrivers/_base/widgets/_base.py 3783@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2F_base%2Fwidgets%2F_base.py src/uidrivers/wx/widgets/entry.py 10053@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2Fuidrivers%2Fwx%2Fwidgets%2Fentry.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] 3151 [email protected] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] 3161 [email protected] 3162 [email protected] 3163 [email protected] 3164 [email protected] 3165 [email protected] 3166 [email protected] 3167 [email protected] 3168 [email protected] 3169 [email protected] 3170 [email protected] 3171 [email protected] 3172 [email protected] 3173 [email protected] 3174 [email protected] 3175 [email protected] 3176 [email protected] 3177 [email protected] 3178 [email protected] 3179 [email protected] 3180 [email protected] 3181 [email protected] 3182 [email protected] 3183 [email protected] 3184 [email protected] 3185 [email protected] 3186 [email protected] 3187 [email protected] 3188 [email protected] 3189 [email protected] 3190 [email protected] 3191 [email protected] 3192 [email protected] 3193 [email protected] 3194 [email protected] 3195 [email protected] 3196 [email protected] 3197 [email protected] 3198 [email protected] 3199 [email protected] 3200 [email protected] 3201 [email protected] 3202 [email protected] 3203 [email protected] 3204 [email protected] 3205 [email protected] 3206 [email protected] 3207 [email protected] 3208 [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] 3152 [email protected] 3153 [email protected] 3154 [email protected] 3155 [email protected] 3156 [email protected] 3157 [email protected] 3158 [email protected] 3159 [email protected] 3160 [email protected] 3161 [email protected] 3162 [email protected] 3163 [email protected] 3164 [email protected] 3165 [email protected] 3166 [email protected] 3167 [email protected] 3168 [email protected] 3169 [email protected] 3170 [email protected] 3171 [email protected] 3172 [email protected] 3173 [email protected] 3174 [email protected] 3175 [email protected] 3176 [email protected] 3177 [email protected] 3178 [email protected] 3179 [email protected] 3180 [email protected] 3181 [email protected] 3182 [email protected] 3183 [email protected] 3184 [email protected] 3185 [email protected] 3186 [email protected] 3187 [email protected] 3188 [email protected] 3189 [email protected] 3190 [email protected] 3191 [email protected] 3192 [email protected] 3193 [email protected] 3194 [email protected] 3195 [email protected] 3196 [email protected] 3197 [email protected] 3198 [email protected] 3199 [email protected] 3200 [email protected] 3201 [email protected] 3202 [email protected] 3203 [email protected] 3204 [email protected] 3205 [email protected] 3206 [email protected] 3207 [email protected] 3208 [email protected] 3209 [email protected] Name: bzr:text-parents - defaults/default.gfd [email protected] + src/GFObjects/GFEntry.py [email protected] src/GFObjects/GFObj.py [email protected] src/GFParser.py [email protected] 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 [email protected] 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 # ------------------------------------------------------------------------- _______________________________________________ commit-gnue mailing list [email protected] https://lists.gnu.org/mailman/listinfo/commit-gnue
