diff options
author | Walter Bender <walter@sugarlabs.org> | 2013-06-21 13:21:56 (GMT) |
---|---|---|
committer | Walter Bender <walter@sugarlabs.org> | 2013-06-21 13:21:56 (GMT) |
commit | 4fededf1be849b0026f8d864a1d4fa071597e01e (patch) | |
tree | e9231331db10e6bfc9c8f2f55d2aa65433246ce5 | |
parent | 63faa82e243188d855164ed517c1ca330fc6a315 (diff) |
parent is not activity (marion zepf)
-rw-r--r-- | TurtleArt/tawindow.py | 12 | ||||
-rwxr-xr-x | turtleblocks.py | 2 |
2 files changed, 11 insertions, 3 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 759f661..731260f 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -99,9 +99,13 @@ _MACROS_SUBPATH = 'macros' class TurtleArtWindow(): ''' TurtleArt Window class abstraction ''' - def __init__(self, canvas_window, path, parent=None, + def __init__(self, canvas_window, path, parent=None, activity=None, mycolors=None, mynick=None, turtle_canvas=None, running_sugar=True): + """parent -- the GTK Window that TA runs in + activity -- the object that instantiated this TurtleArtWindow (in + GNOME, a TurtleMain instance) + """ self.parent = parent self.turtle_canvas = turtle_canvas self._loaded_project = '' @@ -135,7 +139,11 @@ class TurtleArtWindow(): self.interactive_mode = False self.window = canvas_window self.running_sugar = False - self.activity = parent + + if activity is not None: + self.activity = activity + else: + self.activity = parent self.path = path self.load_save_folder = os.path.join(path, 'samples') diff --git a/turtleblocks.py b/turtleblocks.py index baf264d..5d5808f 100755 --- a/turtleblocks.py +++ b/turtleblocks.py @@ -217,7 +217,7 @@ return %s(self)" % (p, P, P) max(768, gtk.gdk.screen_height() * 2)) self.tw = TurtleArtWindow(self.canvas, self._execdirname, turtle_canvas=self.turtle_canvas, - parent=self, running_sugar=False) + activity=self, running_sugar=False) self.tw.save_folder = self._abspath # os.path.expanduser('~') if self.client.get_int(self._HOVER_HELP) == 1: self.hover.set_active(False) |