[Idle-dev] CVS: idle configDialog.py,1.11,1.12

Stephen M. Gava elguavas@users.sourceforge.net
Thu, 25 Oct 2001 23:47:11 -0700


Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv21407

Modified Files:
	configDialog.py 
Log Message:
further work on loading config dialog values from the config files


Index: configDialog.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configDialog.py,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -r1.11 -r1.12
*** configDialog.py	2001/10/23 10:42:12	1.11
--- configDialog.py	2001/10/26 06:47:09	1.12
***************
*** 12,15 ****
--- 12,16 ----
  
  from configHandler import idleConf
+ from dynOptionMenuWidget import DynOptionMenu
  
  class ConfigDialog(Toplevel):
***************
*** 203,215 ****
          self.listFontName.bind('<<ListboxSelect>>',self.SetFontSampleBinding)
          scrollFont=Scrollbar(frameFontName)
-         #self.LoadFontList()
          scrollFont.config(command=self.listFontName.yview)
          self.listFontName.config(yscrollcommand=scrollFont.set)
          labelFontSizeTitle=Label(frameFontSize,text='Size :')
!         sizes=('10','11','12','13','14','16','18','20','22')
!         args=(frameFontSize,self.fontSize)+sizes
!         keyArgs={'command':self.SetFontSampleBinding}
!         optFontSize=apply(OptionMenu,args,keyArgs)
!         #optFontSize.bind('<<MenuSelect>>',self.SetFontSample)
          frameFontSample=Frame(frameFont,relief=SOLID,borderwidth=1)
          self.labelFontSample=Label(frameFontSample,
--- 204,212 ----
          self.listFontName.bind('<<ListboxSelect>>',self.SetFontSampleBinding)
          scrollFont=Scrollbar(frameFontName)
          scrollFont.config(command=self.listFontName.yview)
          self.listFontName.config(yscrollcommand=scrollFont.set)
          labelFontSizeTitle=Label(frameFontSize,text='Size :')
!         self.optMenuFontSize=DynOptionMenu(frameFontSize,self.fontSize,None,
!             command=self.SetFontSampleBinding)
          frameFontSample=Frame(frameFont,relief=SOLID,borderwidth=1)
          self.labelFontSample=Label(frameFontSample,
***************
*** 249,253 ****
          scrollFont.pack(side=LEFT,fill=Y)
          labelFontSizeTitle.pack(side=TOP,anchor=W)
!         optFontSize.pack(side=TOP,anchor=W,fill=X)
          frameFontSample.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH)
          self.labelFontSample.pack(expand=TRUE,fill=BOTH)
--- 246,250 ----
          scrollFont.pack(side=LEFT,fill=Y)
          labelFontSizeTitle.pack(side=TOP,anchor=W)
!         self.optMenuFontSize.pack(side=TOP,anchor=W,fill=X)
          frameFontSample.pack(side=TOP,padx=5,pady=5,expand=TRUE,fill=BOTH)
          self.labelFontSample.pack(expand=TRUE,fill=BOTH)
***************
*** 516,520 ****
          for font in fonts:
              self.listFontName.insert(END,font)
!         configuredFont=idleConf.GetDefault('main','EditorWindow','font',
                  default='courier')
          if configuredFont in fonts:
--- 513,517 ----
          for font in fonts:
              self.listFontName.insert(END,font)
!         configuredFont=idleConf.GetOption('main','EditorWindow','font',
                  default='courier')
          if configuredFont in fonts:
***************
*** 523,528 ****
              self.listFontName.select_set(currentFontIndex)
          ##font size dropdown
!         fontSize=idleConf.GetDefault('main','EditorWindow','font-size',default='12')
!         self.fontSize.set(fontSize)
          ##font sample 
          self.SetFontSample()
--- 520,526 ----
              self.listFontName.select_set(currentFontIndex)
          ##font size dropdown
!         fontSize=idleConf.GetOption('main','EditorWindow','font-size',default='12')
!         self.optMenuFontSize.SetMenu(('10','11','12','13','14',
!                 '16','18','20','22'),fontSize )
          ##font sample 
          self.SetFontSample()
***************
*** 530,592 ****
      def LoadTabCfg(self):
          ##indent type radibuttons
!         spaceIndent=idleConf.GetDefault('main','Indent','use-spaces',
                  default=1,type='bool')
          self.indentType.set(spaceIndent)
          ##indent sizes
!         spaceNum=idleConf.GetDefault('main','Indent','num-spaces',
                  default=4,type='int')
!         tabCols=idleConf.GetDefault('main','Indent','tab-cols',
                  default=4,type='int')
          self.spaceNum.set(spaceNum)
          self.tabCols.set(tabCols)
      
!     #def LoadOptionMenu(self, optMenu, optList, optVar, optVal=None, 
!     #            command=None):
!     def LoadOptionMenu(self, optMenu, optVar, optVal=None, command=None):
!         """
!         Load the relevant list of values into an OptionMenu and set 
!         selected value if required.
!         """
!         params={'cfg':None,
!                 'section':None,
!                 'optList':None,
!                 'optVar':None,
!                 'optVal':None,
!                 'command':None}
!         if optMenu == self.optMenuHighlightTarget:
!             params['cfg']=idleConf.userCfg['highlight']
! #             if 
! #             params['section']=idleconf.userCfg['main'].GetDef('EditorWindow',
! #                     'theme')
! #             
! #             params['optVar']=self.HighlightTarget
! #             params['optList']=idleconf.defaultCfg['main'].options(params.Section)
! #             else: # a default theme
! #                 pass
!             #params.optList=idleConf
!             
! 
!         #if not params.optVar.get(): #no value set yet (initial load)
!         #    params.optVal=   
! 
!         #if params.section: #we're asking to load a list of option names
!         #    optList=params.cfg
!         #elif optMenu == xx:
!         #else:
!         
!         #if self.HighlightTarget.get(): #if there was a value set (reload)
!         #    params.optVal=self.HighlightTarget.get() 
!         #else: #no value set yet (initial load)
!         #if not params.optVar.get(): #no value set yet (initial load)   
!             
!         menu=optMenu['menu']
!         print menu
!         menu.delete(0,END)
!         for item in optList:
!             menu.add_command(label=item,command=command)
!         if optVal:
!             optVar.set(optVal)
!         elif optList:
!             optVar.set(optList[0])
  
      def LoadConfigs(self):
--- 528,545 ----
      def LoadTabCfg(self):
          ##indent type radibuttons
!         spaceIndent=idleConf.GetOption('main','Indent','use-spaces',
                  default=1,type='bool')
          self.indentType.set(spaceIndent)
          ##indent sizes
!         spaceNum=idleConf.GetOption('main','Indent','num-spaces',
                  default=4,type='int')
!         tabCols=idleConf.GetOption('main','Indent','tab-cols',
                  default=4,type='int')
          self.spaceNum.set(spaceNum)
          self.tabCols.set(tabCols)
      
!     def LoadThemeLists(self):
!         ##default themes
!         pass
  
      def LoadConfigs(self):
***************
*** 599,602 ****
--- 552,556 ----
          self.LoadTabCfg()        
          ### highlighting page
+         self.LoadThemeLists()
          ### keys page
          ### help page