Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/TurtleArt
diff options
context:
space:
mode:
Diffstat (limited to 'TurtleArt')
-rw-r--r--TurtleArt/tabasics.py35
-rw-r--r--TurtleArt/taprimitive.py13
2 files changed, 26 insertions, 22 deletions
diff --git a/TurtleArt/tabasics.py b/TurtleArt/tabasics.py
index 984a839..de64608 100644
--- a/TurtleArt/tabasics.py
+++ b/TurtleArt/tabasics.py
@@ -66,7 +66,7 @@ from random import uniform
from gettext import gettext as _
-from taprimitive import Palette, make_prim
+from taprimitive import make_palette, make_prim
from talogo import PLUGIN_DICTIONARY, logoerror
from taconstants import CONSTANTS, BLACK, WHITE
from tautils import convert, chr_to_ord, round_int, strtype
@@ -94,38 +94,31 @@ class Palettes():
def __init__(self, parent):
self.tw = parent
- p = Palette('turtle', ["#00FF00", "#00A000"])
- p.set_help(_('Palette of turtle commands'))
- p.add_palette()
+ make_palette('turtle', ["#00FF00", "#00A000"],
+ _('Palette of turtle commands'))
self._turtle_palette()
- p = Palette('pen', ["#00FFFF", "#00A0A0"])
- p.set_help(_('Palette of pen commands'))
- p.add_palette()
+ make_palette('pen', ["#00FFFF", "#00A0A0"],
+ _('Palette of pen commands'))
self._pen_palette()
- p = Palette('colors', ["#00FFFF", "#00A0A0"])
- p.set_help(_('Palette of pen colors'))
- p.add_palette()
+ make_palette('colors', ["#00FFFF", "#00A0A0"],
+ _('Palette of pen colors'))
self._color_palette()
- p = Palette('numbers', ["#FF00FF", "#A000A0"])
- p.set_help(_('Palette of numeric operators'))
- p.add_palette()
+ make_palette('numbers', ["#FF00FF", "#A000A0"],
+ _('Palette of numeric operators'))
self._numbers_palette()
- p = Palette('flow', ["#FFC000", "#A08000"])
- p.set_help(_('Palette of flow operators'))
- p.add_palette()
+ make_palette('flow', ["#FFC000", "#A08000"],
+ _('Palette of flow operators'))
self._flow_palette()
- p = Palette('blocks', ["#FFFF00", "#A0A000"])
- p.set_help(_('Palette of variable blocks'))
- p.add_palette()
+ make_palette('blocks', ["#FFFF00", "#A0A000"],
+ _('Palette of variable blocks'))
self._blocks_palette()
- p = Palette('trash', ["#FFFF00", "#A0A000"])
- p.add_palette()
+ make_palette('trash', ["#FFFF00", "#A0A000"])
self._trash_palette()
# Palette definitions
diff --git a/TurtleArt/taprimitive.py b/TurtleArt/taprimitive.py
index 7f985f8..7d73ff2 100644
--- a/TurtleArt/taprimitive.py
+++ b/TurtleArt/taprimitive.py
@@ -71,6 +71,17 @@ class Palette():
self._special_name = name
+def make_palette(palette_name, colors=None, help_string=None):
+ """ Palette helper function """
+ if colors is None:
+ p = Palette(palette_name)
+ else:
+ p = Palette(palette_name, colors)
+ if help_string is not None:
+ p.set_help(help_string)
+ p.add_palette()
+
+
class Primitive():
""" a class for defining new block primitives """
@@ -176,7 +187,7 @@ class Primitive():
def make_prim(block_name, style='basic-block', palette=None, label=None,
special_name=None, default=None, prim_name=None,
help_string=None, value_block=False, content_block=False):
- """ Block factory """
+ """ Primitive helper function """
b = Primitive(block_name)
b.set_style(style)
if palette is not None: