commit-gnuradio
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Commit-gnuradio] [gnuradio] 08/15: qtgui: changing line config params t


From: git
Subject: [Commit-gnuradio] [gnuradio] 08/15: qtgui: changing line config params to use base_key to make cleaner.
Date: Thu, 10 Apr 2014 19:38:17 +0000 (UTC)

This is an automated email from the git hooks/post-receive script.

trondeau pushed a commit to branch master
in repository gnuradio.

commit cc418e9a071479a020f42bdd4c48247b688910c2
Author: Tom Rondeau <address@hidden>
Date:   Wed Apr 9 16:17:08 2014 -0400

    qtgui: changing line config params to use base_key to make cleaner.
    
    Also handles complex inputs to time sink better.
---
 gr-qtgui/grc/qtgui_const_sink_x.xml     | 1058 +++-------------------------
 gr-qtgui/grc/qtgui_freq_sink_x.xml      |  482 ++-----------
 gr-qtgui/grc/qtgui_histogram_sink_x.xml | 1060 +++-------------------------
 gr-qtgui/grc/qtgui_number_sink.xml      |  233 +-----
 gr-qtgui/grc/qtgui_time_raster_x.xml    |  237 ++-----
 gr-qtgui/grc/qtgui_time_sink_x.xml      | 1171 +++++--------------------------
 gr-qtgui/grc/qtgui_waterfall_sink_x.xml |  236 ++-----
 7 files changed, 603 insertions(+), 3874 deletions(-)

diff --git a/gr-qtgui/grc/qtgui_const_sink_x.xml 
b/gr-qtgui/grc/qtgui_const_sink_x.xml
index 52c8bde..08f9064 100644
--- a/gr-qtgui/grc/qtgui_const_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_const_sink_x.xml
@@ -22,17 +22,17 @@ self.$(id).set_x_axis($xmin, $xmax)
 self.$(id).enable_autoscale($autoscale)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 widths = [$width1, $width2, $width3, $width4, $width5,
-          $width6, $width7, $width8, $width9]
+          $width6, $width7, $width8, $width9, $width10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 styles = [$style1, $style2, $style3, $style4, $style5,
-          $style6, $style7, $style8, $style9]
+          $style6, $style7, $style8, $style9, $style10]
 markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
-           $marker6, $marker7, $marker8, $marker9]
+           $marker6, $marker7, $marker8, $marker9, $marker10]
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
-          $alpha6, $alpha7, $alpha8, $alpha9]
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 for i in xrange($nconnections):
     if len(labels[i]) == 0:
         self.$(id).set_line_label(i, "Data {0}".format(i))
@@ -293,1244 +293,402 @@ $(gui_hint()($win))</make>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 2 Width</name>
     <key>width2</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 2 Style</name>
     <key>style2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 2 Marker</name>
     <key>marker2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 3 Width</name>
     <key>width3</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 3 Style</name>
     <key>style3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 3 Marker</name>
     <key>marker3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 4 Width</name>
     <key>width4</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 4 Style</name>
     <key>style4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 4 Marker</name>
     <key>marker4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 5 Width</name>
     <key>width5</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 5 Style</name>
     <key>style5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 5 Marker</name>
     <key>marker5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 6 Width</name>
     <key>width6</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 6 Style</name>
     <key>style6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 6 Marker</name>
     <key>marker6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 7 Width</name>
     <key>width7</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 7 Style</name>
     <key>style7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 7 Marker</name>
     <key>marker7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 8 Width</name>
     <key>width8</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 8 Style</name>
     <key>style8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 8 Marker</name>
     <key>marker8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 9 Width</name>
     <key>width9</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 9 Style</name>
     <key>style9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 9 Marker</name>
     <key>marker9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 10 Width</name>
+    <key>width10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <value>"red"</value>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 10 Style</name>
+    <key>style10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 10 Marker</name>
+    <key>marker10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+
+
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-qtgui/grc/qtgui_freq_sink_x.xml 
b/gr-qtgui/grc/qtgui_freq_sink_x.xml
index 0a9bce0..761943e 100644
--- a/gr-qtgui/grc/qtgui_freq_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_freq_sink_x.xml
@@ -26,13 +26,13 @@ self.$(id).enable_autoscale($autoscale)
 self.$(id).set_fft_average($average)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 widths = [$width1, $width2, $width3, $width4, $width5,
-          $width6, $width7, $width8, $width9]
+          $width6, $width7, $width8, $width9, $width10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
-          $alpha6, $alpha7, $alpha8, $alpha9]
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 for i in xrange($nconnections):
     if len(labels[i]) == 0:
         self.$(id).set_line_label(i, "Data {0}".format(i))
