diff options
| author | Terry Jan Reedy <tjreedy@udel.edu> | 2015-09-21 02:56:03 (GMT) |
|---|---|---|
| committer | Terry Jan Reedy <tjreedy@udel.edu> | 2015-09-21 02:56:03 (GMT) |
| commit | ca5d6ecf0a66c14a9d93d9242741118f53cf70f9 (patch) | |
| tree | 6b3eea1ef21539460b7daceec4269ba63b46d766 /Lib/idlelib | |
| parent | 3f746e79fa9befeccab1e77e625a776d7e55147c (diff) | |
| parent | 4fb0cf7b87b4122e71799c0bd9c485d89262ef84 (diff) | |
| download | cpython-ca5d6ecf0a66c14a9d93d9242741118f53cf70f9.zip cpython-ca5d6ecf0a66c14a9d93d9242741118f53cf70f9.tar.gz cpython-ca5d6ecf0a66c14a9d93d9242741118f53cf70f9.tar.bz2 | |
Merge with 3.5
Diffstat (limited to 'Lib/idlelib')
| -rw-r--r-- | Lib/idlelib/EditorWindow.py | 10 | ||||
| -rw-r--r-- | Lib/idlelib/macosxSupport.py | 7 |
2 files changed, 14 insertions, 3 deletions
diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index 09f2b28..0c4caa0 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -537,16 +537,22 @@ class EditorWindow(object): return 'normal' def about_dialog(self, event=None): + "Handle Help 'About IDLE' event." + # Synchronize with macosxSupport.overrideRootMenu.about_dialog. aboutDialog.AboutDialog(self.top,'About IDLE') def config_dialog(self, event=None): + "Handle Options 'Configure IDLE' event." + # Synchronize with macosxSupport.overrideRootMenu.config_dialog. configDialog.ConfigDialog(self.top,'Settings') + def config_extensions_dialog(self, event=None): + "Handle Options 'Configure Extensions' event." configDialog.ConfigExtensionsDialog(self.top) def help_dialog(self, event=None): - "Handle help doc event." - # edit maxosxSupport.overrideRootMenu.help_dialog to match + "Handle Help 'IDLE Help' event." + # Synchronize with macosxSupport.overrideRootMenu.help_dialog. if self.root: parent = self.root else: diff --git a/Lib/idlelib/macosxSupport.py b/Lib/idlelib/macosxSupport.py index 1030afe..b96bae1 100644 --- a/Lib/idlelib/macosxSupport.py +++ b/Lib/idlelib/macosxSupport.py @@ -159,10 +159,14 @@ def overrideRootMenu(root, flist): WindowList.register_callback(postwindowsmenu) def about_dialog(event=None): + "Handle Help 'About IDLE' event." + # Synchronize with EditorWindow.EditorWindow.about_dialog. from idlelib import aboutDialog aboutDialog.AboutDialog(root, 'About IDLE') def config_dialog(event=None): + "Handle Options 'Configure IDLE' event." + # Synchronize with EditorWindow.EditorWindow.config_dialog. from idlelib import configDialog # Ensure that the root object has an instance_dict attribute, @@ -170,10 +174,11 @@ def overrideRootMenu(root, flist): # on an EditorWindow instance that is then passed as the first # argument to ConfigDialog) root.instance_dict = flist.inversedict - root.instance_dict = flist.inversedict configDialog.ConfigDialog(root, 'Settings') def help_dialog(event=None): + "Handle Help 'IDLE Help' event." + # Synchronize with EditorWindow.EditorWindow.help_dialog. from idlelib import help help.show_idlehelp(root) |