diff options
author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-12-15 05:30:32 (GMT) |
---|---|---|
committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2013-12-15 05:30:32 (GMT) |
commit | c483b2ceca529fc49293c3a4151208af97430637 (patch) | |
tree | 58f19b47279efdcf13d0d66f2339d748292f8c74 /plugins/turtle_blocks_extras/turtle_blocks_extras.py | |
parent | 576452376833ad87544060424dfd50c3c6624de0 (diff) | |
parent | 8fcb80b6bc42a1c3bbad8b5c19942c93ae6a1e12 (diff) |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
Diffstat (limited to 'plugins/turtle_blocks_extras/turtle_blocks_extras.py')
-rw-r--r-- | plugins/turtle_blocks_extras/turtle_blocks_extras.py | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py index 556ed41..7bac86c 100644 --- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py +++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py @@ -841,6 +841,18 @@ _('gets a text string or an image from a URL')) special_name=_('top'), help_string=_('top of a collapsed stack')) + palette.add_block('loadpalette', + style='basic-style-1arg', + string_or_number=True, + label=_('select palette'), + prim_name='loadpalette', + default=_('turtle'), + help_string=_('selects a palette')) + self.tw.lc.def_prim('loadpalette', 1, + Primitive(self.tw.prim_load_palette, + export_me=False, + arg_descs=[ArgSlot(TYPE_STRING)])) + palette.add_block('loadblock', style='basic-style-var-arg', label=_('load'), @@ -881,18 +893,6 @@ _('gets a text string or an image from a URL')) ArgSlot(TYPE_OBJECT), ArgSlot(TYPE_OBJECT)])) - palette.add_block('loadpalette', - style='basic-style-1arg', - string_or_number=True, - label=_('select palette'), - prim_name='loadpalette', - default=_('turtle'), - help_string=_('selects a palette')) - self.tw.lc.def_prim('loadpalette', 1, - Primitive(self.tw.prim_load_palette, - export_me=False, - arg_descs=[ArgSlot(TYPE_STRING)])) - def _portfolio_palette(self): palette = make_palette('portfolio', |