[gnue] r10290 - in trunk/gnue-forms: . src/GFObjects src/uidrivers/wx/widgets

[reinhard]

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

   + timestamp: 2011-02-15 19:13:29.038000107 +0100
committer: Reinhard Müller <address@hidden>
properties: 
        branch-nick: forms

Name: bzr:file-ids
   - src/GFObjects/GFBlock.py   
address@hidden:trunk%2Fgnue-forms:src%2FGFObjects%2FGFBlock.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

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

   + 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

Name: bzr:text-parents
   - src/GFObjects/GFBlock.py   address@hidden

   + src/GFObjects/GFTabStop.py address@hidden
src/uidrivers/wx/widgets/entry.py       address@hidden


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)