Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt
diff options
context:
space:
mode:
authorWalter Bender <walter.bender@gmail.com>2012-07-07 00:27:02 (GMT)
committer Walter Bender <walter.bender@gmail.com>2012-07-07 00:27:02 (GMT)
commitdbb289ce9ca4bb7a855bba5b2ab9b1d625e5f796 (patch)
tree03e3d72d1c7af3333419bb3b91b2a7c73db2d170 /TurtleArt
parent3a62b164e7c6115a90a928e00c7383a614296bd7 (diff)
removing more deprecated code
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/tabasics.py9
-rw-r--r--TurtleArt/tablock.py83
-rw-r--r--TurtleArt/tapalette.py6
3 files changed, 1 insertions, 97 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index df9d186..06b8d1c 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -733,11 +733,9 @@ number of seconds'))
primitive_dictionary['forever'] = self._prim_forever
palette.add_block('forever',
- # style='flow-style',
style='clamp-style',
label=_('forever'),
prim_name='forever',
- # default=[None, 'vspace'],
default=[None, None],
logo_command='forever',
help_string=_('loops forever'))
@@ -746,11 +744,9 @@ number of seconds'))
primitive_dictionary['repeat'] = self._prim_repeat
palette.add_block('repeat',
- # style='flow-style-1arg',
style='clamp-style-1arg',
label=_('repeat'),
prim_name='repeat',
- # default=[4, None, 'vspace'],
default=[4, None, None],
logo_command='repeat',
special_name=_('repeat'),
@@ -759,12 +755,9 @@ number of seconds'))
primitive_dictionary['if'] = self._prim_if
palette.add_block('if',
- # style='flow-style-boolean',
style='clamp-style-boolean',
- # label=[_('if'), '', _('then')],
label=[_('if'), _('then'), ''],
prim_name='if',
- # default=[None, None, 'vspace'],
default=[None, None, None],
special_name=_('if then'),
logo_command='if',
@@ -775,11 +768,9 @@ operators from Numbers palette'))
primitive_dictionary['ifelse'] = self._prim_ifelse
palette.add_block('ifelse',
hidden=True, # Too big to fit palette
- # style='flow-style-else',
style='clamp-style-else',
label=[_('if'), _('then'), _('else')],
prim_name='ifelse',
- # default=[None, 'vspace', None, 'vspace'],
default=[None, None, None, None],
logo_command='ifelse',
special_name=_('if then else'),
diff --git a/TurtleArt/tablock.py b/TurtleArt/tablock.py
index dd11893..5393b44 100644
--- a/TurtleArt/tablock.py
+++ b/TurtleArt/tablock.py
@@ -158,7 +158,6 @@ class Block:
'basic-style-2arg': self._make_basic_style_2arg,
'basic-style-3arg': self._make_basic_style_3arg,
'basic-style-var-arg': self._make_basic_style_var_arg,
- 'invisible': self._make_invisible_style,
'bullet-style': self._make_bullet_style,
'box-style': self._make_box_style,
'box-style-media': self._make_media_style,
@@ -178,11 +177,7 @@ 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,
- 'flow-style': self._make_flow_style,
'flow-style-tail': self._make_flow_style_tail,
- 'flow-style-1arg': self._make_flow_style_1arg,
- 'flow-style-boolean': self._make_flow_style_boolean,
- 'flow-style-else': self._make_flow_style_else,
'portfolio-style-2x2': self._make_portfolio_style_2x2,
'portfolio-style-1x1': self._make_portfolio_style_1x1,
'portfolio-style-2x1': self._make_portfolio_style_2x1,
@@ -496,15 +491,6 @@ class Block:
True, 'right', 'bottom', i=i)
elif self.name in EXPANDABLE_FLOW:
self._calc_moving_labels(i)
- # Deprecated
- elif self.name in block_styles['flow-style-boolean'] or \
- self.name in block_styles['flow-style-else']:
- self.spr.set_label_attributes(int(self._font_size[0] + 0.5),
- True, 'left', 'middle', i=0)
- self.spr.set_label_attributes(int(self._font_size[1] + 0.5),
- True, 'right', 'top', i=1)
- self.spr.set_label_attributes(int(self._font_size[1] + 0.5),
- True, 'right', 'bottom', i=2)
elif i == 1: # top
self.spr.set_label_attributes(int(self._font_size[1] + 0.5),
True, 'right', 'top', i=i)
@@ -935,27 +921,6 @@ class Block:
['flow', False, self.svg.docks[6][0],
self.svg.docks[6][1], ']']]
- # Depreciated block styles
-
- def _make_invisible_style(self, svg):
- self._make_block_graphics(svg, self.svg.invisible)
- # force dock positions to be the same
- self.docks = [['flow', True, self.svg.docks[0][0],
- self.svg.docks[0][1]], ['flow', False,
- self.svg.docks[0][0], self.svg.docks[0][1]]]
-
- def _make_flow_style(self, svg):
- self.svg.expand(10 + self.dx + self.ex, self.ey)
- self.svg.set_slot(True)
- self.svg.set_tab(True)
- self._make_block_graphics(svg, self.svg.basic_flow)
- 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], '['],
- ['flow', False, self.svg.docks[2][0],
- self.svg.docks[2][1], ']']]
-
def _make_flow_style_tail(self, svg):
self.svg.expand(10 + self.dx + self.ex, self.ey)
self.svg.set_slot(True)
@@ -966,53 +931,7 @@ class Block:
['flow', False, self.svg.docks[1][0],
self.svg.docks[1][1]]]
- def _make_flow_style_1arg(self, svg):
- self.svg.expand(self.dx + self.ex, self.ey)
- self.svg.set_slot(True)
- self.svg.set_tab(True)
- self.svg.set_innie([True])
- self._make_block_graphics(svg, self.svg.basic_flow)
- 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], '['],
- ['flow', False, self.svg.docks[3][0],
- self.svg.docks[3][1], ']']]
-
- def _make_flow_style_boolean(self, svg):
- self.svg.expand(self.dx + self.ex, self.ey)
- self.svg.set_slot(True)
- self.svg.set_tab(True)
- self.svg.set_boolean(True)
- self._make_block_graphics(svg, self.svg.basic_flow)
- self.docks = [['flow', True, self.svg.docks[0][0],
- self.svg.docks[0][1]],
- ['bool', False, self.svg.docks[1][0],
- self.svg.docks[1][1]],
- ['flow', False, self.svg.docks[2][0],
- self.svg.docks[2][1], '['],
- ['flow', False, self.svg.docks[3][0],
- self.svg.docks[3][1], ']']]
-
- def _make_flow_style_else(self, svg):
- self.svg.expand(self.dx + self.ex, self.ey)
- self.svg.set_slot(True)
- self.svg.set_tab(True)
- self.svg.set_else(True)
- self.svg.set_boolean(True)
- self._make_block_graphics(svg, self.svg.basic_flow)
- self.docks = [['flow', True, self.svg.docks[0][0],
- self.svg.docks[0][1]],
- ['bool', False, self.svg.docks[1][0],
- self.svg.docks[1][1]],
- ['flow', False, self.svg.docks[3][0],
- self.svg.docks[3][1], '['],
- ['flow', False, self.svg.docks[2][0],
- self.svg.docks[2][1], ']['],
- ['flow', False, self.svg.docks[4][0],
- self.svg.docks[4][1], ']']]
+ # Depreciated block styles
def _make_portfolio_style_2x2(self, svg):
self.svg.expand(30 + self.dx + self.ex, 10 + self.ey)
diff --git a/TurtleArt/tapalette.py b/TurtleArt/tapalette.py
index c19d0a5..dd5ca3f 100644
--- a/TurtleArt/tapalette.py
+++ b/TurtleArt/tapalette.py
@@ -50,7 +50,6 @@ block_styles = {'basic-style': [],
'basic-style-3arg': [],
'basic-style-var-arg': [],
'bullet-style': [],
- 'invisible': [],
'box-style': [],
'box-style-media': [],
'number-style': [],
@@ -63,12 +62,7 @@ block_styles = {'basic-style': [],
'compare-porch-style': [],
'boolean-style': [],
'not-style': [],
- 'flow-style': [],
'flow-style-tail': [],
- 'flow-style-1arg': [],
- 'flow-style-boolean': [],
- 'flow-style-while': [],
- 'flow-style-else': [],
'clamp-style': [],
'clamp-style-collapsible': [],
'clamp-style-collapsed': [],