Skip to content

bpo-30781: IDLE - Use ttk Notebook in ConfigDialog #2938

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
terryjreedy merged 6 commits into from
Jul 29, 2017
Merged

bpo-30781: IDLE - Use ttk Notebook in ConfigDialog #2938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
86fe571
bpo-30853: IDLE - touch-up configdialog.VarTrace and tests.
terryjreedy Jul 28, 2017
ab89e66
bpo-30781: IDLE - Use ttk Notebook for ConfigDialog.
terryjreedy Jul 28, 2017
0bdaae8
News blurb.
terryjreedy Jul 28, 2017
d2231a7
Merge remote-tracking branch 'origin' into notebook
terryjreedy Jul 28, 2017
1aa8e87
Adjust size and a few widget properties.
terryjreedy Jul 29, 2017
f7020ee
Enable traversal
terryjreedy Jul 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
61 changes: 32 additions & 29 deletions Lib/idlelib/configdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED,
NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW,
HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END)
from tkinter.ttk import Scrollbar
from tkinter.ttk import Notebook, Scrollbar
import tkinter.colorchooser as tkColorChooser
import tkinter.font as tkFont
import tkinter.messagebox as tkMessageBox
Expand Down Expand Up @@ -101,15 +101,19 @@ def create_widgets(self):
load_configs: Load pages except for extensions.
activate_config_changes: Tell editors to reload.
"""
self.tab_pages = TabbedPageSet(self,
page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General',
'Extensions'])
self.tab_pages.pack(side=TOP, expand=TRUE, fill=BOTH)
self.create_page_font_tab()
self.create_page_highlight()
self.create_page_keys()
self.create_page_general()
self.create_page_extensions()
self.note = note = Notebook(self, width=450, height=450)
fontpage = self.create_page_font_tab()
highpage = self.create_page_highlight()
keyspage = self.create_page_keys()
genpage = self.create_page_general()
extpage = self.create_page_extensions()
note.add(fontpage, text='Fonts/Tabs')
note.add(highpage, text='Highlights')
note.add(keyspage, text=' Keys ')
note.add(genpage, text=' General ')
note.add(extpage, text='Extensions')
note.enable_traversal()
note.pack(side=TOP, expand=TRUE, fill=BOTH)
self.create_action_buttons().pack(side=BOTTOM)

def load_configs(self):
Expand Down Expand Up @@ -270,7 +274,7 @@ def create_page_font_tab(self):

# Create widgets:
# body and body section frames.
frame = self.tab_pages.pages['Fonts/Tabs'].frame
frame = Frame(self.note)
frame_font = LabelFrame(
frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
frame_indent = LabelFrame(
Expand All @@ -281,7 +285,7 @@ def create_page_font_tab(self):
font_name_title = Label(
frame_font_name, justify=LEFT, text='Font Face :')
self.fontlist = Listbox(frame_font_name, height=5,
takefocus=FALSE, exportselection=FALSE)
takefocus=True, exportselection=FALSE)
self.fontlist.bind('<ButtonRelease-1>', self.on_fontlist_select)
self.fontlist.bind('<KeyRelease-Up>', self.on_fontlist_select)
self.fontlist.bind('<KeyRelease-Down>', self.on_fontlist_select)
Expand All @@ -297,7 +301,7 @@ def create_page_font_tab(self):
temp_font = tkFont.Font(parent, ('courier', 10, 'normal'))
self.font_sample = Label(
frame_font_sample, justify=LEFT, font=temp_font,
text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]')
text='AaBbCcDdEe\nFfGgHhIiJj\n1234567890\n#:+=(){}[]')
# frame_indent.
indent_title = Label(
frame_indent, justify=LEFT,
Expand Down Expand Up @@ -493,23 +497,22 @@ def create_page_highlight(self):
self.highlight_target = tracers.add(
StringVar(parent), self.var_changed_highlight_target)

##widget creation
#body frame
frame = self.tab_pages.pages['Highlighting'].frame
#body section frames
# Widget creation:
# body frame and section frames
frame = Frame(self.note)
frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Custom Highlighting ')
frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Highlighting Theme ')
#frame_custom
self.highlight_sample=Text(
frame_custom, relief=SOLID, borderwidth=1,
font=('courier', 12, ''), cursor='hand2', width=21, height=11,
font=('courier', 12, ''), cursor='hand2', width=21, height=13,
takefocus=FALSE, highlightthickness=0, wrap=NONE)
text=self.highlight_sample
text.bind('<Double-Button-1>', lambda e: 'break')
text.bind('<B1-Motion>', lambda e: 'break')
text_and_tags=(
text_and_tags=(('\n', 'normal'),
('#you can click here', 'comment'), ('\n', 'normal'),
('#to choose items', 'comment'), ('\n', 'normal'),
('def', 'keyword'), (' ', 'normal'),
Expand All @@ -525,7 +528,7 @@ def create_page_highlight(self):
('cursor |', 'cursor'), ('\n ', 'normal'),
('shell', 'console'), (' ', 'normal'),
('stdout', 'stdout'), (' ', 'normal'),
('stderr', 'stderr'), ('\n', 'normal'))
('stderr', 'stderr'), ('\n\n', 'normal'))
for texttag in text_and_tags:
text.insert(END, texttag[0], texttag[1])
for element in self.theme_elements:
Expand Down Expand Up @@ -1039,10 +1042,9 @@ def create_page_keys(self):
self.keybinding = tracers.add(
StringVar(parent), self.var_changed_keybinding)

##widget creation
#body frame
frame = self.tab_pages.pages['Keys'].frame
#body section frames
# Widget creation:
# body and section frames.
frame = Frame(self.note)
frame_custom = LabelFrame(
frame, borderwidth=2, relief=GROOVE,
text=' Custom Key Bindings ')
Expand Down Expand Up @@ -1449,9 +1451,8 @@ def create_page_general(self):
StringVar(parent), ('main', 'EditorWindow', 'height'))

# Create widgets:
# body.
frame = self.tab_pages.pages['General'].frame
# body section frames.
# body and section frames.
frame = Frame(self.note)
frame_run = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Startup Preferences ')
frame_save = LabelFrame(frame, borderwidth=2, relief=GROOVE,
Expand Down Expand Up @@ -1488,7 +1489,7 @@ def create_page_general(self):
frame_helplist = Frame(frame_help)
frame_helplist_buttons = Frame(frame_helplist)
self.helplist = Listbox(
frame_helplist, height=5, takefocus=FALSE,
frame_helplist, height=5, takefocus=True,
exportselection=FALSE)
scroll_helplist = Scrollbar(frame_helplist)
scroll_helplist['command'] = self.helplist.yview
Expand Down Expand Up @@ -1669,7 +1670,7 @@ def create_page_extensions(self):
save_all_changed_extensions: Call extension page Save().
"""
parent = self.parent
frame = self.tab_pages.pages['Extensions'].frame
frame = Frame(self.note)
self.ext_defaultCfg = idleConf.defaultCfg['extensions']
self.ext_userCfg = idleConf.userCfg['extensions']
self.is_int = self.register(is_int)
Expand Down Expand Up @@ -1704,6 +1705,8 @@ def create_page_extensions(self):
self.extension_list.selection_set(0)
self.extension_selected(None)

