From 7e55db2bc566381bfda3ddcd44c048f0c627880f Mon Sep 17 00:00:00 2001 From: Terry Jan Reedy Date: Mon, 28 Jul 2014 22:23:59 -0400 Subject: Issue #17172: Add the ability to run turtledemo from Idle. Make turtledemo start as active on Mac even when run with subprocess. Patch by Ramchandra Apt, Lita Cho, and Ned Daily. --- Lib/idlelib/Bindings.py | 5 +++++ Lib/idlelib/EditorWindow.py | 9 +++++++++ Lib/turtledemo/__main__.py | 16 ++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Lib/idlelib/Bindings.py b/Lib/idlelib/Bindings.py index df2b251..c9bef21 100644 --- a/Lib/idlelib/Bindings.py +++ b/Lib/idlelib/Bindings.py @@ -8,6 +8,8 @@ the PythonShell window, and a Format menu which is only present in the Editor windows. """ +from importlib.util import find_spec + from idlelib.configHandler import idleConf # Warning: menudefs is altered in macosxSupport.overrideRootMenu() @@ -86,4 +88,7 @@ menudefs = [ ]), ] +if find_spec('turtledemo'): + menudefs[-1][1].append(('Turtle Demo', '<>')) + default_keydefs = idleConf.GetCurrentKeySet() diff --git a/Lib/idlelib/EditorWindow.py b/Lib/idlelib/EditorWindow.py index f3df8ea..94cf314 100644 --- a/Lib/idlelib/EditorWindow.py +++ b/Lib/idlelib/EditorWindow.py @@ -222,6 +222,7 @@ class EditorWindow(object): text.bind("<>", self.flist.close_all_callback) text.bind("<>", self.open_class_browser) text.bind("<>", self.open_path_browser) + text.bind("<>", self.open_turtle_demo) self.set_status_bar() vbar['command'] = text.yview @@ -705,6 +706,14 @@ class EditorWindow(object): from idlelib import PathBrowser PathBrowser.PathBrowser(self.flist) + def open_turtle_demo(self, event = None): + import subprocess + + cmd = [sys.executable, + '-c', + 'from turtledemo.__main__ import main; main()'] + p = subprocess.Popen(cmd, shell=False) + def gotoline(self, lineno): if lineno is not None and lineno > 0: self.text.mark_set("insert", "%d.0" % lineno) diff --git a/Lib/turtledemo/__main__.py b/Lib/turtledemo/__main__.py index 07560c3..63f97e2 100755 --- a/Lib/turtledemo/__main__.py +++ b/Lib/turtledemo/__main__.py @@ -40,6 +40,22 @@ class DemoWindow(object): root.title('Python turtle-graphics examples') root.wm_protocol("WM_DELETE_WINDOW", self._destroy) + if sys.platform == 'darwin': + import subprocess + # Make sure we are the currently activated OS X application + # so that our menu bar appears. + p = subprocess.Popen( + [ + 'osascript', + '-e', 'tell application "System Events"', + '-e', 'set frontmost of the first process whose ' + 'unix id is {} to true'.format(os.getpid()), + '-e', 'end tell', + ], + stderr=subprocess.DEVNULL, + stdout=subprocess.DEVNULL, + ) + root.grid_rowconfigure(1, weight=1) root.grid_columnconfigure(0, weight=1) root.grid_columnconfigure(1, minsize=90, weight=1) -- cgit v0.12