From 4610b5c72844e326feeee495ea109a860b025539 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter@walter-laptop.(none)>
Date: Sat, 06 Feb 2010 15:07:35 +0000
Subject: cleaning up

---
diff --git a/TurtleArtActivity.py b/TurtleArtActivity.py
index 186d7b5..75270c3 100644
--- a/TurtleArtActivity.py
+++ b/TurtleArtActivity.py
@@ -693,7 +693,7 @@ class TurtleArtActivity(activity.Activity):
             cartesian_button.show()
 
             polar_button = ToolButton('view-polar')
-            polar_button.set_tooltip(_("polar coordinates"))
+            polar_button.set_tooltip(_("Polar coordinates"))
             polar_button.connect('clicked', self._do_polar_cb)
             view_toolbar.insert(polar_button,-1)
             polar_button.show()
@@ -1145,7 +1145,7 @@ class ViewToolbar(gtk.Toolbar):
 
         # polar coordinates
         self.activity.polar_button = ToolButton( "view-polar" )
-        self.activity.polar_button.set_tooltip(_('polar coordinates'))
+        self.activity.polar_button.set_tooltip(_('Polar coordinates'))
         self.activity.polar_button.props.sensitive = True
         self.activity.polar_button.connect('clicked', \
                                            self.activity._do_polar_cb)
diff --git a/taconstants.py b/taconstants.py
index 68efe78..806ecee 100644
--- a/taconstants.py
+++ b/taconstants.py
@@ -126,8 +126,7 @@ PALETTES = [['forward', 'back', 'clean', 'left', 'right', 'show',
              'myfunc',  'nop', 'leftpos', 'toppos', 'width', 'rightpos',
              'bottompos', 'height', 'addturtle', 'print'],
             ['journal', 'audio', 'description', 'templatelist', 'template1x1a',
-             'template1x1', 'template1x2', 'template2x1', 'template2x2',
-             'hideblocks', 'showblocks'],
+             'template2x2', 'hideblocks', 'showblocks'],
             ['empty', 'restoreall']]
 
 #
diff --git a/tawindow.py b/tawindow.py
index 3373f85..4959d5d 100644
--- a/tawindow.py
+++ b/tawindow.py
@@ -1885,7 +1885,6 @@ class TurtleArtWindow():
             return True
 
     def showlabel(self, shp, label=''):
-        print "shp: %s, label: %s" % (shp, label)
         if shp == 'syntaxerror' and label != '':
             shp = label[1:]
             label = ''
diff --git a/turtleart.py b/turtleart.py
index 780cfd3..da1be5c 100755
--- a/turtleart.py
+++ b/turtleart.py
@@ -87,34 +87,38 @@ class TurtleMain():
         menu_items.connect("activate", self._do_save_cb)
         menu_items.show()
 
-        activity_menu = gtk.MenuItem("File")
+        activity_menu = gtk.MenuItem(_("File"))
         activity_menu.show()
         activity_menu.set_submenu(menu)
 
         menu = gtk.Menu()
 
-        menu_items = gtk.MenuItem(_("Cartesian"))
+        menu_items = gtk.MenuItem(_("Cartesian coordinates"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_cartesian_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Polar"))
+        menu_items = gtk.MenuItem(_("Polar coordinates"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_polar_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Larger"))
+        menu_items = gtk.MenuItem(_('Rescale coordinates'))
+        menu.append(menu_items)
+        menu_items.connect("activate", self._do_rescale_cb)
+        menu_items.show()
+        menu_items = gtk.MenuItem(_("Grow blocks"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_resize_cb, 1.5)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Smaller"))
+        menu_items = gtk.MenuItem(_("Shrink blocks"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_resize_cb, 0.667)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Reset"))
+        menu_items = gtk.MenuItem(_("Reset block size"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_resize_cb, -1)
         menu_items.show()
         
-        view_menu = gtk.MenuItem("View")
+        view_menu = gtk.MenuItem(_("View"))
         view_menu.show()
         view_menu.set_submenu(menu)
 
@@ -129,26 +133,26 @@ class TurtleMain():
         menu_items.connect("activate", self._do_paste_cb)
         menu_items.show()
         
-        edit_menu = gtk.MenuItem("Edit")
+        edit_menu = gtk.MenuItem(_("Edit"))
         edit_menu.show()
         edit_menu.set_submenu(menu)
 
         menu = gtk.Menu()
 
-        menu_items = gtk.MenuItem(_("Palette"))
+        menu_items = gtk.MenuItem(_("Show palette"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_palette_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Hide Palette"))
+        menu_items = gtk.MenuItem(_("Hide palette"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_hide_palette_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Blocks"))
+        menu_items = gtk.MenuItem(_("Show/hide blocks"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_hideshow_cb)
         menu_items.show()
 
-        tool_menu = gtk.MenuItem("Tools")
+        tool_menu = gtk.MenuItem(_("Tools"))
         tool_menu.show()
         tool_menu.set_submenu(menu)
 
@@ -166,7 +170,7 @@ class TurtleMain():
         menu.append(menu_items)
         menu_items.connect("activate", self._do_step_cb)
         menu_items.show()
-        menu_items = gtk.MenuItem(_("Trace"))
+        menu_items = gtk.MenuItem(_("Debug"))
         menu.append(menu_items)
         menu_items.connect("activate", self._do_trace_cb)
         menu_items.show()
@@ -175,7 +179,7 @@ class TurtleMain():
         menu_items.connect("activate", self._do_stop_cb)
         menu_items.show()
 
-        turtle_menu = gtk.MenuItem("Turtle")
+        turtle_menu = gtk.MenuItem(_("Turtle"))
         turtle_menu.show()
         turtle_menu.set_submenu(menu)
 
@@ -279,6 +283,14 @@ class TurtleMain():
         if text is not None:
             self.tw.process_data(data_from_string(text))
 
+    def _do_rescale_cb(self, button):
+        if self.tw.coord_scale == 1:
+            self.tw.coord_scale = self.tw.height/200
+            self.tw.eraser_button()
+        else:
+            self.tw.coord_scale = 1
+            self.tw.eraser_button()
+
 def main():
     gtk.main()
     return 0
--
cgit v0.9.1