Issue 964437 Make IDLE help window non-modal.

Patch by Guilherme Polo and Roger Serwy.
This commit is contained in:
Terry Jan Reedy 2012-02-05 15:14:20 -05:00
parent a77aa69870
commit e91e7637bb
3 changed files with 67 additions and 11 deletions

View File

@ -63,6 +63,50 @@ def _find_module(fullname, path=None):
descr = os.path.splitext(filename)[1], None, imp.PY_SOURCE descr = os.path.splitext(filename)[1], None, imp.PY_SOURCE
return file, filename, descr return file, filename, descr
class HelpDialog(object):
def __init__(self):
self.parent = None # parent of help window
self.dlg = None # the help window iteself
def display(self, parent, near=None):
""" Display the help dialog.
parent - parent widget for the help window
near - a Toplevel widget (e.g. EditorWindow or PyShell)
to use as a reference for placing the help window
"""
if self.dlg is None:
self.show_dialog(parent)
if near:
self.nearwindow(near)
def show_dialog(self, parent):
self.parent = parent
fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'help.txt')
self.dlg = dlg = textView.view_file(parent,'Help',fn, modal=False)
dlg.bind('<Destroy>', self.destroy, '+')
def nearwindow(self, near):
# Place the help dialog near the window specified by parent.
# Note - this may not reposition the window in Metacity
# if "/apps/metacity/general/disable_workarounds" is enabled
dlg = self.dlg
geom = (near.winfo_rootx() + 10, near.winfo_rooty() + 10)
dlg.withdraw()
dlg.geometry("=+%d+%d" % geom)
dlg.deiconify()
dlg.lift()
def destroy(self, ev=None):
self.dlg = None
self.parent = None
helpDialog = HelpDialog() # singleton instance
class EditorWindow(object): class EditorWindow(object):
from idlelib.Percolator import Percolator from idlelib.Percolator import Percolator
from idlelib.ColorDelegator import ColorDelegator from idlelib.ColorDelegator import ColorDelegator
@ -453,8 +497,11 @@ class EditorWindow(object):
configDialog.ConfigDialog(self.top,'Settings') configDialog.ConfigDialog(self.top,'Settings')
def help_dialog(self, event=None): def help_dialog(self, event=None):
fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'help.txt') if self.root:
textView.view_file(self.top,'Help',fn) parent = self.root
else:
parent = self.top
helpDialog.display(parent, near=self.top)
def python_docs(self, event=None): def python_docs(self, event=None):
if sys.platform[:3] == 'win': if sys.platform[:3] == 'win':

View File

@ -9,7 +9,7 @@ class TextViewer(Toplevel):
"""A simple text viewer dialog for IDLE """A simple text viewer dialog for IDLE
""" """
def __init__(self, parent, title, text): def __init__(self, parent, title, text, modal=True):
"""Show the given text in a scrollable window with a 'close' button """Show the given text in a scrollable window with a 'close' button
""" """
@ -24,8 +24,6 @@ class TextViewer(Toplevel):
self.CreateWidgets() self.CreateWidgets()
self.title(title) self.title(title)
self.transient(parent)
self.grab_set()
self.protocol("WM_DELETE_WINDOW", self.Ok) self.protocol("WM_DELETE_WINDOW", self.Ok)
self.parent = parent self.parent = parent
self.textView.focus_set() self.textView.focus_set()
@ -34,7 +32,11 @@ class TextViewer(Toplevel):
self.bind('<Escape>',self.Ok) #dismiss dialog self.bind('<Escape>',self.Ok) #dismiss dialog
self.textView.insert(0.0, text) self.textView.insert(0.0, text)
self.textView.config(state=DISABLED) self.textView.config(state=DISABLED)
self.wait_window()
if modal:
self.transient(parent)
self.grab_set()
self.wait_window()
def CreateWidgets(self): def CreateWidgets(self):
frameText = Frame(self, relief=SUNKEN, height=700) frameText = Frame(self, relief=SUNKEN, height=700)
@ -57,10 +59,10 @@ class TextViewer(Toplevel):
self.destroy() self.destroy()
def view_text(parent, title, text): def view_text(parent, title, text, modal=True):
TextViewer(parent, title, text) return TextViewer(parent, title, text, modal)
def view_file(parent, title, filename, encoding=None): def view_file(parent, title, filename, encoding=None, modal=True):
try: try:
with open(filename, 'r', encoding=encoding) as file: with open(filename, 'r', encoding=encoding) as file:
contents = file.read() contents = file.read()
@ -70,7 +72,7 @@ def view_file(parent, title, filename, encoding=None):
message='Unable to load file %r .' % filename, message='Unable to load file %r .' % filename,
parent=parent) parent=parent)
else: else:
return view_text(parent, title, contents) return view_text(parent, title, contents, modal)
if __name__ == '__main__': if __name__ == '__main__':
@ -80,11 +82,15 @@ if __name__ == '__main__':
filename = './textView.py' filename = './textView.py'
text = file(filename, 'r').read() text = file(filename, 'r').read()
btn1 = Button(root, text='view_text', btn1 = Button(root, text='view_text',
command=lambda:view_text(root, 'view_text', text)) command=lambda:view_text(root, 'view_text', text))
btn1.pack(side=LEFT) btn1.pack(side=LEFT)
btn2 = Button(root, text='view_file', btn2 = Button(root, text='view_file',
command=lambda:view_file(root, 'view_file', filename)) command=lambda:view_file(root, 'view_file', filename))
btn2.pack(side=LEFT) btn2.pack(side=LEFT)
btn3 = Button(root, text='nonmodal view_text',
command=lambda:view_text(root, 'nonmodal view_text', text,
modal=False))
btn3.pack(side=LEFT)
close = Button(root, text='Close', command=root.destroy) close = Button(root, text='Close', command=root.destroy)
close.pack(side=RIGHT) close.pack(side=RIGHT)
root.mainloop() root.mainloop()

View File

@ -113,6 +113,9 @@ Core and Builtins
Library Library
------- -------
- Issue #964437 Make IDLE help window non-modal.
Patch by Guilherme Polo and Roger Serwy.
- Issue #2945: Make the distutils upload command aware of bdist_rpm products. - Issue #2945: Make the distutils upload command aware of bdist_rpm products.
- Issue #13933: IDLE auto-complete did not work with some imported - Issue #13933: IDLE auto-complete did not work with some imported