return frame

def load_extensions(self):
"Fill self.extensions with data from the default and user configs."
self.extensions = {}
Expand Down
16 changes: 10 additions & 6 deletions Lib/idlelib/idle_test/test_configdialog.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,20 +296,24 @@ def test_source_selected(self):
d.set = d.set_add_delete_state
d.upc = d.update_help_changes
helplist = d.helplist
helplist.insert(0, 'source')
helplist.activate(0)
dex = 'end'
helplist.insert(dex, 'source')
helplist.activate(dex)

helplist.focus_force()
helplist.see(0)
helplist.see(dex)
helplist.update()
x, y, dx, dy = helplist.bbox(0)
x, y, dx, dy = helplist.bbox(dex)
x += dx // 2
y += dy // 2
d.set.called = d.upc.called = 0
helplist.event_generate('<Enter>', x=0, y=0)
helplist.event_generate('<Motion>', x=x, y=y)
helplist.event_generate('<Button-1>', x=x, y=y)
helplist.event_generate('<ButtonRelease-1>', x=x, y=y)
self.assertEqual(helplist.get('anchor'), 'source')
self.assertTrue(d.set.called)
# The following fail after the switch to
# self.assertEqual(helplist.get('anchor'), 'source')
# self.assertTrue(d.set.called)
self.assertFalse(d.upc.called)

def test_set_add_delete_state(self):
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
IDLE - Use ttk Notebook in ConfigDialog