diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-03-26 04:31:34 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-03-26 04:31:34 (GMT) |
| commit | e483df377d5114555581405ed33a96b5dd412a31 (patch) | |
| tree | 15ce00286e1ee3930d826cb6ecf39b50378c822e | |
| parent | ae55d6ab16bc15495ae0889a399b55642a053516 (diff) | |
| parent | 09b4fd3c3d97206dd974a98ed7010fb002e3abdf (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
| -rw-r--r-- | TurtleArt/taconstants.py | 2 | ||||
| -rwxr-xr-x | TurtleArt/tasprite_factory.py | 2 | ||||
| -rw-r--r-- | TurtleArtActivity.py | 5 | ||||
| -rwxr-xr-x | turtleart.py | 2 |
4 files changed, 3 insertions, 8 deletions
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py index efdc1e8..6bbaf69 100644 --- a/TurtleArt/taconstants.py +++ b/TurtleArt/taconstants.py @@ -143,7 +143,7 @@ OVERLAY_SHAPES = ['Cartesian', 'Cartesian_labeled', 'polar', 'metric'] STATUS_SHAPES = ['status', 'info', 'nostack', 'dupstack', 'noinput', 'emptyheap', 'emptybox', 'nomedia', 'nocode', 'overflowerror', 'negroot', 'syntaxerror', 'nofile', 'nojournal', 'zerodivide', - 'notanumber', 'incompatible', 'help'] + 'notanumber', 'incompatible', 'help', 'print'] # # Emulate Sugar toolbar when running from outside of Sugar diff --git a/TurtleArt/tasprite_factory.py b/TurtleArt/tasprite_factory.py index 963c37c..b750aad 100755 --- a/TurtleArt/tasprite_factory.py +++ b/TurtleArt/tasprite_factory.py @@ -422,7 +422,7 @@ class SVG: def turtle(self, colors): ''' Turtles are just another block ''' self.reset_min_max() - self._fill, self._stroke = colors[0], colors[1] + self._fill, self._stroke = colors[1], colors[0] svg = "%s%s%s%s%s%s%s%s" % (" <path d=\"M 27.5 48.3 ", "C 26.9 48.3 26.4 48.2 25.9 48.2 L 27.2 50.5 L 28.6 48.2 ", diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py index b7c98f7..d9bb020 100644 --- a/TurtleArtActivity.py +++ b/TurtleArtActivity.py @@ -90,8 +90,6 @@ class TurtleArtActivity(activity.Activity): _logger.debug('_setup_palette_toolbar') self._setup_palette_toolbar() self._setup_extra_controls() - if not self.has_toolbarbox: - self._setup_help_toolbar() _logger.debug('_setup_sharing') self._setup_sharing() @@ -504,7 +502,6 @@ class TurtleArtActivity(activity.Activity): self._palette_toolbar_button = ToolbarButton( page=self._palette_toolbar, icon_name='palette') - self._help_button = HelpButton() self._make_load_save_buttons(activity_toolbar_button) @@ -518,7 +515,6 @@ class TurtleArtActivity(activity.Activity): self._palette_toolbar_button.show() self._toolbox.toolbar.insert(self._palette_toolbar_button, -1) - _logger.debug('set_toolbar_box') self.set_toolbar_box(self._toolbox) self._palette_toolbar_button.set_expanded(True) else: @@ -569,7 +565,6 @@ class TurtleArtActivity(activity.Activity): 'help-off', _('Turn off hover help'), self._do_hover_help_toggle, view_toolbar) - edit_toolbar.show() view_toolbar.show() self._toolbox.show() diff --git a/turtleart.py b/turtleart.py index 30a2efc..5fe67a1 100755 --- a/turtleart.py +++ b/turtleart.py @@ -1,6 +1,6 @@ #!/usr/bin/env python #Copyright (c) 2007-8, Playful Invention Company -#Copyright (c) 2008-11, Walter Bender +#Copyright (c) 2008-12, Walter Bender #Copyright (c) 2011 Collabora Ltd. <http://www.collabora.co.uk/> #Permission is hereby granted, free of charge, to any person obtaining a copy |