diff options
| -rw-r--r-- | NEWS | 4 | ||||
| -rw-r--r-- | TurtleArtMiniActivity.py | 4 | ||||
| -rw-r--r-- | activity/activity.info | 2 | ||||
| -rw-r--r-- | tawindow.py | 3 |
4 files changed, 8 insertions, 5 deletions
@@ -1,7 +1,9 @@ -2 +88 * Updated samples to use only blocks found in Turtle Art (mini) * fixed a few problems with block names +* fixed ObjectChooser bug (#2002) -- thanks to alsroot +* synching version numbers with Turtle Blocks 1 diff --git a/TurtleArtMiniActivity.py b/TurtleArtMiniActivity.py index 9bea6c7..04b3582 100644 --- a/TurtleArtMiniActivity.py +++ b/TurtleArtMiniActivity.py @@ -191,7 +191,7 @@ class TurtleArtMiniActivity(activity.Activity): def do_load_ta_project_cb(self, button): """ Load a project from the Journal """ from sugar.graphics.objectchooser import ObjectChooser - chooser = ObjectChooser(_("Project"), None, gtk.DIALOG_MODAL | \ + chooser = ObjectChooser(_("Project"), self, gtk.DIALOG_MODAL | \ gtk.DIALOG_DESTROY_WITH_PARENT) try: result = chooser.run() @@ -218,7 +218,7 @@ class TurtleArtMiniActivity(activity.Activity): def import_py(self): """ Import Python code from the Journal to load into 'myblock'. """ from sugar.graphics.objectchooser import ObjectChooser - chooser = ObjectChooser('Python code', None, gtk.DIALOG_MODAL | \ + chooser = ObjectChooser('Python code', self, gtk.DIALOG_MODAL | \ gtk.DIALOG_DESTROY_WITH_PARENT) try: result = chooser.run() diff --git a/activity/activity.info b/activity/activity.info index 6fb70c3..b259082 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Turtle Art Mini -activity_version = 2 +activity_version = 88 license = MIT bundle_id = org.laptop.TurtleArtMiniActivity exec = sugar-activity TurtleArtMiniActivity.TurtleArtMiniActivity diff --git a/tawindow.py b/tawindow.py index aa0bd4a..6780cb3 100644 --- a/tawindow.py +++ b/tawindow.py @@ -73,6 +73,7 @@ class TurtleArtWindow(): def __init__(self, win, path, parent=None, mycolors=None): self.win = None self.window = win + self.parent = parent self.path = path self.load_save_folder = os.path.join(path, 'samples') self.save_folder = None @@ -1426,7 +1427,7 @@ class TurtleArtWindow(): def _import_from_journal(self, blk): """ Import a file from the Sugar Journal """ if self.running_sugar: - chooser = ObjectChooser('Choose image', None, + chooser = ObjectChooser('Choose image', self.parent, gtk.DIALOG_MODAL | gtk.DIALOG_DESTROY_WITH_PARENT) try: result = chooser.run() |