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-19 19:15:28 (GMT)
committer Walter Bender <walter.bender@gmail.com>2012-07-19 19:15:28 (GMT)
commitcb840832dc2564c090a901552d574880a7b62689 (patch)
tree52016bbc3c8e0c2a98c97d59825e65329ca02c98 /TurtleArt
parentb34eb4723bde739eed00c9595192aa5325808592 (diff)
added variable args to load_block
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/taconstants.py5
-rw-r--r--TurtleArt/tawindow.py16
2 files changed, 17 insertions, 4 deletions
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 8cba7c2..fd84d5b 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -95,8 +95,9 @@ EXPANDABLE_FLOW = []
EXPANDABLE = ['vspace', 'hspace', 'identity2']
-EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg', 'myfunc3arg',
- 'userdefined', 'userdefined2args', 'userdefined3args']
+EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg',
+ 'userdefined', 'userdefined2args',
+ 'loadblock', 'loadblock2arg']
#
# Deprecated block styles that need dock adjustments
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index afa8a7c..7e58de4 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -2387,6 +2387,16 @@ class TurtleArtWindow():
blk.primitive = 'userdefined3'
blk.name = 'userdefined3args'
self._resize_skin(blk)
+ elif blk.name == 'loadblock':
+ dy = blk.add_arg()
+ blk.primitive = 'loadblock2'
+ blk.name = 'loadblock2arg'
+ self._resize_skin(blk)
+ elif blk.name == 'loadblock2arg':
+ dy = blk.add_arg(False)
+ blk.primitive = 'loadblock3'
+ blk.name = 'loadblock3arg'
+ self._resize_skin(blk)
else:
dy = blk.add_arg()
for gblk in group:
@@ -3550,9 +3560,11 @@ class TurtleArtWindow():
for i in range(len(b[4]) - 4):
blk.add_arg()
elif btype == 'myfunc2arg' or btype == 'myfunc3arg' or\
- btype == 'userdefined2args' or btype == 'userdefined3args':
+ btype == 'userdefined2args' or btype == 'userdefined3args' or\
+ btype == 'loadblock2arg' or btype == 'loadblock3arg':
blk.add_arg()
- if btype == 'myfunc3arg' or btype == 'userdefined3args':
+ if btype == 'myfunc3arg' or btype == 'userdefined3args' or \
+ btype == 'loadblock3arg':
blk.add_arg(False)
if btype in PYTHON_SKIN:
if self.nop == 'pythonloaded':