diff options
| -rw-r--r-- | TurtleArt/tabasics.py | 47 | ||||
| -rw-r--r-- | plugins/turtle_blocks_plugin.py | 29 |
2 files changed, 44 insertions, 32 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py index cc4f144..12301e9 100644 --- a/TurtleArt/tabasics.py +++ b/TurtleArt/tabasics.py @@ -94,38 +94,18 @@ class Palettes(): def __init__(self, parent): self.tw = parent - make_palette('turtle', - colors=["#00FF00", "#00A000"], - help_string=_('Palette of turtle commands')) self._turtle_palette() - make_palette('pen', - colors=["#00FFFF", "#00A0A0"], - help_string=_('Palette of pen commands')) self._pen_palette() - make_palette('colors', - colors=["#00FFFF", "#00A0A0"], - help_string=_('Palette of pen colors')) self._color_palette() - make_palette('numbers', - colors=["#FF00FF", "#A000A0"], - help_string=_('Palette of numeric operators')) self._numbers_palette() - make_palette('flow', - colors=["#FFC000", "#A08000"], - help_string=_('Palette of flow operators')) self._flow_palette() - make_palette('blocks', - colors=["#FFFF00", "#A0A000"], - help_string=_('Palette of variable blocks')) self._blocks_palette() - make_palette('trash', - colors=["#FFFF00", "#A0A000"]) self._trash_palette() # Palette definitions @@ -133,6 +113,10 @@ class Palettes(): def _turtle_palette(self): """ The basic Turtle Art turtle palette """ + make_palette('turtle', + colors=["#00FF00", "#00A000"], + help_string=_('Palette of turtle commands')) + PLUGIN_DICTIONARY['move'] = self._prim_move make_prim('forward', palette='turtle', @@ -273,6 +257,10 @@ is in the center of the screen.')) def _pen_palette(self): """ The basic Turtle Art pen palette """ + make_palette('pen', + colors=["#00FFFF", "#00A0A0"], + help_string=_('Palette of pen commands')) + make_prim('penup', palette='pen', style='basic-style-extended-vertical', @@ -345,6 +333,10 @@ fill block)')) def _color_palette(self): """ The basic Turtle Art color palette """ + make_palette('colors', + colors=["#00FFFF", "#00A0A0"], + help_string=_('Palette of pen colors')) + make_prim('setcolor', palette='colors', style='basic-style-1arg', @@ -440,6 +432,10 @@ place of a number block)'), def _numbers_palette(self): """ The basic Turtle Art numbers palette """ + make_palette('numbers', + colors=["#FF00FF", "#A000A0"], + help_string=_('Palette of numeric operators')) + PLUGIN_DICTIONARY['plus'] = self._prim_plus make_prim('plus2', palette='numbers', @@ -604,6 +600,10 @@ operators')) def _flow_palette(self): """ The basic Turtle Art flow palette """ + make_palette('flow', + colors=["#FFC000", "#A08000"], + help_string=_('Palette of flow operators')) + PLUGIN_DICTIONARY['wait'] = self._prim_wait make_prim('wait', palette='flow', @@ -691,6 +691,10 @@ operators from Numbers palette')) def _blocks_palette(self): """ The basic Turtle Art blocks palette """ + make_palette('blocks', + colors=["#FFFF00", "#A0A000"], + help_string=_('Palette of variable blocks')) + PLUGIN_DICTIONARY['start'] = self._prim_start make_prim('start', palette='blocks', @@ -830,6 +834,9 @@ operators from Numbers palette')) def _trash_palette(self): """ The basic Turtle Art turtle palette """ + make_palette('trash', + colors=["#FFFF00", "#A0A000"]) + make_prim('empty', palette='trash', style='basic-style-tail', diff --git a/plugins/turtle_blocks_plugin.py b/plugins/turtle_blocks_plugin.py index 8d56e9f..2f02171 100644 --- a/plugins/turtle_blocks_plugin.py +++ b/plugins/turtle_blocks_plugin.py @@ -77,24 +77,12 @@ class Turtle_blocks_plugin(Plugin): # set up Turtle Block palettes self._flow_palette() - make_palette('media', - colors=["#A0FF00", "#80A000"], - help_string=_('Palette of media objects')) self._media_palette() - make_palette('sensor', - colors=["#FF6060", "#A06060"], - help_string=_('Palette of sensor blocks')) self._sensor_palette() - make_palette('extras', - colors=["#FF0000", "#A00000"], - help_string=_('Palette of extra options')) self._extras_palette() - make_palette('portfolio', - colors=["#0606FF", "#0606A0"], - help_string=_('Palette of presentation templates')) self._portfolio_palette() # Palette definitions @@ -117,6 +105,11 @@ operators from Numbers palette')) operators from Numbers palette')) def _media_palette(self): + + make_palette('media', + colors=["#A0FF00", "#80A000"], + help_string=_('Palette of media objects')) + make_prim('journal', palette='media', style='box-style-media', @@ -241,6 +234,10 @@ Sugar Journal')) def _sensor_palette(self): + make_palette('sensor', + colors=["#FF6060", "#A06060"], + help_string=_('Palette of sensor blocks')) + PLUGIN_DICTIONARY['kbinput'] = self._prim_kbinput make_prim('kbinput', palette='sensor', @@ -297,6 +294,10 @@ started')) def _extras_palette(self): + make_palette('extras', + colors=["#FF0000", "#A00000"], + help_string=_('Palette of extra options')) + PLUGIN_DICTIONARY['push'] = self._prim_push make_prim('push', palette='extras', @@ -519,6 +520,10 @@ open')) def _portfolio_palette(self): + make_palette('portfolio', + colors=["#0606FF", "#0606A0"], + help_string=_('Palette of presentation templates')) + make_prim('hideblocks', palette='portfolio', style='basic-style-extended-vertical', |