From 2968422700dfdef13ff9b29a57b322a507c13ef5 Mon Sep 17 00:00:00 2001
From: Walter Bender <walter.bender@gmail.com>
Date: Sat, 26 Feb 2011 22:42:19 +0000
Subject: further isolation of BLOCK STYLE internals

---
(limited to 'plugins')

diff --git a/plugins/audio_sensors_plugin.py b/plugins/audio_sensors_plugin.py
index 8f0e2d4..4c9a364 100644
--- a/plugins/audio_sensors_plugin.py
+++ b/plugins/audio_sensors_plugin.py
@@ -38,7 +38,7 @@ from audio.audiograb import AudioGrab_Unknown, AudioGrab_XO1, AudioGrab_XO15, \
 from audio.ringbuffer import RingBuffer1d
 
 from TurtleArt.taprimitive import Primitive
-from TurtleArt.taconstants import BOX_STYLE, XO1, XO15
+from TurtleArt.taconstants import XO1, XO15
 from TurtleArt.talogo import PLUGIN_DICTIONARY
 from TurtleArt.tautils import get_path
 
@@ -86,7 +86,7 @@ class Audio_sensors_plugin(Plugin):
 
         sound = Primitive('sound')
         sound.set_palette('sensor')
-        sound.set_style(BOX_STYLE)
+        sound.set_style('box-style')
         sound.set_label(_('sound'))
         sound.set_help(_('raw microphone input signal'))
         sound.set_value_block(True)
@@ -98,7 +98,7 @@ class Audio_sensors_plugin(Plugin):
 
         volume = Primitive('volume')
         volume.set_palette('sensor')
-        volume.set_style(BOX_STYLE)
+        volume.set_style('box-style')
         volume.set_label(_('volume'))
         volume.set_help(_('microphone input volume'))
         volume.set_value_block(True)
@@ -111,7 +111,7 @@ class Audio_sensors_plugin(Plugin):
         pitch = Primitive('pitch')
         if PITCH_AVAILABLE:
             pitch.set_palette('sensor')
-        pitch.set_style(BOX_STYLE)
+        pitch.set_style('box-style')
         pitch.set_label(_('pitch'))
         pitch.set_help(_('microphone input pitch'))
         pitch.set_value_block(True)
@@ -124,7 +124,7 @@ class Audio_sensors_plugin(Plugin):
         if self.hw in [XO1, XO15]:
             resistance = Primitive('resistance')
             resistance.set_palette('sensor')
-            resistance.set_style(BOX_STYLE)
+            resistance.set_style('box-style')
             resistance.set_label(_('resistance'))
             resistance.set_help(_('sensor input resistance'))
             resistance.set_value_block(True)
@@ -136,7 +136,7 @@ class Audio_sensors_plugin(Plugin):
 
             voltage = Primitive('voltage')
             voltage.set_palette('sensor')
-            voltage.set_style(BOX_STYLE)
+            voltage.set_style('box-style')
             voltage.set_label(_('voltage'))
             voltage.set_help(_('sensor input voltage'))
             voltage.set_value_block(True)
diff --git a/plugins/camera_plugin.py b/plugins/camera_plugin.py
index 960dc54..c4e6bc8 100644
--- a/plugins/camera_plugin.py
+++ b/plugins/camera_plugin.py
@@ -32,7 +32,6 @@ from camera.v4l2 import v4l2_control, V4L2_CID_AUTOGAIN, VIDIOC_G_CTRL, \
 from plugin import Plugin
 
 from TurtleArt.taprimitive import Primitive
-from TurtleArt.taconstants import BOX_STYLE_MEDIA, BOX_STYLE
 from TurtleArt.talogo import MEDIA_BLOCKS_DICTIONARY, PLUGIN_DICTIONARY
 from TurtleArt.tautils import get_path
 
@@ -63,7 +62,7 @@ class Camera_plugin(Plugin):
         if self._status:
             luminance = Primitive('luminance')
             luminance.set_palette('sensor')
-            luminance.set_style(BOX_STYLE)
+            luminance.set_style('box-style')
             luminance.set_label(_('brightness'))
             luminance.set_help(_('light level detected by camera'))
             luminance.set_value_block(True)
@@ -75,7 +74,7 @@ class Camera_plugin(Plugin):
 
             # Depreciated block
             read_camera = Primitive('read_camera')
-            read_camera.set_style(BOX_STYLE)
+            read_camera.set_style('box-style')
             read_camera.set_label(_('brightness'))
             read_camera.set_help(
                 _('Average RGB color from camera is pushed to the stack'))
@@ -88,7 +87,7 @@ class Camera_plugin(Plugin):
 
             camera = Primitive('camera')
             camera.set_palette('sensor')
-            camera.set_style(BOX_STYLE_MEDIA)
+            camera.set_style('box-style-media')
             camera.set_label([' '])
             camera.set_help(_('camera output'))
             camera.set_special_name(_('camera'))
diff --git a/plugins/rfid_plugin.py b/plugins/rfid_plugin.py
index 82f431a..cb1dd18 100644
--- a/plugins/rfid_plugin.py
+++ b/plugins/rfid_plugin.py
@@ -29,7 +29,6 @@ from rfid.rfidutils import strhex2bin, strbin2dec, find_device
 from plugin import Plugin
 
 from TurtleArt.taprimitive import Primitive
-from TurtleArt.taconstants import BOX_STYLE
 from TurtleArt.talogo import PLUGIN_DICTIONARY
 
 import logging
@@ -88,7 +87,7 @@ class Rfid_plugin(Plugin):
         if self._status:
             rfid = Primitive('rfid')
             rfid.set_palette('sensor')
-            rfid.set_style(BOX_STYLE)
+            rfid.set_style('box-style')
             rfid.set_label(_('RFID'))
             rfid.set_help(_('read value from RFID device'))
             rfid.set_value_block(True)
--
cgit v0.9.1