@@ -260,7 +260,7 @@ $(gui_hint()($win))</make>
     </option>
     <option>
       <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
+      <key>"dark blue"</key>
     </option>
     <tab>Config</tab>
   </param>
@@ -276,605 +276,275 @@ $(gui_hint()($win))</make>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 2 Width</name>
     <key>width2</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
-
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 3 Width</name>
     <key>width3</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
+    <value>"green"</value>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 4 Width</name>
     <key>width4</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
+    <value>"black"</value>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 5 Width</name>
     <key>width5</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
+    <value>"cyan"</value>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 6 Width</name>
     <key>width6</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
+    <value>"magenta"</value>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 7 Width</name>
     <key>width7</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
+    <value>"yellow"</value>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 8 Width</name>
     <key>width8</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
+    <value>"dark red"</value>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 9 Width</name>
     <key>width9</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
+    <value>"dark green"</value>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 10 Width</name>
+    <key>width10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <value>"dark blue"</value>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-qtgui/grc/qtgui_histogram_sink_x.xml 
b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
index cbd5539..2540891 100644
--- a/gr-qtgui/grc/qtgui_histogram_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_histogram_sink_x.xml
@@ -25,17 +25,17 @@ self.$(id).enable_autoscale($autoscale)
 self.$(id).enable_accumulate($accum)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 widths = [$width1, $width2, $width3, $width4, $width5,
-          $width6, $width7, $width8, $width9]
+          $width6, $width7, $width8, $width9, $width10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 styles = [$style1, $style2, $style3, $style4, $style5,
-          $style6, $style7, $style8, $style9]
+          $style6, $style7, $style8, $style9, $style10]
 markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
-           $marker6, $marker7, $marker8, $marker9]
+           $marker6, $marker7, $marker8, $marker9, $marker10]
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
-          $alpha6, $alpha7, $alpha8, $alpha9]
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 for i in xrange($nconnections):
     if len(labels[i]) == 0:
         self.$(id).set_line_label(i, "Data {0}".format(i))
@@ -205,7 +205,7 @@ $(gui_hint()($win))</make>
     </option>
     <option>
       <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
+      <key>"dark blue"</key>
     </option>
     <tab>Config</tab>
   </param>
@@ -301,1245 +301,403 @@ $(gui_hint()($win))</make>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 2 Width</name>
     <key>width2</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
+    <value>"red"</value>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 2 Style</name>
     <key>style2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 2 Marker</name>
     <key>marker2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 3 Width</name>
     <key>width3</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
+    <value>"green"</value>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 3 Style</name>
     <key>style3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 3 Marker</name>
     <key>marker3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 4 Width</name>
     <key>width4</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
+    <value>"black"</value>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 4 Style</name>
     <key>style4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 4 Marker</name>
     <key>marker4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 5 Width</name>
     <key>width5</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
+    <value>"cyan"</value>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 5 Style</name>
     <key>style5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 5 Marker</name>
     <key>marker5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 6 Width</name>
     <key>width6</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
+    <value>"magenta"</value>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 6 Style</name>
     <key>style6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 6 Marker</name>
     <key>marker6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 7 Width</name>
     <key>width7</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
+    <value>"yellow"</value>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 7 Style</name>
     <key>style7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 7 Marker</name>
     <key>marker7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 8 Width</name>
     <key>width8</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
+    <value>"dark red"</value>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 8 Style</name>
     <key>style8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 8 Marker</name>
     <key>marker8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 9 Width</name>
     <key>width9</key>
-    <value>1</value>
-    <type>int</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
+    <value>"dark green"</value>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 9 Style</name>
     <key>style9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 9 Marker</name>
     <key>marker9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 10 Width</name>
+    <key>width10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <value>"dark blue"</value>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 10 Style</name>
+    <key>style10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 10 Marker</name>
+    <key>marker10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+
+
+
   <sink>
     <name>in</name>
     <type>float</type>
diff --git a/gr-qtgui/grc/qtgui_number_sink.xml 
b/gr-qtgui/grc/qtgui_number_sink.xml
index e277e7f..af74bca 100644
--- a/gr-qtgui/grc/qtgui_number_sink.xml
+++ b/gr-qtgui/grc/qtgui_number_sink.xml
@@ -20,14 +20,17 @@ qtgui.number_sink(
 self.$(id).set_update_time($update_time)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 for i in xrange($nconnections):
     self.$(id).set_min(i, $min)
     self.$(id).set_max(i, $max)
-    self.$(id).set_label(i, labels[i])
     self.$(id).set_color(i, colors[i][0], colors[i][1])
+    if len(labels[i]) == 0:
+        self.$(id).set_label(i, "Data {0}".format(i))
+    else:
+        self.$(id).set_label(i, labels[i])
 
 self.$(id).enable_autoscale($autoscale)
 self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
@@ -188,300 +191,140 @@ $(gui_hint()($win))</make>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>("black", "black")</key>
-    </option>
-    <option>
-      <name>Blue-Red</name>
-      <key>("blue", "red")</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>("black", "white")</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>("white", "black")</key>
-    </option>
-    <option>
-      <name>Black-Red</name>
-      <key>("black", "red")</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-qtgui/grc/qtgui_time_raster_x.xml 
b/gr-qtgui/grc/qtgui_time_raster_x.xml
index 201ab90..db13ce5 100644
--- a/gr-qtgui/grc/qtgui_time_raster_x.xml
+++ b/gr-qtgui/grc/qtgui_time_raster_x.xml
@@ -24,11 +24,11 @@ qtgui.$(type.fcn)(
 self.$(id).set_update_time($update_time)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
-          $alpha6, $alpha7, $alpha8, $alpha9]
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 for i in xrange($nconnections):
     if len(labels[i]) == 0:
         self.$(id).set_line_label(i, "Data {0}".format(i))
@@ -162,340 +162,203 @@ $(gui_hint()($win))</make>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+
   <sink>
     <name>in</name>
     <type>$type</type>
diff --git a/gr-qtgui/grc/qtgui_time_sink_x.xml 
b/gr-qtgui/grc/qtgui_time_sink_x.xml
index 57e1cc9..172da7a 100644
--- a/gr-qtgui/grc/qtgui_time_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_time_sink_x.xml
@@ -25,17 +25,33 @@ self.$(id).set_trigger_mode($tr_mode, $tr_slope, $tr_level, 
$tr_delay, $tr_chan,
 self.$(id).enable_autoscale($autoscale)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 widths = [$width1, $width2, $width3, $width4, $width5,
-          $width6, $width7, $width8, $width9]
+          $width6, $width7, $width8, $width9, $width10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 styles = [$style1, $style2, $style3, $style4, $style5,
-          $style6, $style7, $style8, $style9]
+          $style6, $style7, $style8, $style9, $style10]
 markers = [$marker1, $marker2, $marker3, $marker4, $marker5,
-           $marker6, $marker7, $marker8, $marker9]
+           $marker6, $marker7, $marker8, $marker9, $marker10]
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
-          $alpha6, $alpha7, $alpha8, $alpha9]
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
+
+#if($type() == "complex")
+for i in xrange(2*$nconnections):
+    if len(labels[i]) == 0:
+        if(i % 2 == 0):
+            self.$(id).set_line_label(i, "Re{{Data {0}}}".format(i/2))
+        else:
+            self.$(id).set_line_label(i, "Im{{Data {0}}}".format(i/2))
+    else:
+        self.$(id).set_line_label(i, labels[i])
+    self.$(id).set_line_width(i, widths[i])
+    self.$(id).set_line_color(i, colors[i])
+    self.$(id).set_line_style(i, styles[i])
+    self.$(id).set_line_marker(i, markers[i])
+    self.$(id).set_line_alpha(i, alphas[i])
+#else
 for i in xrange($nconnections):
     if len(labels[i]) == 0:
         self.$(id).set_line_label(i, "Data {0}".format(i))
