diff options
| -rw-r--r-- | TurtleArt/tablock.py | 7 | ||||
| -rw-r--r-- | plugins/turtle_blocks_extras/turtle_blocks_extras.py | 24 |
2 files changed, 16 insertions, 15 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py index 402de33..81bdd2a 100644 --- a/TurtleArt/tablock.py +++ b/TurtleArt/tablock.py @@ -183,7 +183,7 @@ class Block: trash -- block in the trash """ def __init__(self, block_list, sprite_list, name, x, y, type='block', - values=[], scale=BLOCK_SCALE[0], + values=None, scale=BLOCK_SCALE[0], colors=['#A0A0A0', '#808080']): self.block_list = block_list @@ -256,8 +256,9 @@ class Block: self.font_size[i] *= self.scale * \ self.block_list.font_scale_factor - for v in (values): - self.values.append(v) + if values is not None: + for v in (values): + self.values.append(v) # If there is already a block with the same name, reuse it copy_block = None 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', |