diff options
author | Walter Bender <walter@walter-laptop.(none)> | 2010-02-01 21:50:05 (GMT) |
---|---|---|
committer | Walter Bender <walter@walter-laptop.(none)> | 2010-02-01 21:50:05 (GMT) |
commit | fff69f19e3d19508627bf71723076d19edeb271d (patch) | |
tree | b10d9f6eb5b0d7342f8e8d5bd7afbea5f9b33fd1 | |
parent | b1da81cd14f54d0f6596c58175de27e1aaeb21ca (diff) |
added default values for flow connections
-rw-r--r-- | constants.py | 4 | ||||
-rw-r--r-- | tawindow.py | 33 |
2 files changed, 24 insertions, 13 deletions
diff --git a/constants.py b/constants.py index 632f1ad..388dd68 100644 --- a/constants.py +++ b/constants.py @@ -330,6 +330,8 @@ DEFAULTS = { 'fillscreen':[60,80], 'forward':[100], 'hat':[_('action')], + 'if':[None, None, 'vspace'], + 'ifelse':[None,'vspace', None, 'vspace'], 'journal':[None], 'left':[90], 'list':[_('Title'), '∙ '], @@ -338,7 +340,7 @@ DEFAULTS = { 'nop':[100], 'number':[100], 'random':[0,100], - 'repeat':[4], + 'repeat':[4, None, 'vspace'], 'right':[90], 'setcolor':[0], 'setheading':[0], diff --git a/tawindow.py b/tawindow.py index e4bce3b..714ab6e 100644 --- a/tawindow.py +++ b/tawindow.py @@ -1172,19 +1172,28 @@ class TurtleArtWindow(): elif argname == 'number' and\ (type(argvalue) is str or type(argvalue) is unicode): argname = 'string' + elif argname == 'bool': + argname = argvalue + elif argname == 'flow': + argname = argvalue (sx, sy) = newspr.get_xy() - argblk = Block(self.block_list, self.sprite_list, - argname, 0, 0, 'block', [argvalue]) - argdock = argblk.docks[0] - nx, ny = sx+dock[2]-argdock[2], sy+dock[3]-argdock[3] - if argname == 'journal': - argblk.spr.set_image(self.media_shapes['journaloff'], - 1, 37, 6) - argblk.spr.set_label(' ') - argblk.spr.move((nx, ny)) - argblk.spr.set_layer(TOP_LAYER) - argblk.connections = [newblk, None] - newblk.connections[i+1] = argblk + if argname is not None: + if argname in CONTENT_BLOCKS: + argblk = Block(self.block_list, self.sprite_list, + argname, 0, 0, 'block', [argvalue]) + else: + argblk = Block(self.block_list, self.sprite_list, + argname, 0, 0, 'block') + argdock = argblk.docks[0] + nx, ny = sx+dock[2]-argdock[2], sy+dock[3]-argdock[3] + if argname == 'journal': + argblk.spr.set_image(self.media_shapes['journaloff'], + 1, 37, 6) + argblk.spr.set_label(' ') + argblk.spr.move((nx, ny)) + argblk.spr.set_layer(TOP_LAYER) + argblk.connections = [newblk, None] + newblk.connections[i+1] = argblk self.drag_group = self._find_group(newblk) self.block_operation = 'new' |