diff options
| author | Walter Bender <walter@sugarlabs.org> | 2010-10-21 02:33:00 (GMT) |
|---|---|---|
| committer | Walter Bender <walter@sugarlabs.org> | 2010-10-21 02:33:00 (GMT) |
| commit | 36a3a644ddb7fe324df232673afefd171ce4c7bb (patch) | |
| tree | 5a4e97b8477039acf462b9881d564de974dd1449 | |
| parent | c0e138f0e4d5cef86f6290e9a10d36a7efa695a5 (diff) | |
updates
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | TurtleArt/sprites.py | 2 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 3 | ||||
| -rw-r--r-- | TurtleArtActivity.py | 34 | ||||
| -rw-r--r-- | activity/activity.info | 2 |
5 files changed, 23 insertions, 19 deletions
@@ -5,6 +5,7 @@ * fixed typo in Python sample code (#2449) * only allow one start block per project * show box values on box label +* moved import/export functions off activity toolbar onto journal toolbar 100 diff --git a/TurtleArt/sprites.py b/TurtleArt/sprites.py index d91fd71..9b12cdd 100644 --- a/TurtleArt/sprites.py +++ b/TurtleArt/sprites.py @@ -52,7 +52,7 @@ Example usage: my_sprite = sprites.Sprite(self.sprite_list, x1, y1, my_pixbuf) # Move the sprite to a new position. - my_sprite.move((x1+dx, y1+dy)) + my_sprite.move_relative((dx, dy)) # Create another "pixbuf". your_pixbuf = svg_str_to_pixbuf("<svg>...some svg code...</svg>") diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index b0db7ac..2d39667 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -784,7 +784,8 @@ class TurtleArtWindow(): else: # You can only have one instance of some blocks if blk.name in ['start', 'hat1', 'hat2']: - if len(self.block_list.get_all_blocks_of_same_type_and_name('block', blk.name)) > 0: + if len(self.block_list.get_similar_blocks( + 'block', blk.name)) > 0: return True blk.highlight() self._new_block(blk.name, x, y) diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index 940d548..14f58b8 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -724,28 +724,30 @@ class TurtleArtActivity(activity.Activity): page=help_toolbar, icon_name='help-toolbar') + journal_toolbar = gtk.Toolbar() + journal_toolbar_button = ToolbarButton(page=journal_toolbar, + icon_name='activity-journal') + # Add the toolbars and buttons to the toolbox activity_toolbar_button.show() toolbox.toolbar.insert(activity_toolbar_button, -1) edit_toolbar_button.show() toolbox.toolbar.insert(edit_toolbar_button, -1) + journal_toolbar_button.show() + toolbox.toolbar.insert(journal_toolbar_button, -1) view_toolbar_button.show() toolbox.toolbar.insert(view_toolbar_button, -1) - toolbox.toolbar.insert(palette_toolbar_button, -1) palette_toolbar_button.show() + toolbox.toolbar.insert(palette_toolbar_button, -1) + help_toolbar_button.show() + toolbox.toolbar.insert(help_toolbar_button, -1) _add_separator(toolbox.toolbar) self._make_project_buttons(toolbox.toolbar) - _add_separator(toolbox.toolbar) - - toolbox.toolbar.insert(help_toolbar_button, -1) - help_toolbar_button.show() - _add_separator(toolbox.toolbar, True) - # Sugar Stop Button stop_button = StopButton(self) stop_button.props.accelerator = '<Ctrl>Q' toolbox.toolbar.insert(stop_button, -1) @@ -765,9 +767,9 @@ class TurtleArtActivity(activity.Activity): edit_toolbar = gtk.Toolbar() toolbox.add_toolbar(_('Edit'), edit_toolbar) edit_toolbar_button = edit_toolbar - save_toolbar = gtk.Toolbar() - toolbox.add_toolbar(_('Import/Export'), save_toolbar) - activity_toolbar_button = save_toolbar + journal_toolbar = gtk.Toolbar() + toolbox.add_toolbar(_('Import/Export'), journal_toolbar) + journal_toolbar_button = journal_toolbar help_toolbar = gtk.Toolbar() toolbox.add_toolbar(_('Help'), help_toolbar) help_toolbar_button = help_toolbar @@ -780,22 +782,22 @@ class TurtleArtActivity(activity.Activity): self.keep_button = _add_button('filesave', _("Save snapshot"), self.do_keep_cb, - activity_toolbar_button) + journal_toolbar_button) self.save_as_html = _add_button('htmloff', _("Save as HTML"), self.do_save_as_html_cb, - activity_toolbar_button) + journal_toolbar_button) self.save_as_logo = _add_button('logo-saveoff', _("Save as Logo"), self.do_save_as_logo_cb, - activity_toolbar_button) + journal_toolbar_button) self.save_as_image = _add_button('image-saveoff', _("Save as image"), self.do_save_as_image_cb, - activity_toolbar_button) + journal_toolbar_button) self.load_python = _add_button('pippy-openoff', _("Load my block"), self.do_load_python_cb, - activity_toolbar_button) + journal_toolbar_button) self.load_ta_project = _add_button('load-from-journal', _("Import project from the Journal"), self.do_load_ta_project_cb, - activity_toolbar_button) + journal_toolbar_button) copy = _add_button('edit-copy', _('Copy'), self._copy_cb, edit_toolbar_button, '<Ctrl>c') paste = _add_button('edit-paste', _('Paste'), self._paste_cb, diff --git a/activity/activity.info b/activity/activity.info index 6c9f463..41e0104 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = Turtle Art -activity_version = 100 +activity_version = 101 license = MIT bundle_id = org.laptop.TurtleArtActivity exec = sugar-activity TurtleArtActivity.TurtleArtActivity |