traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2015-09-20 22:55:51 -04:00
parent 1de516e1df b50c6377a6
commit 4fb0cf7b87
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Lib/idlelib/EditorWindow.py
View File

@ -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:

7
Lib/idlelib/macosxSupport.py
View File

@ -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)