[Idle-dev] CVS: idle configDialog.py,1.49,1.50 configHelpSourceEdit.py,1.3,1.4
Kurt B. Kaiser
kbk@users.sourceforge.net
Fri, 10 Jan 2003 12:13:59 -0800
Update of /cvsroot/idlefork/idle
In directory sc8-pr-cvs1:/tmp/cvs-serv3739
Modified Files:
configDialog.py configHelpSourceEdit.py
Log Message:
M configDialog.py
M configHelpSourceEdit.py
1. Attach configHelpSourceEdit error dialogs to parent to avoid Tk root
pop-ups.
2. Make configHelpSourceEdit OK button the default and bind <Return>.
3. Reformat configHelpSourceEdit.
4. ConfigDialog.SaveAllChangedConfig() had a bug which caused additional
help sources to be deleted when other config items were changed.
4. Uniform capitalization in configDialog.
5. Update configDialog doc string.
Index: configDialog.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configDialog.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -r1.49 -r1.50
*** configDialog.py 31 Dec 2002 16:03:22 -0000 1.49
--- configDialog.py 10 Jan 2003 20:13:57 -0000 1.50
***************
*** 1,4 ****
! """
! configuration dialog
"""
from Tkinter import *
--- 1,12 ----
! """IDLE Configuration Dialog: support user customization of IDLE by GUI
!
! Customize font faces, sizes, and colorization attributes. Set indentation
! defaults. Customize keybindings. Colorization and keybindings can be
! saved as user defined sets. Select startup options including shell/editor
! and default window size. Define additional help sources.
!
! Note that tab width in IDLE is currently fixed at eight due to Tk issues.
! Refer to comment in EditorWindow autoindent code for details.
!
"""
from Tkinter import *
***************
*** 12,15 ****
--- 20,24 ----
from configSectionNameDialog import GetCfgSectionNameDialog
from configHelpSourceEdit import GetHelpSourceDialog
+
class ConfigDialog(Toplevel):
"""
***************
*** 337,345 ****
#frameRun
labelRunTitle=Label(frameRun,text='Startup Preferences')
! labelRunChoiceTitle=Label(frameRun,text='On startup : ')
radioStartupEdit=Radiobutton(frameRun,variable=self.startupEdit,
! value=1,command=self.SetKeysType,text="open Edit Window")
radioStartupShell=Radiobutton(frameRun,variable=self.startupEdit,
! value=0,command=self.SetKeysType,text='open Shell Window')
#frameWinSize
labelWinSizeTitle=Label(frameWinSize,text='Initial Window Size'+
--- 346,354 ----
#frameRun
labelRunTitle=Label(frameRun,text='Startup Preferences')
! labelRunChoiceTitle=Label(frameRun,text='On Startup : ')
radioStartupEdit=Radiobutton(frameRun,variable=self.startupEdit,
! value=1,command=self.SetKeysType,text="Open Edit Window")
radioStartupShell=Radiobutton(frameRun,variable=self.startupEdit,
! value=0,command=self.SetKeysType,text='Open Shell Window')
#frameWinSize
labelWinSizeTitle=Label(frameWinSize,text='Initial Window Size'+
***************
*** 355,359 ****
frameHelpList=Frame(frameHelp)
frameHelpListButtons=Frame(frameHelpList)
! labelHelpListTitle=Label(frameHelpList,text='Additional (html) Help Sources:')
scrollHelpList=Scrollbar(frameHelpList)
self.listHelp=Listbox(frameHelpList,height=5,takefocus=FALSE,
--- 364,368 ----
frameHelpList=Frame(frameHelp)
frameHelpListButtons=Frame(frameHelpList)
! labelHelpListTitle=Label(frameHelpList,text='Additional Help Sources:')
scrollHelpList=Scrollbar(frameHelpList)
self.listHelp=Listbox(frameHelpList,height=5,takefocus=FALSE,
***************
*** 841,849 ****
self.SetColourSample()
! def OnCheckUserHelpBrowser(self):
! if self.userHelpBrowser.get():
! self.entryHelpBrowser.config(state=NORMAL)
! else:
! self.entryHelpBrowser.config(state=DISABLED)
def HelpSourceSelected(self,event):
--- 850,858 ----
self.SetColourSample()
! ## def OnCheckUserHelpBrowser(self):
! ## if self.userHelpBrowser.get():
! ## self.entryHelpBrowser.config(state=NORMAL)
! ## else:
! ## self.entryHelpBrowser.config(state=DISABLED)
def HelpSourceSelected(self,event):
***************
*** 891,895 ****
def UpdateUserHelpChangedItems(self):
! #clear and rebuild the HelpFiles secion in self.changedItems
if self.changedItems['main'].has_key('HelpFiles'):
del(self.changedItems['main']['HelpFiles'])
--- 900,904 ----
def UpdateUserHelpChangedItems(self):
! #clear and rebuild the HelpFiles section in self.changedItems
if self.changedItems['main'].has_key('HelpFiles'):
del(self.changedItems['main']['HelpFiles'])
***************
*** 1070,1086 ****
def SaveAllChangedConfigs(self):
! """
! save all configuration changes to user config files.
! """
! #this section gets completely replaced
! idleConf.userCfg['main'].remove_section('HelpFiles')
idleConf.userCfg['main'].Save()
for configType in self.changedItems.keys():
! cfgTypeHasChanges=0
for section in self.changedItems[configType].keys():
for item in self.changedItems[configType][section].keys():
! value=self.changedItems[configType][section][item]
if self.SetUserValue(configType,section,item,value):
! cfgTypeHasChanges=1
if cfgTypeHasChanges:
idleConf.userCfg[configType].Save()
--- 1079,1094 ----
def SaveAllChangedConfigs(self):
! "Save configuration changes to the user config file."
idleConf.userCfg['main'].Save()
for configType in self.changedItems.keys():
! cfgTypeHasChanges = False
for section in self.changedItems[configType].keys():
+ if section == 'HelpFiles':
+ #this section gets completely replaced
+ idleConf.userCfg['main'].remove_section('HelpFiles')
for item in self.changedItems[configType][section].keys():
! value = self.changedItems[configType][section][item]
if self.SetUserValue(configType,section,item,value):
! cfgTypeHasChanges = True
if cfgTypeHasChanges:
idleConf.userCfg[configType].Save()
Index: configHelpSourceEdit.py
===================================================================
RCS file: /cvsroot/idlefork/idle/configHelpSourceEdit.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** configHelpSourceEdit.py 31 Dec 2002 16:03:23 -0000 1.3
--- configHelpSourceEdit.py 10 Jan 2003 20:13:57 -0000 1.4
***************
*** 1,6 ****
! """
! Dialog that allows user to specify or edit the parameters for a user configured
! help source.
! """
from Tkinter import *
import tkMessageBox
--- 1,4 ----
! "Dialog to specify or edit the parameters for a user configured help source."
!
from Tkinter import *
import tkMessageBox
***************
*** 8,12 ****
class GetHelpSourceDialog(Toplevel):
! def __init__(self,parent,title,menuItem='',filePath=''):
"""
menuItem - string, the menu item to edit, if any
--- 6,10 ----
class GetHelpSourceDialog(Toplevel):
! def __init__(self, parent, title, menuItem='', filePath=''):
"""
menuItem - string, the menu item to edit, if any
***************
*** 15,19 ****
Toplevel.__init__(self, parent)
self.configure(borderwidth=5)
! self.resizable(height=FALSE,width=FALSE)
self.title(title)
self.transient(parent)
--- 13,17 ----
Toplevel.__init__(self, parent)
self.configure(borderwidth=5)
! self.resizable(height=FALSE, width=FALSE)
self.title(title)
self.transient(parent)
***************
*** 21,119 ****
self.protocol("WM_DELETE_WINDOW", self.Cancel)
self.parent = parent
! self.result=None
self.CreateWidgets()
self.menu.set(menuItem)
self.path.set(filePath)
self.withdraw() #hide while setting geometry
- self.update_idletasks()
#needs to be done here so that the winfo_reqwidth is valid
self.geometry("+%d+%d" %
! ((parent.winfo_rootx()+((parent.winfo_width()/2)
! -(self.winfo_reqwidth()/2)),
! parent.winfo_rooty()+((parent.winfo_height()/2)
! -(self.winfo_reqheight()/2)) )) ) #centre dialog over parent
self.deiconify() #geometry set, unhide
self.wait_window()
def CreateWidgets(self):
! self.menu=StringVar(self)
! self.path=StringVar(self)
! self.fontSize=StringVar(self)
! self.frameMain = Frame(self,borderwidth=2,relief=SUNKEN)
! self.frameMain.pack(side=TOP,expand=TRUE,fill=BOTH)
! labelMenu=Label(self.frameMain,anchor=W,justify=LEFT,
! text='Menu Item:')
! self.entryMenu=Entry(self.frameMain,textvariable=self.menu,width=30)
self.entryMenu.focus_set()
! labelPath=Label(self.frameMain,anchor=W,justify=LEFT,
! text='Help File Path:')
! self.entryPath=Entry(self.frameMain,textvariable=self.path,width=40)
self.entryMenu.focus_set()
! labelMenu.pack(anchor=W,padx=5,pady=3)
! self.entryMenu.pack(anchor=W,padx=5,pady=3)
! labelPath.pack(anchor=W,padx=5,pady=3)
! self.entryPath.pack(anchor=W,padx=5,pady=3)
! frameButtons=Frame(self)
! frameButtons.pack(side=BOTTOM,fill=X)
! self.buttonOk = Button(frameButtons,text='Ok',
! width=8,command=self.Ok)
! self.buttonOk.grid(row=0,column=0,padx=5,pady=5)
! self.buttonCancel = Button(frameButtons,text='Cancel',
! width=8,command=self.Cancel)
! self.buttonCancel.grid(row=0,column=1,padx=5,pady=5)
def MenuOk(self):
! #simple validity check for a sensible
! #menu item name
! menuOk=1
! menu=self.menu.get()
menu.strip()
! if not menu: #no menu item specified
tkMessageBox.showerror(title='Menu Item Error',
! message='No menu item specified.')
self.entryMenu.focus_set()
! menuOk=0
! elif len(menu)>30: #menu item name too long
tkMessageBox.showerror(title='Menu Item Error',
! message='Menu item too long. It should be no more '+
! 'than 30 characters.')
self.entryMenu.focus_set()
! menuOk=0
return menuOk
def PathOk(self):
! #simple validity check for menu file path
! pathOk=1
! path=self.path.get()
path.strip()
if not path: #no path specified
tkMessageBox.showerror(title='File Path Error',
! message='No help file path specified.')
self.entryPath.focus_set()
! pathOk=0
elif not os.path.exists(path):
tkMessageBox.showerror(title='File Path Error',
! message='Help file path does not exist.')
self.entryPath.focus_set()
! pathOk=0
return pathOk
def Ok(self, event=None):
! if self.MenuOk():
! if self.PathOk():
! self.result=( self.menu.get().strip(),self.path.get().strip() )
! self.destroy()
def Cancel(self, event=None):
! self.result=None
self.destroy()
if __name__ == '__main__':
#test the dialog
! root=Tk()
def run():
! keySeq=''
! dlg=GetHelpSourceDialog(root,'Get Help Source')
print dlg.result
! Button(root,text='Dialog',command=run).pack()
root.mainloop()
--- 19,126 ----
self.protocol("WM_DELETE_WINDOW", self.Cancel)
self.parent = parent
! self.result = None
self.CreateWidgets()
self.menu.set(menuItem)
self.path.set(filePath)
self.withdraw() #hide while setting geometry
#needs to be done here so that the winfo_reqwidth is valid
+ self.update_idletasks()
+ #centre dialog over parent:
self.geometry("+%d+%d" %
! ((parent.winfo_rootx() + ((parent.winfo_width()/2)
! -(self.winfo_reqwidth()/2)),
! parent.winfo_rooty() + ((parent.winfo_height()/2)
! -(self.winfo_reqheight()/2)))))
self.deiconify() #geometry set, unhide
+ self.bind('<Return>', self.Ok)
self.wait_window()
def CreateWidgets(self):
! self.menu = StringVar(self)
! self.path = StringVar(self)
! self.fontSize = StringVar(self)
! self.frameMain = Frame(self, borderwidth=2, relief=SUNKEN)
! self.frameMain.pack(side=TOP, expand=TRUE, fill=BOTH)
! labelMenu = Label(self.frameMain, anchor=W, justify=LEFT,
! text='Menu Item:')
! self.entryMenu = Entry(self.frameMain, textvariable=self.menu,
! width=30)
self.entryMenu.focus_set()
! labelPath = Label(self.frameMain, anchor=W, justify=LEFT,
! text='Help File Path:')
! self.entryPath = Entry(self.frameMain, textvariable=self.path,
! width=40)
self.entryMenu.focus_set()
! labelMenu.pack(anchor=W, padx=5, pady=3)
! self.entryMenu.pack(anchor=W, padx=5, pady=3)
! labelPath.pack(anchor=W, padx=5, pady=3)
! self.entryPath.pack(anchor=W, padx=5, pady=3)
! frameButtons = Frame(self)
! frameButtons.pack(side=BOTTOM, fill=X)
! self.buttonOk = Button(frameButtons, text='OK',
! width=8, default=ACTIVE, command=self.Ok)
! self.buttonOk.grid(row=0, column=0, padx=5,pady=5)
! self.buttonOk.bind('<Return>', self.Ok)
! #self.buttonOk.focus()
! self.buttonCancel = Button(frameButtons, text='Cancel',
! width=8, command=self.Cancel)
! self.buttonCancel.grid(row=0, column=1, padx=5, pady=5)
def MenuOk(self):
! "Simple validity check for a sensible menu item name"
! menuOk = True
! menu = self.menu.get()
menu.strip()
! if not menu:
tkMessageBox.showerror(title='Menu Item Error',
! message='No menu item specified',
! parent=self)
self.entryMenu.focus_set()
! menuOk = False
! elif len(menu) > 30:
tkMessageBox.showerror(title='Menu Item Error',
! message='Menu item too long:'
! '\nLimit 30 characters.',
! parent=self)
self.entryMenu.focus_set()
! menuOk = False
return menuOk
def PathOk(self):
! "Simple validity check for menu file path"
! pathOk = True
! path = self.path.get()
path.strip()
if not path: #no path specified
tkMessageBox.showerror(title='File Path Error',
! message='No help file path specified.',
! parent=self)
self.entryPath.focus_set()
! pathOk = False
elif not os.path.exists(path):
tkMessageBox.showerror(title='File Path Error',
! message='Help file path does not exist.',
! parent=self)
self.entryPath.focus_set()
! pathOk = False
return pathOk
def Ok(self, event=None):
! if self.MenuOk() and self.PathOk():
! self.result = (self.menu.get().strip(),
! self.path.get().strip())
! self.destroy()
def Cancel(self, event=None):
! self.result = None
self.destroy()
if __name__ == '__main__':
#test the dialog
! root = Tk()
def run():
! keySeq = ''
! dlg = GetHelpSourceDialog(root, 'Get Help Source')
print dlg.result
! Button(root,text='Dialog', command=run).pack()
root.mainloop()