diff options
| author | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-12-06 05:30:37 (GMT) |
|---|---|---|
| committer | Pootle daemon <pootle@pootle.sugarlabs.org> | 2012-12-06 05:30:37 (GMT) |
| commit | 1f24491db53c4d9a55cc3ab6e7dd9987c3c0ceeb (patch) | |
| tree | cb0734bac478ec2af21f8755522e95c1f1df25df | |
| parent | c9e5ec50ca924a9ae95e4ba9a2f54480c024bcdc (diff) | |
| parent | 5d393dff9f0b00961da8ec5abc0b90329bcb02c0 (diff) | |
Merge branch 'master' of git.sugarlabs.org:turtleart/mainline
| -rw-r--r-- | NEWS | 8 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 4 | ||||
| -rw-r--r--[-rwxr-xr-x] | pysamples/ta-stats.py | 0 | ||||
| -rwxr-xr-x | turtleblocks.py | 3 |
4 files changed, 10 insertions, 5 deletions
@@ -3,10 +3,14 @@ ENHANCEMENT: * New translations * Expand textview vertically when editing multiline strings -* Set maximum width of string blocks +* Add sample python code for accessing Alice engine +* Add new graphic example by Jonny Emerson +* Enable use of Enter on number blocks (#4271) -BUG FIX: +BUG FIXES: * Fixed regression in renaming action and box blocks +* Fixed problem with mic boost on XO 1.75 (#4288) +* Set maximum width of string blocks to prevent them from running off screen 167 diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index e726c2a..9c5295c 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -1841,6 +1841,10 @@ class TurtleArtWindow(): elif argname == 'number' and \ (type(argvalue) is str or type(argvalue) is unicode): argname = 'string' + elif argname == 'string' and \ + name in block_styles['number-style-1strarg'] and \ + type(argvalue) in [int, float]: + argname = 'number' elif argname == 'bool': argname = argvalue elif argname == 'flow': diff --git a/pysamples/ta-stats.py b/pysamples/ta-stats.py index 4d293e6..4d293e6 100755..100644 --- a/pysamples/ta-stats.py +++ b/pysamples/ta-stats.py diff --git a/turtleblocks.py b/turtleblocks.py index 938625c..dcd4d99 100755 --- a/turtleblocks.py +++ b/turtleblocks.py @@ -312,8 +312,6 @@ class TurtleMain(): ''' Create a scrolled window to contain the turtle canvas. We add a Fixed container in order to position text Entry widgets on top of string and number blocks.''' - # vbox = gtk.VBox(False, 0) - # win.add(vbox) self.fixed = gtk.Fixed() self.fixed.connect('size-allocate', self._fixed_resize_cb) @@ -342,7 +340,6 @@ class TurtleMain(): self.fixed.put(self.vbox, 0, 0) self.fixed.show() - # vbox.pack_start(self.fixed, False, False, 0) win.add(self.fixed) win.show_all() self.win = win |