diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2016-06-14 04:53:41 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2016-06-14 04:53:41 (GMT) |
| commit | d34bafa9701c8234280470df7ec2f16175ae7e2a (patch) | |
| tree | 54c1d40cf9e0e9c479ed46a2fc6b4533bbca4432 /Lib/idlelib | |
| parent | cdd3a99106269c6e8d583fd71f5ea9861a56787a (diff) | |
| parent | ec84417ce88ebd467751c2ed3edd141b4e91cc03 (diff) | |
| download | cpython-d34bafa9701c8234280470df7ec2f16175ae7e2a.zip cpython-d34bafa9701c8234280470df7ec2f16175ae7e2a.tar.gz cpython-d34bafa9701c8234280470df7ec2f16175ae7e2a.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/configDialog.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Lib/idlelib/configDialog.py b/Lib/idlelib/configDialog.py index 1d7b417..d19749a 100644 --- a/Lib/idlelib/configDialog.py +++ b/Lib/idlelib/configDialog.py @@ -752,6 +752,7 @@ class ConfigDialog(Toplevel): if not tkMessageBox.askyesno( 'Delete Key Set', delmsg % keySetName, parent=self): return + self.DeactivateCurrentConfig() #remove key set from config idleConf.userCfg['keys'].remove_section(keySetName) if keySetName in self.changedItems['keys']: @@ -770,7 +771,8 @@ class ConfigDialog(Toplevel): self.keysAreBuiltin.set(idleConf.defaultCfg['main'].Get('Keys', 'default')) self.builtinKeys.set(idleConf.defaultCfg['main'].Get('Keys', 'name')) #user can't back out of these changes, they must be applied now - self.Apply() + self.SaveAllChangedConfigs() + self.ActivateConfigChanges() self.SetKeysType() def DeleteCustomTheme(self): @@ -779,6 +781,7 @@ class ConfigDialog(Toplevel): if not tkMessageBox.askyesno( 'Delete Theme', delmsg % themeName, parent=self): return + self.DeactivateCurrentConfig() #remove theme from config idleConf.userCfg['highlight'].remove_section(themeName) if themeName in self.changedItems['highlight']: @@ -797,7 +800,8 @@ class ConfigDialog(Toplevel): self.themeIsBuiltin.set(idleConf.defaultCfg['main'].Get('Theme', 'default')) self.builtinTheme.set(idleConf.defaultCfg['main'].Get('Theme', 'name')) #user can't back out of these changes, they must be applied now - self.Apply() + self.SaveAllChangedConfigs() + self.ActivateConfigChanges() self.SetThemeType() def GetColour(self): |