diff -r 443772a82dcd Lib/idlelib/EditorWindow.py --- a/Lib/idlelib/EditorWindow.py Sat Feb 04 18:38:10 2012 +0100 +++ b/Lib/idlelib/EditorWindow.py Sat Feb 04 13:21:26 2012 -0600 @@ -63,6 +63,35 @@ descr = os.path.splitext(filename)[1], None, imp.PY_SOURCE return file, filename, descr +class _singledialog(object): + """Just a given dialog should be executing at any time. Trying to + create a new one results in bringing to front the running dialog.""" + + def __init__(self, meth): + self.meth = meth + self.dlg = None + + def __get__(self, instance, owner): + self.instance = instance + return self + + def __call__(self, *args): + if self.dlg: # dialog is already running + # bring it to front + self.dlg.withdraw() + self.dlg.deiconify() + self.dlg.lift() + + else: # dialog not running, start it and save the instance + self.dlg = self.meth(self.instance, *args) + self.dlg.bind('', self._clear_dlg) + + def _clear_dlg(self, *args): + """Dialog is being destroyed. A new dialog instance can be created.""" + self.dlg = None + + + class EditorWindow(object): from idlelib.Percolator import Percolator from idlelib.ColorDelegator import ColorDelegator @@ -452,9 +481,10 @@ def config_dialog(self, event=None): configDialog.ConfigDialog(self.top,'Settings') + @_singledialog def help_dialog(self, event=None): fn=os.path.join(os.path.abspath(os.path.dirname(__file__)),'help.txt') - textView.view_file(self.top,'Help',fn) + return textView.view_file(self.top,'Help',fn, modal=False) def python_docs(self, event=None): if sys.platform[:3] == 'win': diff -r 443772a82dcd Lib/idlelib/textView.py --- a/Lib/idlelib/textView.py Sat Feb 04 18:38:10 2012 +0100 +++ b/Lib/idlelib/textView.py Sat Feb 04 13:21:26 2012 -0600 @@ -9,7 +9,7 @@ """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 """ @@ -24,8 +24,6 @@ self.CreateWidgets() self.title(title) - self.transient(parent) - self.grab_set() self.protocol("WM_DELETE_WINDOW", self.Ok) self.parent = parent self.textView.focus_set() @@ -34,7 +32,11 @@ self.bind('',self.Ok) #dismiss dialog self.textView.insert(0.0, text) self.textView.config(state=DISABLED) - self.wait_window() + + if modal: + self.transient(parent) + self.grab_set() + self.wait_window() def CreateWidgets(self): frameText = Frame(self, relief=SUNKEN, height=700) @@ -57,10 +59,10 @@ self.destroy() -def view_text(parent, title, text): - TextViewer(parent, title, text) +def view_text(parent, title, text, modal=True): + 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: with open(filename, 'r', encoding=encoding) as file: contents = file.read() @@ -70,7 +72,7 @@ message='Unable to load file %r .' % filename, parent=parent) else: - return view_text(parent, title, contents) + return view_text(parent, title, contents, modal) if __name__ == '__main__': @@ -80,11 +82,15 @@ filename = './textView.py' text = file(filename, 'r').read() 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) btn2 = Button(root, text='view_file', command=lambda:view_file(root, 'view_file', filename)) 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.pack(side=RIGHT) root.mainloop()