Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt/tabasics.py
diff options
context:
space:
mode:
authorWalter Bender <walter@sugarlabs.org>2013-11-26 09:55:02 (GMT)
committer Walter Bender <walter@sugarlabs.org>2013-11-26 09:55:02 (GMT)
commit770864358ab20d94288ad95ef7f8fb4d4ea7e062 (patch)
tree4a09cc001ab6934157e13ac5e644502d735ef473 /TurtleArt/tabasics.py
parent6675f1181529a6c893ee5c6f3244e73801f93f26 (diff)
resync with 194
Diffstat (limited to 'TurtleArt/tabasics.py')
-rw-r--r--TurtleArt/tabasics.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index 3d88ce4..d66345b 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -198,7 +198,8 @@ turtle'))
Primitive(self.tw.lc.clear_value_blocks),
Primitive(self.tw.lc.reset_internals),
Primitive(self.tw.canvas.clearscreen),
- Primitive(self.tw.turtles.reset_turtles)
+ Primitive(self.tw.turtles.reset_turtles),
+ Primitive(self.tw.lc.active_turtle)
])]))
palette.add_block('left',
@@ -445,7 +446,8 @@ in place of a number block)'),
value_block=True,
prim_name='shade',
logo_command=':shade')
- self.tw.lc.def_prim('shade', 0, Primitive(Turtle.get_shade))
+ self.tw.lc.def_prim('shade', 0,
+ Primitive(Turtle.get_shade, return_type=TYPE_NUMBER))
palette.add_block('gray',
style='box-style',
@@ -894,7 +896,7 @@ number of seconds'))
style='clamp-style',
label=_('forever'),
prim_name='forever',
- default=[None, None],
+ default=[None],
logo_command='forever',
help_string=_('loops forever'))
self.tw.lc.def_prim(
@@ -908,7 +910,7 @@ number of seconds'))
style='clamp-style-1arg',
label=_('repeat'),
prim_name='repeat',
- default=[4, None, None],
+ default=[4, None],
logo_command='repeat',
special_name=_('repeat'),
help_string=_('loops specified number of times'))
@@ -926,7 +928,7 @@ number of seconds'))
style='clamp-style-boolean',
label=[_('if'), _('then'), ''],
prim_name='if',
- default=[None, None, None],
+ default=[None, None],
special_name=_('if then'),
logo_command='if',
help_string=_('if-then operator that uses boolean \
@@ -942,7 +944,7 @@ operators from Numbers palette'))
style='clamp-style-else',
label=[_('if'), _('then'), _('else')],
prim_name='ifelse',
- default=[None, None, None, None],
+ default=[None, None, None],
logo_command='ifelse',
special_name=_('if then else'),
help_string=_('if-then-else operator that uses \