From f2b1eb72702402dc250c2883777123f186e30d9c Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Mon, 21 Feb 2011 12:49:26 +0000
Subject: minor reordering of palettes based on Bill Kerr suggestions

---
(limited to 'TurtleArt')

diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index aa9e065..e26f6d3 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -118,18 +118,18 @@ PALETTE_NAMES = ['turtle', 'pen', 'colors', 'numbers', 'flow', 'blocks',
 PALETTES = [['forward', 'back', 'clean', 'left', 'right',
              'arc', 'setxy2', 'seth', 'xcor', 'ycor', 'heading'],
             ['penup', 'pendown', 'setpensize', 'fillscreen', 'pensize',
-             'setcolor', 'setshade', 'setgray', 'color', 'shade',
-             'gray', 'startfill', 'stopfill'],
-            ['red', 'orange', 'yellow', 'green', 'cyan', 'blue', 'purple',
+              'startfill', 'stopfill'],
+            ['setcolor', 'setshade', 'setgray', 'color', 'shade', 'gray',
+             'red', 'orange', 'yellow', 'green', 'cyan', 'blue', 'purple',
              'white', 'black'],
             ['plus2', 'minus2', 'product2',
              'division2', 'identity2', 'remainder2', 'sqrt', 'random',
              'number', 'greater2', 'less2', 'equal2', 'not', 'and2', 'or2'],
             ['wait', 'forever', 'repeat', 'if', 'ifelse', 'while', 'until',
              'hspace', 'vspace', 'stopstack'],
-            ['start', 'hat1', 'stack1', 'hat', 'hat2', 'stack2', 'stack',
-             'storeinbox1', 'storeinbox2', 'string', 'box1', 'box2', 'box',
-             'storein'],
+            ['start', 'storeinbox1', 'storeinbox2', 'string', 'box1', 'box2',
+             'box', 'storein', 'hat', 'hat1', 'hat2', 'stack', 'stack1',
+             'stack2'],
             ['push', 'printheap', 'clearheap', 'pop', 'comment', 'print',
              'myfunc1arg', 'userdefined', 'cartesian', 'polar', 'addturtle',
              'reskin', 'sandwichtop_no_label', 'sandwichbottom'],
@@ -150,7 +150,7 @@ COLORS = [["#00FF00", "#00A000"], ["#00FFFF", "#00A0A0"],
           ["#00FFFF", "#00A0A0"], ["#FF00FF", "#A000A0"],
           ["#FFC000", "#A08000"], ["#FFFF00", "#A0A000"],
           ["#FF0000", "#A00000"], ["#FF0000", "#A00000"],
-          ["#FFFF00", "#A0A000"], ["#0000FF", "#0000A0"],
+          ["#A0FF00", "#A0A000"], ["#0000FF", "#0000A0"],
           ["#FFFF00", "#A0A000"]]
 
 BOX_COLORS = {'red': ["#FF0000", "#A00000"],
@@ -747,7 +747,9 @@ TEMPLATES = {'t1x1': (0.5, 0.5, 0.0625, 0.125, 1.05, 0),
 # Names for blocks without names for popup help
 #
 SPECIAL_NAMES = {
+    'and2': _('and'),
     'audio': _('audio'),
+    'description': _('description'),
     'division2': _('divide'),
     'equal2': _('equal'),
     'greater2': _('greater than'),
@@ -757,11 +759,13 @@ SPECIAL_NAMES = {
     'ifelse': _('if then else'),
     'journal': _('journal'),
     'less2': _('less than'),
+    'or2': _('or'),
     'minus2': _('minus'),
     'nop': _('Python code'),
     'number': _('number'),
     'plus2': _('plus'),
     'product2': _('multiply'),
+    'sensors': _('sensors'),
     'sqrt': _('square root'),
     'template1x1': _('presentation 1x1'),
     'template1x1a': _('presentation 1x1'),
@@ -770,6 +774,9 @@ SPECIAL_NAMES = {
     'template2x2': _('presentation 2x2'),
     'templatelist': _('presentation bulleted list'),
     'textsize': _('text size'),
+    'userdefined': _('Python block'),
+    'userdefined2args': _('Python block'),
+    'userdefined3args': _('Python block'),
     'video': _('video'),
     'vspace': _('vertical space')}
 
@@ -839,7 +846,7 @@ HELP_STRINGS = {
     'not': _("logical NOT operator"),
     'numbers': _("Palette of numeric operators"),
     'number': _("used as numeric input in mathematic operators"),
-    'or': _("logical OR operator"),
+    'or2': _("logical OR operator"),
     'orientation': _("changes the orientation of the palette of blocks"),
     'pendown': _("Turtle will draw when moved."),
     'pen': _("Palette of pen commands"),
--
cgit v0.9.1