[Idle-dev] CVS: idle configDialog.py,1.19,1.20
Stephen M. Gava
elguavas@users.sourceforge.net
Tue, 04 Dec 2001 23:54:09 -0800
Update of /cvsroot/idlefork/idle
In directory usw-pr-cvs1:/tmp/cvs-serv17638
Modified Files:
configDialog.py
Log Message:
changes to use new tabpages classes
Index: configDialog.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configDialog.py,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** configDialog.py 2001/11/21 05:56:26 1.19
--- configDialog.py 2001/12/05 07:54:07 1.20
***************
*** 1,8 ****
- ##---------------------------------------------------------------------------##
- ##
- ## idle - configuration dialog
- ## elguavas
- ##
- ##---------------------------------------------------------------------------##
"""
configuration dialog
--- 1,2 ----
***************
*** 13,16 ****
--- 7,11 ----
from configHandler import idleConf
from dynOptionMenuWidget import DynOptionMenu
+ from tabpage import TabPageSet
class ConfigDialog(Toplevel):
***************
*** 42,59 ****
self.CreateWidgets()
self.resizable(height=FALSE,width=FALSE)
- self.ChangePage()
self.transient(parent)
self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.Cancel)
self.parent = parent
! self.framePages.focus_set()
#key bindings for this dialog
self.bind('<Escape>',self.CancelBinding) #dismiss dialog, no save
self.bind('<Alt-a>',self.ApplyBinding) #apply changes, save
self.bind('<F1>',self.HelpBinding) #context help
- self.bind('<Alt-f>',self.ChangePageBinding)
- self.bind('<Alt-h>',self.ChangePageBinding)
- self.bind('<Alt-k>',self.ChangePageBinding)
- self.bind('<Alt-g>',self.ChangePageBinding)
self.LoadConfigs()
self.wait_window()
--- 37,49 ----
self.CreateWidgets()
self.resizable(height=FALSE,width=FALSE)
self.transient(parent)
self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.Cancel)
self.parent = parent
! self.tabPages.focus_set()
#key bindings for this dialog
self.bind('<Escape>',self.CancelBinding) #dismiss dialog, no save
self.bind('<Alt-a>',self.ApplyBinding) #apply changes, save
self.bind('<F1>',self.HelpBinding) #context help
self.LoadConfigs()
self.wait_window()
***************
*** 83,105 ****
self.Help()
- def ChangePage(self):
- #pop up the active 'tab' only
- for button in self.pageButtons: button.master.config(relief=RIDGE)
- self.pageButtons[self.pageNum.get()].master.config(relief=RAISED)
- #switch page
- self.pages[self.pageNum.get()].lift()
- self.title('Settings - '+
- self.pageButtons[self.pageNum.get()].cget('text'))
-
- def ChangePageBinding(self,event):
- pageKeys=('f','h','k','g')
- pos=0
- for key in pageKeys:
- if event.char == key:
- self.pageNum.set(pos)
- self.ChangePage()
- return
- pos=pos+1
-
def SetThemeType(self):
if self.themeIsBuiltin.get():
--- 73,76 ----
***************
*** 172,178 ****
def CreateWidgets(self):
! self.framePages = Frame(self)
frameActionButtons = Frame(self)
- framePageButtons = Frame(self.framePages)
#action buttons
self.buttonHelp = Button(frameActionButtons,text='Help',
--- 143,149 ----
def CreateWidgets(self):
! self.tabPages = TabPageSet(self,
! pageNames=['Fonts/Tabs','Highlighting','Keys','General'])
frameActionButtons = Frame(self)
#action buttons
self.buttonHelp = Button(frameActionButtons,text='Help',
***************
*** 184,215 ****
self.buttonCancel = Button(frameActionButtons,text='Cancel',
command=self.Cancel,takefocus=FALSE)
! #page buttons
! self.pageNum=IntVar(self)
! self.pageNum.set(0)
! pageButtonNames=('Fonts/Tabs','Highlighting','Keys','General')
! self.pageButtons=[]
! buttonValue=0
! buttonSelColour=framePageButtons.cget('bg')
! for name in pageButtonNames:
! buttonFrame=Frame(framePageButtons,borderwidth=2,relief=RIDGE)
! buttonFrame.pack(side=LEFT)
! button = Radiobutton(buttonFrame,command=self.ChangePage,
! value=buttonValue,padx=5,pady=5,takefocus=FALSE,underline=0,
! indicatoron=FALSE,highlightthickness=0,variable=self.pageNum,
! selectcolor=buttonSelColour,borderwidth=0,text=name)
! button.pack()
! button.lift()
! self.pageButtons.append(button)
! buttonValue=buttonValue+1
! #pages
! self.pages=(self.CreatePageFontTab(),
! self.CreatePageHighlight(),
! self.CreatePageKeys(),
! self.CreatePageGeneral())
!
! #grid in framePages so we can overlap pages
! framePageButtons.grid(row=0,column=0,sticky=NSEW)
! for page in self.pages: page.grid(row=1,column=0,sticky=(N,S,E,W))
!
self.buttonHelp.pack(side=RIGHT,padx=5,pady=5)
self.buttonOk.pack(side=LEFT,padx=5,pady=5)
--- 155,162 ----
self.buttonCancel = Button(frameActionButtons,text='Cancel',
command=self.Cancel,takefocus=FALSE)
! self.CreatePageFontTab()
! self.CreatePageHighlight()
! self.CreatePageKeys()
! self.CreatePageGeneral()
self.buttonHelp.pack(side=RIGHT,padx=5,pady=5)
self.buttonOk.pack(side=LEFT,padx=5,pady=5)
***************
*** 217,221 ****
self.buttonCancel.pack(side=LEFT,padx=5,pady=5)
frameActionButtons.pack(side=BOTTOM)
! self.framePages.pack(side=TOP,expand=TRUE,fill=BOTH)
def CreatePageFontTab(self):
--- 164,169 ----
self.buttonCancel.pack(side=LEFT,padx=5,pady=5)
frameActionButtons.pack(side=BOTTOM)
! self.tabPages.pack(side=TOP,expand=TRUE,fill=BOTH)
!
def CreatePageFontTab(self):
***************
*** 229,233 ****
##widget creation
#body frame
! frame=Frame(self.framePages,borderwidth=2,relief=RAISED)
#body section frames
frameFont=Frame(frame,borderwidth=2,relief=GROOVE)
--- 177,181 ----
##widget creation
#body frame
! frame=self.tabPages.pages['Fonts/Tabs']['page']
#body section frames
frameFont=Frame(frame,borderwidth=2,relief=GROOVE)
***************
*** 315,319 ****
##widget creation
#body frame
! frame=Frame(self.framePages,borderwidth=2,relief=RAISED)
#body section frames
frameCustom=Frame(frame,borderwidth=2,relief=GROOVE)
--- 263,267 ----
##widget creation
#body frame
! frame=self.tabPages.pages['Highlighting']['page']
#body section frames
frameCustom=Frame(frame,borderwidth=2,relief=GROOVE)
***************
*** 405,409 ****
##widget creation
#body frame
! frame=Frame(self.framePages,borderwidth=2,relief=RAISED)
#body section frames
frameCustom=Frame(frame,borderwidth=2,relief=GROOVE)
--- 353,357 ----
##widget creation
#body frame
! frame=self.tabPages.pages['Keys']['page']
#body section frames
frameCustom=Frame(frame,borderwidth=2,relief=GROOVE)
***************
*** 438,442 ****
self.customKeys,None,command=None)
self.buttonDeleteCustomKeys=Button(frameKeySets,text='Delete Custom Key Set')
- # self.SetKeysType()
##widget packing
#body
--- 386,389 ----
***************
*** 476,480 ****
#widget creation
#body
! frame=Frame(self.framePages,borderwidth=2,relief=RAISED)
#body section frames
frameRun=Frame(frame,borderwidth=2,relief=GROOVE)
--- 423,427 ----
#widget creation
#body
! frame=self.tabPages.pages['General']['page']
#body section frames
frameRun=Frame(frame,borderwidth=2,relief=GROOVE)