Merge branch 'master' of git.sugarlabs.org:turtleart/mainline

3 files changed, 32 insertions, 10 deletions

diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 376b7dd..ae7ce19 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -640,6 +640,10 @@ class TurtleArtActivity(activity.Activity):
             self._add_separator(self._toolbox.toolbar, expand=True,
                                 visible=False)
 
+        self.keep_button = self._add_button(
+            'filesaveoff', _('Save snapshot'), self.do_keep_cb,
+            self._toolbox.toolbar)
+
         self.samples_button = self._add_button(
             'ta-open', _('Load example'), self.do_samples_cb,
             self._toolbox.toolbar)
@@ -674,9 +678,10 @@ class TurtleArtActivity(activity.Activity):
         add_paragraph(help_box, _('Clean'), icon='eraseron')
         add_paragraph(help_box, _('Run'), icon='run-fastoff')
         add_paragraph(help_box, _('Step'), icon='run-slowoff')
-        add_paragraph(help_box, _('Debug'), icon='debugoff')
+        # add_paragraph(help_box, _('Debug'), icon='debugoff')
         add_paragraph(help_box, _('Stop turtle'), icon='stopitoff')
         add_paragraph(help_box, _('Show blocks'), icon='hideshowoff')
+        add_paragraph(help_box, _('Save snapshot'), icon='filesaveoff')
         add_paragraph(help_box, _('Load example'), icon='ta-open')
         add_paragraph(help_box, _('Help'), icon='help-toolbar')
         add_paragraph(help_box, _('Stop'), icon='activity-stop')
@@ -702,7 +707,6 @@ class TurtleArtActivity(activity.Activity):
         add_paragraph(help_box, _('Save as image'), icon='image-saveoff')
         # add_paragraph(help_box, _('Save as HTML'), icon='htmloff')
         add_paragraph(help_box, _('Save as Logo'), icon='logo-saveoff')
-        add_paragraph(help_box, _('Save snapshot'), icon='filesaveoff')
         add_paragraph(help_box, _('Load project'), icon='load-from-journal')
         home = os.environ['HOME']
         if activity.get_bundle_path()[0:len(home)] == home:
@@ -800,8 +804,6 @@ class TurtleArtActivity(activity.Activity):
             self.save_as_logo = self._add_button_and_label(
                 'logo-saveoff', _('Save as Logo'), self.do_save_as_logo_cb,
                 button_box)
-            self.keep_button = self._add_button_and_label(
-                'filesaveoff', _('Save snapshot'), self.do_keep_cb, button_box)
             self.load_ta_project = self._add_button_and_label(
                 'load-from-journal', _('Load project'),
                 self.do_load_ta_project_cb, button_box)
@@ -865,10 +867,12 @@ class TurtleArtActivity(activity.Activity):
             'run-fastoff', _('Run'), self.do_run_cb, toolbar, _('<Ctrl>r'))
         self.step_button = self._add_button(
             'run-slowoff', _('Step'), self.do_step_cb, toolbar, _('<Ctrl>w'))
+        '''
         if self.tw.hw not in [XO30]:
             self.debug_button = self._add_button(
                 'debugoff', _('Debug'), self.do_debug_cb, toolbar,
                 _('<Ctrl>d'))
+        '''
         self.stop_turtle_button = self._add_button(
             'stopitoff', _('Stop turtle'), self.do_stop_cb, toolbar,
             _('<Ctrl>s'))
diff --git a/plugins/turtle_blocks_extras/turtle_blocks_extras.py b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
index cae6abb..6543619 100644
--- a/plugins/turtle_blocks_extras/turtle_blocks_extras.py
+++ b/plugins/turtle_blocks_extras/turtle_blocks_extras.py
@@ -517,21 +517,23 @@ bottom of the screen'))
         self.tw.lc.def_prim('print', 1,
             lambda self, x: primitive_dictionary['print'](x, False))
 
+        primitive_dictionary['chr'] = self._prim_chr
         palette.add_block('chr',
                           style='number-style-1arg',
                           label='chr',
                           prim_name='chr',
                           help_string=_('Python chr operator'))
         self.tw.lc.def_prim('chr', 1,
-                             lambda self, x: chr(x))
+                            lambda self, x: primitive_dictionary['chr'](x))
 
+        primitive_dictionary['int'] = self._prim_int
         palette.add_block('int',
                           style='number-style-1arg',
                           label='int',
                           prim_name='int',
                           help_string=_('Python int operator'))
         self.tw.lc.def_prim('int', 1,
-                             lambda self, x: int(x))
+                            lambda self, x: primitive_dictionary['int'](x))
 
         primitive_dictionary['myfunction'] = self._prim_myfunction
         palette.add_block('myfunc1arg',
@@ -1410,6 +1412,22 @@ bullets'))
             self.tw.activity.stop_turtle_button.set_icon("stopiton")
             self.tw.activity.stop_turtle_button.set_tooltip(_('Stop turtle'))
 
+    def _prim_chr(self, x):
+        """ Chr conversion """
+        try:
+            return chr(int(x))
+        except ValueError:
+            self.tw.lc.stop_logo()
+            raise logoerror("#notanumber")
+
+    def _prim_int(self, x):
+        """ Int conversion """
+        try:
+            return int(x)
+        except ValueError:
+            self.tw.lc.stop_logo()
+            raise logoerror("#notanumber")
+
     # Deprecated blocks
 
     def _prim_t1x1(self, title, media):
diff --git a/taextras.py b/taextras.py
index 874d148..783138b 100644
--- a/taextras.py
+++ b/taextras.py
@@ -47,10 +47,10 @@ CURRENCY_STRINGS = [
     _('Palette of Mexican pesos'),
     _('Palette of Colombian pesos'),
     _('Palette of Rwandan francs'),
-    _('Palette of US currencies'),
-    _('Palette of Australian currencies'),
-    _('Palette of Guaranies'),
-    _('Palette of Soles'),
+    _('Palette of US dollars'),
+    _('Palette of Australian dollars'),
+    _('Palette of Paraguayan Guaranies'),
+    _('Palette of Peruvian Nuevo Soles'),
     _('Palette of Uruguayan Pesos')
     ]