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 <reinhard.muel...@bytewise.at>
properties:
branch-nick: forms
+ timestamp: 2011-02-15 19:13:29.038000107 +0100
committer: Reinhard Müller <reinhard.muel...@bytewise.at>
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 reinhard.muel...@bytewise.at-20100426083500-vtmq0qvd7htz02zx
3117 reinhard.muel...@bytewise.at-20100512151744-2jx8tmtop30kl5n0
3118 reinhard.muel...@bytewise.at-20100705094014-ks9yv7b8gs6ychrb
3119 reinhard.muel...@bytewise.at-20100706085143-hyxadj30ayg28jpx
3120 reinhard.muel...@bytewise.at-20100706140804-sn3npws1ykm81ubx
3121 reinhard.muel...@bytewise.at-20100909134008-5p7jq048nkutldse
3122 reinhard.muel...@bytewise.at-20100923144753-e8hthxho7n5mwg9z
3123 reinhard.muel...@bytewise.at-20100929193018-7r3injoy8g28fwm6
3124 reinhard.muel...@bytewise.at-20100930073631-ilf6smgjt6mfvkpz
3125 reinhard.muel...@bytewise.at-20101011191957-yaj9rkqbervc91ac
3126 reinhard.muel...@bytewise.at-20101020084039-jmfxjbctt6vc2usd
3127 reinhard.muel...@bytewise.at-20101020124425-0dpprxsmanmaenty
3128 reinhard.muel...@bytewise.at-20101020124541-zppkmzww1lnsk8x4
3129 reinhard.muel...@bytewise.at-20101020141905-vjg7r3wihnm7mxam
3130 reinhard.muel...@bytewise.at-20101020143045-pf9ywx1s3hdqbsh7
3131 reinhard.muel...@bytewise.at-20101020143328-ctfmr3fpp5quq1eo
3132 reinhard.muel...@bytewise.at-20101020152139-rlllh9m2qn45atcz
3133 reinhard.muel...@bytewise.at-20101020163022-tgnjcv18nzrc5sfw
3134 reinhard.muel...@bytewise.at-20101020165411-krluvclyw61ef9zp
3135 reinhard.muel...@bytewise.at-20101020185529-pmdkwkm59c1h630f
3136 reinhard.muel...@bytewise.at-20101020195954-1kd9avbmzkrzwzbt
3137 reinhard.muel...@bytewise.at-20101020202048-8q84nx5a54ifxkla
3138 reinhard.muel...@bytewise.at-20101027211256-o7pi879h2x1ceri2
3139 reinhard.muel...@bytewise.at-20101028135833-wftnu2r1cocknxyf
3140 reinhard.muel...@bytewise.at-20101028144709-dbamfa759xoeh127
3141 reinhard.muel...@bytewise.at-20101028145355-uhqftv7n1bcvuz8l
3142 reinhard.muel...@bytewise.at-20101028151042-ueeqwlufysjbke01
3143 reinhard.muel...@bytewise.at-20101028153459-522p7574jw2e11jj
3144 reinhard.muel...@bytewise.at-20101028164956-gua27xm7ad12a218
3145 reinhard.muel...@bytewise.at-20101028181046-hxaehghl84zx9ye0
3146 reinhard.muel...@bytewise.at-20101028194606-598w1lqua0te1m7j
3147 reinhard.muel...@bytewise.at-20101028205855-5k1f08wfdgofenjd
3148 reinhard.muel...@bytewise.at-20101102154340-basdvi9wrxzbx4va
3149 reinhard.muel...@bytewise.at-20101102155520-bbh74pv3qjur1epo
3150 reinhard.muel...@bytewise.at-20101112154024-57tv8mf0wbiycuw1
3151 reinhard.muel...@bytewise.at-20101112155954-ky2g6irsodlzg6yy
3152 reinhard.muel...@bytewise.at-20101114210345-8zsz8bdxtwjytkss
3153 reinhard.muel...@bytewise.at-20101114213813-m10tqf7r2elldh6l
3154 reinhard.muel...@bytewise.at-20101115202536-k0zrvggyt6jy8h0y
3155 reinhard.muel...@bytewise.at-20101122074637-ydmqkqy3udno2n5m
3156 reinhard.muel...@bytewise.at-20101122083336-1n0xys8y4ivtfzo4
3157 reinhard.muel...@bytewise.at-20101201210052-n8pz9fkj6z95zlo2
3158 reinhard.muel...@bytewise.at-20101202012351-kou0f0zchuws25al
3159 reinhard.muel...@bytewise.at-20101202125150-izgvlp3p35t6ny4q
3160 reinhard.muel...@bytewise.at-20101202145210-pf97mpvy5nvhkzqz
3161 reinhard.muel...@bytewise.at-20101202160021-cwhtwpidejk31t6w
3162 reinhard.muel...@bytewise.at-20101202174643-d9ydcs06o8kfy8h7
3163 reinhard.muel...@bytewise.at-20101202180214-zbmb7u0eec43z58g
3164 reinhard.muel...@bytewise.at-20101202202940-kv3x2nnl7ljp8ywo
3165 reinhard.muel...@bytewise.at-20101202204605-4conpgzutzq33iza
3166 reinhard.muel...@bytewise.at-20101202222547-mhsz18h7mqtifatt
3167 reinhard.muel...@bytewise.at-20101203082101-4u4p255falj52btx
3168 reinhard.muel...@bytewise.at-20101203101318-9xi1eyhql8obrhy1
3169 reinhard.muel...@bytewise.at-20101203101750-eeesm6a88ihyja18
3170 reinhard.muel...@bytewise.at-20101203105845-pb8n81gdqfjhb3fi
3171 reinhard.muel...@bytewise.at-20101203112140-2fva9rrj0j87abw4
3172 reinhard.muel...@bytewise.at-20101203115417-rw7t0y2fxoqksceo
3173 reinhard.muel...@bytewise.at-20101203133118-qtzn9umcgo0j75xj
3174 reinhard.muel...@bytewise.at-20101207234352-a0t9jal1a3hhl6w5
3175 reinhard.muel...@bytewise.at-20101208000304-7uofgoiy9afr66t0
3176 reinhard.muel...@bytewise.at-20101211165220-2jxsfkmi6hfk5vix
3177 reinhard.muel...@bytewise.at-20101216193526-a2stgysag5f7wdgx
3178 reinhard.muel...@bytewise.at-20101216205502-y7rxbvt79w19avee
3179 reinhard.muel...@bytewise.at-20101220102255-5hhctceuouexqbcr
3180 reinhard.muel...@bytewise.at-20110104124022-tce9r100eqbqby6e
3181 reinhard.muel...@bytewise.at-20110111114434-ce4ebi6thl4a81zq
3182 reinhard.muel...@bytewise.at-20110111152808-923nj682p2fv071h
3183 reinhard.muel...@bytewise.at-20110201205238-2ei2zzkcyli7vt9k
3184 reinhard.muel...@bytewise.at-20110203111430-gz06s5xfq9pm720j
3185 reinhard.muel...@bytewise.at-20110204074758-v914zikh0x1nu9w5
+ 3116 reinhard.muel...@bytewise.at-20100426083500-vtmq0qvd7htz02zx
3117 reinhard.muel...@bytewise.at-20100512151744-2jx8tmtop30kl5n0
3118 reinhard.muel...@bytewise.at-20100705094014-ks9yv7b8gs6ychrb
3119 reinhard.muel...@bytewise.at-20100706085143-hyxadj30ayg28jpx
3120 reinhard.muel...@bytewise.at-20100706140804-sn3npws1ykm81ubx
3121 reinhard.muel...@bytewise.at-20100909134008-5p7jq048nkutldse
3122 reinhard.muel...@bytewise.at-20100923144753-e8hthxho7n5mwg9z
3123 reinhard.muel...@bytewise.at-20100929193018-7r3injoy8g28fwm6
3124 reinhard.muel...@bytewise.at-20100930073631-ilf6smgjt6mfvkpz
3125 reinhard.muel...@bytewise.at-20101011191957-yaj9rkqbervc91ac
3126 reinhard.muel...@bytewise.at-20101020084039-jmfxjbctt6vc2usd
3127 reinhard.muel...@bytewise.at-20101020124425-0dpprxsmanmaenty
3128 reinhard.muel...@bytewise.at-20101020124541-zppkmzww1lnsk8x4
3129 reinhard.muel...@bytewise.at-20101020141905-vjg7r3wihnm7mxam
3130 reinhard.muel...@bytewise.at-20101020143045-pf9ywx1s3hdqbsh7
3131 reinhard.muel...@bytewise.at-20101020143328-ctfmr3fpp5quq1eo
3132 reinhard.muel...@bytewise.at-20101020152139-rlllh9m2qn45atcz
3133 reinhard.muel...@bytewise.at-20101020163022-tgnjcv18nzrc5sfw
3134 reinhard.muel...@bytewise.at-20101020165411-krluvclyw61ef9zp
3135 reinhard.muel...@bytewise.at-20101020185529-pmdkwkm59c1h630f
3136 reinhard.muel...@bytewise.at-20101020195954-1kd9avbmzkrzwzbt
3137 reinhard.muel...@bytewise.at-20101020202048-8q84nx5a54ifxkla
3138 reinhard.muel...@bytewise.at-20101027211256-o7pi879h2x1ceri2
3139 reinhard.muel...@bytewise.at-20101028135833-wftnu2r1cocknxyf
3140 reinhard.muel...@bytewise.at-20101028144709-dbamfa759xoeh127
3141 reinhard.muel...@bytewise.at-20101028145355-uhqftv7n1bcvuz8l
3142 reinhard.muel...@bytewise.at-20101028151042-ueeqwlufysjbke01
3143 reinhard.muel...@bytewise.at-20101028153459-522p7574jw2e11jj
3144 reinhard.muel...@bytewise.at-20101028164956-gua27xm7ad12a218
3145 reinhard.muel...@bytewise.at-20101028181046-hxaehghl84zx9ye0
3146 reinhard.muel...@bytewise.at-20101028194606-598w1lqua0te1m7j
3147 reinhard.muel...@bytewise.at-20101028205855-5k1f08wfdgofenjd
3148 reinhard.muel...@bytewise.at-20101102154340-basdvi9wrxzbx4va
3149 reinhard.muel...@bytewise.at-20101102155520-bbh74pv3qjur1epo
3150 reinhard.muel...@bytewise.at-20101112154024-57tv8mf0wbiycuw1
3151 reinhard.muel...@bytewise.at-20101112155954-ky2g6irsodlzg6yy
3152 reinhard.muel...@bytewise.at-20101114210345-8zsz8bdxtwjytkss
3153 reinhard.muel...@bytewise.at-20101114213813-m10tqf7r2elldh6l
3154 reinhard.muel...@bytewise.at-20101115202536-k0zrvggyt6jy8h0y
3155 reinhard.muel...@bytewise.at-20101122074637-ydmqkqy3udno2n5m
3156 reinhard.muel...@bytewise.at-20101122083336-1n0xys8y4ivtfzo4
3157 reinhard.muel...@bytewise.at-20101201210052-n8pz9fkj6z95zlo2
3158 reinhard.muel...@bytewise.at-20101202012351-kou0f0zchuws25al
3159 reinhard.muel...@bytewise.at-20101202125150-izgvlp3p35t6ny4q
3160 reinhard.muel...@bytewise.at-20101202145210-pf97mpvy5nvhkzqz
3161 reinhard.muel...@bytewise.at-20101202160021-cwhtwpidejk31t6w
3162 reinhard.muel...@bytewise.at-20101202174643-d9ydcs06o8kfy8h7
3163 reinhard.muel...@bytewise.at-20101202180214-zbmb7u0eec43z58g
3164 reinhard.muel...@bytewise.at-20101202202940-kv3x2nnl7ljp8ywo
3165 reinhard.muel...@bytewise.at-20101202204605-4conpgzutzq33iza
3166 reinhard.muel...@bytewise.at-20101202222547-mhsz18h7mqtifatt
3167 reinhard.muel...@bytewise.at-20101203082101-4u4p255falj52btx
3168 reinhard.muel...@bytewise.at-20101203101318-9xi1eyhql8obrhy1
3169 reinhard.muel...@bytewise.at-20101203101750-eeesm6a88ihyja18
3170 reinhard.muel...@bytewise.at-20101203105845-pb8n81gdqfjhb3fi
3171 reinhard.muel...@bytewise.at-20101203112140-2fva9rrj0j87abw4
3172 reinhard.muel...@bytewise.at-20101203115417-rw7t0y2fxoqksceo
3173 reinhard.muel...@bytewise.at-20101203133118-qtzn9umcgo0j75xj
3174 reinhard.muel...@bytewise.at-20101207234352-a0t9jal1a3hhl6w5
3175 reinhard.muel...@bytewise.at-20101208000304-7uofgoiy9afr66t0
3176 reinhard.muel...@bytewise.at-20101211165220-2jxsfkmi6hfk5vix
3177 reinhard.muel...@bytewise.at-20101216193526-a2stgysag5f7wdgx
3178 reinhard.muel...@bytewise.at-20101216205502-y7rxbvt79w19avee
3179 reinhard.muel...@bytewise.at-20101220102255-5hhctceuouexqbcr
3180 reinhard.muel...@bytewise.at-20110104124022-tce9r100eqbqby6e
3181 reinhard.muel...@bytewise.at-20110111114434-ce4ebi6thl4a81zq
3182 reinhard.muel...@bytewise.at-20110111152808-923nj682p2fv071h
3183 reinhard.muel...@bytewise.at-20110201205238-2ei2zzkcyli7vt9k
3184 reinhard.muel...@bytewise.at-20110203111430-gz06s5xfq9pm720j
3185 reinhard.muel...@bytewise.at-20110204074758-v914zikh0x1nu9w5
3186 reinhard.muel...@bytewise.at-20110215181329-kqmd82xq2sjdoxy9
Name: bzr:text-parents
- src/GFObjects/GFBlock.py
reinhard.muel...@bytewise.at-20101208000304-7uofgoiy9afr66t0
+ src/GFObjects/GFTabStop.py
reinhard.muel...@bytewise.at-20101220102255-5hhctceuouexqbcr
src/uidrivers/wx/widgets/entry.py
reinhard.muel...@bytewise.at-20110111114434-ce4ebi6thl4a81zq
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
commit-gnue@gnu.org
http://lists.gnu.org/mailman/listinfo/commit-gnue
