mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-26 18:29:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge with 3.4

Browse source
This commit is contained in:
Terry Jan Reedy 2014-07-30 19:24:47 -04:00
commit 7c87fdd5d5
1 changed files with 38 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

67
Lib/idlelib/configDialog.py
View file

@ -30,6 +30,7 @@ class ConfigDialog(Toplevel):
_utest - bool, don't wait_window when running unittest _utest - bool, don't wait_window when running unittest
""" """
Toplevel.__init__(self, parent) Toplevel.__init__(self, parent)
self.parent = parent
self.wm_withdraw() self.wm_withdraw()
self.configure(borderwidth=5) self.configure(borderwidth=5)
@ -61,7 +62,6 @@ class ConfigDialog(Toplevel):
self.transient(parent) self.transient(parent)
self.grab_set() self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.Cancel) self.protocol("WM_DELETE_WINDOW", self.Cancel)
self.parent = parent
self.tabPages.focus_set() self.tabPages.focus_set()
#key bindings for this dialog #key bindings for this dialog
#self.bind('<Escape>',self.Cancel) #dismiss dialog, no save #self.bind('<Escape>',self.Cancel) #dismiss dialog, no save
@ -112,12 +112,13 @@ class ConfigDialog(Toplevel):
self.tabPages.pack(side=TOP,expand=TRUE,fill=BOTH) self.tabPages.pack(side=TOP,expand=TRUE,fill=BOTH)
def CreatePageFontTab(self): def CreatePageFontTab(self):
#tkVars parent = self.parent
self.fontSize=StringVar(self) self.fontSize = StringVar(parent)
self.fontBold=BooleanVar(self) self.fontBold = BooleanVar(parent)
self.fontName=StringVar(self) self.fontName = StringVar(parent)
self.spaceNum=IntVar(self) self.spaceNum = IntVar(parent)
self.editFont=tkFont.Font(self,('courier',10,'normal')) self.editFont = tkFont.Font(parent,('courier',10,'normal'))
##widget creation ##widget creation
#body frame #body frame
frame=self.tabPages.pages['Fonts/Tabs'].frame frame=self.tabPages.pages['Fonts/Tabs'].frame
@ -153,6 +154,7 @@ class ConfigDialog(Toplevel):
self.scaleSpaceNum=Scale(frameIndentSize, variable=self.spaceNum, self.scaleSpaceNum=Scale(frameIndentSize, variable=self.spaceNum,
orient='horizontal', orient='horizontal',
tickinterval=2, from_=2, to=16) tickinterval=2, from_=2, to=16)
#widget packing #widget packing
#body #body
frameFont.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH) frameFont.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH)
@ -175,13 +177,15 @@ class ConfigDialog(Toplevel):
return frame return frame
def CreatePageHighlight(self): def CreatePageHighlight(self):
self.builtinTheme=StringVar(self) parent = self.parent
self.customTheme=StringVar(self) self.builtinTheme = StringVar(parent)
self.fgHilite=BooleanVar(self) self.customTheme = StringVar(parent)
self.colour=StringVar(self) self.fgHilite = BooleanVar(parent)
self.fontName=StringVar(self) self.colour = StringVar(parent)
self.themeIsBuiltin=BooleanVar(self) self.fontName = StringVar(parent)
self.highlightTarget=StringVar(self) self.themeIsBuiltin = BooleanVar(parent)
self.highlightTarget = StringVar(parent)
##widget creation ##widget creation
#body frame #body frame
frame=self.tabPages.pages['Highlighting'].frame frame=self.tabPages.pages['Highlighting'].frame
@ -240,6 +244,7 @@ class ConfigDialog(Toplevel):
self.customTheme,None,command=None) self.customTheme,None,command=None)
self.buttonDeleteCustomTheme=Button(frameTheme,text='Delete Custom Theme', self.buttonDeleteCustomTheme=Button(frameTheme,text='Delete Custom Theme',
command=self.DeleteCustomTheme) command=self.DeleteCustomTheme)
##widget packing ##widget packing
#body #body
frameCustom.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH) frameCustom.pack(side=LEFT,padx=5,pady=5,expand=TRUE,fill=BOTH)
@ -264,12 +269,13 @@ class ConfigDialog(Toplevel):
return frame return frame
def CreatePageKeys(self): def CreatePageKeys(self):
#tkVars parent = self.parent
self.bindingTarget=StringVar(self) self.bindingTarget = StringVar(parent)
self.builtinKeys=StringVar(self) self.builtinKeys = StringVar(parent)
self.customKeys=StringVar(self) self.customKeys = StringVar(parent)
self.keysAreBuiltin=BooleanVar(self) self.keysAreBuiltin = BooleanVar(parent)
self.keyBinding=StringVar(self) self.keyBinding = StringVar(parent)
##widget creation ##widget creation
#body frame #body frame
frame=self.tabPages.pages['Keys'].frame frame=self.tabPages.pages['Keys'].frame
@ -307,6 +313,7 @@ class ConfigDialog(Toplevel):
command=self.DeleteCustomKeys) command=self.DeleteCustomKeys)
buttonSaveCustomKeys=Button(frames[1], buttonSaveCustomKeys=Button(frames[1],
text='Save as New Custom Key Set',command=self.SaveAsNewKeySet) text='Save as New Custom Key Set',command=self.SaveAsNewKeySet)
##widget packing ##widget packing
#body #body
frameCustom.pack(side=BOTTOM,padx=5,pady=5,expand=TRUE,fill=BOTH) frameCustom.pack(side=BOTTOM,padx=5,pady=5,expand=TRUE,fill=BOTH)
@ -333,15 +340,16 @@ class ConfigDialog(Toplevel):
return frame return frame
def CreatePageGeneral(self): def CreatePageGeneral(self):
#tkVars parent = self.parent
self.winWidth=StringVar(self) self.winWidth = StringVar(parent)
self.winHeight=StringVar(self) self.winHeight = StringVar(parent)
self.paraWidth=StringVar(self) self.paraWidth = StringVar(parent)
self.startupEdit=IntVar(self) self.startupEdit = IntVar(parent)
self.autoSave=IntVar(self) self.autoSave = IntVar(parent)
self.encoding=StringVar(self) self.encoding = StringVar(parent)
self.userHelpBrowser=BooleanVar(self) self.userHelpBrowser = BooleanVar(parent)
self.helpBrowser=StringVar(self) self.helpBrowser = StringVar(parent)
#widget creation #widget creation
#body #body
frame=self.tabPages.pages['General'].frame frame=self.tabPages.pages['General'].frame
@ -395,6 +403,7 @@ class ConfigDialog(Toplevel):
width=8,command=self.HelpListItemAdd) width=8,command=self.HelpListItemAdd)
self.buttonHelpListRemove=Button(frameHelpListButtons,text='Remove', self.buttonHelpListRemove=Button(frameHelpListButtons,text='Remove',
state=DISABLED,width=8,command=self.HelpListItemRemove) state=DISABLED,width=8,command=self.HelpListItemRemove)
#widget packing #widget packing
#body #body
frameRun.pack(side=TOP,padx=5,pady=5,fill=X) frameRun.pack(side=TOP,padx=5,pady=5,fill=X)