Skip to content

C
cpython
Kaydet (Commit) bac7d336 authored tarafından csabella's avatar csabella Kaydeden (comit) terryjreedy
Dosyalara gözat
Seçenekler

bpo-30728: IDLE: Refactor configdialog to PEP8 names (#2307) 

Also, change '*' in the tkinter import to an explicit list of names.
Patch by Cheryl Sabella.
üst b350c22e
Hide whitespace changes
Inline Side-by-side
Showing with 841 additions and 828 deletions
Lib/idlelib/configdialog.py
Dosyayı görüntüle @ bac7d336
...@@ -9,7 +9,12 @@ Note that tab width in IDLE is currently fixed at eight due to Tk issues. ...@@ -9,7 +9,12 @@ 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 * from tkinter import (Toplevel, Frame, LabelFrame, Listbox, Label, Button,
Entry, Text, Scale, Radiobutton, Checkbutton, Canvas,
StringVar, BooleanVar, IntVar, TRUE, FALSE,
TOP, BOTTOM, RIGHT, LEFT, SOLID, GROOVE, NORMAL, DISABLED,
NONE, BOTH, X, Y, W, E, EW, NS, NSEW, NW,
HORIZONTAL, VERTICAL, ANCHOR, END)
from tkinter.ttk import Scrollbar from tkinter.ttk import Scrollbar
import tkinter.colorchooser as tkColorChooser import tkinter.colorchooser as tkColorChooser
import tkinter.font as tkFont import tkinter.font as tkFont
...@@ -34,17 +39,17 @@ class ConfigDialog(Toplevel): ...@@ -34,17 +39,17 @@ class ConfigDialog(Toplevel):
self.parent = parent self.parent = parent
if _htest: if _htest:
parent.instance_dict = {} parent.instance_dict = {}
self.wm_withdraw() self.withdraw()
self.configure(borderwidth=5) self.configure(borderwidth=5)
self.title(title or 'IDLE Preferences') self.title(title or 'IDLE Preferences')
self.geometry( x = parent.winfo_rootx() + 20
"+%d+%d" % (parent.winfo_rootx() + 20, y = parent.winfo_rooty() + (30 if not _htest else 150)
parent.winfo_rooty() + (30 if not _htest else 150))) self.geometry(f'+{x}+{y}')
#Theme Elements. Each theme element key is its display name. #Theme Elements. Each theme element key is its display name.
#The first value of the tuple is the sample area tag name. #The first value of the tuple is the sample area tag name.
#The second value is the display name list sort index. #The second value is the display name list sort index.
self.themeElements={ self.theme_elements={
'Normal Text': ('normal', '00'), 'Normal Text': ('normal', '00'),
'Python Keywords': ('keyword', '01'), 'Python Keywords': ('keyword', '01'),
'Python Definitions': ('definition', '02'), 'Python Definitions': ('definition', '02'),
...@@ -60,152 +65,152 @@ class ConfigDialog(Toplevel): ...@@ -60,152 +65,152 @@ class ConfigDialog(Toplevel):
'Shell Stdout Text': ('stdout', '12'), 'Shell Stdout Text': ('stdout', '12'),
'Shell Stderr Text': ('stderr', '13'), 'Shell Stderr Text': ('stderr', '13'),
} }
self.ResetChangedItems() #load initial values in changed items dict self.reset_changed_items() #load initial values in changed items dict
self.CreateWidgets() self.create_widgets()
self.resizable(height=FALSE, width=FALSE) self.resizable(height=FALSE, width=FALSE)
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.tabPages.focus_set() self.tab_pages.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
#self.bind('<Alt-a>', self.Apply) #apply changes, save #self.bind('<Alt-a>', self.Apply) #apply changes, save
#self.bind('<F1>', self.Help) #context help #self.bind('<F1>', self.Help) #context help
self.LoadConfigs() self.load_configs()
self.AttachVarCallbacks() #avoid callbacks during LoadConfigs self.attach_var_callbacks() #avoid callbacks during load_configs
if not _utest: if not _utest:
self.wm_deiconify() self.wm_deiconify()
self.wait_window() self.wait_window()
def CreateWidgets(self): def create_widgets(self):
self.tabPages = TabbedPageSet(self, self.tab_pages = TabbedPageSet(self,
page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General', page_names=['Fonts/Tabs', 'Highlighting', 'Keys', 'General',
'Extensions']) 'Extensions'])
self.tabPages.pack(side=TOP, expand=TRUE, fill=BOTH) self.tab_pages.pack(side=TOP, expand=TRUE, fill=BOTH)
self.CreatePageFontTab() self.create_page_font_tab()
self.CreatePageHighlight() self.create_page_highlight()
self.CreatePageKeys() self.create_page_keys()
self.CreatePageGeneral() self.create_page_general()
self.CreatePageExtensions() self.create_page_extensions()
self.create_action_buttons().pack(side=BOTTOM) self.create_action_buttons().pack(side=BOTTOM)
def create_action_buttons(self): def create_action_buttons(self):
if macosx.isAquaTk(): if macosx.isAquaTk():
# Changing the default padding on OSX results in unreadable # Changing the default padding on OSX results in unreadable
# text in the buttons # text in the buttons
paddingArgs = {} padding_args = {}
else: else:
paddingArgs = {'padx':6, 'pady':3} padding_args = {'padx':6, 'pady':3}
outer = Frame(self, pady=2) outer = Frame(self, pady=2)
buttons = Frame(outer, pady=2) buttons = Frame(outer, pady=2)
for txt, cmd in ( for txt, cmd in (
('Ok', self.Ok), ('Ok', self.ok),
('Apply', self.Apply), ('Apply', self.apply),
('Cancel', self.Cancel), ('Cancel', self.cancel),
('Help', self.Help)): ('Help', self.help)):
Button(buttons, text=txt, command=cmd, takefocus=FALSE, Button(buttons, text=txt, command=cmd, takefocus=FALSE,
**paddingArgs).pack(side=LEFT, padx=5) **padding_args).pack(side=LEFT, padx=5)
# add space above buttons # add space above buttons
Frame(outer, height=2, borderwidth=0).pack(side=TOP) Frame(outer, height=2, borderwidth=0).pack(side=TOP)
buttons.pack(side=BOTTOM) buttons.pack(side=BOTTOM)
return outer return outer
def CreatePageFontTab(self): def create_page_font_tab(self):
parent = self.parent parent = self.parent
self.fontSize = StringVar(parent) self.font_size = StringVar(parent)
self.fontBold = BooleanVar(parent) self.font_bold = BooleanVar(parent)
self.fontName = StringVar(parent) self.font_name = StringVar(parent)
self.spaceNum = IntVar(parent) self.space_num = IntVar(parent)
self.editFont = tkFont.Font(parent, ('courier', 10, 'normal')) self.edit_font = tkFont.Font(parent, ('courier', 10, 'normal'))
##widget creation ##widget creation
#body frame #body frame
frame = self.tabPages.pages['Fonts/Tabs'].frame frame = self.tab_pages.pages['Fonts/Tabs'].frame
#body section frames #body section frames
frameFont = LabelFrame( frame_font = LabelFrame(
frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ') frame, borderwidth=2, relief=GROOVE, text=' Base Editor Font ')
frameIndent = LabelFrame( frame_indent = LabelFrame(
frame, borderwidth=2, relief=GROOVE, text=' Indentation Width ') frame, borderwidth=2, relief=GROOVE, text=' Indentation Width ')
#frameFont #frame_font
frameFontName = Frame(frameFont) frame_font_name = Frame(frame_font)
frameFontParam = Frame(frameFont) frame_font_param = Frame(frame_font)
labelFontNameTitle = Label( font_name_title = Label(
frameFontName, justify=LEFT, text='Font Face :') frame_font_name, justify=LEFT, text='Font Face :')
self.listFontName = Listbox( self.list_fonts = Listbox(
frameFontName, height=5, takefocus=FALSE, exportselection=FALSE) frame_font_name, height=5, takefocus=FALSE, exportselection=FALSE)
self.listFontName.bind( self.list_fonts.bind(
'<ButtonRelease-1>', self.OnListFontButtonRelease) '<ButtonRelease-1>', self.on_list_fonts_button_release)
scrollFont = Scrollbar(frameFontName) scroll_font = Scrollbar(frame_font_name)
scrollFont.config(command=self.listFontName.yview) scroll_font.config(command=self.list_fonts.yview)
self.listFontName.config(yscrollcommand=scrollFont.set) self.list_fonts.config(yscrollcommand=scroll_font.set)
labelFontSizeTitle = Label(frameFontParam, text='Size :') font_size_title = Label(frame_font_param, text='Size :')
self.optMenuFontSize = DynOptionMenu( self.opt_menu_font_size = DynOptionMenu(
frameFontParam, self.fontSize, None, command=self.SetFontSample) frame_font_param, self.font_size, None, command=self.set_font_sample)
checkFontBold = Checkbutton( check_font_bold = Checkbutton(
frameFontParam, variable=self.fontBold, onvalue=1, frame_font_param, variable=self.font_bold, onvalue=1,
offvalue=0, text='Bold', command=self.SetFontSample) offvalue=0, text='Bold', command=self.set_font_sample)
frameFontSample = Frame(frameFont, relief=SOLID, borderwidth=1) frame_font_sample = Frame(frame_font, relief=SOLID, borderwidth=1)
self.labelFontSample = Label( self.font_sample = Label(
frameFontSample, justify=LEFT, font=self.editFont, frame_font_sample, justify=LEFT, font=self.edit_font,
text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]') text='AaBbCcDdEe\nFfGgHhIiJjK\n1234567890\n#:+=(){}[]')
#frameIndent #frame_indent
frameIndentSize = Frame(frameIndent) frame_indent_size = Frame(frame_indent)
labelSpaceNumTitle = Label( indent_size_title = Label(
frameIndentSize, justify=LEFT, frame_indent_size, justify=LEFT,
text='Python Standard: 4 Spaces!') text='Python Standard: 4 Spaces!')
self.scaleSpaceNum = Scale( self.scale_indent_size = Scale(
frameIndentSize, variable=self.spaceNum, frame_indent_size, variable=self.space_num,
orient='horizontal', tickinterval=2, from_=2, to=16) orient='horizontal', tickinterval=2, from_=2, to=16)
#widget packing #widget packing
#body #body
frameFont.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_font.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
frameIndent.pack(side=LEFT, padx=5, pady=5, fill=Y) frame_indent.pack(side=LEFT, padx=5, pady=5, fill=Y)
#frameFont #frame_font
frameFontName.pack(side=TOP, padx=5, pady=5, fill=X) frame_font_name.pack(side=TOP, padx=5, pady=5, fill=X)
frameFontParam.pack(side=TOP, padx=5, pady=5, fill=X) frame_font_param.pack(side=TOP, padx=5, pady=5, fill=X)
labelFontNameTitle.pack(side=TOP, anchor=W) font_name_title.pack(side=TOP, anchor=W)
self.listFontName.pack(side=LEFT, expand=TRUE, fill=X) self.list_fonts.pack(side=LEFT, expand=TRUE, fill=X)
scrollFont.pack(side=LEFT, fill=Y) scroll_font.pack(side=LEFT, fill=Y)
labelFontSizeTitle.pack(side=LEFT, anchor=W) font_size_title.pack(side=LEFT, anchor=W)
self.optMenuFontSize.pack(side=LEFT, anchor=W) self.opt_menu_font_size.pack(side=LEFT, anchor=W)
checkFontBold.pack(side=LEFT, anchor=W, padx=20) check_font_bold.pack(side=LEFT, anchor=W, padx=20)
frameFontSample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_font_sample.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
self.labelFontSample.pack(expand=TRUE, fill=BOTH) self.font_sample.pack(expand=TRUE, fill=BOTH)
#frameIndent #frame_indent
frameIndentSize.pack(side=TOP, fill=X) frame_indent_size.pack(side=TOP, fill=X)
labelSpaceNumTitle.pack(side=TOP, anchor=W, padx=5) indent_size_title.pack(side=TOP, anchor=W, padx=5)
self.scaleSpaceNum.pack(side=TOP, padx=5, fill=X) self.scale_indent_size.pack(side=TOP, padx=5, fill=X)
return frame return frame
def CreatePageHighlight(self): def create_page_highlight(self):
parent = self.parent parent = self.parent
self.builtinTheme = StringVar(parent) self.builtin_theme = StringVar(parent)
self.customTheme = StringVar(parent) self.custom_theme = StringVar(parent)
self.fgHilite = BooleanVar(parent) self.fg_bg_toggle = BooleanVar(parent)
self.colour = StringVar(parent) self.colour = StringVar(parent)
self.fontName = StringVar(parent) self.font_name = StringVar(parent)
self.themeIsBuiltin = BooleanVar(parent) self.is_builtin_theme = BooleanVar(parent)
self.highlightTarget = StringVar(parent) self.highlight_target = StringVar(parent)
##widget creation ##widget creation
#body frame #body frame
frame = self.tabPages.pages['Highlighting'].frame frame = self.tab_pages.pages['Highlighting'].frame
#body section frames #body section frames
frameCustom = LabelFrame(frame, borderwidth=2, relief=GROOVE, frame_custom = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Custom Highlighting ') text=' Custom Highlighting ')
frameTheme = LabelFrame(frame, borderwidth=2, relief=GROOVE, frame_theme = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Highlighting Theme ') text=' Highlighting Theme ')
#frameCustom #frame_custom
self.textHighlightSample=Text( self.text_highlight_sample=Text(
frameCustom, relief=SOLID, borderwidth=1, frame_custom, relief=SOLID, borderwidth=1,
font=('courier', 12, ''), cursor='hand2', width=21, height=11, font=('courier', 12, ''), cursor='hand2', width=21, height=11,
takefocus=FALSE, highlightthickness=0, wrap=NONE) takefocus=FALSE, highlightthickness=0, wrap=NONE)
text=self.textHighlightSample text=self.text_highlight_sample
text.bind('<Double-Button-1>', lambda e: 'break') text.bind('<Double-Button-1>', lambda e: 'break')
text.bind('<B1-Motion>', lambda e: 'break') text.bind('<B1-Motion>', lambda e: 'break')
textAndTags=( text_and_tags=(
('#you can click here', 'comment'), ('\n', 'normal'), ('#you can click here', 'comment'), ('\n', 'normal'),
('#to choose items', 'comment'), ('\n', 'normal'), ('#to choose items', 'comment'), ('\n', 'normal'),
('def', 'keyword'), (' ', 'normal'), ('def', 'keyword'), (' ', 'normal'),
...@@ -222,1004 +227,1004 @@ class ConfigDialog(Toplevel): ...@@ -222,1004 +227,1004 @@ class ConfigDialog(Toplevel):
('shell', 'console'), (' ', 'normal'), ('shell', 'console'), (' ', 'normal'),
('stdout', 'stdout'), (' ', 'normal'), ('stdout', 'stdout'), (' ', 'normal'),
('stderr', 'stderr'), ('\n', 'normal')) ('stderr', 'stderr'), ('\n', 'normal'))
for txTa in textAndTags: for texttag in text_and_tags:
text.insert(END, txTa[0], txTa[1]) text.insert(END, texttag[0], texttag[1])
for element in self.themeElements: for element in self.theme_elements:
def tem(event, elem=element): def tem(event, elem=element):
event.widget.winfo_toplevel().highlightTarget.set(elem) event.widget.winfo_toplevel().highlight_target.set(elem)
text.tag_bind( text.tag_bind(
self.themeElements[element][0], '<ButtonPress-1>', tem) self.theme_elements[element][0], '<ButtonPress-1>', tem)
text.config(state=DISABLED) text.config(state=DISABLED)
self.frameColourSet = Frame(frameCustom, relief=SOLID, borderwidth=1) self.frame_colour_set = Frame(frame_custom, relief=SOLID, borderwidth=1)
frameFgBg = Frame(frameCustom) frame_fg_bg_toggle = Frame(frame_custom)
buttonSetColour = Button( button_set_colour = Button(
self.frameColourSet, text='Choose Colour for :', self.frame_colour_set, text='Choose Colour for :',
command=self.GetColour, highlightthickness=0) command=self.get_colour, highlightthickness=0)
self.optMenuHighlightTarget = DynOptionMenu( self.opt_menu_highlight_target = DynOptionMenu(
self.frameColourSet, self.highlightTarget, None, self.frame_colour_set, self.highlight_target, None,
highlightthickness=0) #, command=self.SetHighlightTargetBinding highlightthickness=0) #, command=self.set_highlight_targetBinding
self.radioFg = Radiobutton( self.radio_fg = Radiobutton(
frameFgBg, variable=self.fgHilite, value=1, frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=1,
text='Foreground', command=self.SetColourSampleBinding) text='Foreground', command=self.set_colour_sample_binding)
self.radioBg=Radiobutton( self.radio_bg=Radiobutton(
frameFgBg, variable=self.fgHilite, value=0, frame_fg_bg_toggle, variable=self.fg_bg_toggle, value=0,
text='Background', command=self.SetColourSampleBinding) text='Background', command=self.set_colour_sample_binding)
self.fgHilite.set(1) self.fg_bg_toggle.set(1)
buttonSaveCustomTheme = Button( button_save_custom_theme = Button(
frameCustom, text='Save as New Custom Theme', frame_custom, text='Save as New Custom Theme',
command=self.SaveAsNewTheme) command=self.save_as_new_theme)
#frameTheme #frame_theme
labelTypeTitle = Label(frameTheme, text='Select : ') theme_type_title = Label(frame_theme, text='Select : ')
self.radioThemeBuiltin = Radiobutton( self.radio_theme_builtin = Radiobutton(
frameTheme, variable=self.themeIsBuiltin, value=1, frame_theme, variable=self.is_builtin_theme, value=1,
command=self.SetThemeType, text='a Built-in Theme') command=self.set_theme_type, text='a Built-in Theme')
self.radioThemeCustom = Radiobutton( self.radio_theme_custom = Radiobutton(
frameTheme, variable=self.themeIsBuiltin, value=0, frame_theme, variable=self.is_builtin_theme, value=0,
command=self.SetThemeType, text='a Custom Theme') command=self.set_theme_type, text='a Custom Theme')
self.optMenuThemeBuiltin = DynOptionMenu( self.opt_menu_theme_builtin = DynOptionMenu(
frameTheme, self.builtinTheme, None, command=None) frame_theme, self.builtin_theme, None, command=None)
self.optMenuThemeCustom=DynOptionMenu( self.opt_menu_theme_custom=DynOptionMenu(
frameTheme, self.customTheme, None, command=None) frame_theme, self.custom_theme, None, command=None)
self.buttonDeleteCustomTheme=Button( self.button_delete_custom_theme=Button(
frameTheme, text='Delete Custom Theme', frame_theme, text='Delete Custom Theme',
command=self.DeleteCustomTheme) command=self.delete_custom_theme)
self.new_custom_theme = Label(frameTheme, bd=2) self.new_custom_theme = Label(frame_theme, bd=2)
##widget packing ##widget packing
#body #body
frameCustom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_custom.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
frameTheme.pack(side=LEFT, padx=5, pady=5, fill=Y) frame_theme.pack(side=LEFT, padx=5, pady=5, fill=Y)
#frameCustom #frame_custom
self.frameColourSet.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X) self.frame_colour_set.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=X)
frameFgBg.pack(side=TOP, padx=5, pady=0) frame_fg_bg_toggle.pack(side=TOP, padx=5, pady=0)
self.textHighlightSample.pack( self.text_highlight_sample.pack(
side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
buttonSetColour.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4) button_set_colour.pack(side=TOP, expand=TRUE, fill=X, padx=8, pady=4)
self.optMenuHighlightTarget.pack( self.opt_menu_highlight_target.pack(
side=TOP, expand=TRUE, fill=X, padx=8, pady=3) side=TOP, expand=TRUE, fill=X, padx=8, pady=3)
self.radioFg.pack(side=LEFT, anchor=E) self.radio_fg.pack(side=LEFT, anchor=E)
self.radioBg.pack(side=RIGHT, anchor=W) self.radio_bg.pack(side=RIGHT, anchor=W)
buttonSaveCustomTheme.pack(side=BOTTOM, fill=X, padx=5, pady=5) button_save_custom_theme.pack(side=BOTTOM, fill=X, padx=5, pady=5)
#frameTheme #frame_theme
labelTypeTitle.pack(side=TOP, anchor=W, padx=5, pady=5) theme_type_title.pack(side=TOP, anchor=W, padx=5, pady=5)
self.radioThemeBuiltin.pack(side=TOP, anchor=W, padx=5) self.radio_theme_builtin.pack(side=TOP, anchor=W, padx=5)
self.radioThemeCustom.pack(side=TOP, anchor=W, padx=5, pady=2) self.radio_theme_custom.pack(side=TOP, anchor=W, padx=5, pady=2)
self.optMenuThemeBuiltin.pack(side=TOP, fill=X, padx=5, pady=5) self.opt_menu_theme_builtin.pack(side=TOP, fill=X, padx=5, pady=5)
self.optMenuThemeCustom.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5) self.opt_menu_theme_custom.pack(side=TOP, fill=X, anchor=W, padx=5, pady=5)
self.buttonDeleteCustomTheme.pack(side=TOP, fill=X, padx=5, pady=5) self.button_delete_custom_theme.pack(side=TOP, fill=X, padx=5, pady=5)
self.new_custom_theme.pack(side=TOP, fill=X, pady=5) self.new_custom_theme.pack(side=TOP, fill=X, pady=5)
return frame return frame
def CreatePageKeys(self): def create_page_keys(self):
parent = self.parent parent = self.parent
self.bindingTarget = StringVar(parent) self.binding_target = StringVar(parent)
self.builtinKeys = StringVar(parent) self.builtin_keys = StringVar(parent)
self.customKeys = StringVar(parent) self.custom_keys = StringVar(parent)
self.keysAreBuiltin = BooleanVar(parent) self.are_keys_builtin = BooleanVar(parent)
self.keyBinding = StringVar(parent) self.keybinding = StringVar(parent)
##widget creation ##widget creation
#body frame #body frame
frame = self.tabPages.pages['Keys'].frame frame = self.tab_pages.pages['Keys'].frame
#body section frames #body section frames
frameCustom = LabelFrame( frame_custom = LabelFrame(
frame, borderwidth=2, relief=GROOVE, frame, borderwidth=2, relief=GROOVE,
text=' Custom Key Bindings ') text=' Custom Key Bindings ')
frameKeySets = LabelFrame( frame_key_sets = LabelFrame(
frame, borderwidth=2, relief=GROOVE, text=' Key Set ') frame, borderwidth=2, relief=GROOVE, text=' Key Set ')
#frameCustom #frame_custom
frameTarget = Frame(frameCustom) frame_target = Frame(frame_custom)
labelTargetTitle = Label(frameTarget, text='Action - Key(s)') target_title = Label(frame_target, text='Action - Key(s)')
scrollTargetY = Scrollbar(frameTarget) scroll_target_y = Scrollbar(frame_target)
scrollTargetX = Scrollbar(frameTarget, orient=HORIZONTAL) scroll_target_x = Scrollbar(frame_target, orient=HORIZONTAL)
self.listBindings = Listbox( self.list_bindings = Listbox(
frameTarget, takefocus=FALSE, exportselection=FALSE) frame_target, takefocus=FALSE, exportselection=FALSE)
self.listBindings.bind('<ButtonRelease-1>', self.KeyBindingSelected) self.list_bindings.bind('<ButtonRelease-1>', self.keybinding_selected)
scrollTargetY.config(command=self.listBindings.yview) scroll_target_y.config(command=self.list_bindings.yview)
scrollTargetX.config(command=self.listBindings.xview) scroll_target_x.config(command=self.list_bindings.xview)
self.listBindings.config(yscrollcommand=scrollTargetY.set) self.list_bindings.config(yscrollcommand=scroll_target_y.set)
self.listBindings.config(xscrollcommand=scrollTargetX.set) self.list_bindings.config(xscrollcommand=scroll_target_x.set)
self.buttonNewKeys = Button( self.button_new_keys = Button(
frameCustom, text='Get New Keys for Selection', frame_custom, text='Get New Keys for Selection',
command=self.GetNewKeys, state=DISABLED) command=self.get_new_keys, state=DISABLED)
#frameKeySets #frame_key_sets
frames = [Frame(frameKeySets, padx=2, pady=2, borderwidth=0) frames = [Frame(frame_key_sets, padx=2, pady=2, borderwidth=0)
for i in range(2)] for i in range(2)]
self.radioKeysBuiltin = Radiobutton( self.radio_keys_builtin = Radiobutton(
frames[0], variable=self.keysAreBuiltin, value=1, frames[0], variable=self.are_keys_builtin, value=1,
command=self.SetKeysType, text='Use a Built-in Key Set') command=self.set_keys_type, text='Use a Built-in Key Set')
self.radioKeysCustom = Radiobutton( self.radio_keys_custom = Radiobutton(
frames[0], variable=self.keysAreBuiltin, value=0, frames[0], variable=self.are_keys_builtin, value=0,
command=self.SetKeysType, text='Use a Custom Key Set') command=self.set_keys_type, text='Use a Custom Key Set')
self.optMenuKeysBuiltin = DynOptionMenu( self.opt_menu_keys_builtin = DynOptionMenu(
frames[0], self.builtinKeys, None, command=None) frames[0], self.builtin_keys, None, command=None)
self.optMenuKeysCustom = DynOptionMenu( self.opt_menu_keys_custom = DynOptionMenu(
frames[0], self.customKeys, None, command=None) frames[0], self.custom_keys, None, command=None)
self.buttonDeleteCustomKeys = Button( self.button_delete_custom_keys = Button(
frames[1], text='Delete Custom Key Set', frames[1], text='Delete Custom Key Set',
command=self.DeleteCustomKeys) command=self.delete_custom_keys)
buttonSaveCustomKeys = Button( 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.SaveAsNewKeySet) command=self.save_as_new_key_set)
self.new_custom_keys = Label(frames[0], bd=2) self.new_custom_keys = Label(frames[0], bd=2)
##widget packing ##widget packing
#body #body
frameCustom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_custom.pack(side=BOTTOM, padx=5, pady=5, expand=TRUE, fill=BOTH)
frameKeySets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH) frame_key_sets.pack(side=BOTTOM, padx=5, pady=5, fill=BOTH)
#frameCustom #frame_custom
self.buttonNewKeys.pack(side=BOTTOM, fill=X, padx=5, pady=5) self.button_new_keys.pack(side=BOTTOM, fill=X, padx=5, pady=5)
frameTarget.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_target.pack(side=LEFT, padx=5, pady=5, expand=TRUE, fill=BOTH)
#frame target #frame target
frameTarget.columnconfigure(0, weight=1) frame_target.columnconfigure(0, weight=1)
frameTarget.rowconfigure(1, weight=1) frame_target.rowconfigure(1, weight=1)
labelTargetTitle.grid(row=0, column=0, columnspan=2, sticky=W) target_title.grid(row=0, column=0, columnspan=2, sticky=W)
self.listBindings.grid(row=1, column=0, sticky=NSEW) self.list_bindings.grid(row=1, column=0, sticky=NSEW)
scrollTargetY.grid(row=1, column=1, sticky=NS) scroll_target_y.grid(row=1, column=1, sticky=NS)
scrollTargetX.grid(row=2, column=0, sticky=EW) scroll_target_x.grid(row=2, column=0, sticky=EW)
#frameKeySets #frame_key_sets
self.radioKeysBuiltin.grid(row=0, column=0, sticky=W+NS) self.radio_keys_builtin.grid(row=0, column=0, sticky=W+NS)
self.radioKeysCustom.grid(row=1, column=0, sticky=W+NS) self.radio_keys_custom.grid(row=1, column=0, sticky=W+NS)
self.optMenuKeysBuiltin.grid(row=0, column=1, sticky=NSEW) self.opt_menu_keys_builtin.grid(row=0, column=1, sticky=NSEW)
self.optMenuKeysCustom.grid(row=1, column=1, sticky=NSEW) self.opt_menu_keys_custom.grid(row=1, column=1, sticky=NSEW)
self.new_custom_keys.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5) self.new_custom_keys.grid(row=0, column=2, sticky=NSEW, padx=5, pady=5)
self.buttonDeleteCustomKeys.pack(side=LEFT, fill=X, expand=True, padx=2) self.button_delete_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
buttonSaveCustomKeys.pack(side=LEFT, fill=X, expand=True, padx=2) button_save_custom_keys.pack(side=LEFT, fill=X, expand=True, padx=2)
frames[0].pack(side=TOP, fill=BOTH, expand=True) frames[0].pack(side=TOP, fill=BOTH, expand=True)
frames[1].pack(side=TOP, fill=X, expand=True, pady=2) frames[1].pack(side=TOP, fill=X, expand=True, pady=2)
return frame return frame
def CreatePageGeneral(self): def create_page_general(self):
parent = self.parent parent = self.parent
self.winWidth = StringVar(parent) self.win_width = StringVar(parent)
self.winHeight = StringVar(parent) self.win_height = StringVar(parent)
self.startupEdit = IntVar(parent) self.startup_edit = IntVar(parent)
self.autoSave = IntVar(parent) self.autosave = IntVar(parent)
self.encoding = StringVar(parent) self.encoding = StringVar(parent)
self.userHelpBrowser = BooleanVar(parent) self.user_help_browser = BooleanVar(parent)
self.helpBrowser = StringVar(parent) self.help_browser = StringVar(parent)
#widget creation #widget creation
#body #body
frame = self.tabPages.pages['General'].frame frame = self.tab_pages.pages['General'].frame
#body section frames #body section frames
frameRun = LabelFrame(frame, borderwidth=2, relief=GROOVE, frame_run = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Startup Preferences ') text=' Startup Preferences ')
frameSave = LabelFrame(frame, borderwidth=2, relief=GROOVE, frame_save = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Autosave Preferences ') text=' autosave Preferences ')
frameWinSize = Frame(frame, borderwidth=2, relief=GROOVE) frame_win_size = Frame(frame, borderwidth=2, relief=GROOVE)
frameHelp = LabelFrame(frame, borderwidth=2, relief=GROOVE, frame_help = LabelFrame(frame, borderwidth=2, relief=GROOVE,
text=' Additional Help Sources ') text=' Additional Help Sources ')
#frameRun #frame_run
labelRunChoiceTitle = Label(frameRun, text='At Startup') startup_title = Label(frame_run, text='At Startup')
self.radioStartupEdit = Radiobutton( self.radio_startup_edit = Radiobutton(
frameRun, variable=self.startupEdit, value=1, frame_run, variable=self.startup_edit, value=1,
text="Open Edit Window") text="Open Edit Window")
self.radioStartupShell = Radiobutton( self.radio_startup_shell = Radiobutton(
frameRun, variable=self.startupEdit, value=0, frame_run, variable=self.startup_edit, value=0,
text='Open Shell Window') text='Open Shell Window')
#frameSave #frame_save
labelRunSaveTitle = Label(frameSave, text='At Start of Run (F5) ') run_save_title = Label(frame_save, text='At Start of Run (F5) ')
self.radioSaveAsk = Radiobutton( self.radio_save_ask = Radiobutton(
frameSave, variable=self.autoSave, value=0, frame_save, variable=self.autosave, value=0,
text="Prompt to Save") text="Prompt to Save")
self.radioSaveAuto = Radiobutton( self.radio_save_auto = Radiobutton(
frameSave, variable=self.autoSave, value=1, frame_save, variable=self.autosave, value=1,
text='No Prompt') text='No Prompt')
#frameWinSize #frame_win_size
labelWinSizeTitle = Label( win_size_title = Label(
frameWinSize, text='Initial Window Size (in characters)') frame_win_size, text='Initial Window Size (in characters)')
labelWinWidthTitle = Label(frameWinSize, text='Width') win_width_title = Label(frame_win_size, text='Width')
self.entryWinWidth = Entry( self.entry_win_width = Entry(
frameWinSize, textvariable=self.winWidth, width=3) frame_win_size, textvariable=self.win_width, width=3)
labelWinHeightTitle = Label(frameWinSize, text='Height') win_height_title = Label(frame_win_size, text='Height')
self.entryWinHeight = Entry( self.entry_win_height = Entry(
frameWinSize, textvariable=self.winHeight, width=3) frame_win_size, textvariable=self.win_height, width=3)
#frameHelp #frame_help
frameHelpList = Frame(frameHelp) frame_helplist = Frame(frame_help)
frameHelpListButtons = Frame(frameHelpList) frame_helplist_buttons = Frame(frame_helplist)
scrollHelpList = Scrollbar(frameHelpList) scroll_helplist = Scrollbar(frame_helplist)
self.listHelp = Listbox( self.list_help = Listbox(
frameHelpList, height=5, takefocus=FALSE, frame_helplist, height=5, takefocus=FALSE,
exportselection=FALSE) exportselection=FALSE)
scrollHelpList.config(command=self.listHelp.yview) scroll_helplist.config(command=self.list_help.yview)
self.listHelp.config(yscrollcommand=scrollHelpList.set) self.list_help.config(yscrollcommand=scroll_helplist.set)
self.listHelp.bind('<ButtonRelease-1>', self.HelpSourceSelected) self.list_help.bind('<ButtonRelease-1>', self.help_source_selected)
self.buttonHelpListEdit = Button( self.button_helplist_edit = Button(
frameHelpListButtons, text='Edit', state=DISABLED, frame_helplist_buttons, text='Edit', state=DISABLED,
width=8, command=self.HelpListItemEdit) width=8, command=self.helplist_item_edit)
self.buttonHelpListAdd = Button( self.button_helplist_add = Button(
frameHelpListButtons, text='Add', frame_helplist_buttons, text='Add',
width=8, command=self.HelpListItemAdd) width=8, command=self.helplist_item_add)
self.buttonHelpListRemove = Button( self.button_helplist_remove = Button(
frameHelpListButtons, text='Remove', state=DISABLED, frame_helplist_buttons, text='Remove', state=DISABLED,
width=8, command=self.HelpListItemRemove) width=8, command=self.helplist_item_remove)
#widget packing #widget packing
#body #body
frameRun.pack(side=TOP, padx=5, pady=5, fill=X) frame_run.pack(side=TOP, padx=5, pady=5, fill=X)
frameSave.pack(side=TOP, padx=5, pady=5, fill=X) frame_save.pack(side=TOP, padx=5, pady=5, fill=X)
frameWinSize.pack(side=TOP, padx=5, pady=5, fill=X) frame_win_size.pack(side=TOP, padx=5, pady=5, fill=X)
frameHelp.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_help.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
#frameRun #frame_run
labelRunChoiceTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) startup_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
self.radioStartupShell.pack(side=RIGHT, anchor=W, padx=5, pady=5) self.radio_startup_shell.pack(side=RIGHT, anchor=W, padx=5, pady=5)
self.radioStartupEdit.pack(side=RIGHT, anchor=W, padx=5, pady=5) self.radio_startup_edit.pack(side=RIGHT, anchor=W, padx=5, pady=5)
#frameSave #frame_save
labelRunSaveTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) run_save_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
self.radioSaveAuto.pack(side=RIGHT, anchor=W, padx=5, pady=5) self.radio_save_auto.pack(side=RIGHT, anchor=W, padx=5, pady=5)
self.radioSaveAsk.pack(side=RIGHT, anchor=W, padx=5, pady=5) self.radio_save_ask.pack(side=RIGHT, anchor=W, padx=5, pady=5)
#frameWinSize #frame_win_size
labelWinSizeTitle.pack(side=LEFT, anchor=W, padx=5, pady=5) win_size_title.pack(side=LEFT, anchor=W, padx=5, pady=5)
self.entryWinHeight.pack(side=RIGHT, anchor=E, padx=10, pady=5) self.entry_win_height.pack(side=RIGHT, anchor=E, padx=10, pady=5)
labelWinHeightTitle.pack(side=RIGHT, anchor=E, pady=5) win_height_title.pack(side=RIGHT, anchor=E, pady=5)
self.entryWinWidth.pack(side=RIGHT, anchor=E, padx=10, pady=5) self.entry_win_width.pack(side=RIGHT, anchor=E, padx=10, pady=5)
labelWinWidthTitle.pack(side=RIGHT, anchor=E, pady=5) win_width_title.pack(side=RIGHT, anchor=E, pady=5)
#frameHelp #frame_help
frameHelpListButtons.pack(side=RIGHT, padx=5, pady=5, fill=Y) frame_helplist_buttons.pack(side=RIGHT, padx=5, pady=5, fill=Y)
frameHelpList.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH) frame_helplist.pack(side=TOP, padx=5, pady=5, expand=TRUE, fill=BOTH)
scrollHelpList.pack(side=RIGHT, anchor=W, fill=Y) scroll_helplist.pack(side=RIGHT, anchor=W, fill=Y)
self.listHelp.pack(side=LEFT, anchor=E, expand=TRUE, fill=BOTH) self.list_help.pack(side=LEFT, anchor=E, expand=TRUE, fill=BOTH)
self.buttonHelpListEdit.pack(side=TOP, anchor=W, pady=5) self.button_helplist_edit.pack(side=TOP, anchor=W, pady=5)
self.buttonHelpListAdd.pack(side=TOP, anchor=W) self.button_helplist_add.pack(side=TOP, anchor=W)
self.buttonHelpListRemove.pack(side=TOP, anchor=W, pady=5) self.button_helplist_remove.pack(side=TOP, anchor=W, pady=5)
return frame return frame
def AttachVarCallbacks(self): def attach_var_callbacks(self):
self.fontSize.trace_add('write', self.VarChanged_font) self.font_size.trace_add('write', self.var_changed_font)
self.fontName.trace_add('write', self.VarChanged_font) self.font_name.trace_add('write', self.var_changed_font)
self.fontBold.trace_add('write', self.VarChanged_font) self.font_bold.trace_add('write', self.var_changed_font)
self.spaceNum.trace_add('write', self.VarChanged_spaceNum) self.space_num.trace_add('write', self.var_changed_space_num)
self.colour.trace_add('write', self.VarChanged_colour) self.colour.trace_add('write', self.var_changed_colour)
self.builtinTheme.trace_add('write', self.VarChanged_builtinTheme) self.builtin_theme.trace_add('write', self.var_changed_builtin_theme)
self.customTheme.trace_add('write', self.VarChanged_customTheme) self.custom_theme.trace_add('write', self.var_changed_custom_theme)
self.themeIsBuiltin.trace_add('write', self.VarChanged_themeIsBuiltin) self.is_builtin_theme.trace_add('write', self.var_changed_is_builtin_theme)
self.highlightTarget.trace_add('write', self.VarChanged_highlightTarget) self.highlight_target.trace_add('write', self.var_changed_highlight_target)
self.keyBinding.trace_add('write', self.VarChanged_keyBinding) self.keybinding.trace_add('write', self.var_changed_keybinding)
self.builtinKeys.trace_add('write', self.VarChanged_builtinKeys) self.builtin_keys.trace_add('write', self.var_changed_builtin_keys)
self.customKeys.trace_add('write', self.VarChanged_customKeys) self.custom_keys.trace_add('write', self.var_changed_custom_keys)
self.keysAreBuiltin.trace_add('write', self.VarChanged_keysAreBuiltin) self.are_keys_builtin.trace_add('write', self.var_changed_are_keys_builtin)
self.winWidth.trace_add('write', self.VarChanged_winWidth) self.win_width.trace_add('write', self.var_changed_win_width)
self.winHeight.trace_add('write', self.VarChanged_winHeight) self.win_height.trace_add('write', self.var_changed_win_height)
self.startupEdit.trace_add('write', self.VarChanged_startupEdit) self.startup_edit.trace_add('write', self.var_changed_startup_edit)
self.autoSave.trace_add('write', self.VarChanged_autoSave) self.autosave.trace_add('write', self.var_changed_autosave)
self.encoding.trace_add('write', self.VarChanged_encoding) self.encoding.trace_add('write', self.var_changed_encoding)
def remove_var_callbacks(self): def remove_var_callbacks(self):
"Remove callbacks to prevent memory leaks." "Remove callbacks to prevent memory leaks."
for var in ( for var in (
self.fontSize, self.fontName, self.fontBold, self.font_size, self.font_name, self.font_bold,
self.spaceNum, self.colour, self.builtinTheme, self.space_num, self.colour, self.builtin_theme,
self.customTheme, self.themeIsBuiltin, self.highlightTarget, self.custom_theme, self.is_builtin_theme, self.highlight_target,
self.keyBinding, self.builtinKeys, self.customKeys, self.keybinding, self.builtin_keys, self.custom_keys,
self.keysAreBuiltin, self.winWidth, self.winHeight, self.are_keys_builtin, self.win_width, self.win_height,
self.startupEdit, self.autoSave, self.encoding,): self.startup_edit, self.autosave, self.encoding,):
var.trace_remove('write', var.trace_info()[0][1]) var.trace_remove('write', var.trace_info()[0][1])
def VarChanged_font(self, *params): def var_changed_font(self, *params):
'''When one font attribute changes, save them all, as they are '''When one font attribute changes, save them all, as they are
not independent from each other. In particular, when we are not independent from each other. In particular, when we are
overriding the default font, we need to write out everything. overriding the default font, we need to write out everything.
''' '''
value = self.fontName.get() value = self.font_name.get()
self.AddChangedItem('main', 'EditorWindow', 'font', value) self.add_changed_item('main', 'EditorWindow', 'font', value)
value = self.fontSize.get() value = self.font_size.get()
self.AddChangedItem('main', 'EditorWindow', 'font-size', value) self.add_changed_item('main', 'EditorWindow', 'font-size', value)
value = self.fontBold.get() value = self.font_bold.get()
self.AddChangedItem('main', 'EditorWindow', 'font-bold', value) self.add_changed_item('main', 'EditorWindow', 'font-bold', value)
def VarChanged_spaceNum(self, *params): def var_changed_space_num(self, *params):
value = self.spaceNum.get() value = self.space_num.get()
self.AddChangedItem('main', 'Indent', 'num-spaces', value) self.add_changed_item('main', 'Indent', 'num-spaces', value)
def VarChanged_colour(self, *params): def var_changed_colour(self, *params):
self.OnNewColourSet() self.on_new_colour_set()
def VarChanged_builtinTheme(self, *params): def var_changed_builtin_theme(self, *params):
oldthemes = ('IDLE Classic', 'IDLE New') old_themes = ('IDLE Classic', 'IDLE New')
value = self.builtinTheme.get() value = self.builtin_theme.get()
if value not in oldthemes: if value not in old_themes:
if idleConf.GetOption('main', 'Theme', 'name') not in oldthemes: if idleConf.GetOption('main', 'Theme', 'name') not in old_themes:
self.AddChangedItem('main', 'Theme', 'name', oldthemes[0]) self.add_changed_item('main', 'Theme', 'name', old_themes[0])
self.AddChangedItem('main', 'Theme', 'name2', value) self.add_changed_item('main', 'Theme', 'name2', value)
self.new_custom_theme.config(text='New theme, see Help', self.new_custom_theme.config(text='New theme, see Help',
fg='#500000') fg='#500000')
else: else:
self.AddChangedItem('main', 'Theme', 'name', value) self.add_changed_item('main', 'Theme', 'name', value)
self.AddChangedItem('main', 'Theme', 'name2', '') self.add_changed_item('main', 'Theme', 'name2', '')
self.new_custom_theme.config(text='', fg='black') self.new_custom_theme.config(text='', fg='black')
self.PaintThemeSample() self.paint_theme_sample()
def VarChanged_customTheme(self, *params): def var_changed_custom_theme(self, *params):
value = self.customTheme.get() value = self.custom_theme.get()
if value != '- no custom themes -': if value != '- no custom themes -':
self.AddChangedItem('main', 'Theme', 'name', value) self.add_changed_item('main', 'Theme', 'name', value)
self.PaintThemeSample() self.paint_theme_sample()
def VarChanged_themeIsBuiltin(self, *params): def var_changed_is_builtin_theme(self, *params):
value = self.themeIsBuiltin.get() value = self.is_builtin_theme.get()
self.AddChangedItem('main', 'Theme', 'default', value) self.add_changed_item('main', 'Theme', 'default', value)
if value: if value:
self.VarChanged_builtinTheme() self.var_changed_builtin_theme()
else: else:
self.VarChanged_customTheme() self.var_changed_custom_theme()
def VarChanged_highlightTarget(self, *params): def var_changed_highlight_target(self, *params):
self.SetHighlightTarget() self.set_highlight_target()
def VarChanged_keyBinding(self, *params): def var_changed_keybinding(self, *params):
value = self.keyBinding.get() value = self.keybinding.get()
keySet = self.customKeys.get() key_set = self.custom_keys.get()
event = self.listBindings.get(ANCHOR).split()[0] event = self.list_bindings.get(ANCHOR).split()[0]
if idleConf.IsCoreBinding(event): if idleConf.IsCoreBinding(event):
#this is a core keybinding #this is a core keybinding
self.AddChangedItem('keys', keySet, event, value) self.add_changed_item('keys', key_set, event, value)
else: #this is an extension key binding else: #this is an extension key binding
extName = idleConf.GetExtnNameForEvent(event) ext_name = idleConf.GetExtnNameForEvent(event)
extKeybindSection = extName + '_cfgBindings' ext_keybind_section = ext_name + '_cfgBindings'
self.AddChangedItem('extensions', extKeybindSection, event, value) self.add_changed_item('extensions', ext_keybind_section, event, value)
def VarChanged_builtinKeys(self, *params): def var_changed_builtin_keys(self, *params):
oldkeys = ( old_keys = (
'IDLE Classic Windows', 'IDLE Classic Windows',
'IDLE Classic Unix', 'IDLE Classic Unix',
'IDLE Classic Mac', 'IDLE Classic Mac',
'IDLE Classic OSX', 'IDLE Classic OSX',
) )
value = self.builtinKeys.get() value = self.builtin_keys.get()
if value not in oldkeys: if value not in old_keys:
if idleConf.GetOption('main', 'Keys', 'name') not in oldkeys: if idleConf.GetOption('main', 'Keys', 'name') not in old_keys:
self.AddChangedItem('main', 'Keys', 'name', oldkeys[0]) self.add_changed_item('main', 'Keys', 'name', old_keys[0])
self.AddChangedItem('main', 'Keys', 'name2', value) self.add_changed_item('main', 'Keys', 'name2', value)
self.new_custom_keys.config(text='New key set, see Help', self.new_custom_keys.config(text='New key set, see Help',
fg='#500000') fg='#500000')
else: else:
self.AddChangedItem('main', 'Keys', 'name', value) self.add_changed_item('main', 'Keys', 'name', value)
self.AddChangedItem('main', 'Keys', 'name2', '') self.add_changed_item('main', 'Keys', 'name2', '')
self.new_custom_keys.config(text='', fg='black') self.new_custom_keys.config(text='', fg='black')
self.LoadKeysList(value) self.load_keys_list(value)
def VarChanged_customKeys(self, *params): def var_changed_custom_keys(self, *params):
value = self.customKeys.get() value = self.custom_keys.get()
if value != '- no custom keys -': if value != '- no custom keys -':
self.AddChangedItem('main', 'Keys', 'name', value) self.add_changed_item('main', 'Keys', 'name', value)
self.LoadKeysList(value) self.load_keys_list(value)
def VarChanged_keysAreBuiltin(self, *params): def var_changed_are_keys_builtin(self, *params):
value = self.keysAreBuiltin.get() value = self.are_keys_builtin.get()
self.AddChangedItem('main', 'Keys', 'default', value) self.add_changed_item('main', 'Keys', 'default', value)
if value: if value:
self.VarChanged_builtinKeys() self.var_changed_builtin_keys()
else: else:
self.VarChanged_customKeys() self.var_changed_custom_keys()
def VarChanged_winWidth(self, *params): def var_changed_win_width(self, *params):
value = self.winWidth.get() value = self.win_width.get()
self.AddChangedItem('main', 'EditorWindow', 'width', value) self.add_changed_item('main', 'EditorWindow', 'width', value)
def VarChanged_winHeight(self, *params): def var_changed_win_height(self, *params):
value = self.winHeight.get() value = self.win_height.get()
self.AddChangedItem('main', 'EditorWindow', 'height', value) self.add_changed_item('main', 'EditorWindow', 'height', value)
def VarChanged_startupEdit(self, *params): def var_changed_startup_edit(self, *params):
value = self.startupEdit.get() value = self.startup_edit.get()
self.AddChangedItem('main', 'General', 'editor-on-startup', value) self.add_changed_item('main', 'General', 'editor-on-startup', value)
def VarChanged_autoSave(self, *params): def var_changed_autosave(self, *params):
value = self.autoSave.get() value = self.autosave.get()
self.AddChangedItem('main', 'General', 'autosave', value) self.add_changed_item('main', 'General', 'autosave', value)
def VarChanged_encoding(self, *params): def var_changed_encoding(self, *params):
value = self.encoding.get() value = self.encoding.get()
self.AddChangedItem('main', 'EditorWindow', 'encoding', value) self.add_changed_item('main', 'EditorWindow', 'encoding', value)
def ResetChangedItems(self): def reset_changed_items(self):
#When any config item is changed in this dialog, an entry #When any config item is changed in this dialog, an entry
#should be made in the relevant section (config type) of this #should be made in the relevant section (config type) of this
#dictionary. The key should be the config file section name and the #dictionary. The key should be the config file section name and the
#value a dictionary, whose key:value pairs are item=value pairs for #value a dictionary, whose key:value pairs are item=value pairs for
#that config file section. #that config file section.
self.changedItems = {'main':{}, 'highlight':{}, 'keys':{}, self.changed_items = {'main':{}, 'highlight':{}, 'keys':{},
'extensions':{}} 'extensions':{}}
def AddChangedItem(self, typ, section, item, value): def add_changed_item(self, typ, section, item, value):
value = str(value) #make sure we use a string value = str(value) #make sure we use a string
if section not in self.changedItems[typ]: if section not in self.changed_items[typ]:
self.changedItems[typ][section] = {} self.changed_items[typ][section] = {}
self.changedItems[typ][section][item] = value self.changed_items[typ][section][item] = value
def GetDefaultItems(self): def GetDefaultItems(self):
dItems={'main':{}, 'highlight':{}, 'keys':{}, 'extensions':{}} d_items={'main':{}, 'highlight':{}, 'keys':{}, 'extensions':{}}
for configType in dItems: for config_type in d_items:
sections = idleConf.GetSectionList('default', configType) sections = idleConf.GetSectionList('default', config_type)
for section in sections: for section in sections:
dItems[configType][section] = {} d_items[config_type][section] = {}
options = idleConf.defaultCfg[configType].GetOptionList(section) options = idleConf.defaultCfg[config_type].GetOptionList(section)
for option in options: for option in options:
dItems[configType][section][option] = ( d_items[config_type][section][option] = (
idleConf.defaultCfg[configType].Get(section, option)) idleConf.defaultCfg[config_type].Get(section, option))
return dItems return d_items
def SetThemeType(self): def set_theme_type(self):
if self.themeIsBuiltin.get(): if self.is_builtin_theme.get():
self.optMenuThemeBuiltin.config(state=NORMAL) self.opt_menu_theme_builtin.config(state=NORMAL)
self.optMenuThemeCustom.config(state=DISABLED) self.opt_menu_theme_custom.config(state=DISABLED)
self.buttonDeleteCustomTheme.config(state=DISABLED) self.button_delete_custom_theme.config(state=DISABLED)
else: else:
self.optMenuThemeBuiltin.config(state=DISABLED) self.opt_menu_theme_builtin.config(state=DISABLED)
self.radioThemeCustom.config(state=NORMAL) self.radio_theme_custom.config(state=NORMAL)
self.optMenuThemeCustom.config(state=NORMAL) self.opt_menu_theme_custom.config(state=NORMAL)
self.buttonDeleteCustomTheme.config(state=NORMAL) self.button_delete_custom_theme.config(state=NORMAL)
def SetKeysType(self): def set_keys_type(self):
if self.keysAreBuiltin.get(): if self.are_keys_builtin.get():
self.optMenuKeysBuiltin.config(state=NORMAL) self.opt_menu_keys_builtin.config(state=NORMAL)
self.optMenuKeysCustom.config(state=DISABLED) self.opt_menu_keys_custom.config(state=DISABLED)
self.buttonDeleteCustomKeys.config(state=DISABLED) self.button_delete_custom_keys.config(state=DISABLED)
else: else:
self.optMenuKeysBuiltin.config(state=DISABLED) self.opt_menu_keys_builtin.config(state=DISABLED)
self.radioKeysCustom.config(state=NORMAL) self.radio_keys_custom.config(state=NORMAL)
self.optMenuKeysCustom.config(state=NORMAL) self.opt_menu_keys_custom.config(state=NORMAL)
self.buttonDeleteCustomKeys.config(state=NORMAL) self.button_delete_custom_keys.config(state=NORMAL)
def GetNewKeys(self): def get_new_keys(self):
listIndex = self.listBindings.index(ANCHOR) list_index = self.list_bindings.index(ANCHOR)
binding = self.listBindings.get(listIndex) binding = self.list_bindings.get(list_index)
bindName = binding.split()[0] #first part, up to first space bind_name = binding.split()[0] #first part, up to first space
if self.keysAreBuiltin.get(): if self.are_keys_builtin.get():
currentKeySetName = self.builtinKeys.get() current_key_set_name = self.builtin_keys.get()
else: else:
currentKeySetName = self.customKeys.get() current_key_set_name = self.custom_keys.get()
currentBindings = idleConf.GetCurrentKeySet() current_bindings = idleConf.GetCurrentKeySet()
if currentKeySetName in self.changedItems['keys']: #unsaved changes if current_key_set_name in self.changed_items['keys']: #unsaved changes
keySetChanges = self.changedItems['keys'][currentKeySetName] key_set_changes = self.changed_items['keys'][current_key_set_name]
for event in keySetChanges: for event in key_set_changes:
currentBindings[event] = keySetChanges[event].split() current_bindings[event] = key_set_changes[event].split()
currentKeySequences = list(currentBindings.values()) current_key_sequences = list(current_bindings.values())
newKeys = GetKeysDialog(self, 'Get New Keys', bindName, new_keys = GetKeysDialog(self, 'Get New Keys', bind_name,
currentKeySequences).result current_key_sequences).result
if newKeys: #new keys were specified if new_keys: #new keys were specified
if self.keysAreBuiltin.get(): #current key set is a built-in if self.are_keys_builtin.get(): #current key set is a built-in
message = ('Your changes will be saved as a new Custom Key Set.' message = ('Your changes will be saved as a new Custom Key Set.'
' Enter a name for your new Custom Key Set below.') ' Enter a name for your new Custom Key Set below.')
newKeySet = self.GetNewKeysName(message) new_keyset = self.get_new_keys_name(message)
if not newKeySet: #user cancelled custom key set creation if not new_keyset: #user cancelled custom key set creation
self.listBindings.select_set(listIndex) self.list_bindings.select_set(list_index)
self.listBindings.select_anchor(listIndex) self.list_bindings.select_anchor(list_index)
return return
else: #create new custom key set based on previously active key set else: #create new custom key set based on previously active key set
self.CreateNewKeySet(newKeySet) self.create_new_key_set(new_keyset)
self.listBindings.delete(listIndex) self.list_bindings.delete(list_index)
self.listBindings.insert(listIndex, bindName+' - '+newKeys) self.list_bindings.insert(list_index, bind_name+' - '+new_keys)
self.listBindings.select_set(listIndex) self.list_bindings.select_set(list_index)
self.listBindings.select_anchor(listIndex) self.list_bindings.select_anchor(list_index)
self.keyBinding.set(newKeys) self.keybinding.set(new_keys)
else: else:
self.listBindings.select_set(listIndex) self.list_bindings.select_set(list_index)
self.listBindings.select_anchor(listIndex) self.list_bindings.select_anchor(list_index)
def GetNewKeysName(self, message): def get_new_keys_name(self, message):
usedNames = (idleConf.GetSectionList('user', 'keys') + used_names = (idleConf.GetSectionList('user', 'keys') +
idleConf.GetSectionList('default', 'keys')) idleConf.GetSectionList('default', 'keys'))
newKeySet = SectionName( new_keyset = SectionName(
self, 'New Custom Key Set', message, usedNames).result self, 'New Custom Key Set', message, used_names).result
return newKeySet return new_keyset
def SaveAsNewKeySet(self): def save_as_new_key_set(self):
newKeysName = self.GetNewKeysName('New Key Set Name:') new_keys_name = self.get_new_keys_name('New Key Set Name:')
if newKeysName: if new_keys_name:
self.CreateNewKeySet(newKeysName) self.create_new_key_set(new_keys_name)
def KeyBindingSelected(self, event): def keybinding_selected(self, event):
self.buttonNewKeys.config(state=NORMAL) self.button_new_keys.config(state=NORMAL)
def CreateNewKeySet(self, newKeySetName): def create_new_key_set(self, new_key_set_name):
#creates new custom key set based on the previously active key set, #creates new custom key set based on the previously active key set,
#and makes the new key set active #and makes the new key set active
if self.keysAreBuiltin.get(): if self.are_keys_builtin.get():
prevKeySetName = self.builtinKeys.get() prev_key_set_name = self.builtin_keys.get()
else: else:
prevKeySetName = self.customKeys.get() prev_key_set_name = self.custom_keys.get()
prevKeys = idleConf.GetCoreKeys(prevKeySetName) prev_keys = idleConf.GetCoreKeys(prev_key_set_name)
newKeys = {} new_keys = {}
for event in prevKeys: #add key set to changed items for event in prev_keys: #add key set to changed items
eventName = event[2:-2] #trim off the angle brackets event_name = event[2:-2] #trim off the angle brackets
binding = ' '.join(prevKeys[event]) binding = ' '.join(prev_keys[event])
newKeys[eventName] = binding new_keys[event_name] = binding
#handle any unsaved changes to prev key set #handle any unsaved changes to prev key set
if prevKeySetName in self.changedItems['keys']: if prev_key_set_name in self.changed_items['keys']:
keySetChanges = self.changedItems['keys'][prevKeySetName] key_set_changes = self.changed_items['keys'][prev_key_set_name]
for event in keySetChanges: for event in key_set_changes:
newKeys[event] = keySetChanges[event] new_keys[event] = key_set_changes[event]
#save the new theme #save the new theme
self.SaveNewKeySet(newKeySetName, newKeys) self.save_new_key_set(new_key_set_name, new_keys)
#change gui over to the new key set #change gui over to the new key set
customKeyList = idleConf.GetSectionList('user', 'keys') custom_key_list = idleConf.GetSectionList('user', 'keys')
customKeyList.sort() custom_key_list.sort()
self.optMenuKeysCustom.SetMenu(customKeyList, newKeySetName) self.opt_menu_keys_custom.SetMenu(custom_key_list, new_key_set_name)
self.keysAreBuiltin.set(0) self.are_keys_builtin.set(0)
self.SetKeysType() self.set_keys_type()
def LoadKeysList(self, keySetName): def load_keys_list(self, keyset_name):
reselect = 0 reselect = 0
newKeySet = 0 new_keyset = 0
if self.listBindings.curselection(): if self.list_bindings.curselection():
reselect = 1 reselect = 1
listIndex = self.listBindings.index(ANCHOR) list_index = self.list_bindings.index(ANCHOR)
keySet = idleConf.GetKeySet(keySetName) keyset = idleConf.GetKeySet(keyset_name)
bindNames = list(keySet.keys()) bind_names = list(keyset.keys())
bindNames.sort() bind_names.sort()
self.listBindings.delete(0, END) self.list_bindings.delete(0, END)
for bindName in bindNames: for bind_name in bind_names:
key = ' '.join(keySet[bindName]) #make key(s) into a string key = ' '.join(keyset[bind_name]) #make key(s) into a string
bindName = bindName[2:-2] #trim off the angle brackets bind_name = bind_name[2:-2] #trim off the angle brackets
if keySetName in self.changedItems['keys']: if keyset_name in self.changed_items['keys']:
#handle any unsaved changes to this key set #handle any unsaved changes to this key set
if bindName in self.changedItems['keys'][keySetName]: if bind_name in self.changed_items['keys'][keyset_name]:
key = self.changedItems['keys'][keySetName][bindName] key = self.changed_items['keys'][keyset_name][bind_name]
self.listBindings.insert(END, bindName+' - '+key) self.list_bindings.insert(END, bind_name+' - '+key)
if reselect: if reselect:
self.listBindings.see(listIndex) self.list_bindings.see(list_index)
self.listBindings.select_set(listIndex) self.list_bindings.select_set(list_index)
self.listBindings.select_anchor(listIndex) self.list_bindings.select_anchor(list_index)
def DeleteCustomKeys(self): def delete_custom_keys(self):
keySetName=self.customKeys.get() keyset_name=self.custom_keys.get()
delmsg = 'Are you sure you wish to delete the key set %r ?' delmsg = 'Are you sure you wish to delete the key set %r ?'
if not tkMessageBox.askyesno( if not tkMessageBox.askyesno(
'Delete Key Set', delmsg % keySetName, parent=self): 'Delete Key Set', delmsg % keyset_name, parent=self):
return return
self.DeactivateCurrentConfig() self.deactivate_current_config()
#remove key set from config #remove key set from config
idleConf.userCfg['keys'].remove_section(keySetName) idleConf.userCfg['keys'].remove_section(keyset_name)
if keySetName in self.changedItems['keys']: if keyset_name in self.changed_items['keys']:
del(self.changedItems['keys'][keySetName]) del(self.changed_items['keys'][keyset_name])
#write changes #write changes
idleConf.userCfg['keys'].Save() idleConf.userCfg['keys'].Save()
#reload user key set list #reload user key set list
itemList = idleConf.GetSectionList('user', 'keys') item_list = idleConf.GetSectionList('user', 'keys')
itemList.sort() item_list.sort()
if not itemList: if not item_list:
self.radioKeysCustom.config(state=DISABLED) self.radio_keys_custom.config(state=DISABLED)
self.optMenuKeysCustom.SetMenu(itemList, '- no custom keys -') self.opt_menu_keys_custom.SetMenu(item_list, '- no custom keys -')
else: else:
self.optMenuKeysCustom.SetMenu(itemList, itemList[0]) self.opt_menu_keys_custom.SetMenu(item_list, item_list[0])
#revert to default key set #revert to default key set
self.keysAreBuiltin.set(idleConf.defaultCfg['main'] self.are_keys_builtin.set(idleConf.defaultCfg['main']
.Get('Keys', 'default')) .Get('Keys', 'default'))
self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name') self.builtin_keys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')
or idleConf.default_keys()) or idleConf.default_keys())
#user can't back out of these changes, they must be applied now #user can't back out of these changes, they must be applied now
self.SaveAllChangedConfigs() self.save_all_changed_configs()
self.ActivateConfigChanges() self.activate_config_changes()
self.SetKeysType() self.set_keys_type()
def DeleteCustomTheme(self): def delete_custom_theme(self):
themeName = self.customTheme.get() theme_name = self.custom_theme.get()
delmsg = 'Are you sure you wish to delete the theme %r ?' delmsg = 'Are you sure you wish to delete the theme %r ?'
if not tkMessageBox.askyesno( if not tkMessageBox.askyesno(
'Delete Theme', delmsg % themeName, parent=self): 'Delete Theme', delmsg % theme_name, parent=self):
return return
self.DeactivateCurrentConfig() self.deactivate_current_config()
#remove theme from config #remove theme from config
idleConf.userCfg['highlight'].remove_section(themeName) idleConf.userCfg['highlight'].remove_section(theme_name)
if themeName in self.changedItems['highlight']: if theme_name in self.changed_items['highlight']:
del(self.changedItems['highlight'][themeName]) del(self.changed_items['highlight'][theme_name])
#write changes #write changes
idleConf.userCfg['highlight'].Save() idleConf.userCfg['highlight'].Save()
#reload user theme list #reload user theme list
itemList = idleConf.GetSectionList('user', 'highlight') item_list = idleConf.GetSectionList('user', 'highlight')
itemList.sort() item_list.sort()
if not itemList: if not item_list:
self.radioThemeCustom.config(state=DISABLED) self.radio_theme_custom.config(state=DISABLED)
self.optMenuThemeCustom.SetMenu(itemList, '- no custom themes -') self.opt_menu_theme_custom.SetMenu(item_list, '- no custom themes -')
else: else:
self.optMenuThemeCustom.SetMenu(itemList, itemList[0]) self.opt_menu_theme_custom.SetMenu(item_list, item_list[0])
#revert to default theme #revert to default theme
self.themeIsBuiltin.set(idleConf.defaultCfg['main'].Get('Theme', 'default')) self.is_builtin_theme.set(idleConf.defaultCfg['main'].Get('Theme', 'default'))
self.builtinTheme.set(idleConf.defaultCfg['main'].Get('Theme', 'name')) self.builtin_theme.set(idleConf.defaultCfg['main'].Get('Theme', 'name'))
#user can't back out of these changes, they must be applied now #user can't back out of these changes, they must be applied now
self.SaveAllChangedConfigs() self.save_all_changed_configs()
self.ActivateConfigChanges() self.activate_config_changes()
self.SetThemeType() self.set_theme_type()
def GetColour(self): def get_colour(self):
target = self.highlightTarget.get() target = self.highlight_target.get()
prevColour = self.frameColourSet.cget('bg') prev_colour = self.frame_colour_set.cget('bg')
rgbTuplet, colourString = tkColorChooser.askcolor( rgbTuplet, colour_string = tkColorChooser.askcolor(
parent=self, title='Pick new colour for : '+target, parent=self, title='Pick new colour for : '+target,
initialcolor=prevColour) initialcolor=prev_colour)
if colourString and (colourString != prevColour): if colour_string and (colour_string != prev_colour):
#user didn't cancel, and they chose a new colour #user didn't cancel, and they chose a new colour
if self.themeIsBuiltin.get(): #current theme is a built-in if self.is_builtin_theme.get(): #current theme is a built-in
message = ('Your changes will be saved as a new Custom Theme. ' message = ('Your changes will be saved as a new Custom Theme. '
'Enter a name for your new Custom Theme below.') 'Enter a name for your new Custom Theme below.')
newTheme = self.GetNewThemeName(message) new_theme = self.get_new_theme_name(message)
if not newTheme: #user cancelled custom theme creation if not new_theme: #user cancelled custom theme creation
return return
else: #create new custom theme based on previously active theme else: #create new custom theme based on previously active theme
self.CreateNewTheme(newTheme) self.create_new_theme(new_theme)
self.colour.set(colourString) self.colour.set(colour_string)
else: #current theme is user defined else: #current theme is user defined
self.colour.set(colourString) self.colour.set(colour_string)
def OnNewColourSet(self): def on_new_colour_set(self):
newColour=self.colour.get() new_colour=self.colour.get()
self.frameColourSet.config(bg=newColour) #set sample self.frame_colour_set.config(bg=new_colour) #set sample
plane ='foreground' if self.fgHilite.get() else 'background' plane ='foreground' if self.fg_bg_toggle.get() else 'background'
sampleElement = self.themeElements[self.highlightTarget.get()][0] sample_element = self.theme_elements[self.highlight_target.get()][0]
self.textHighlightSample.tag_config(sampleElement, **{plane:newColour}) self.text_highlight_sample.tag_config(sample_element, **{plane:new_colour})
theme = self.customTheme.get() theme = self.custom_theme.get()
themeElement = sampleElement + '-' + plane theme_element = sample_element + '-' + plane
self.AddChangedItem('highlight', theme, themeElement, newColour) self.add_changed_item('highlight', theme, theme_element, new_colour)
def GetNewThemeName(self, message): def get_new_theme_name(self, message):
usedNames = (idleConf.GetSectionList('user', 'highlight') + used_names = (idleConf.GetSectionList('user', 'highlight') +
idleConf.GetSectionList('default', 'highlight')) idleConf.GetSectionList('default', 'highlight'))
newTheme = SectionName( new_theme = SectionName(
self, 'New Custom Theme', message, usedNames).result self, 'New Custom Theme', message, used_names).result
return newTheme return new_theme
def SaveAsNewTheme(self): def save_as_new_theme(self):
newThemeName = self.GetNewThemeName('New Theme Name:') new_theme_name = self.get_new_theme_name('New Theme Name:')
if newThemeName: if new_theme_name:
self.CreateNewTheme(newThemeName) self.create_new_theme(new_theme_name)
def CreateNewTheme(self, newThemeName): def create_new_theme(self, new_theme_name):
#creates new custom theme based on the previously active theme, #creates new custom theme based on the previously active theme,
#and makes the new theme active #and makes the new theme active
if self.themeIsBuiltin.get(): if self.is_builtin_theme.get():
themeType = 'default' theme_type = 'default'
themeName = self.builtinTheme.get() theme_name = self.builtin_theme.get()
else: else:
themeType = 'user' theme_type = 'user'
themeName = self.customTheme.get() theme_name = self.custom_theme.get()
newTheme = idleConf.GetThemeDict(themeType, themeName) new_theme = idleConf.GetThemeDict(theme_type, theme_name)
#apply any of the old theme's unsaved changes to the new theme #apply any of the old theme's unsaved changes to the new theme
if themeName in self.changedItems['highlight']: if theme_name in self.changed_items['highlight']:
themeChanges = self.changedItems['highlight'][themeName] theme_changes = self.changed_items['highlight'][theme_name]
for element in themeChanges: for element in theme_changes:
newTheme[element] = themeChanges[element] new_theme[element] = theme_changes[element]
#save the new theme #save the new theme
self.SaveNewTheme(newThemeName, newTheme) self.save_new_theme(new_theme_name, new_theme)
#change gui over to the new theme #change gui over to the new theme
customThemeList = idleConf.GetSectionList('user', 'highlight') custom_theme_list = idleConf.GetSectionList('user', 'highlight')
customThemeList.sort() custom_theme_list.sort()
self.optMenuThemeCustom.SetMenu(customThemeList, newThemeName) self.opt_menu_theme_custom.SetMenu(custom_theme_list, new_theme_name)
self.themeIsBuiltin.set(0) self.is_builtin_theme.set(0)
self.SetThemeType() self.set_theme_type()
def OnListFontButtonRelease(self, event): def on_list_fonts_button_release(self, event):
font = self.listFontName.get(ANCHOR) font = self.list_fonts.get(ANCHOR)
self.fontName.set(font.lower()) self.font_name.set(font.lower())
self.SetFontSample() self.set_font_sample()
def SetFontSample(self, event=None): def set_font_sample(self, event=None):
fontName = self.fontName.get() font_name = self.font_name.get()
fontWeight = tkFont.BOLD if self.fontBold.get() else tkFont.NORMAL font_weight = tkFont.BOLD if self.font_bold.get() else tkFont.NORMAL
newFont = (fontName, self.fontSize.get(), fontWeight) new_font = (font_name, self.font_size.get(), font_weight)
self.labelFontSample.config(font=newFont) self.font_sample.config(font=new_font)
self.textHighlightSample.configure(font=newFont) self.text_highlight_sample.configure(font=new_font)
def SetHighlightTarget(self): def set_highlight_target(self):
if self.highlightTarget.get() == 'Cursor': #bg not possible if self.highlight_target.get() == 'Cursor': #bg not possible
self.radioFg.config(state=DISABLED) self.radio_fg.config(state=DISABLED)
self.radioBg.config(state=DISABLED) self.radio_bg.config(state=DISABLED)
self.fgHilite.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.radioFg.config(state=NORMAL) self.radio_fg.config(state=NORMAL)
self.radioBg.config(state=NORMAL) self.radio_bg.config(state=NORMAL)
self.fgHilite.set(1) self.fg_bg_toggle.set(1)
self.SetColourSample() self.set_colour_sample()
def SetColourSampleBinding(self, *args): def set_colour_sample_binding(self, *args):
self.SetColourSample() self.set_colour_sample()
def SetColourSample(self): def set_colour_sample(self):
#set the colour smaple area #set the colour smaple area
tag = self.themeElements[self.highlightTarget.get()][0] tag = self.theme_elements[self.highlight_target.get()][0]
plane = 'foreground' if self.fgHilite.get() else 'background' plane = 'foreground' if self.fg_bg_toggle.get() else 'background'
colour = self.textHighlightSample.tag_cget(tag, plane) colour = self.text_highlight_sample.tag_cget(tag, plane)
self.frameColourSet.config(bg=colour) self.frame_colour_set.config(bg=colour)
def PaintThemeSample(self): def paint_theme_sample(self):
if self.themeIsBuiltin.get(): #a default theme if self.is_builtin_theme.get(): #a default theme
theme = self.builtinTheme.get() theme = self.builtin_theme.get()
else: #a user theme else: #a user theme
theme = self.customTheme.get() theme = self.custom_theme.get()
for elementTitle in self.themeElements: for element_title in self.theme_elements:
element = self.themeElements[elementTitle][0] element = self.theme_elements[element_title][0]
colours = idleConf.GetHighlight(theme, element) colours = idleConf.GetHighlight(theme, element)
if element == 'cursor': #cursor sample needs special painting if element == 'cursor': #cursor sample needs special painting
colours['background'] = idleConf.GetHighlight( colours['background'] = idleConf.GetHighlight(
theme, 'normal', fgBg='bg') theme, 'normal', fgBg='bg')
#handle any unsaved changes to this theme #handle any unsaved changes to this theme
if theme in self.changedItems['highlight']: if theme in self.changed_items['highlight']:
themeDict = self.changedItems['highlight'][theme] theme_dict = self.changed_items['highlight'][theme]
if element + '-foreground' in themeDict: if element + '-foreground' in theme_dict:
colours['foreground'] = themeDict[element + '-foreground'] colours['foreground'] = theme_dict[element + '-foreground']
if element + '-background' in themeDict: if element + '-background' in theme_dict:
colours['background'] = themeDict[element + '-background'] colours['background'] = theme_dict[element + '-background']
self.textHighlightSample.tag_config(element, **colours) self.text_highlight_sample.tag_config(element, **colours)
self.SetColourSample() self.set_colour_sample()
def HelpSourceSelected(self, event): def help_source_selected(self, event):
self.SetHelpListButtonStates() self.set_helplist_button_states()
def SetHelpListButtonStates(self): def set_helplist_button_states(self):
if self.listHelp.size() < 1: #no entries in list if self.list_help.size() < 1: #no entries in list
self.buttonHelpListEdit.config(state=DISABLED) self.button_helplist_edit.config(state=DISABLED)
self.buttonHelpListRemove.config(state=DISABLED) self.button_helplist_remove.config(state=DISABLED)
else: #there are some entries else: #there are some entries
if self.listHelp.curselection(): #there currently is a selection if self.list_help.curselection(): #there currently is a selection
self.buttonHelpListEdit.config(state=NORMAL) self.button_helplist_edit.config(state=NORMAL)
self.buttonHelpListRemove.config(state=NORMAL) self.button_helplist_remove.config(state=NORMAL)
else: #there currently is not a selection else: #there currently is not a selection
self.buttonHelpListEdit.config(state=DISABLED) self.button_helplist_edit.config(state=DISABLED)
self.buttonHelpListRemove.config(state=DISABLED) self.button_helplist_remove.config(state=DISABLED)
def HelpListItemAdd(self): def helplist_item_add(self):
helpSource = HelpSource(self, 'New Help Source', help_source = HelpSource(self, 'New Help Source',
).result ).result
if helpSource: if help_source:
self.userHelpList.append((helpSource[0], helpSource[1])) self.user_helplist.append((help_source[0], help_source[1]))
self.listHelp.insert(END, helpSource[0]) self.list_help.insert(END, help_source[0])
self.UpdateUserHelpChangedItems() self.update_user_help_changed_items()
self.SetHelpListButtonStates() self.set_helplist_button_states()
def HelpListItemEdit(self): def helplist_item_edit(self):
itemIndex = self.listHelp.index(ANCHOR) item_index = self.list_help.index(ANCHOR)
helpSource = self.userHelpList[itemIndex] help_source = self.user_helplist[item_index]
newHelpSource = HelpSource( new_help_source = HelpSource(
self, 'Edit Help Source', self, 'Edit Help Source',
menuitem=helpSource[0], menuitem=help_source[0],
filepath=helpSource[1], filepath=help_source[1],
).result ).result
if newHelpSource and newHelpSource != helpSource: if new_help_source and new_help_source != help_source:
self.userHelpList[itemIndex] = newHelpSource self.user_helplist[item_index] = new_help_source
self.listHelp.delete(itemIndex) self.list_help.delete(item_index)
self.listHelp.insert(itemIndex, newHelpSource[0]) self.list_help.insert(item_index, new_help_source[0])
self.UpdateUserHelpChangedItems() self.update_user_help_changed_items()
self.SetHelpListButtonStates() self.set_helplist_button_states()
def HelpListItemRemove(self): def helplist_item_remove(self):
itemIndex = self.listHelp.index(ANCHOR) item_index = self.list_help.index(ANCHOR)
del(self.userHelpList[itemIndex]) del(self.user_helplist[item_index])
self.listHelp.delete(itemIndex) self.list_help.delete(item_index)
self.UpdateUserHelpChangedItems() self.update_user_help_changed_items()
self.SetHelpListButtonStates() self.set_helplist_button_states()
def UpdateUserHelpChangedItems(self): def update_user_help_changed_items(self):
"Clear and rebuild the HelpFiles section in self.changedItems" "Clear and rebuild the HelpFiles section in self.changed_items"
self.changedItems['main']['HelpFiles'] = {} self.changed_items['main']['HelpFiles'] = {}
for num in range(1, len(self.userHelpList) + 1): for num in range(1, len(self.user_helplist) + 1):
self.AddChangedItem( self.add_changed_item(
'main', 'HelpFiles', str(num), 'main', 'HelpFiles', str(num),
';'.join(self.userHelpList[num-1][:2])) ';'.join(self.user_helplist[num-1][:2]))
def LoadFontCfg(self): def load_font_cfg(self):
##base editor font selection list ##base editor font selection list
fonts = list(tkFont.families(self)) fonts = list(tkFont.families(self))
fonts.sort() fonts.sort()
for font in fonts: for font in fonts:
self.listFontName.insert(END, font) self.list_fonts.insert(END, font)
configuredFont = idleConf.GetFont(self, 'main', 'EditorWindow') configured_font = idleConf.GetFont(self, 'main', 'EditorWindow')
fontName = configuredFont[0].lower() font_name = configured_font[0].lower()
fontSize = configuredFont[1] font_size = configured_font[1]
fontBold = configuredFont[2]=='bold' font_bold = configured_font[2]=='bold'
self.fontName.set(fontName) self.font_name.set(font_name)
lc_fonts = [s.lower() for s in fonts] lc_fonts = [s.lower() for s in fonts]
try: try:
currentFontIndex = lc_fonts.index(fontName) current_font_index = lc_fonts.index(font_name)
self.listFontName.see(currentFontIndex) self.list_fonts.see(current_font_index)
self.listFontName.select_set(currentFontIndex) self.list_fonts.select_set(current_font_index)
self.listFontName.select_anchor(currentFontIndex) self.list_fonts.select_anchor(current_font_index)
except ValueError: except ValueError:
pass pass
##font size dropdown ##font size dropdown
self.optMenuFontSize.SetMenu(('7', '8', '9', '10', '11', '12', '13', self.opt_menu_font_size.SetMenu(('7', '8', '9', '10', '11', '12', '13',
'14', '16', '18', '20', '22', '14', '16', '18', '20', '22',
'25', '29', '34', '40'), fontSize ) '25', '29', '34', '40'), font_size )
##fontWeight ##font_weight
self.fontBold.set(fontBold) self.font_bold.set(font_bold)
##font sample ##font sample
self.SetFontSample() self.set_font_sample()
def LoadTabCfg(self): def load_tab_cfg(self):
##indent sizes ##indent sizes
spaceNum = idleConf.GetOption( space_num = idleConf.GetOption(
'main', 'Indent', 'num-spaces', default=4, type='int') 'main', 'Indent', 'num-spaces', default=4, type='int')
self.spaceNum.set(spaceNum) self.space_num.set(space_num)
def LoadThemeCfg(self): def load_theme_cfg(self):
##current theme type radiobutton ##current theme type radiobutton
self.themeIsBuiltin.set(idleConf.GetOption( self.is_builtin_theme.set(idleConf.GetOption(
'main', 'Theme', 'default', type='bool', default=1)) 'main', 'Theme', 'default', type='bool', default=1))
##currently set theme ##currently set theme
currentOption = idleConf.CurrentTheme() current_option = idleConf.CurrentTheme()
##load available theme option menus ##load available theme option menus
if self.themeIsBuiltin.get(): #default theme selected if self.is_builtin_theme.get(): #default theme selected
itemList = idleConf.GetSectionList('default', 'highlight') item_list = idleConf.GetSectionList('default', 'highlight')
itemList.sort() item_list.sort()
self.optMenuThemeBuiltin.SetMenu(itemList, currentOption) self.opt_menu_theme_builtin.SetMenu(item_list, current_option)
itemList = idleConf.GetSectionList('user', 'highlight') item_list = idleConf.GetSectionList('user', 'highlight')
itemList.sort() item_list.sort()
if not itemList: if not item_list:
self.radioThemeCustom.config(state=DISABLED) self.radio_theme_custom.config(state=DISABLED)
self.customTheme.set('- no custom themes -') self.custom_theme.set('- no custom themes -')
else: else:
self.optMenuThemeCustom.SetMenu(itemList, itemList[0]) self.opt_menu_theme_custom.SetMenu(item_list, item_list[0])
else: #user theme selected else: #user theme selected
itemList = idleConf.GetSectionList('user', 'highlight') item_list = idleConf.GetSectionList('user', 'highlight')
itemList.sort() item_list.sort()
self.optMenuThemeCustom.SetMenu(itemList, currentOption) self.opt_menu_theme_custom.SetMenu(item_list, current_option)
itemList = idleConf.GetSectionList('default', 'highlight') item_list = idleConf.GetSectionList('default', 'highlight')
itemList.sort() item_list.sort()
self.optMenuThemeBuiltin.SetMenu(itemList, itemList[0]) self.opt_menu_theme_builtin.SetMenu(item_list, item_list[0])
self.SetThemeType() self.set_theme_type()
##load theme element option menu ##load theme element option menu
themeNames = list(self.themeElements.keys()) theme_names = list(self.theme_elements.keys())
themeNames.sort(key=lambda x: self.themeElements[x][1]) theme_names.sort(key=lambda x: self.theme_elements[x][1])
self.optMenuHighlightTarget.SetMenu(themeNames, themeNames[0]) self.opt_menu_highlight_target.SetMenu(theme_names, theme_names[0])
self.PaintThemeSample() self.paint_theme_sample()
self.SetHighlightTarget() self.set_highlight_target()
def LoadKeyCfg(self): def load_key_cfg(self):
##current keys type radiobutton ##current keys type radiobutton
self.keysAreBuiltin.set(idleConf.GetOption( self.are_keys_builtin.set(idleConf.GetOption(
'main', 'Keys', 'default', type='bool', default=1)) 'main', 'Keys', 'default', type='bool', default=1))
##currently set keys ##currently set keys
currentOption = idleConf.CurrentKeys() current_option = idleConf.CurrentKeys()
##load available keyset option menus ##load available keyset option menus
if self.keysAreBuiltin.get(): #default theme selected if self.are_keys_builtin.get(): #default theme selected
itemList = idleConf.GetSectionList('default', 'keys') item_list = idleConf.GetSectionList('default', 'keys')
itemList.sort() item_list.sort()
self.optMenuKeysBuiltin.SetMenu(itemList, currentOption) self.opt_menu_keys_builtin.SetMenu(item_list, current_option)
itemList = idleConf.GetSectionList('user', 'keys') item_list = idleConf.GetSectionList('user', 'keys')
itemList.sort() item_list.sort()
if not itemList: if not item_list:
self.radioKeysCustom.config(state=DISABLED) self.radio_keys_custom.config(state=DISABLED)
self.customKeys.set('- no custom keys -') self.custom_keys.set('- no custom keys -')
else: else:
self.optMenuKeysCustom.SetMenu(itemList, itemList[0]) self.opt_menu_keys_custom.SetMenu(item_list, item_list[0])
else: #user key set selected else: #user key set selected
itemList = idleConf.GetSectionList('user', 'keys') item_list = idleConf.GetSectionList('user', 'keys')
itemList.sort() item_list.sort()
self.optMenuKeysCustom.SetMenu(itemList, currentOption) self.opt_menu_keys_custom.SetMenu(item_list, current_option)
itemList = idleConf.GetSectionList('default', 'keys') item_list = idleConf.GetSectionList('default', 'keys')
itemList.sort() item_list.sort()
self.optMenuKeysBuiltin.SetMenu(itemList, idleConf.default_keys()) self.opt_menu_keys_builtin.SetMenu(item_list, idleConf.default_keys())
self.SetKeysType() self.set_keys_type()
##load keyset element list ##load keyset element list
keySetName = idleConf.CurrentKeys() keyset_name = idleConf.CurrentKeys()
self.LoadKeysList(keySetName) self.load_keys_list(keyset_name)
def LoadGeneralCfg(self): def load_general_cfg(self):
#startup state #startup state
self.startupEdit.set(idleConf.GetOption( self.startup_edit.set(idleConf.GetOption(
'main', 'General', 'editor-on-startup', default=1, type='bool')) 'main', 'General', 'editor-on-startup', default=1, type='bool'))
#autosave state #autosave state
self.autoSave.set(idleConf.GetOption( self.autosave.set(idleConf.GetOption(
'main', 'General', 'autosave', default=0, type='bool')) 'main', 'General', 'autosave', default=0, type='bool'))
#initial window size #initial window size
self.winWidth.set(idleConf.GetOption( self.win_width.set(idleConf.GetOption(
'main', 'EditorWindow', 'width', type='int')) 'main', 'EditorWindow', 'width', type='int'))
self.winHeight.set(idleConf.GetOption( self.win_height.set(idleConf.GetOption(
'main', 'EditorWindow', 'height', type='int')) 'main', 'EditorWindow', 'height', type='int'))
# default source encoding # default source encoding
self.encoding.set(idleConf.GetOption( self.encoding.set(idleConf.GetOption(
'main', 'EditorWindow', 'encoding', default='none')) 'main', 'EditorWindow', 'encoding', default='none'))
# additional help sources # additional help sources
self.userHelpList = idleConf.GetAllExtraHelpSourcesList() self.user_helplist = idleConf.GetAllExtraHelpSourcesList()
for helpItem in self.userHelpList: for help_item in self.user_helplist:
self.listHelp.insert(END, helpItem[0]) self.list_help.insert(END, help_item[0])
self.SetHelpListButtonStates() self.set_helplist_button_states()
def LoadConfigs(self): def load_configs(self):
""" """
load configuration from default and user config files and populate load configuration from default and user config files and populate
the widgets on the config dialog pages. the widgets on the config dialog pages.
""" """
### fonts / tabs page ### fonts / tabs page
self.LoadFontCfg() self.load_font_cfg()
self.LoadTabCfg() self.load_tab_cfg()
### highlighting page ### highlighting page
self.LoadThemeCfg() self.load_theme_cfg()
### keys page ### keys page
self.LoadKeyCfg() self.load_key_cfg()
### general page ### general page
self.LoadGeneralCfg() self.load_general_cfg()
# note: extension page handled separately # note: extension page handled separately
def SaveNewKeySet(self, keySetName, keySet): def save_new_key_set(self, keyset_name, keyset):
""" """
save a newly created core key set. save a newly created core key set.
keySetName - string, the name of the new key set keyset_name - string, the name of the new key set
keySet - dictionary containing the new key set keyset - dictionary containing the new key set
""" """
if not idleConf.userCfg['keys'].has_section(keySetName): if not idleConf.userCfg['keys'].has_section(keyset_name):
idleConf.userCfg['keys'].add_section(keySetName) idleConf.userCfg['keys'].add_section(keyset_name)
for event in keySet: for event in keyset:
value = keySet[event] value = keyset[event]
idleConf.userCfg['keys'].SetOption(keySetName, event, value) idleConf.userCfg['keys'].SetOption(keyset_name, event, value)
def SaveNewTheme(self, themeName, theme): def save_new_theme(self, theme_name, theme):
""" """
save a newly created theme. save a newly created theme.
themeName - string, the name of the new theme theme_name - string, the name of the new theme
theme - dictionary containing the new theme theme - dictionary containing the new theme
""" """
if not idleConf.userCfg['highlight'].has_section(themeName): if not idleConf.userCfg['highlight'].has_section(theme_name):
idleConf.userCfg['highlight'].add_section(themeName) idleConf.userCfg['highlight'].add_section(theme_name)
for element in theme: for element in theme:
value = theme[element] value = theme[element]
idleConf.userCfg['highlight'].SetOption(themeName, element, value) idleConf.userCfg['highlight'].SetOption(theme_name, element, value)
def SetUserValue(self, configType, section, item, value): def set_user_value(self, config_type, section, item, value):
if idleConf.defaultCfg[configType].has_option(section, item): if idleConf.defaultCfg[config_type].has_option(section, item):
if idleConf.defaultCfg[configType].Get(section, item) == value: if idleConf.defaultCfg[config_type].Get(section, item) == value:
#the setting equals a default setting, remove it from user cfg #the setting equals a default setting, remove it from user cfg
return idleConf.userCfg[configType].RemoveOption(section, item) return idleConf.userCfg[config_type].RemoveOption(section, item)
#if we got here set the option #if we got here set the option
return idleConf.userCfg[configType].SetOption(section, item, value) return idleConf.userCfg[config_type].SetOption(section, item, value)
def SaveAllChangedConfigs(self): def save_all_changed_configs(self):
"Save configuration changes to the user config file." "Save configuration changes to the user config file."
idleConf.userCfg['main'].Save() idleConf.userCfg['main'].Save()
for configType in self.changedItems: for config_type in self.changed_items:
cfgTypeHasChanges = False cfg_type_changed = False
for section in self.changedItems[configType]: for section in self.changed_items[config_type]:
if section == 'HelpFiles': if section == 'HelpFiles':
#this section gets completely replaced #this section gets completely replaced
idleConf.userCfg['main'].remove_section('HelpFiles') idleConf.userCfg['main'].remove_section('HelpFiles')
cfgTypeHasChanges = True cfg_type_changed = True
for item in self.changedItems[configType][section]: for item in self.changed_items[config_type][section]:
value = self.changedItems[configType][section][item] value = self.changed_items[config_type][section][item]
if self.SetUserValue(configType, section, item, value): if self.set_user_value(config_type, section, item, value):
cfgTypeHasChanges = True cfg_type_changed = True
if cfgTypeHasChanges: if cfg_type_changed:
idleConf.userCfg[configType].Save() idleConf.userCfg[config_type].Save()
for configType in ['keys', 'highlight']: for config_type in ['keys', 'highlight']:
# save these even if unchanged! # save these even if unchanged!
idleConf.userCfg[configType].Save() idleConf.userCfg[config_type].Save()
self.ResetChangedItems() #clear the changed items dict self.reset_changed_items() #clear the changed items dict
self.save_all_changed_extensions() # uses a different mechanism self.save_all_changed_extensions() # uses a different mechanism
def DeactivateCurrentConfig(self): def deactivate_current_config(self):
#Before a config is saved, some cleanup of current #Before a config is saved, some cleanup of current
#config must be done - remove the previous keybindings #config must be done - remove the previous keybindings
winInstances = self.parent.instance_dict.keys() win_instances = self.parent.instance_dict.keys()
for instance in winInstances: for instance in win_instances:
instance.RemoveKeybindings() instance.RemoveKeybindings()
def ActivateConfigChanges(self): def activate_config_changes(self):
"Dynamically apply configuration changes" "Dynamically apply configuration changes"
winInstances = self.parent.instance_dict.keys() win_instances = self.parent.instance_dict.keys()
for instance in winInstances: for instance in win_instances:
instance.ResetColorizer() instance.ResetColorizer()
instance.ResetFont() instance.ResetFont()
instance.set_notabs_indentwidth() instance.set_notabs_indentwidth()
instance.ApplyKeybindings() instance.ApplyKeybindings()
instance.reset_help_menu_entries() instance.reset_help_menu_entries()
def Cancel(self): def cancel(self):
self.destroy() self.destroy()
def Ok(self): def ok(self):
self.Apply() self.apply()
self.destroy() self.destroy()
def Apply(self): def apply(self):
self.DeactivateCurrentConfig() self.deactivate_current_config()
self.SaveAllChangedConfigs() self.save_all_changed_configs()
self.ActivateConfigChanges() self.activate_config_changes()
def Help(self): def help(self):
page = self.tabPages._current_page page = self.tab_pages._current_page
view_text(self, title='Help for IDLE preferences', view_text(self, title='Help for IDLE preferences',
text=help_common+help_pages.get(page, '')) text=help_common+help_pages.get(page, ''))
def CreatePageExtensions(self): def create_page_extensions(self):
"""Part of the config dialog used for configuring IDLE extensions. """Part of the config dialog used for configuring IDLE extensions.
This code is generic - it works for any and all IDLE extensions. This code is generic - it works for any and all IDLE extensions.
...@@ -1237,7 +1242,7 @@ class ConfigDialog(Toplevel): ...@@ -1237,7 +1242,7 @@ class ConfigDialog(Toplevel):
which are boolean, and can be toggled with a True/False button. which are boolean, and can be toggled with a True/False button.
""" """
parent = self.parent parent = self.parent
frame = self.tabPages.pages['Extensions'].frame frame = self.tab_pages.pages['Extensions'].frame
self.ext_defaultCfg = idleConf.defaultCfg['extensions'] self.ext_defaultCfg = idleConf.defaultCfg['extensions']
self.ext_userCfg = idleConf.userCfg['extensions'] self.ext_userCfg = idleConf.userCfg['extensions']
self.is_int = self.register(is_int) self.is_int = self.register(is_int)
......
Lib/idlelib/idle_test/test_configdialog.py
Dosyayı görüntüle @ bac7d336
...@@ -21,14 +21,19 @@ testcfg = { ...@@ -21,14 +21,19 @@ testcfg = {
'extensions': config.IdleUserConfParser(''), 'extensions': config.IdleUserConfParser(''),
} }
# ConfigDialog.changedItems is a 3-level hierarchical dictionary of # ConfigDialog.changed_items is a 3-level hierarchical dictionary of
# pending changes that mirrors the multilevel user config dict. # pending changes that mirrors the multilevel user config dict.
# For testing, record args in a list for comparison with expected. # For testing, record args in a list for comparison with expected.
changes = [] changes = []
root = None
configure = None
class TestDialog(ConfigDialog): class TestDialog(ConfigDialog):
def AddChangedItem(self, *args): def add_changed_item(self, *args):
changes.append(args) changes.append(args)
def setUpModule(): def setUpModule():
global root, configure global root, configure
idleConf.userCfg = testcfg idleConf.userCfg = testcfg
...@@ -49,40 +54,39 @@ def tearDownModule(): ...@@ -49,40 +54,39 @@ def tearDownModule():
class FontTabTest(unittest.TestCase): class FontTabTest(unittest.TestCase):
def setUp(self): def setUp(self):
changes.clear() changes.clear()
def test_font(self): def test_font(self):
# Set values guaranteed not to be defaults. # Set values guaranteed not to be defaults.
dfont = idleConf.GetFont(root, 'main', 'EditorWindow') default_font = idleConf.GetFont(root, 'main', 'EditorWindow')
dsize = str(dfont[1]) default_size = str(default_font[1])
dbold = dfont[2] == 'bold' default_bold = default_font[2] == 'bold'
configure.fontName.set('Test Font') configure.font_name.set('Test Font')
expected = [ expected = [
('main', 'EditorWindow', 'font', 'Test Font'), ('main', 'EditorWindow', 'font', 'Test Font'),
('main', 'EditorWindow', 'font-size', dsize), ('main', 'EditorWindow', 'font-size', default_size),
('main', 'EditorWindow', 'font-bold', dbold)] ('main', 'EditorWindow', 'font-bold', default_bold)]
self.assertEqual(changes, expected) self.assertEqual(changes, expected)
changes.clear() changes.clear()
configure.fontSize.set(20) configure.font_size.set(20)
expected = [ expected = [
('main', 'EditorWindow', 'font', 'Test Font'), ('main', 'EditorWindow', 'font', 'Test Font'),
('main', 'EditorWindow', 'font-size', '20'), ('main', 'EditorWindow', 'font-size', '20'),
('main', 'EditorWindow', 'font-bold', dbold)] ('main', 'EditorWindow', 'font-bold', default_bold)]
self.assertEqual(changes, expected) self.assertEqual(changes, expected)
changes.clear() changes.clear()
configure.fontBold.set(not dbold) configure.font_bold.set(not default_bold)
expected = [ expected = [
('main', 'EditorWindow', 'font', 'Test Font'), ('main', 'EditorWindow', 'font', 'Test Font'),
('main', 'EditorWindow', 'font-size', '20'), ('main', 'EditorWindow', 'font-size', '20'),
('main', 'EditorWindow', 'font-bold', not dbold)] ('main', 'EditorWindow', 'font-bold', not default_bold)]
self.assertEqual(changes, expected) self.assertEqual(changes, expected)
#def test_sample(self): pass # TODO #def test_sample(self): pass # TODO
def test_tabspace(self): def test_tabspace(self):
configure.spaceNum.set(6) configure.space_num.set(6)
self.assertEqual(changes, [('main', 'Indent', 'num-spaces', 6)]) self.assertEqual(changes, [('main', 'Indent', 'num-spaces', 6)])
...@@ -106,19 +110,19 @@ class GeneralTest(unittest.TestCase): ...@@ -106,19 +110,19 @@ class GeneralTest(unittest.TestCase):
changes.clear() changes.clear()
def test_startup(self): def test_startup(self):
configure.radioStartupEdit.invoke() configure.radio_startup_edit.invoke()
self.assertEqual(changes, self.assertEqual(changes,
[('main', 'General', 'editor-on-startup', 1)]) [('main', 'General', 'editor-on-startup', 1)])
def test_autosave(self): def test_autosave(self):
configure.radioSaveAuto.invoke() configure.radio_save_auto.invoke()
self.assertEqual(changes, [('main', 'General', 'autosave', 1)]) self.assertEqual(changes, [('main', 'General', 'autosave', 1)])
def test_editor_size(self): def test_editor_size(self):
configure.entryWinHeight.insert(0, '1') configure.entry_win_height.insert(0, '1')
self.assertEqual(changes, [('main', 'EditorWindow', 'height', '140')]) self.assertEqual(changes, [('main', 'EditorWindow', 'height', '140')])
changes.clear() changes.clear()
configure.entryWinWidth.insert(0, '1') configure.entry_win_width.insert(0, '1')
self.assertEqual(changes, [('main', 'EditorWindow', 'width', '180')]) self.assertEqual(changes, [('main', 'EditorWindow', 'width', '180')])
#def test_help_sources(self): pass # TODO #def test_help_sources(self): pass # TODO
......
Misc/NEWS.d/next/IDLE/2017-06-26-15-47-13.bpo-30728.qH4TGL.rst 0 → 100644
Dosyayı görüntüle @ bac7d336
Review and change idlelib.configdialog names.
Lowercase method and attribute names.
Replace 'colour' with 'color', expand overly cryptic names, delete unneeded underscores.
Replace ``import *`` with specific imports. Patches by Cheryl Sabella.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment