From c2e939def27ef50d443ceb4ddbcd9e38bf88ace6 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Thu, 03 Mar 2011 03:43:25 +0000
Subject: added make_palette helper function

---
(limited to 'plugins')

diff --git a/plugins/camera_plugin.py b/plugins/camera_plugin.py
index 26150f4..ebc45a0 100644
--- a/plugins/camera_plugin.py
+++ b/plugins/camera_plugin.py
@@ -31,7 +31,7 @@ from camera.v4l2 import v4l2_control, V4L2_CID_AUTOGAIN, VIDIOC_G_CTRL, \
 
 from plugin import Plugin
 
-from TurtleArt.taprimitive import Palette, make_prim
+from TurtleArt.taprimitive import make_palette, make_prim
 from TurtleArt.talogo import MEDIA_BLOCKS_DICTIONARY, PLUGIN_DICTIONARY
 from TurtleArt.tautils import get_path
 
@@ -58,9 +58,8 @@ class Camera_plugin(Plugin):
             self._status = True
 
     def setup(self):
-        sensors = Palette('sensor')
-        sensors.set_help(_('Palette of sensor blocks'))
-        sensors.add_palette()
+        make_palette('sensor', ["#FF6060", "#A06060"],
+                     _('Palette of sensor blocks'))
 
         # set up camera-specific blocks
         if self._status:
diff --git a/plugins/rfid_plugin.py b/plugins/rfid_plugin.py
index a69eb6d..03b08bd 100644
--- a/plugins/rfid_plugin.py
+++ b/plugins/rfid_plugin.py
@@ -29,7 +29,7 @@ from rfid.rfidutils import strhex2bin, strbin2dec, find_device
 
 from plugin import Plugin
 
-from TurtleArt.taprimitive import Palette, make_prim
+from TurtleArt.taprimitive import make_palette, make_prim
 from TurtleArt.talogo import PLUGIN_DICTIONARY
 
 import logging
@@ -86,9 +86,8 @@ class Rfid_plugin(Plugin):
     def setup(self):
         # set up RFID-specific blocks
         if self._status:
-            sensors = Palette('sensor')
-            sensors.set_help(_('Palette of sensor blocks'))
-            sensors.add_palette()
+            make_palette('sensor', ["#FF6060", "#A06060"],
+                         _('Palette of sensor blocks'))
 
             PLUGIN_DICTIONARY['rfid'] = self.prim_read_camera
             make_prim('rfid',
diff --git a/plugins/turtle_blocks_plugin.py b/plugins/turtle_blocks_plugin.py
index 969fde8..ce6f73b 100644
--- a/plugins/turtle_blocks_plugin.py
+++ b/plugins/turtle_blocks_plugin.py
@@ -30,7 +30,7 @@ except ImportError:
     pass
 
 from plugin import Plugin
-from TurtleArt.taprimitive import Palette, make_prim
+from TurtleArt.taprimitive import make_palette, make_prim
 from TurtleArt.talogo import PLUGIN_DICTIONARY, logoerror, \
     MEDIA_BLOCKS_DICTIONARY
 from TurtleArt.taconstants import DEFAULT_SCALE, CONSTANTS, ICON_SIZE
@@ -81,24 +81,20 @@ class Turtle_blocks_plugin(Plugin):
         # set up Turtle Block palettes
         self._flow_palette()
 
-        p = Palette('media', ["#A0FF00", "#80A000"])
-        p.set_help(_('Palette of media objects'))
-        p.add_palette()
+        make_palette('media', ["#A0FF00", "#80A000"],
+                     _('Palette of media objects'))
         self._media_palette()
 
-        p = Palette('sensor', ["#FF6060", "#A06060"])
-        p.set_help(_('Palette of sensor blocks'))
-        p.add_palette()
+        make_palette('sensor', ["#FF6060", "#A06060"],
+                     _('Palette of sensor blocks'))
         self._sensor_palette()
 
-        p = Palette('extras', ["#FF0000", "#A00000"])
-        p.set_help(_('Palette of extra options'))
-        p.add_palette()
+        make_palette('extras', ["#FF0000", "#A00000"],
+                     _('Palette of extra options'))
         self._extras_palette()
 
-        p = Palette('portfolio', ["#0606FF", "#0606A0"])
-        p.set_help(_('Palette of presentation templates'))
-        p.add_palette()
+        make_palette('portfolio', ["#0606FF", "#0606A0"],
+                     _('Palette of presentation templates'))
         self._portfolio_palette()
 
     def start(self):
--
cgit v0.9.1