diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-03-03 05:31:54 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-03-03 05:31:54 (GMT) |
| commit | 94c67f7c77f1e009932b43c0d44cb58988d8b147 (patch) | |
| tree | fd6324486b9e878182a2ba1dfe4e0a71073be44a | |
| parent | 38e8f0db0a24a5260c2d1cbc01cf51a67c5ce076 (diff) | |
| parent | baf253a6422119c80d931982468068d604107a05 (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
| -rw-r--r-- | TurtleArt/tawindow.py | 19 | ||||
| -rw-r--r-- | taextras.py | 2 |
2 files changed, 11 insertions, 10 deletions
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index 77459e5..b0fed0e 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -858,7 +858,7 @@ class TurtleArtWindow(): blk.spr.hide() old_blocks = self.palettes[n][:] self.palettes[n] = [] - for i, name in enumerate(palette_blocks[n]): + for name in palette_blocks[n]: found_block = False for oblk in old_blocks: if oblk.name == name: @@ -870,19 +870,19 @@ class TurtleArtWindow(): self.block_list, self.sprite_list, name, 0, 0, 'proto', [], PALETTE_SCALE)) if name in hidden_proto_blocks: - self.palettes[n][i].set_visibility(False) - self.palettes[n][i].spr.set_layer(PROTO_LAYER) - self.palettes[n][i].unhighlight() + self.palettes[n][-1].set_visibility(False) + self.palettes[n][-1].spr.set_layer(PROTO_LAYER) + self.palettes[n][-1].unhighlight() # Some proto blocks get a skin. if name in block_styles['box-style-media']: - self._proto_skin(name + 'small', n, i) + self._proto_skin(name + 'small', n, -1) elif name[:8] == 'template': # Deprecated - self._proto_skin(name[8:], n, i) + self._proto_skin(name[8:], n, -1) elif name[:7] == 'picture': # Deprecated - self._proto_skin(name[7:], n, i) + self._proto_skin(name[7:], n, -1) elif name in PYTHON_SKIN: - self._proto_skin('pythonsmall', n, i) + self._proto_skin('pythonsmall', n, -1) return def _hide_toolbar_palette(self): @@ -905,7 +905,8 @@ class TurtleArtWindow(): if palette is not None: for proto in self.palettes[palette]: proto.spr.hide() - self.palette_sprs[palette][self.orientation].hide() + if self.palette_sprs[palette][self.orientation] is not None: + self.palette_sprs[palette][self.orientation].hide() if self.activity is None or not self.activity.has_toolbarbox: self.selectors[palette].set_shape( self.selector_shapes[palette][0]) diff --git a/taextras.py b/taextras.py index e4a6c4c..d7f8624 100644 --- a/taextras.py +++ b/taextras.py @@ -269,7 +269,7 @@ LEGO_STRINGS = [ _('Please check the connection with the brick.'), _('Please check the port.'), _('The value of power must be between -127 to 127.'), - _('An error has ocurred: check all and try reconnect.'), + _('An error has occurred: check all connections and try to reconnect.'), _('NXT found'), _('NXT not found'), _('refresh NXT'), |