Author: reinhard Date: 2011-02-15 12:14:20 -0600 (Tue, 15 Feb 2011) New Revision: 10290
Modified: trunk/gnue-forms/ trunk/gnue-forms/src/GFObjects/GFTabStop.py trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py Log: Use wx.DatePickerCtrl only if the date format is %x. Property changes on: trunk/gnue-forms ___________________________________________________________________ Name: bzr:revision-info - timestamp: 2011-02-04 08:47:58.796999931 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms + timestamp: 2011-02-15 19:13:29.038000107 +0100 committer: Reinhard Müller <[email protected]> properties: branch-nick: forms Name: bzr:file-ids - src/GFObjects/GFBlock.py 1459@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.py + src/GFObjects/GFTabStop.py 3166@3a364389-8fce-0310-8f11-cc363fde16c7:trunk%2Fgnue-forms:src%2FGFObjects%2FGFTabStop.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] + 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] Name: bzr:text-parents - src/GFObjects/GFBlock.py [email protected] + src/GFObjects/GFTabStop.py [email protected] src/uidrivers/wx/widgets/entry.py [email protected] Modified: trunk/gnue-forms/src/GFObjects/GFTabStop.py =================================================================== --- trunk/gnue-forms/src/GFObjects/GFTabStop.py 2011-02-14 16:11:40 UTC (rev 10289) +++ trunk/gnue-forms/src/GFObjects/GFTabStop.py 2011-02-15 18:14:20 UTC (rev 10290) @@ -604,9 +604,22 @@ self._field = self._bound_block._fieldMap[self.field] self._field._entryList.append(self) + if self._field.datatype == 'date': + def_displaymask = gConfigForms('DateMask') + def_inputmask = gConfigForms('DateEditMask') + elif self._field.datatype == 'time': + def_displaymask = gConfigForms('DateMask_Time') + def_inputmask = gConfigForms('DateEditMask_Time') + elif self._field.datatype == 'datetime': + def_displaymask = gConfigForms('DateMask_Timestamp') + def_inputmask = gConfigForms('DateEditMask_Timestamp') + else: + def_displaymask = "" + def_inputmask = "" + self._formatmask = "" - self._inputmask = getattr(self, 'inputmask', '') - self._displaymask = getattr(self, 'displaymask', '') + self._displaymask = getattr(self, 'displaymask', def_displaymask) + self._inputmask = getattr(self, 'inputmask', def_inputmask) # Associate a display handler with this instance self._displayHandler = displayHandlers.factory(self, Modified: trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py =================================================================== --- trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2011-02-14 16:11:40 UTC (rev 10289) +++ trunk/gnue-forms/src/uidrivers/wx/widgets/entry.py 2011-02-15 18:14:20 UTC (rev 10290) @@ -107,7 +107,10 @@ style = wx.CB_DROPDOWN ctrl = NumberEntryCtrl(parent, style=style) - elif self._gfObject._field.datatype == 'date': + elif self._gfObject._field.datatype == 'date' \ + and self._gfObject._inputmask == '%x': + # wx.DatePickerCtrl uses a hardcoded format of %x, so we can only + # use it if we want to use %x as the date format, too. style = wx.DP_DROPDOWN | wx.DP_ALLOWNONE ctrl = DatePickerCtrl(parent, style=style) _______________________________________________ commit-gnue mailing list [email protected] http://lists.gnu.org/mailman/listinfo/commit-gnue
