From e29dda666ee01332bf532849588f4fb12d560400 Mon Sep 17 00:00:00 2001 From: Marc Culler Date: Fri, 27 Dec 2024 16:03:18 -0700 Subject: [PATCH] Remove autocall setting, make cusp labels default to False. --- python/app.py | 5 ----- python/settings.py | 10 +--------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/python/app.py b/python/app.py index 1b4a48fe..9248d305 100644 --- a/python/app.py +++ b/python/app.py @@ -439,11 +439,6 @@ def apply_settings(self): IP.magics_manager.magics['line']['autocall'](2) else: IP.magics_manager.magics['line']['autocall'](0) - if 'automagic' in changed: - if self.setting_dict['automagic']: - IP.magics_manager.magics['line']['automagic']('on') - else: - IP.magics_manager.magics['line']['automagic']('off') self.terminal.quiet = False for window in self.window_list: window.apply_settings() diff --git a/python/settings.py b/python/settings.py index 033d24e3..07a0c42d 100644 --- a/python/settings.py +++ b/python/settings.py @@ -12,13 +12,12 @@ def __init__(self, text_widget): self.text_widget = text_widget self.setting_dict = { 'autocall' : False, - 'automagic' : False, 'font' : self.current_font_tuple(), 'cusp_horoballs' : True, 'cusp_triangulation' : True, 'cusp_ford_domain' : True, 'cusp_parallelogram' : True, - 'cusp_labels' : True, + 'cusp_labels' : False, 'cusp_cutoff' : '0.1000', 'keyboard' : 'QWERTY'} self.cache = {} @@ -265,7 +264,6 @@ def set_font_sample(self, event=None): def build_shell_pane(self, master): groupBG = self.style.groupBG self.autocall = Tk_.BooleanVar(value=self.settings['autocall']) - self.automagic = Tk_.BooleanVar(value=self.settings['automagic']) self.update_idletasks() self.shell_frame = shell_frame = ttk.Frame(master) shell_frame.rowconfigure(3, weight=1) @@ -281,17 +279,11 @@ def build_shell_pane(self, master): text='IPython autocall', command=self.set_autocall) next_check.grid(row=1, column=1, sticky=Tk_.W, pady=(10,0)) - next_check = ttk.Checkbutton(shell_frame, variable=self.automagic, - text='IPython automagic', - command=self.set_automagic) next_check.grid(row=2, column=1, sticky=Tk_.W, pady=(5,0)) def set_autocall(self): self.settings['autocall'] = self.autocall.get() - def set_automagic(self): - self.settings['automagic'] = self.automagic.get() - def build_cusp_pane(self, master): groupBG = self.style.groupBG self.cusp_frame = cusp_frame = ttk.Frame(master)