@@ -46,6 +62,7 @@ for i in xrange($nconnections):
     self.$(id).set_line_style(i, styles[i])
     self.$(id).set_line_marker(i, markers[i])
     self.$(id).set_line_alpha(i, alphas[i])
+#end if
 
 self._$(id)_win = sip.wrapinstance(self.$(id).pyqwidget(), Qt.QWidget)
 $(gui_hint()($win))</make>
@@ -391,1245 +408,403 @@ $(gui_hint()($win))</make>
   </param>
 
 
+
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and 
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 2 Width</name>
     <key>width2</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and 
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"red"</value>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and 
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 2 Style</name>
     <key>style2</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and 
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 2 Marker</name>
     <key>marker2</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and 
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 2 or ($type() == "complex" and 
int($nconnections()) >= 1)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 3 Width</name>
     <key>width3</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"green"</value>
+    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 3 Style</name>
     <key>style3</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 3 Marker</name>
     <key>marker3</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 3 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 4 Width</name>
     <key>width4</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"black"</value>
+    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 4 Style</name>
     <key>style4</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 4 Marker</name>
     <key>marker4</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 4 or ($type() == "complex" and 
int($nconnections()) >= 2)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 5 Width</name>
     <key>width5</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"cyan"</value>
+    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 5 Style</name>
     <key>style5</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 5 Marker</name>
     <key>marker5</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 5 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 6 Width</name>
     <key>width6</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"magenta"</value>
+    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 6 Style</name>
     <key>style6</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 6 Marker</name>
     <key>marker6</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 6 or ($type() == "complex" and 
int($nconnections()) >= 3)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 7 Width</name>
     <key>width7</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"yellow"</value>
+    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 7 Style</name>
     <key>style7</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 7 Marker</name>
     <key>marker7</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 7 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 8 Width</name>
     <key>width8</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"dark red"</value>
+    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 8 Style</name>
     <key>style8</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 8 Marker</name>
     <key>marker8</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 8 or ($type() == "complex" and 
int($nconnections()) >= 4)) then 'part' else 'all'#</hide>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
-    <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>width1</base_key>
     <name>Line 9 Width</name>
     <key>width9</key>
-    <value>1</value>
-    <type>int</type>
-    <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Dark Green</name>
-      <key>"dark green"</key>
-    </option>
-    <option>
-      <name>Dark Blue</name>
-      <key>"Dark Blue"</key>
-    </option>
-    <option>
-      <name>Blue</name>
-      <key>"blue"</key>
-    </option>
-    <option>
-      <name>Red</name>
-      <key>"red"</key>
-    </option>
-    <option>
-      <name>Green</name>
-      <key>"green"</key>
-    </option>
-    <option>
-      <name>Black</name>
-      <key>"black"</key>
-    </option>
-    <option>
-      <name>Cyan</name>
-      <key>"cyan"</key>
-    </option>
-    <option>
-      <name>Magenta</name>
-      <key>"magenta"</key>
-    </option>
-    <option>
-      <name>Yellow</name>
-      <key>"yellow"</key>
-    </option>
-    <option>
-      <name>Dark Red</name>
-      <key>"dark red"</key>
-    </option>
-    <tab>Config</tab>
+    <value>"dark green"</value>
+    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>style1</base_key>
     <name>Line 9 Style</name>
     <key>style9</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Solid</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Dash</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Dots</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Dash-Dot</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Dash-Dot-Dot</name>
-      <key>5</key>
-    </option>
-    <option>
-      <name>None</name>
-      <key>0</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>marker1</base_key>
     <name>Line 9 Marker</name>
     <key>marker9</key>
-    <type>enum</type>
-    <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>None</name>
-      <key>-1</key>
-    </option>
-    <option>
-      <name>Circle</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>Rectangle</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Diamond</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Triangle</name>
-      <key>3</key>
-    </option>
-    <option>
-      <name>Down Triangle</name>
-      <key>4</key>
-    </option>
-    <option>
-      <name>Left Triangle</name>
-      <key>6</key>
-    </option>
-    <option>
-      <name>Right Triangle</name>
-      <key>7</key>
-    </option>
-    <option>
-      <name>Cross</name>
-      <key>8</key>
-    </option>
-    <option>
-      <name>X-Cross</name>
-      <key>9</key>
-    </option>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <value>1.0</value>
-    <type>float</type>
-    <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+    <hide>#if (int($nconnections()) >= 9 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
   </param>
 
