mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-27 10:50:04 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

bpo-30781: IDLE - use ttk widgets in configdialog (#2654)

Browse source 
Patch by Cheryl Sabella.
This commit is contained in:
Cheryl Sabella 2017-08-26 14:26:02 -04:00 • committed by Terry Jan Reedy
parent 0780bf7578
commit 7028e5986f
3 changed files with 87 additions and 86 deletions
Download patch file Download diff file Expand all files Collapse all files

109
Lib/idlelib/configdialog.py
View file

@ -9,13 +9,13 @@ Note that tab width in IDLE is currently fixed at eight due to Tk issues.
Refer to comments in EditorWindow autoindent code for details. Refer to comments in EditorWindow autoindent code for details.
""" """
from tkinter import (Toplevel, Frame, LabelFrame, Listbox, Label, Button, from tkinter import (Toplevel, Listbox, Text, Scale, Canvas,
Entry, Text, Scale, Radiobutton, Checkbutton, Canvas,
StringVar, BooleanVar, IntVar, TRUE, FALSE, StringVar, BooleanVar, IntVar, TRUE, FALSE,
TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED, TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED,
NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW, NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW,
HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END) HORIZONTAL, VERTICAL, ANCHOR, ACTIVE, END)
from tkinter.ttk import Notebook, Scrollbar from tkinter.ttk import (Button, Checkbutton, Entry, Frame, Label, LabelFrame,
Notebook, Radiobutton, Scrollbar, Style)
import tkinter.colorchooser as tkColorChooser import tkinter.colorchooser as tkColorChooser
import tkinter.font as tkFont import tkinter.font as tkFont
import tkinter.messagebox as tkMessageBox import tkinter.messagebox as tkMessageBox
@ -137,9 +137,9 @@ class ConfigDialog(Toplevel):
# text in the buttons. # text in the buttons.
padding_args = {} padding_args = {}
else: else:
padding_args = {'padx':6, 'pady':3} padding_args = {'padding': (6, 3)}
outer = Frame(self, pady=2) outer = Frame(self, padding=2)
buttons = Frame(outer, pady=2) buttons = Frame(outer, padding=2)
for txt, cmd in ( for txt, cmd in (
('Ok', self.ok), ('Ok', self.ok),
('Apply', self.apply), ('Apply', self.apply),
@ -266,7 +266,7 @@ class ConfigDialog(Toplevel):
self.extension_list.grid(column=0, row=0, sticky='nws') self.extension_list.grid(column=0, row=0, sticky='nws')
scroll.grid(column=1, row=0, sticky='ns') scroll.grid(column=1, row=0, sticky='ns')
self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0]) self.details_frame.grid(column=2, row=0, sticky='nsew', padx=[10, 0])
frame.configure(padx=10, pady=10) frame.configure(padding=10)
self.config_frame = {} self.config_frame = {}
self.current_extension = None self.current_extension = None
@ -356,9 +356,8 @@ class ConfigDialog(Toplevel):
label.grid(row=row, column=0, sticky=NW) label.grid(row=row, column=0, sticky=NW)
var = opt['var'] var = opt['var']
if opt['type'] == 'bool': if opt['type'] == 'bool':
Checkbutton(entry_area, textvariable=var, variable=var, Checkbutton(entry_area, variable=var,
onvalue='True', offvalue='False', onvalue='True', offvalue='False', width=8
indicatoron=FALSE, selectcolor='', width=8
).grid(row=row, column=1, sticky=W, padx=7) ).grid(row=row, column=1, sticky=W, padx=7)
elif opt['type'] == 'int': elif opt['type'] == 'int':
Entry(entry_area, textvariable=var, validate='key', Entry(entry_area, textvariable=var, validate='key',
@ -635,6 +634,7 @@ class HighPage(Frame):
def __init__(self, master): def __init__(self, master):
super().__init__(master) super().__init__(master)
self.cd = master.master self.cd = master.master
self.style = Style(master)
self.create_page_highlight() self.create_page_highlight()
self.load_theme_cfg() self.load_theme_cfg()
@ -821,12 +821,14 @@ class HighPage(Frame):
self.highlight_target.set(elem) self.highlight_target.set(elem)
text.tag_bind( text.tag_bind(
self.theme_elements[element][0], '<ButtonPress-1>', tem) self.theme_elements[element][0], '<ButtonPress-1>', tem)
text['state'] = DISABLED text['state'] = 'disabled'
self.frame_color_set = Frame(frame_custom, relief=SOLID, borderwidth=1) self.style.configure('frame_color_set.TFrame', borderwidth=1,
relief='solid')
self.frame_color_set = Frame(frame_custom, style='frame_color_set.TFrame')
frame_fg_bg_toggle = Frame(frame_custom) frame_fg_bg_toggle = Frame(frame_custom)
self.button_set_color = Button( self.button_set_color = Button(
self.frame_color_set, text='Choose Color for :', self.frame_color_set, text='Choose Color for :',
command=self.get_color, highlightthickness=0) command=self.get_color)
self.targetlist = DynOptionMenu( self.targetlist = DynOptionMenu(
self.frame_color_set, self.highlight_target, None, self.frame_color_set, self.highlight_target, None,
highlightthickness=0) #, command=self.set_highlight_targetBinding highlightthickness=0) #, command=self.set_highlight_targetBinding
@ -855,7 +857,7 @@ class HighPage(Frame):
self.button_delete_custom = Button( self.button_delete_custom = Button(
frame_theme, text='Delete Custom Theme', frame_theme, text='Delete Custom Theme',
command=self.delete_custom) command=self.delete_custom)
self.theme_message = Label(frame_theme, bd=2) self.theme_message = Label(frame_theme, borderwidth=2)
# Pack widgets: # Pack widgets:
# body. # body.
@ -913,7 +915,7 @@ class HighPage(Frame):
item_list = idleConf.GetSectionList('user', 'highlight') item_list = idleConf.GetSectionList('user', 'highlight')
item_list.sort() item_list.sort()
if not item_list: if not item_list:
self.custom_theme_on['state'] = DISABLED self.custom_theme_on.state(('disabled',))
self.custom_name.set('- no custom themes -') self.custom_name.set('- no custom themes -')
else: else:
self.customlist.SetMenu(item_list, item_list[0]) self.customlist.SetMenu(item_list, item_list[0])
@ -945,12 +947,10 @@ class HighPage(Frame):
changes.add_option('main', 'Theme', 'name', old_themes[0]) changes.add_option('main', 'Theme', 'name', old_themes[0])
changes.add_option('main', 'Theme', 'name2', value) changes.add_option('main', 'Theme', 'name2', value)
self.theme_message['text'] = 'New theme, see Help' self.theme_message['text'] = 'New theme, see Help'
self.theme_message['fg'] = '#500000'
else: else:
changes.add_option('main', 'Theme', 'name', value) changes.add_option('main', 'Theme', 'name', value)
changes.add_option('main', 'Theme', 'name2', '') changes.add_option('main', 'Theme', 'name2', '')
self.theme_message['text'] = '' self.theme_message['text'] = ''
self.theme_message['fg'] = 'black'
self.paint_theme_sample() self.paint_theme_sample()
def var_changed_custom_name(self, *params): def var_changed_custom_name(self, *params):
@ -1004,14 +1004,14 @@ class HighPage(Frame):
load_theme_cfg load_theme_cfg
""" """
if self.theme_source.get(): if self.theme_source.get():
self.builtinlist['state'] = NORMAL self.builtinlist['state'] = 'normal'
self.customlist['state'] = DISABLED self.customlist['state'] = 'disabled'
self.button_delete_custom['state'] = DISABLED self.button_delete_custom.state(('disabled',))
else: else:
self.builtinlist['state'] = DISABLED self.builtinlist['state'] = 'disabled'
self.custom_theme_on['state'] = NORMAL self.custom_theme_on.state(('!disabled',))
self.customlist['state'] = NORMAL self.customlist['state'] = 'normal'
self.button_delete_custom['state'] = NORMAL self.button_delete_custom.state(('!disabled',))
def get_color(self): def get_color(self):
"""Handle button to select a new color for the target tag. """Handle button to select a new color for the target tag.
@ -1032,7 +1032,8 @@ class HighPage(Frame):
create_new create_new
""" """
target = self.highlight_target.get() target = self.highlight_target.get()
prev_color = self.frame_color_set.cget('bg') prev_color = self.style.lookup(self.frame_color_set['style'],
'background')
rgbTuplet, color_string = tkColorChooser.askcolor( rgbTuplet, color_string = tkColorChooser.askcolor(
parent=self, title='Pick new color for : '+target, parent=self, title='Pick new color for : '+target,
initialcolor=prev_color) initialcolor=prev_color)
@ -1053,7 +1054,7 @@ class HighPage(Frame):
def on_new_color_set(self): def on_new_color_set(self):
"Display sample of new color selection on the dialog." "Display sample of new color selection on the dialog."
new_color = self.color.get() new_color = self.color.get()
self.frame_color_set['bg'] = new_color # Set sample. self.style.configure('frame_color_set.TFrame', background=new_color)
plane = 'foreground' if self.fg_bg_toggle.get() else 'background' plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
sample_element = self.theme_elements[self.highlight_target.get()][0] sample_element = self.theme_elements[self.highlight_target.get()][0]
self.highlight_sample.tag_config(sample_element, **{plane: new_color}) self.highlight_sample.tag_config(sample_element, **{plane: new_color})
@ -1139,12 +1140,12 @@ class HighPage(Frame):
load_theme_cfg load_theme_cfg
""" """
if self.highlight_target.get() == 'Cursor': # bg not possible if self.highlight_target.get() == 'Cursor': # bg not possible
self.fg_on['state'] = DISABLED self.fg_on.state(('disabled',))
self.bg_on['state'] = DISABLED self.bg_on.state(('disabled',))
self.fg_bg_toggle.set(1) self.fg_bg_toggle.set(1)
else: # Both fg and bg can be set. else: # Both fg and bg can be set.
self.fg_on['state'] = NORMAL self.fg_on.state(('!disabled',))
self.bg_on['state'] = NORMAL self.bg_on.state(('!disabled',))
self.fg_bg_toggle.set(1) self.fg_bg_toggle.set(1)
self.set_color_sample() self.set_color_sample()
@ -1172,7 +1173,7 @@ class HighPage(Frame):
tag = self.theme_elements[self.highlight_target.get()][0] tag = self.theme_elements[self.highlight_target.get()][0]
plane = 'foreground' if self.fg_bg_toggle.get() else 'background' plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
color = self.highlight_sample.tag_cget(tag, plane) color = self.highlight_sample.tag_cget(tag, plane)
self.frame_color_set['bg'] = color self.style.configure('frame_color_set.TFrame', background=color)
def paint_theme_sample(self): def paint_theme_sample(self):
"""Apply the theme colors to each element tag in the sample text. """Apply the theme colors to each element tag in the sample text.
@ -1260,7 +1261,7 @@ class HighPage(Frame):
item_list = idleConf.GetSectionList('user', 'highlight') item_list = idleConf.GetSectionList('user', 'highlight')
item_list.sort() item_list.sort()
if not item_list: if not item_list:
self.custom_theme_on['state'] = DISABLED self.custom_theme_on.state(('disabled',))
self.customlist.SetMenu(item_list, '- no custom themes -') self.customlist.SetMenu(item_list, '- no custom themes -')
else: else:
self.customlist.SetMenu(item_list, item_list[0]) self.customlist.SetMenu(item_list, item_list[0])
@ -1397,7 +1398,7 @@ class KeysPage(Frame):
frame_custom, text='Get New Keys for Selection', frame_custom, text='Get New Keys for Selection',
command=self.get_new_keys, state=DISABLED) command=self.get_new_keys, state=DISABLED)
# frame_key_sets. # frame_key_sets.
frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0) frames = [Frame(frame_key_sets, padding=2, borderwidth=0)
for i in range(2)] for i in range(2)]
self.builtin_keyset_on = Radiobutton( self.builtin_keyset_on = Radiobutton(
frames[0], variable=self.keyset_source, value=1, frames[0], variable=self.keyset_source, value=1,
@ -1415,7 +1416,7 @@ class KeysPage(Frame):
self.button_save_custom_keys = Button( self.button_save_custom_keys = Button(
frames[1], text='Save as New Custom Key Set', frames[1], text='Save as New Custom Key Set',
command=self.save_as_new_key_set) command=self.save_as_new_key_set)
self.keys_message = Label(frames[0], bd=2) self.keys_message = Label(frames[0], borderwidth=2)
# Pack widgets: # Pack widgets:
# body. # body.
@ -1457,7 +1458,7 @@ class KeysPage(Frame):
item_list = idleConf.GetSectionList('user', 'keys') item_list = idleConf.GetSectionList('user', 'keys')
item_list.sort() item_list.sort()
if not item_list: if not item_list:
self.custom_keyset_on['state'] = DISABLED self.custom_keyset_on.state(('disabled',))
self.custom_name.set('- no custom keys -') self.custom_name.set('- no custom keys -')
else: else:
self.customlist.SetMenu(item_list, item_list[0]) self.customlist.SetMenu(item_list, item_list[0])
@ -1487,12 +1488,10 @@ class KeysPage(Frame):
changes.add_option('main', 'Keys', 'name', old_keys[0]) changes.add_option('main', 'Keys', 'name', old_keys[0])
changes.add_option('main', 'Keys', 'name2', value) changes.add_option('main', 'Keys', 'name2', value)
self.keys_message['text'] = 'New key set, see Help' self.keys_message['text'] = 'New key set, see Help'
self.keys_message['fg'] = '#500000'
else: else:
changes.add_option('main', 'Keys', 'name', value) changes.add_option('main', 'Keys', 'name', value)
changes.add_option('main', 'Keys', 'name2', '') changes.add_option('main', 'Keys', 'name2', '')
self.keys_message['text'] = '' self.keys_message['text'] = ''
self.keys_message['fg'] = 'black'
self.load_keys_list(value) self.load_keys_list(value)
def var_changed_custom_name(self, *params): def var_changed_custom_name(self, *params):
@ -1526,14 +1525,14 @@ class KeysPage(Frame):
def set_keys_type(self): def set_keys_type(self):
"Set available screen options based on builtin or custom key set." "Set available screen options based on builtin or custom key set."
if self.keyset_source.get(): if self.keyset_source.get():
self.builtinlist['state'] = NORMAL self.builtinlist['state'] = 'normal'
self.customlist['state'] = DISABLED self.customlist['state'] = 'disabled'
self.button_delete_custom_keys['state'] = DISABLED self.button_delete_custom_keys.state(('disabled',))
else: else:
self.builtinlist['state'] = DISABLED self.builtinlist['state'] = 'disabled'
self.custom_keyset_on['state'] = NORMAL self.custom_keyset_on.state(('!disabled',))
self.customlist['state'] = NORMAL self.customlist['state'] = 'normal'
self.button_delete_custom_keys['state'] = NORMAL self.button_delete_custom_keys.state(('!disabled',))
def get_new_keys(self): def get_new_keys(self):
"""Handle event to change key binding for selected line. """Handle event to change key binding for selected line.
@ -1595,7 +1594,7 @@ class KeysPage(Frame):
def on_bindingslist_select(self, event): def on_bindingslist_select(self, event):
"Activate button to assign new keys to selected action." "Activate button to assign new keys to selected action."
self.button_new_keys['state'] = NORMAL self.button_new_keys.state(('!disabled',))
def create_new_key_set(self, new_key_set_name): def create_new_key_set(self, new_key_set_name):
"""Create a new custom key set with the given name. """Create a new custom key set with the given name.
@ -1689,7 +1688,7 @@ class KeysPage(Frame):
item_list = idleConf.GetSectionList('user', 'keys') item_list = idleConf.GetSectionList('user', 'keys')
item_list.sort() item_list.sort()
if not item_list: if not item_list:
self.custom_keyset_on['state'] = DISABLED self.custom_keyset_on.state(('disabled',))
self.customlist.SetMenu(item_list, '- no custom keys -') self.customlist.SetMenu(item_list, '- no custom keys -')
else: else:
self.customlist.SetMenu(item_list, item_list[0]) self.customlist.SetMenu(item_list, item_list[0])
@ -1809,13 +1808,13 @@ class GenPage(Frame):
self.helplist['yscrollcommand'] = scroll_helplist.set self.helplist['yscrollcommand'] = scroll_helplist.set
self.helplist.bind('<ButtonRelease-1>', self.help_source_selected) self.helplist.bind('<ButtonRelease-1>', self.help_source_selected)
self.button_helplist_edit = Button( self.button_helplist_edit = Button(
frame_helplist_buttons, text='Edit', state=DISABLED, frame_helplist_buttons, text='Edit', state='disabled',
width=8, command=self.helplist_item_edit) width=8, command=self.helplist_item_edit)
self.button_helplist_add = Button( self.button_helplist_add = Button(
frame_helplist_buttons, text='Add', frame_helplist_buttons, text='Add',
width=8, command=self.helplist_item_add) width=8, command=self.helplist_item_add)
self.button_helplist_remove = Button( self.button_helplist_remove = Button(
frame_helplist_buttons, text='Remove', state=DISABLED, frame_helplist_buttons, text='Remove', state='disabled',
width=8, command=self.helplist_item_remove) width=8, command=self.helplist_item_remove)
# Pack widgets: # Pack widgets:
@ -1874,15 +1873,15 @@ class GenPage(Frame):
def set_add_delete_state(self): def set_add_delete_state(self):
"Toggle the state for the help list buttons based on list entries." "Toggle the state for the help list buttons based on list entries."
if self.helplist.size() < 1: # No entries in list. if self.helplist.size() < 1: # No entries in list.
self.button_helplist_edit['state'] = DISABLED self.button_helplist_edit.state(('disabled',))
self.button_helplist_remove['state'] = DISABLED self.button_helplist_remove.state(('disabled',))
else: # Some entries. else: # Some entries.
if self.helplist.curselection(): # There currently is a selection. if self.helplist.curselection(): # There currently is a selection.
self.button_helplist_edit['state'] = NORMAL self.button_helplist_edit.state(('!disabled',))
self.button_helplist_remove['state'] = NORMAL self.button_helplist_remove.state(('!disabled',))
else: # There currently is not a selection. else: # There currently is not a selection.
self.button_helplist_edit['state'] = DISABLED self.button_helplist_edit.state(('disabled',))
self.button_helplist_remove['state'] = DISABLED self.button_helplist_remove.state(('disabled',))
def helplist_item_add(self): def helplist_item_add(self):
"""Handle add button for the help list. """Handle add button for the help list.
@ -2062,7 +2061,7 @@ class VerticalScrolledFrame(Frame):
# Create a canvas object and a vertical scrollbar for scrolling it. # Create a canvas object and a vertical scrollbar for scrolling it.
vscrollbar = Scrollbar(self, orient=VERTICAL) vscrollbar = Scrollbar(self, orient=VERTICAL)
vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE) vscrollbar.pack(fill=Y, side=RIGHT, expand=FALSE)
canvas = Canvas(self, bd=0, highlightthickness=0, canvas = Canvas(self, borderwidth=0, highlightthickness=0,
yscrollcommand=vscrollbar.set, width=240) yscrollcommand=vscrollbar.set, width=240)
canvas.pack(side=LEFT, fill=BOTH, expand=TRUE) canvas.pack(side=LEFT, fill=BOTH, expand=TRUE)
vscrollbar.config(command=canvas.yview) vscrollbar.config(command=canvas.yview)

61
Lib/idlelib/idle_test/test_configdialog.py
View file

@ -272,7 +272,7 @@ class HighPageTest(unittest.TestCase):
# builtinlist sets variable builtin_name to the CurrentTheme default. # builtinlist sets variable builtin_name to the CurrentTheme default.
eq(d.builtin_name.get(), 'IDLE Classic') eq(d.builtin_name.get(), 'IDLE Classic')
eq(d.custom_name.get(), '- no custom themes -') eq(d.custom_name.get(), '- no custom themes -')
eq(d.custom_theme_on['state'], DISABLED) eq(d.custom_theme_on.state(), ('disabled',))
eq(d.set_theme_type.called, 1) eq(d.set_theme_type.called, 1)
eq(d.paint_theme_sample.called, 1) eq(d.paint_theme_sample.called, 1)
eq(d.set_highlight_target.called, 1) eq(d.set_highlight_target.called, 1)
@ -315,7 +315,7 @@ class HighPageTest(unittest.TestCase):
changes.clear() changes.clear()
# Custom selected. # Custom selected.
d.custom_theme_on['state'] = NORMAL d.custom_theme_on.state(('!disabled',))
d.custom_theme_on.invoke() d.custom_theme_on.invoke()
self.assertEqual(mainpage, {'Theme': {'default': 'False'}}) self.assertEqual(mainpage, {'Theme': {'default': 'False'}})
eq(d.var_changed_builtin_name.called, 1) eq(d.var_changed_builtin_name.called, 1)
@ -428,15 +428,15 @@ class HighPageTest(unittest.TestCase):
d.set_theme_type() d.set_theme_type()
eq(d.builtinlist['state'], NORMAL) eq(d.builtinlist['state'], NORMAL)
eq(d.customlist['state'], DISABLED) eq(d.customlist['state'], DISABLED)
eq(d.button_delete_custom['state'], DISABLED) eq(d.button_delete_custom.state(), ('disabled',))
# Custom theme selected. # Custom theme selected.
d.theme_source.set(False) d.theme_source.set(False)
d.set_theme_type() d.set_theme_type()
eq(d.builtinlist['state'], DISABLED) eq(d.builtinlist['state'], DISABLED)
eq(d.custom_theme_on['state'], NORMAL) eq(d.custom_theme_on.state(), ('selected',))
eq(d.customlist['state'], NORMAL) eq(d.customlist['state'], NORMAL)
eq(d.button_delete_custom['state'], NORMAL) eq(d.button_delete_custom.state(), ())
d.set_theme_type = Func() d.set_theme_type = Func()
def test_get_color(self): def test_get_color(self):
@ -455,7 +455,7 @@ class HighPageTest(unittest.TestCase):
eq(d.color.get(), '#ffffff') eq(d.color.get(), '#ffffff')
# Selection same as previous color. # Selection same as previous color.
chooser.result = ('', d.frame_color_set.cget('bg')) chooser.result = ('', d.style.lookup(d.frame_color_set['style'], 'background'))
d.button_set_color.invoke() d.button_set_color.invoke()
eq(d.color.get(), '#ffffff') eq(d.color.get(), '#ffffff')
@ -494,7 +494,7 @@ class HighPageTest(unittest.TestCase):
d.fg_bg_toggle.set(True) d.fg_bg_toggle.set(True)
d.color.set(color) d.color.set(color)
self.assertEqual(d.frame_color_set.cget('bg'), color) self.assertEqual(d.style.lookup(d.frame_color_set['style'], 'background'), color)
self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color) self.assertEqual(d.highlight_sample.tag_cget('hilite', 'foreground'), color)
self.assertEqual(highpage, self.assertEqual(highpage,
{'Python': {'hilite-foreground': color}}) {'Python': {'hilite-foreground': color}})
@ -567,15 +567,15 @@ class HighPageTest(unittest.TestCase):
# Target is cursor. # Target is cursor.
d.highlight_target.set('Cursor') d.highlight_target.set('Cursor')
eq(d.fg_on['state'], DISABLED) eq(d.fg_on.state(), ('disabled', 'selected'))
eq(d.bg_on['state'], DISABLED) eq(d.bg_on.state(), ('disabled',))
self.assertTrue(d.fg_bg_toggle) self.assertTrue(d.fg_bg_toggle)
eq(d.set_color_sample.called, 1) eq(d.set_color_sample.called, 1)
# Target is not cursor. # Target is not cursor.
d.highlight_target.set('Comment') d.highlight_target.set('Comment')
eq(d.fg_on['state'], NORMAL) eq(d.fg_on.state(), ('selected',))
eq(d.bg_on['state'], NORMAL) eq(d.bg_on.state(), ())
self.assertTrue(d.fg_bg_toggle) self.assertTrue(d.fg_bg_toggle)
eq(d.set_color_sample.called, 2) eq(d.set_color_sample.called, 2)
@ -597,8 +597,9 @@ class HighPageTest(unittest.TestCase):
d.highlight_target.set('Selected Text') d.highlight_target.set('Selected Text')
d.fg_bg_toggle.set(True) d.fg_bg_toggle.set(True)
d.set_color_sample() d.set_color_sample()
self.assertEqual(d.frame_color_set.cget('bg'), self.assertEqual(
d.highlight_sample.tag_cget('hilite', 'foreground')) d.style.lookup(d.frame_color_set['style'], 'background'),
d.highlight_sample.tag_cget('hilite', 'foreground'))
d.set_color_sample = Func() d.set_color_sample = Func()
def test_paint_theme_sample(self): def test_paint_theme_sample(self):
@ -641,7 +642,7 @@ class HighPageTest(unittest.TestCase):
def test_delete_custom(self): def test_delete_custom(self):
eq = self.assertEqual eq = self.assertEqual
d = self.page d = self.page
d.button_delete_custom['state'] = NORMAL d.button_delete_custom.state(('!disabled',))
yesno = configdialog.tkMessageBox.askyesno = Func() yesno = configdialog.tkMessageBox.askyesno = Func()
dialog.deactivate_current_config = Func() dialog.deactivate_current_config = Func()
dialog.activate_config_changes = Func() dialog.activate_config_changes = Func()
@ -670,7 +671,7 @@ class HighPageTest(unittest.TestCase):
eq(yesno.called, 2) eq(yesno.called, 2)
self.assertNotIn(theme_name, highpage) self.assertNotIn(theme_name, highpage)
eq(idleConf.GetSectionList('user', 'highlight'), []) eq(idleConf.GetSectionList('user', 'highlight'), [])
eq(d.custom_theme_on['state'], DISABLED) eq(d.custom_theme_on.state(), ('disabled',))
eq(d.custom_name.get(), '- no custom themes -') eq(d.custom_name.get(), '- no custom themes -')
eq(dialog.deactivate_current_config.called, 1) eq(dialog.deactivate_current_config.called, 1)
eq(dialog.activate_config_changes.called, 1) eq(dialog.activate_config_changes.called, 1)
@ -721,7 +722,7 @@ class KeysPageTest(unittest.TestCase):
# builtinlist sets variable builtin_name to the CurrentKeys default. # builtinlist sets variable builtin_name to the CurrentKeys default.
eq(d.builtin_name.get(), 'IDLE Classic OSX') eq(d.builtin_name.get(), 'IDLE Classic OSX')
eq(d.custom_name.get(), '- no custom keys -') eq(d.custom_name.get(), '- no custom keys -')
eq(d.custom_keyset_on['state'], DISABLED) eq(d.custom_keyset_on.state(), ('disabled',))
eq(d.set_keys_type.called, 1) eq(d.set_keys_type.called, 1)
eq(d.load_keys_list.called, 1) eq(d.load_keys_list.called, 1)
eq(d.load_keys_list.args, ('IDLE Classic OSX', )) eq(d.load_keys_list.args, ('IDLE Classic OSX', ))
@ -765,7 +766,7 @@ class KeysPageTest(unittest.TestCase):
changes.clear() changes.clear()
# Custom selected. # Custom selected.
d.custom_keyset_on['state'] = NORMAL d.custom_keyset_on.state(('!disabled',))
d.custom_keyset_on.invoke() d.custom_keyset_on.invoke()
self.assertEqual(mainpage, {'Keys': {'default': 'False'}}) self.assertEqual(mainpage, {'Keys': {'default': 'False'}})
eq(d.var_changed_builtin_name.called, 1) eq(d.var_changed_builtin_name.called, 1)
@ -847,15 +848,15 @@ class KeysPageTest(unittest.TestCase):
d.set_keys_type() d.set_keys_type()
eq(d.builtinlist['state'], NORMAL) eq(d.builtinlist['state'], NORMAL)
eq(d.customlist['state'], DISABLED) eq(d.customlist['state'], DISABLED)
eq(d.button_delete_custom_keys['state'], DISABLED) eq(d.button_delete_custom_keys.state(), ('disabled',))
# Custom keyset selected. # Custom keyset selected.
d.keyset_source.set(False) d.keyset_source.set(False)
d.set_keys_type() d.set_keys_type()
eq(d.builtinlist['state'], DISABLED) eq(d.builtinlist['state'], DISABLED)
eq(d.custom_keyset_on['state'], NORMAL) eq(d.custom_keyset_on.state(), ('selected',))
eq(d.customlist['state'], NORMAL) eq(d.customlist['state'], NORMAL)
eq(d.button_delete_custom_keys['state'], NORMAL) eq(d.button_delete_custom_keys.state(), ())
d.set_keys_type = Func() d.set_keys_type = Func()
def test_get_new_keys(self): def test_get_new_keys(self):
@ -865,7 +866,7 @@ class KeysPageTest(unittest.TestCase):
gkd = configdialog.GetKeysDialog = Func(return_self=True) gkd = configdialog.GetKeysDialog = Func(return_self=True)
gnkn = d.get_new_keys_name = Func() gnkn = d.get_new_keys_name = Func()
d.button_new_keys['state'] = NORMAL d.button_new_keys.state(('!disabled',))
d.bindingslist.delete(0, 'end') d.bindingslist.delete(0, 'end')
d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>') d.bindingslist.insert(0, 'copy - <Control-Shift-Key-C>')
d.bindingslist.selection_set(0) d.bindingslist.selection_set(0)
@ -953,7 +954,7 @@ class KeysPageTest(unittest.TestCase):
b.event_generate('<Button-1>', x=x, y=y) b.event_generate('<Button-1>', x=x, y=y)
b.event_generate('<ButtonRelease-1>', x=x, y=y) b.event_generate('<ButtonRelease-1>', x=x, y=y)
self.assertEqual(b.get('anchor'), 'find') self.assertEqual(b.get('anchor'), 'find')
self.assertEqual(d.button_new_keys['state'], NORMAL) self.assertEqual(d.button_new_keys.state(), ())
def test_create_new_key_set_and_save_new_key_set(self): def test_create_new_key_set_and_save_new_key_set(self):
eq = self.assertEqual eq = self.assertEqual
@ -1032,7 +1033,7 @@ class KeysPageTest(unittest.TestCase):
def test_delete_custom_keys(self): def test_delete_custom_keys(self):
eq = self.assertEqual eq = self.assertEqual
d = self.page d = self.page
d.button_delete_custom_keys['state'] = NORMAL d.button_delete_custom_keys.state(('!disabled',))
yesno = configdialog.tkMessageBox.askyesno = Func() yesno = configdialog.tkMessageBox.askyesno = Func()
dialog.deactivate_current_config = Func() dialog.deactivate_current_config = Func()
dialog.activate_config_changes = Func() dialog.activate_config_changes = Func()
@ -1061,7 +1062,7 @@ class KeysPageTest(unittest.TestCase):
eq(yesno.called, 2) eq(yesno.called, 2)
self.assertNotIn(keyset_name, keyspage) self.assertNotIn(keyset_name, keyspage)
eq(idleConf.GetSectionList('user', 'keys'), []) eq(idleConf.GetSectionList('user', 'keys'), [])
eq(d.custom_keyset_on['state'], DISABLED) eq(d.custom_keyset_on.state(), ('disabled',))
eq(d.custom_name.get(), '- no custom keys -') eq(d.custom_name.get(), '- no custom keys -')
eq(dialog.deactivate_current_config.called, 1) eq(dialog.deactivate_current_config.called, 1)
eq(dialog.activate_config_changes.called, 1) eq(dialog.activate_config_changes.called, 1)
@ -1173,18 +1174,18 @@ class GenPageTest(unittest.TestCase):
h.delete(0, 'end') h.delete(0, 'end')
sad() sad()
eq(d.button_helplist_edit['state'], DISABLED) eq(d.button_helplist_edit.state(), ('disabled',))
eq(d.button_helplist_remove['state'], DISABLED) eq(d.button_helplist_remove.state(), ('disabled',))
h.insert(0, 'source') h.insert(0, 'source')
sad() sad()
eq(d.button_helplist_edit['state'], DISABLED) eq(d.button_helplist_edit.state(), ('disabled',))
eq(d.button_helplist_remove['state'], DISABLED) eq(d.button_helplist_remove.state(), ('disabled',))
h.selection_set(0) h.selection_set(0)
sad() sad()
eq(d.button_helplist_edit['state'], NORMAL) eq(d.button_helplist_edit.state(), ())
eq(d.button_helplist_remove['state'], NORMAL) eq(d.button_helplist_remove.state(), ())
d.set_add_delete_state = Func() # Mask method. d.set_add_delete_state = Func() # Mask method.
def test_helplist_item_add(self): def test_helplist_item_add(self):

3
Misc/NEWS.d/next/IDLE/2017-07-28-18-59-06.bpo-30781.ud5m18.rst
View file

@ -1 +1,2 @@
IDLE - Use ttk Notebook in ConfigDialog IDLE - Use ttk widgets in ConfigDialog.
Patches by Terry Jan Reedy and Cheryl Sabella.