diff options
| -rw-r--r-- | TurtleArt/tawindow.py | 5 | ||||
| -rw-r--r-- | plugins/turtle_blocks_extras/turtle_blocks_extras.py | 54 |
2 files changed, 4 insertions, 55 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 066870c..15ebad7 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -3252,7 +3252,7 @@ class TurtleArtWindow(): elif type(btype) == list: btype, value = btype[0], btype[1] - # Replace old-style sandwich blocks + # Replace deprecated sandwich blocks if btype == 'sandwichtop_no_label': btype = 'sandwichclamp' docks = [] @@ -3271,6 +3271,9 @@ class TurtleArtWindow(): # sandwich top dock[2], currently set to None elif btype in ['sandwichbottom', 'sandwichcollapsed']: btype = 'vspace' + # FIXME: blocks after sandwichtop should be in a sandwich clamp + elif btype in ['sandwichtop', 'sandwichtop_no_arm']: + btype = 'comment' # Some blocks can only appear once... if btype in ['start', 'hat1', 'hat2']: diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py index f904f67..dd174de 100644 --- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py +++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py @@ -692,60 +692,6 @@ module found in the Journal')) special_name=_('top'), help_string=_('top of a collapsed stack')) - # deprecated blocks - palette.add_block('sandwichtop_no_label', - hidden=True, - style='collapsible-top-no-label', - label=[' ', ' '], - special_name=_('top'), - prim_name='nop', - help_string=_('top of a collapsed stack')) - - palette.add_block('sandwichbottom', - hidden=True, - style='collapsible-bottom', - label=[' ', ' '], - prim_name='nop', - special_name=_('bottom'), - help_string=_('bottom of a collapsible stack')) - - palette.add_block('sandwichtop_no_arm_no_label', - hidden=True, - colors=["#FF0000", "#A00000"], - style='collapsible-top-no-arm-no-label', - label=[' ', _('click to open')], - prim_name='nop', - help_string=_('collapsed stack: click to open')) - - palette.add_block('sandwichcollapsed', - hidden=True, - colors=["#FF0000", "#A00000"], - style='invisible', - label=' ', - prim_name='nop', - help_string=_('bottom block in a collapsed stack: \ -click to open')) - - palette.add_block('sandwichtop', - hidden=True, - colors=["#FF0000", "#A00000"], - style='collapsible-top', - label=_('top of stack'), - default=_('label'), - string_or_number=True, - prim_name='comment', - help_string=_('top of stack')) - - palette.add_block('sandwichtop_no_arm', - hidden=True, - colors=["#FF0000", "#A00000"], - style='collapsible-top-no-arm', - label=_('top of a collapsible stack'), - default=_('label'), - prim_name='comment', - string_or_number=True, - help_string=_('top of stack')) - def _portfolio_palette(self): palette = make_palette('portfolio', |