[Python-checkins] [3.6] bpo-31051: Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections. (GH-3239) (#3240)
Terry Jan Reedy
webhook-mailer at python.org
Wed Aug 30 02:47:30 EDT 2017
https://github.com/python/cpython/commit/87c50245b1ba21469cc2e4e84cd5e5cd54ff954d
commit: 87c50245b1ba21469cc2e4e84cd5e5cd54ff954d
branch: 3.6
author: Terry Jan Reedy <tjreedy at udel.edu>
committer: GitHub <noreply at github.com>
date: 2017-08-30T02:47:24-04:00
summary:
[3.6] bpo-31051: Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections. (GH-3239) (#3240)
(cherry picked from commit 390ead)
files:
A Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
M Lib/idlelib/configdialog.py
diff --git a/Lib/idlelib/configdialog.py b/Lib/idlelib/configdialog.py
index 8afc9e6d692..4ef6197e714 100644
--- a/Lib/idlelib/configdialog.py
+++ b/Lib/idlelib/configdialog.py
@@ -1739,20 +1739,22 @@ def create_page_general(self):
rewrite changes['main']['HelpFiles'].
Widgets for GenPage(Frame): (*) widgets bound to self
- frame_run: LabelFrame
- startup_title: Label
- (*)startup_editor_on: Radiobutton - startup_edit
- (*)startup_shell_on: Radiobutton - startup_edit
- frame_save: LabelFrame
- run_save_title: Label
- (*)save_ask_on: Radiobutton - autosave
- (*)save_auto_on: Radiobutton - autosave
- frame_win_size: LabelFrame
- win_size_title: Label
- win_width_title: Label
- (*)win_width_int: Entry - win_width
- win_height_title: Label
- (*)win_height_int: Entry - win_height
+ frame_window: LabelFrame
+ frame_run: Frame
+ startup_title: Label
+ (*)startup_editor_on: Radiobutton - startup_edit
+ (*)startup_shell_on: Radiobutton - startup_edit
+ frame_win_size: Frame
+ win_size_title: Label
+ win_width_title: Label
+ (*)win_width_int: Entry - win_width
+ win_height_title: Label
+ (*)win_height_int: Entry - win_height
+ frame_editor: LabelFrame
+ frame_save: Frame
+ run_save_title: Label
+ (*)save_ask_on: Radiobutton - autosave
+ (*)save_auto_on: Radiobutton - autosave
frame_help: LabelFrame
frame_helplist: Frame
frame_helplist_buttons: Frame
@@ -1771,16 +1773,15 @@ def create_page_general(self):
self.win_height = tracers.add(
StringVar(self), ('main', 'EditorWindow', 'height'))
- # Create widgets:
# Section frames.
- frame_run = LabelFrame(self, borderwidth=2, relief=GROOVE,
- text=' Startup Preferences ')
- frame_save = LabelFrame(self, borderwidth=2, relief=GROOVE,
- text=' autosave Preferences ')
- frame_win_size = Frame(self, borderwidth=2, relief=GROOVE)
+ frame_window = LabelFrame(self, borderwidth=2, relief=GROOVE,
+ text=' Window Preferences')
+ frame_editor = LabelFrame(self, borderwidth=2, relief=GROOVE,
+ text=' Editor Preferences')
frame_help = LabelFrame(self, borderwidth=2, relief=GROOVE,
text=' Additional Help Sources ')
- # frame_run.
+ # Frame_window.
+ frame_run = Frame(frame_window, borderwidth=0)
startup_title = Label(frame_run, text='At Startup')
self.startup_editor_on = Radiobutton(
frame_run, variable=self.startup_edit, value=1,
@@ -1788,15 +1789,8 @@ def create_page_general(self):
self.startup_shell_on = Radiobutton(
frame_run, variable=self.startup_edit, value=0,
text='Open Shell Window')
- # frame_save.
- run_save_title = Label(frame_save, text='At Start of Run (F5) ')
- self.save_ask_on = Radiobutton(
- frame_save, variable=self.autosave, value=0,
- text="Prompt to Save")
- self.save_auto_on = Radiobutton(
- frame_save, variable=self.autosave, value=1,
- text='No Prompt')
- # frame_win_size.
+
+ frame_win_size = Frame(frame_window, borderwidth=0,)
win_size_title = Label(
frame_win_size, text='Initial Window Size (in characters)')
win_width_title = Label(frame_win_size, text='Width')
@@ -1805,6 +1799,17 @@ def create_page_general(self):
win_height_title = Label(frame_win_size, text='Height')
self.win_height_int = Entry(
frame_win_size, textvariable=self.win_height, width=3)
+
+ # Frame_editor.
+ frame_save = Frame(frame_editor, borderwidth=0)
+ run_save_title = Label(frame_save, text='At Start of Run (F5) ')
+ self.save_ask_on = Radiobutton(
+ frame_save, variable=self.autosave, value=0,
+ text="Prompt to Save")
+ self.save_auto_on = Radiobutton(
+ frame_save, variable=self.autosave, value=1,
+ text='No Prompt')
+
# frame_help.
frame_helplist = Frame(frame_help)
frame_helplist_buttons = Frame(frame_helplist)
@@ -1826,25 +1831,27 @@ def create_page_general(self):
width=8, command=self.helplist_item_remove)
# Pack widgets:
- # body.
- frame_run.pack(side=TOP, padx=5, pady=5, fill=X)
- frame_save.pack(side=TOP, padx=5, pady=5, fill=X)
- frame_win_size.pack(side=TOP, padx=5, pady=5, fill=X)
+ # Body.
+ frame_window.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
+ frame_editor.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
frame_help.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
# frame_run.
+ frame_run.pack(side=TOP, padx=5, pady=0, fill=X)
startup_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
self.startup_shell_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
self.startup_editor_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
- # frame_save.
- run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
- self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
- self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
# frame_win_size.
+ frame_win_size.pack(side=TOP, padx=5, pady=0, fill=X)
win_size_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
self.win_height_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
win_height_title.pack(side=RIGHT, anchor=E, pady=5)
self.win_width_int.pack(side=RIGHT, anchor=E, padx=10, pady=5)
win_width_title.pack(side=RIGHT, anchor=E, pady=5)
+ # frame_save.
+ frame_save.pack(side=TOP, padx=5, pady=0, fill=X)
+ run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
+ self.save_auto_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
+ self.save_ask_on.pack(side=RIGHT, anchor=W, padx=5, pady=5)
# frame_help.
frame_helplist_buttons.pack(side=RIGHT, padx=5, pady=5, fill=Y)
frame_helplist.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
diff --git a/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst b/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
new file mode 100644
index 00000000000..fe515911b0d
--- /dev/null
+++ b/Misc/NEWS.d/next/IDLE/2017-08-30-00-06-58.bpo-31051.50Jp_Q.rst
@@ -0,0 +1 @@
+Rearrange IDLE condigdialog GenPage into Window, Editor, and Help sections.
More information about the Python-checkins
mailing list