Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt
diff options
context:
space:
mode:
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/tablock.py33
-rw-r--r--TurtleArt/taconstants.py5
-rw-r--r--TurtleArt/tapalette.py5
-rw-r--r--TurtleArt/tautils.py6
-rw-r--r--TurtleArt/tawindow.py12
5 files changed, 4 insertions, 57 deletions
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index d9a6731..dd11893 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -178,14 +178,6 @@ class Block:
'clamp-style-1arg': self._make_clamp_style_1arg,
'clamp-style-boolean': self._make_clamp_style_boolean,
'clamp-style-else': self._make_clamp_style_else,
- 'collapsible-top': [self._make_collapsible_style_top, True, True],
- 'collapsible-top-no-arm': [self._make_collapsible_style_top,
- False, True],
- 'collapsible-top-no-label': [self._make_collapsible_style_top,
- True, False],
- 'collapsible-top-no-arm-no-label': [
- self._make_collapsible_style_top, False, False],
- 'collapsible-bottom': self._make_collapsible_style_bottom,
'flow-style': self._make_flow_style,
'flow-style-tail': self._make_flow_style_tail,
'flow-style-1arg': self._make_flow_style_1arg,
@@ -943,31 +935,6 @@ class Block:
['flow', False, self.svg.docks[6][0],
self.svg.docks[6][1], ']']]
- def _make_collapsible_style_top(self, svg, arm=True, label=True):
- self.svg.expand(self.dx + self.ex, self.ey)
- self.svg.set_arm(arm)
- self.svg.set_show(not arm)
- self._make_block_graphics(svg, self.svg.sandwich_top, label)
- if label:
- self.docks = [['flow', True, self.svg.docks[0][0],
- self.svg.docks[0][1]],
- ['number', False, self.svg.docks[1][0],
- self.svg.docks[1][1]],
- ['flow', False, self.svg.docks[2][0],
- self.svg.docks[2][1]]]
- else:
- self.docks = [['flow', True, self.svg.docks[0][0],
- self.svg.docks[0][1]],
- ['flow', False, self.svg.docks[1][0],
- self.svg.docks[1][1]]]
-
- def _make_collapsible_style_bottom(self, svg):
- self.svg.expand(self.dx + self.ex, self.ey)
- self._make_block_graphics(svg, self.svg.sandwich_bottom)
- self.docks = [['flow', True, self.svg.docks[0][0],
- self.svg.docks[0][1]], ['flow', False,
- self.svg.docks[1][0], self.svg.docks[1][1]]]
-
# Depreciated block styles
def _make_invisible_style(self, svg):
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index d3c8b63..f5af623 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -98,11 +98,6 @@ EXPANDABLE = ['vspace', 'hspace', 'identity2']
EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg', 'myfunc3arg',
'userdefined', 'userdefined2args', 'userdefined3args']
-#
-# Blocks that are 'collapsible'
-# Deprecated
-#
-COLLAPSIBLE = ['sandwichbottom', 'sandwichcollapsed']
#
# Deprecated block styles that need dock adjustments
diff --git a/TurtleArt/tapalette.py b/TurtleArt/tapalette.py
index 72533e8..c19d0a5 100644
--- a/TurtleArt/tapalette.py
+++ b/TurtleArt/tapalette.py
@@ -75,11 +75,6 @@ block_styles = {'basic-style': [],
'clamp-style-1arg': [],
'clamp-style-boolean': [],
'clamp-style-else': [],
- 'collapsible-top': [],
- 'collapsible-top-no-arm': [],
- 'collapsible-top-no-label': [],
- 'collapsible-top-no-arm-no-label': [],
- 'collapsible-bottom': [],
'portfolio-style-2x2': [],
'portfolio-style-1x1': [],
'portfolio-style-2x1': [],
diff --git a/TurtleArt/tautils.py b/TurtleArt/tautils.py
index 4bb4571..bd7309f 100644
--- a/TurtleArt/tautils.py
+++ b/TurtleArt/tautils.py
@@ -41,11 +41,7 @@ except (ImportError, AttributeError):
OLD_SUGAR_SYSTEM = True
from StringIO import StringIO
-from taconstants import COLLAPSIBLE, HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, \
- XO30, UNKNOWN
-
-SANDWICHES = ['sandwichtop', 'sandwichtop_no_label', 'sandwichtop_no_arm',
- 'sandwichtop_no_arm_no_label']
+from taconstants import HIT_HIDE, HIT_SHOW, XO1, XO15, XO175, XO30, UNKNOWN
import logging
_logger = logging.getLogger('turtleart-activity')
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 15ebad7..2097c4b 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -48,7 +48,7 @@ from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \
TOOLBAR_SHAPES, TAB_LAYER, RETURN, OVERLAY_LAYER, CATEGORY_LAYER, \
BLOCKS_WITH_SKIN, ICON_SIZE, PALETTE_SCALE, PALETTE_WIDTH, SKIN_PATHS, \
MACROS, TOP_LAYER, BLOCK_LAYER, OLD_NAMES, DEFAULT_TURTLE, TURTLE_LAYER, \
- CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \
+ CURSOR, EXPANDABLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \
TEMPLATES, PYTHON_SKIN, PALETTE_HEIGHT, STATUS_LAYER, OLD_DOCK, \
EXPANDABLE_ARGS, XO1, XO15, XO175, XO30, TITLEXY, CONTENT_ARGS, \
CONSTANTS, EXPAND_SKIN, PROTO_LAYER, EXPANDABLE_FLOW
@@ -3317,18 +3317,12 @@ class TurtleArtWindow():
if not self._find_proto_name('box_%s' % (name), name):
self._new_box_block(name)
- if btype in content_blocks or btype in COLLAPSIBLE:
+ if btype in content_blocks:
if btype == 'number':
try:
values = [round_int(value)]
except ValueError:
values = [0]
- # Deprecated
- elif btype in COLLAPSIBLE:
- if value is not None:
- values = [int(value)]
- else:
- values = []
else:
values = [value]
else:
@@ -3525,7 +3519,7 @@ class TurtleArtWindow():
for i, blk in enumerate(blks):
blk.id = i
for blk in blks:
- if blk.name in content_blocks or blk.name in COLLAPSIBLE:
+ if blk.name in content_blocks:
if len(blk.values) > 0:
name = (blk.name, blk.values[0])
else: