[Idle-dev] CVS: idle config-main.def,1.2,1.3 configDialog.py,1.12,1.13 configHandler.py,1.3,1.4 dynOptionMenuWidget.py,1.1,1.2
Stephen M. Gava
elguavas@users.sourceforge.net
Mon, 29 Oct 2001 00:05:36 -0800
Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv17507
Modified Files:
config-main.def configDialog.py configHandler.py
dynOptionMenuWidget.py
Log Message:
more of config dialog reading from files
Index: config-main.def
===================================================================
RCS file: /cvsroot/idlefork/idle/config-main.def,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** config-main.def 2001/10/23 10:42:12 1.2
--- config-main.def 2001/10/29 08:05:34 1.3
***************
*** 60,68 ****
[Theme]
user= 0
! name= "IDLE Classic New"
[Keys]
user= 0
! name= "IDLE Classic - windows"
[RecentFiles]
--- 60,68 ----
[Theme]
user= 0
! name= IDLE Classic New
[Keys]
user= 0
! name= IDLE Classic - windows
[RecentFiles]
Index: configDialog.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configDialog.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -r1.12 -r1.13
*** configDialog.py 2001/10/26 06:47:09 1.12
--- configDialog.py 2001/10/29 08:05:34 1.13
***************
*** 132,135 ****
--- 132,141 ----
self.editFont.config(size=self.fontSize.get(),weight=NORMAL,
family=self.listFontName.get(self.listFontName.curselection()[0]))
+
+ def SetHighlightSampleBinding(self,event):
+ self.SetHighlightSample()
+
+ def SetHighlightSample(self):
+ pass
def CreateWidgets(self):
***************
*** 288,293 ****
labelCustomTitle=Label(frameCustom,text='Set Custom Highlighting')
labelTargetTitle=Label(self.frameHighlightTarget,text='for : ')
! self.optMenuHighlightTarget=OptionMenu(self.frameHighlightTarget,
! self.highlightTarget,'normal text background','test target interface item 2')
buttonSetColour=Button(self.frameColourSet,text='Set Colour',
command=self.GetColour)
--- 294,299 ----
labelCustomTitle=Label(frameCustom,text='Set Custom Highlighting')
labelTargetTitle=Label(self.frameHighlightTarget,text='for : ')
! self.optMenuHighlightTarget=DynOptionMenu(self.frameHighlightTarget,
! self.highlightTarget,None,command=None)
buttonSetColour=Button(self.frameColourSet,text='Set Colour',
command=self.GetColour)
***************
*** 309,325 ****
labelThemeTitle=Label(frameTheme,text='Select a Highlighting Theme')
labelTypeTitle=Label(frameTheme,text='Select : ')
! radioThemeBuiltin=Radiobutton(frameTheme,variable=self.themeType,
value=0,command=self.SetThemeType,text='a Built-in Theme')
! radioThemeCustom=Radiobutton(frameTheme,variable=self.themeType,
value=1,command=self.SetThemeType,text='a Custom Theme')
! self.optMenuThemeBuiltin=OptionMenu(frameTheme,
! self.builtinTheme,'test builtin junk','test builtin junk 2')
! self.builtinTheme.set('test builtin junk')
! self.optMenuThemeCustom=OptionMenu(frameTheme,
! self.customTheme,'test custom junk','test custom junk 2')
! self.customTheme.set('test custom junk')
! self.themeType.set(0)
self.buttonDeleteCustomTheme=Button(frameTheme,text='Delete Custom Theme')
! self.SetThemeType()
##widget packing
#body
--- 315,329 ----
labelThemeTitle=Label(frameTheme,text='Select a Highlighting Theme')
labelTypeTitle=Label(frameTheme,text='Select : ')
! self.radioThemeBuiltin=Radiobutton(frameTheme,variable=self.themeType,
value=0,command=self.SetThemeType,text='a Built-in Theme')
! self.radioThemeCustom=Radiobutton(frameTheme,variable=self.themeType,
value=1,command=self.SetThemeType,text='a Custom Theme')
! self.optMenuThemeBuiltin=DynOptionMenu(frameTheme,
! self.builtinTheme,None,command=self.SetHighlightSampleBinding)
! self.optMenuThemeCustom=DynOptionMenu(frameTheme,
! self.customTheme,None,command=self.SetHighlightSampleBinding)
! # self.themeType.set(0)
self.buttonDeleteCustomTheme=Button(frameTheme,text='Delete Custom Theme')
! # self.SetThemeType()
##widget packing
#body
***************
*** 345,350 ****
labelThemeTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
labelTypeTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
! radioThemeBuiltin.pack(side=TOP,anchor=W,padx=5)
! radioThemeCustom.pack(side=TOP,anchor=W,padx=5,pady=2)
self.optMenuThemeBuiltin.pack(side=TOP,fill=X,padx=5,pady=5)
self.optMenuThemeCustom.pack(side=TOP,fill=X,anchor=W,padx=5,pady=5)
--- 349,354 ----
labelThemeTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
labelTypeTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
! self.radioThemeBuiltin.pack(side=TOP,anchor=W,padx=5)
! self.radioThemeCustom.pack(side=TOP,anchor=W,padx=5,pady=2)
self.optMenuThemeBuiltin.pack(side=TOP,fill=X,padx=5,pady=5)
self.optMenuThemeCustom.pack(side=TOP,fill=X,anchor=W,padx=5,pady=5)
***************
*** 388,404 ****
labelKeysTitle=Label(frameKeySets,text='Select a Key Set')
labelTypeTitle=Label(frameKeySets,text='Select : ')
! radioKeysBuiltin=Radiobutton(frameKeySets,variable=self.keysType,
value=0,command=self.SetKeysType,text='a Built-in Key Set')
! radioKeysCustom=Radiobutton(frameKeySets,variable=self.keysType,
value=1,command=self.SetKeysType,text='a Custom Key Set')
! self.optMenuKeysBuiltin=OptionMenu(frameKeySets,
! self.builtinKeys,'test builtin junk','test builtin junk 2')
! self.builtinKeys.set('test builtin junk')
! self.optMenuKeysCustom=OptionMenu(frameKeySets,
! self.customKeys,'test custom junk','test custom junk 2')
! self.customKeys.set('test custom junk')
! self.keysType.set(0)
self.buttonDeleteCustomKeys=Button(frameKeySets,text='Delete Custom Key Set')
! self.SetKeysType()
##widget packing
#body
--- 392,405 ----
labelKeysTitle=Label(frameKeySets,text='Select a Key Set')
labelTypeTitle=Label(frameKeySets,text='Select : ')
! self.radioKeysBuiltin=Radiobutton(frameKeySets,variable=self.keysType,
value=0,command=self.SetKeysType,text='a Built-in Key Set')
! self.radioKeysCustom=Radiobutton(frameKeySets,variable=self.keysType,
value=1,command=self.SetKeysType,text='a Custom Key Set')
! self.optMenuKeysBuiltin=DynOptionMenu(frameKeySets,
! self.builtinKeys,None,command=None)
! self.optMenuKeysCustom=DynOptionMenu(frameKeySets,
! self.customKeys,None,command=None)
self.buttonDeleteCustomKeys=Button(frameKeySets,text='Delete Custom Key Set')
! # self.SetKeysType()
##widget packing
#body
***************
*** 423,428 ****
labelKeysTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
labelTypeTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
! radioKeysBuiltin.pack(side=TOP,anchor=W,padx=5)
! radioKeysCustom.pack(side=TOP,anchor=W,padx=5,pady=2)
self.optMenuKeysBuiltin.pack(side=TOP,fill=X,padx=5,pady=5)
self.optMenuKeysCustom.pack(side=TOP,fill=X,anchor=W,padx=5,pady=5)
--- 424,429 ----
labelKeysTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
labelTypeTitle.pack(side=TOP,anchor=W,padx=5,pady=5)
! self.radioKeysBuiltin.pack(side=TOP,anchor=W,padx=5)
! self.radioKeysCustom.pack(side=TOP,anchor=W,padx=5,pady=2)
self.optMenuKeysBuiltin.pack(side=TOP,fill=X,padx=5,pady=5)
self.optMenuKeysCustom.pack(side=TOP,fill=X,anchor=W,padx=5,pady=5)
***************
*** 540,546 ****
def LoadThemeLists(self):
! ##default themes
! pass
!
def LoadConfigs(self):
"""
--- 541,587 ----
def LoadThemeLists(self):
! ##current theme type radiobutton
! self.themeType.set(idleConf.GetOption('main','Theme','user',type='int'))
! ##currently set theme
! currentOption=idleConf.GetOption('main','Theme','name')
! ##load option menus
! if self.themeType.get() == 0: #default theme selected
! itemList=idleConf.GetSectionList('default','highlight')
! self.optMenuThemeBuiltin.SetMenu(itemList,currentOption)
! itemList=idleConf.GetSectionList('user','highlight')
! if not itemList:
! self.radioThemeCustom.config(state=DISABLED)
! self.customTheme.set('- no custom themes -')
! else:
! self.optMenuThemeCustom.SetMenu(itemList,itemList[0])
! elif self.themeType.get() == 1: #user theme selected
! itemList=idleConf.GetSectionList('user','highlight')
! self.optMenuThemeCustom.SetMenu(itemList,currentOption)
! itemList=idleConf.GetSectionList('default','highlight')
! self.optMenuThemeBuiltin.SetMenu(itemList,itemList[0])
! self.SetThemeType()
!
! def LoadKeyLists(self):
! ##current keys type radiobutton
! self.keysType.set(idleConf.GetOption('main','Keys','user',type='int'))
! ##currently set keys
! currentOption=idleConf.GetOption('main','Keys','name')
! ##load option menus
! if self.keysType.get() == 0: #default theme selected
! itemList=idleConf.GetSectionList('default','keys')
! self.optMenuKeysBuiltin.SetMenu(itemList,currentOption)
! itemList=idleConf.GetSectionList('user','keys')
! if not itemList:
! self.radioKeysCustom.config(state=DISABLED)
! self.customKeys.set('- no custom keys -')
! else:
! self.optMenuKeysCustom.SetMenu(itemList,itemList[0])
! elif self.keysType.get() == 1: #user theme selected
! itemList=idleConf.GetSectionList('user','keys')
! self.optMenuKeysCustom.SetMenu(itemList,currentOption)
! itemList=idleConf.GetSectionList('default','keys')
! self.optMenuKeysBuiltin.SetMenu(itemList,itemList[0])
! self.SetKeysType()
!
def LoadConfigs(self):
"""
***************
*** 554,557 ****
--- 595,599 ----
self.LoadThemeLists()
### keys page
+ self.LoadKeyLists()
### help page
### general page
Index: configHandler.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configHandler.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configHandler.py 2001/10/26 06:50:54 1.3
--- configHandler.py 2001/10/29 08:05:34 1.4
***************
*** 29,35 ****
If type is specified, return as type.
"""
! if type=='bool': getVal=self.getboolean
! elif type=='int': getVal=self.getint
! else: getVal=self.get
if self.has_option(section,option):
#return getVal(section, option, raw, vars)
--- 29,38 ----
If type is specified, return as type.
"""
! if type=='bool':
! getVal=self.getboolean
! elif type=='int':
! getVal=self.getint
! else:
! getVal=self.get
if self.has_option(section,option):
#return getVal(section, option, raw, vars)
***************
*** 166,170 ****
pass
-
def GetKeys(self, name=None):
"""
--- 169,172 ----
***************
*** 174,178 ****
"""
pass
-
def LoadCfgFiles(self):
--- 176,179 ----
Index: dynOptionMenuWidget.py
===================================================================
RCS file: /cvsroot/idlefork/idle/dynOptionMenuWidget.py,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** dynOptionMenuWidget.py 2001/10/26 06:49:14 1.1
--- dynOptionMenuWidget.py 2001/10/29 08:05:34 1.2
***************
*** 22,26 ****
self.command=kwargs.get('command')
! def SetMenu(self,valueList,value):
"""
clear and reload the menu with a new set of options.
--- 22,26 ----
self.command=kwargs.get('command')
! def SetMenu(self,valueList,value=None):
"""
clear and reload the menu with a new set of options.
***************
*** 32,34 ****
self['menu'].add_command(label=item,
command=_setit(self.variable,item,self.command))
! self.variable.set(value)
--- 32,35 ----
self['menu'].add_command(label=item,
command=_setit(self.variable,item,self.command))
! if value:
! self.variable.set(value)