+  <param>
+    <base_key>width1</base_key>
+    <name>Line 10 Width</name>
+    <key>width10</key>
+    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <value>"dark blue"</value>
+    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>style1</base_key>
+    <name>Line 10 Style</name>
+    <key>style10</key>
+    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>marker1</base_key>
+    <name>Line 10 Marker</name>
+    <key>marker10</key>
+    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if (int($nconnections()) >= 10 or ($type() == "complex" and 
int($nconnections()) >= 5)) then 'part' else 'all'#</hide>
+  </param>
+
+
   <check>$tr_chan &lt; 2*$nconnections</check>
 
   <sink>
diff --git a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml 
b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
index 0d71024..943aa9d 100644
--- a/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_waterfall_sink_x.xml
@@ -23,11 +23,11 @@ qtgui.$(type.fcn)(
 self.$(id).set_update_time($update_time)
 
 labels = [$label1, $label2, $label3, $label4, $label5,
-          $label6, $label7, $label8, $label9]
+          $label6, $label7, $label8, $label9, $label10]
 colors = [$color1, $color2, $color3, $color4, $color5,
-          $color6, $color7, $color8, $color9]
+          $color6, $color7, $color8, $color9, $color10]
 alphas = [$alpha1, $alpha2, $alpha3, $alpha4, $alpha5,
-          $alpha6, $alpha7, $alpha8, $alpha9]
+          $alpha6, $alpha7, $alpha8, $alpha9, $alpha10]
 for i in xrange($nconnections):
     if len(labels[i]) == 0:
         self.$(id).set_line_label(i, "Data {0}".format(i))
@@ -182,338 +182,200 @@ $(gui_hint()($win))</make>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 2 Label</name>
     <key>label2</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 2 Color</name>
     <key>color2</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 2 Alpha</name>
     <key>alpha2</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 2 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 3 Label</name>
     <key>label3</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 3 Color</name>
     <key>color3</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 3 Alpha</name>
     <key>alpha3</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 3 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 4 Label</name>
     <key>label4</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 4 Color</name>
     <key>color4</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 4 Alpha</name>
     <key>alpha4</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 4 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 5 Label</name>
     <key>label5</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 5 Color</name>
     <key>color5</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 5 Alpha</name>
     <key>alpha5</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 5 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 6 Label</name>
     <key>label6</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 6 Color</name>
     <key>color6</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 6 Alpha</name>
     <key>alpha6</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 6 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 7 Label</name>
     <key>label7</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 7 Color</name>
     <key>color7</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 7 Alpha</name>
     <key>alpha7</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 7 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 8 Label</name>
     <key>label8</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 8 Color</name>
     <key>color8</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 8 Alpha</name>
     <key>alpha8</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 8 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
 
   <param>
+    <base_key>label1</base_key>
     <name>Line 9 Label</name>
     <key>label9</key>
-    <type>string</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>color1</base_key>
     <name>Line 9 Color</name>
     <key>color9</key>
-    <type>enum</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <option>
-      <name>Multi Color</name>
-      <key>0</key>
-    </option>
-    <option>
-      <name>White Hot</name>
-      <key>1</key>
-    </option>
-    <option>
-      <name>Black Hot</name>
-      <key>2</key>
-    </option>
-    <option>
-      <name>Incandescent</name>
-      <key>3</key>
-    </option>
-    <tab>Config</tab>
   </param>
 
   <param>
+    <base_key>alpha1</base_key>
     <name>Line 9 Alpha</name>
     <key>alpha9</key>
-    <value>1.0</value>
-    <type>float</type>
     <hide>#if int($nconnections()) >= 9 then 'part' else 'all'#</hide>
-    <tab>Config</tab>
+  </param>
+
+
+  <param>
+    <base_key>label1</base_key>
+    <name>Line 10 Label</name>
+    <key>label10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>color1</base_key>
+    <name>Line 10 Color</name>
+    <key>color10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
+  </param>
+
+  <param>
+    <base_key>alpha1</base_key>
+    <name>Line 10 Alpha</name>
+    <key>alpha10</key>
+    <hide>#if int($nconnections()) >= 10 then 'part' else 'all'#</hide>
   </param>
 
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]