diff options
| author | Walter Bender <walter@sugarlabs.org> | 2014-01-18 14:34:41 (GMT) |
|---|---|---|
| committer | Walter Bender <walter@sugarlabs.org> | 2014-01-18 14:34:41 (GMT) |
| commit | 6592663e2e956c5d6557d3eb006b119b5d59ebfe (patch) | |
| tree | 7f9a2773eb76643461db407312b4e0bacc545d9e | |
| parent | 61aad889c65f4d568e1bad14fc942275ac7153d9 (diff) | |
sync with v197
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | TurtleArt/talogo.py | 5 | ||||
| -rw-r--r-- | TurtleArt/tawindow.py | 3 | ||||
| -rw-r--r-- | activity/activity.info | 2 |
4 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,8 @@ +197 + +BUG FIX: +* Fix problem with dragging canvas while programming is running + 196 ENHANCEMENTS: @@ -19,10 +24,8 @@ BUG FIXES: ENHANCEMENTS: * New translations -* Add pen to Physics palette -* Add sample projects that use Physics palette -BUG FIX: +BUG FIXES: * Added missing parens for some binary operations in Python export * Fixed positioning of help messages (#4679) diff --git a/TurtleArt/talogo.py b/TurtleArt/talogo.py index ec6e7e7..7307b99 100644 --- a/TurtleArt/talogo.py +++ b/TurtleArt/talogo.py @@ -554,6 +554,7 @@ class LogoCode: while (_millisecond() - starttime) < 120: try: if self.step is None: + self.tw.running_blocks = False return False if self.tw.running_turtleart: try: @@ -588,12 +589,14 @@ class LogoCode: except BaseException as error: if isinstance(error, (StopIteration, logoerror)): + self.tw.running_blocks = False raise error else: traceback.print_exc() self.tw.showlabel( 'status', '%s: %s' % (type(error).__name__, str(error))) + self.tw.running_blocks = False return False except StopIteration: if self.tw.running_turtleart: @@ -613,10 +616,10 @@ class LogoCode: self.tw.display_coordinates() self.tw.showlabel('syntaxerror', str(e)) self.tw.turtles.show_all() - self.tw.running_blocks = False else: traceback.print_exc() self.tw.showlabel('status', 'logoerror: ' + str(e)) + self.tw.running_blocks = False return False return True diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py index db24d08..09b9b30 100644 --- a/TurtleArt/tawindow.py +++ b/TurtleArt/tawindow.py @@ -359,6 +359,7 @@ class TurtleArtWindow(): font_map_default.set_resolution(dpi) def _tablet_mode(self): + ''' DEPRECATED ''' return False # Sugar will autoscroll the window for me def _get_plugin_home(self): @@ -3278,7 +3279,7 @@ before making changes to your program')) else: while self.lc.doevalstep(): pass - self.running_blocks = False + # self.running_blocks = False # Should be handled in talogo.py def _snap_to_dock(self): ''' Snap a block (selected_block) to the dock of another block diff --git a/activity/activity.info b/activity/activity.info index 8388d0e..3a3bafd 100644 --- a/activity/activity.info +++ b/activity/activity.info @@ -1,6 +1,6 @@ [Activity] name = TurtleBlocks -activity_version = 196.1 +activity_version = 197.1 license = MIT bundle_id = org.laptop.TurtleArtActivity exec = sugar-activity TurtleArtActivity.TurtleArtActivity |