Changeset 650
- Timestamp:
- 07/31/03 13:21:56 (5 years ago)
- Files:
-
- trunk/RBSkinning/RBSkinning/wxPythonSkin/maskcombo.py (modified) (2 diffs)
- trunk/RBSkinning/RBSkinning/wxPythonSkin/maskfield.py (added)
- trunk/RBSkinning/RBSkinning/wxPythonSkin/masktext.py (modified) (3 diffs)
- trunk/RBSkinning/RBSkinning/wxPythonSkin/wxSkinObject.py (modified) (1 diff)
- trunk/RBSkinning/demo/wxPythonSkin/widgets/maskcombo.py (modified) (1 diff)
- trunk/RBSkinning/demo/wxPythonSkin/widgets/masktext.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/RBSkinning/RBSkinning/wxPythonSkin/maskcombo.py
r649 r650 24 24 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 25 25 26 from wxSkinLayoutObject import wx, wxSkinLayoutObject 27 from wxPython.lib.maskededit import wxMaskedComboBox, Field 26 from wxPython.lib import maskededit 27 from masktext import wx, masktext 28 28 29 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 29 30 #~ Class 30 31 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 32 32 class maskcombo( wxSkinLayoutObject,wxMaskedComboBox):33 class maskcombo(masktext): 33 34 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 34 35 #~ Constants / Variables / Etc. 35 36 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 36 37 37 default_settings = wxSkinLayoutObject.default_settings.copy()38 default_settings = masktext.default_settings.copy() 38 39 default_settings.update({ 39 40 'name': __name__, 40 'wxid': 41 'wxid': 'wx.wxNewId()', 41 42 }) 42 43 … … 47 48 def SkinInitialize(self): 48 49 winParent = self.wxGetParentObject(wx.wxWindowPtr) 49 kwSettings = self.wxSettingDict(['wxid', 'style', 'pos', 'size'], ['name', 'mask', 'choices', 50 'choiceRequired', 'formatcodes', 51 'validRegex', 'fields']) 52 self.object = wxMaskedComboBox(winParent, **kwSettings) 50 51 kwSettings = self.wxSettingDict(['wxid', 'style', 'pos', 'size', 'choices'], ['name', 'value']) 52 kwSettings.update(self._GetMaskCtrlSettings()) 53 kwSettings.update(self._GetFieldSettings()) 54 55 self.object = maskededit.wxMaskedComboBox(winParent, **kwSettings) 56 53 57 self.wxInitialStandardOptions() 54 58 55 def SkinFinalize(self):56 self.wxFinalStandardOptions()57 trunk/RBSkinning/RBSkinning/wxPythonSkin/masktext.py
r649 r650 24 24 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 25 25 26 from wxPython.lib import maskededit 26 27 from wxSkinLayoutObject import wx, wxSkinLayoutObject 27 from wxPython.lib.maskededit import wxMaskedTextCtrl 28 from maskfield import maskfield 29 28 30 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 29 31 #~ Class 30 32 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 31 33 32 class masktext(wxSkinLayoutObject, wxMaskedTextCtrl):34 class masktext(wxSkinLayoutObject, maskfield): 33 35 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ 34 36 #~ Constants / Variables / Etc. … … 36 38 37 39 default_settings = wxSkinLayoutObject.default_settings.copy() 40 default_settings.update(maskfield.default_settings) 38 41 default_settings.update({ 39 'name': __name__,40 'wxid': 'wx.wxNewId()',42 'name': __name__, 43 'wxid': 'wx.wxNewId()', 41 44 }) 45 46 ctxVars = maskfield.ctxVars.copy() 47 ctxVars.update(vars(maskededit)) 42 48 43 49 #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ … … 47 53 def SkinInitialize(self): 48 54 winParent = self.wxGetParentObject(wx.wxWindowPtr) 49 kwSettings = self.wxSettingDict(['wxid', 'style', 'pos', 'size'], ['name','mask','choices', 50 'excludeChars','formatcodes',51 'includeChars','validRegex',52 'validRange','choiceRequired',53 'defaultValue','demo' 54 ])55 self.object = wxMaskedTextCtrl(winParent, **kwSettings) 55 56 kwSettings = self.wxSettingDict(['wxid', 'style', 'pos', 'size'], ['name']) 57 kwSettings.update(self._GetMaskCtrlSettings()) 58 kwSettings.update(self._GetFieldSettings()) 59 60 self.object = maskededit.wxMaskedTextCtrl(winParent, **kwSettings) 61 56 62 self.wxInitialStandardOptions() 57 63 58 64 def SkinFinalize(self): 65 fields = [x.object for x in self.Elements() if isinstance(x.object, maskededit.Field)] 66 if fields: 67 self.object.SetMaskParameters(fields=fields) 68 59 69 self.wxFinalStandardOptions() 60 70 71 def _GetMaskCtrlSettings(self): 72 maskCtrlSettings = self.wxSettingDict( 73 ['autoCompleteKeycodes', 'useFixedWidthFont', 'retainFieldValidation'], 74 ['autoformat', 'emptyBackgroundColor', 75 'validBackgroundColor', 'invalidBackgroundColor', 76 'foregroundColor', 'signedForegroundColor']) 77 78 # some aliases 79 if 'emptyBGColor' in self.settings: 80 maskCtrlSettings['emptyBackgroundColor'] = self.settings['emptyBGColor'] 81 if 'validBGColor' in self.settings: 82 maskCtrlSettings['validBackgroundColor'] = self.settings['validBGColor'] 83 if 'invalidBGColor' in self.settings: 84 maskCtrlSettings['invalidBackgroundColor'] = self.settings['invalidBGColor'] 85 if 'FGColor' in self.settings: 86 maskCtrlSettings['foregroundColor'] = self.settings['FGColor'] 87 if 'fgcolor' in self.settings: 88 maskCtrlSettings['foregroundColor'] = self.settings['fgcolor'] 89 if 'signedFGColor' in self.settings: 90 maskCtrlSettings['signedForegroundColor'] = self.settings['signedFGColor'] 91 92 return maskCtrlSettings 93 trunk/RBSkinning/RBSkinning/wxPythonSkin/wxSkinObject.py
r614 r650 181 181 result[each] = self.wxEvalCond(each, result.get(each)) 182 182 for each in NonEval: 183 result[each] = self.settings[each] 183 try: result[each] = self.settings[each] 184 except KeyError: pass 184 185 if 'wxid' in result: 185 186 result['id'] = result['wxid'] trunk/RBSkinning/demo/wxPythonSkin/widgets/maskcombo.py
r649 r650 11 11 <panel sizercfg='1, wxEXPAND'> 12 12 <layout sizercfg='1, wxEXPAND'> 13 <maskcombo choices='list goes here' mask='#/##' formatcodes='F_' validRegex='^\d\/\d\d?' choiceRequired='1' fields='dict goes here'/> 13 <maskcombo mask='#/##' formatcodes='F_' validRegex='^\d\/\d\d?' /> 14 <maskcombo mask='#/##' formatcodes='F_' validRegex='^\d\/\d\d?' choices='"7/11", "5/12"' choiceRequired='1' /> 14 15 </layout> 15 16 </panel> trunk/RBSkinning/demo/wxPythonSkin/widgets/masktext.py
r649 r650 13 13 <panel sizercfg='1, wxEXPAND'> 14 14 <layout sizercfg='1, wxEXPAND'> 15 <masktext name='Phone No' mask='(###) ###-#### x:###' excludeChars='' formatcodes='F^-' includeChars='' validRegex='^\(\d{3}\) \d{3}-\d{4}' validRange='' choices='' choiceRequired='' defaultValue='' demo='1'/> 15 <masktext name='Phone No' mask='(###) ###-#### x:###' excludeChars='' formatcodes='F^-' includeChars='' validRegex='^\(\d{3}\) \d{3}-\d{4}'/> 16 <!-- 17 <masktext name='Phone No' mask='(###) ###-#### x:###' excludeChars='' formatcodes='F^-' includeChars='' validRegex='^\(\d{3}\) \d{3}-\d{4}' validRange='' choices='' choiceRequired='' defaultValue='' /> 18 --> 16 19 </layout> 17 20 </panel>
