[Python-checkins] cpython (merge 3.4 -> default): Merge with 3.4

Thu Oct 9 02:29:54 CEST 2014

https://hg.python.org/cpython/rev/99d6a6bfb51c
changeset: 92885:99d6a6bfb51c
parent: 92882:8b1ac1a3d007
parent: 92884:f0e06514d67f
user: Terry Jan Reedy <tjreedy at udel.edu>
date: Wed Oct 08 20:29:32 2014 -0400
summary:
 Merge with 3.4
files:
 Lib/idlelib/configDialog.py | 40 +++++++++++++-----------
 1 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py
--- a/Lib/idlelib/configDialog.py
+++ b/Lib/idlelib/configDialog.py
@@ -79,8 +79,15 @@
 def CreateWidgets(self):
 self.tabPages = TabbedPageSet(self,
 page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General'])
- frameActionButtons = Frame(self, pady=2)
- #action buttons
+ self.tabPages.pack(side=TOP, expand=TRUE, fill=BOTH)
+ self.CreatePageFontTab()
+ self.CreatePageHighlight()
+ self.CreatePageKeys()
+ self.CreatePageGeneral()
+ self.create_action_buttons().pack(side=BOTTOM)
+ Frame(self, height=2, borderwidth=0).pack(side=BOTTOM)
+
+ def create_action_buttons(self):
 if macosxSupport.isAquaTk():
 # Changing the default padding on OSX results in unreadable
 # text in the buttons
@@ -88,30 +95,25 @@
 else:
 paddingArgs = {'padx':6, 'pady':3}
 
-# Comment out button creation and packing until implement self.Help
-## self.buttonHelp = Button(frameActionButtons, text='Help',
-## command=self.Help, takefocus=FALSE,
-## **paddingArgs)
+ frame = Frame(self, pady=2)
 self.buttonOk = Button(
- frameActionButtons, text='Ok',
- command=self.Ok, takefocus=FALSE, **paddingArgs)
+ frame, text='Ok', command=self.Ok,
+ takefocus=FALSE, **paddingArgs)
 self.buttonApply = Button(
- frameActionButtons, text='Apply',
- command=self.Apply, takefocus=FALSE, **paddingArgs)
+ frame, text='Apply', command=self.Apply,
+ takefocus=FALSE, **paddingArgs)
 self.buttonCancel = Button(
- frameActionButtons, text='Cancel',
- command=self.Cancel, takefocus=FALSE, **paddingArgs)
- self.CreatePageFontTab()
- self.CreatePageHighlight()
- self.CreatePageKeys()
- self.CreatePageGeneral()
+ frame, text='Cancel', command=self.Cancel,
+ takefocus=FALSE, **paddingArgs)
+# Comment out Help button creation and packing until implement self.Help
+## self.buttonHelp = Button(
+## frame, text='Help', command=self.Help,
+## takefocus=FALSE, **paddingArgs)
 ## self.buttonHelp.pack(side=RIGHT, padx=5)
 self.buttonOk.pack(side=LEFT, padx=5)
 self.buttonApply.pack(side=LEFT, padx=5)
 self.buttonCancel.pack(side=LEFT, padx=5)
- frameActionButtons.pack(side=BOTTOM)
- Frame(self, height=2, borderwidth=0).pack(side=BOTTOM)
- self.tabPages.pack(side=TOP, expand=TRUE, fill=BOTH)
+ return frame
 
 def CreatePageFontTab(self):
 parent = self.parent
-- 
Repository URL: https://hg.python.org/cpython
