grc: work on generator for gui flowgraphs to simplify generation

generator does not differentiate between notebooks and controls,
they are all block, but block are now sorted by variables present in the make

also adjusted categories listed in the wx and qt widget related blocks

3 files changed, 3 insertions, 86 deletions

diff --git a/grc/blocks/Makefile.am b/grc/blocks/Makefile.am
index 40353a1fa..d9ec0896e 100644
--- a/grc/blocks/Makefile.am
+++ b/grc/blocks/Makefile.am
@@ -1,5 +1,5 @@
 #
-# Copyright 2008-2010 Free Software Foundation, Inc.
+# Copyright 2008-2011 Free Software Foundation, Inc.
 #
 # This file is part of GNU Radio
 #
@@ -197,7 +197,6 @@ dist_ourdata_DATA = \
 	import.xml \
 	low_pass_filter.xml \
 	note.xml \
-	notebook.xml \
 	options.xml \
 	pad_sink.xml \
 	pad_source.xml \
diff --git a/grc/blocks/block_tree.xml b/grc/blocks/block_tree.xml
index 782d6ca9b..50c463f55 100644
--- a/grc/blocks/block_tree.xml
+++ b/grc/blocks/block_tree.xml
@@ -39,17 +39,6 @@
 		<block>virtual_sink</block>
 	</cat>
 	<cat>
-		<name>Graphical Sinks</name>
-		<block>wxgui_numbersink2</block>
-		<block>wxgui_scopesink2</block>
-		<block>wxgui_fftsink2</block>
-		<block>wxgui_constellationsink2</block>
-		<block>wxgui_waterfallsink2</block>
-		<block>wxgui_histosink2</block>
-		<block>wxgui_termsink</block>
-		<block>qtgui_sink_x</block>
-	</cat>
-	<cat>
 		<name>Operators</name>
 		<block>gr_add_xx</block>
 		<block>gr_sub_xx</block>
@@ -139,7 +128,7 @@
 		<block>gr_pll_freqdet_cf</block>
 		<block>gr_pll_refout_cc</block>
 
-                <block>gr_fll_band_edge_cc</block>
+		<block>gr_fll_band_edge_cc</block>
 
 		<block>gr_correlate_access_code_bb</block>
 		<block>gr_pn_correlator_cc</block>
@@ -263,7 +252,7 @@
 		<block>gr_additive_scrambler_bb</block>
 	</cat>
 	<cat>
-	        <name>Vocoders</name>
+		<name>Vocoders</name>
 		<block>blks2_cvsd_encode</block>
 		<block>blks2_cvsd_decode</block>
 	</cat>
@@ -311,7 +300,5 @@
 
 		<block>xmlrpc_server</block>
 		<block>xmlrpc_client</block>
-
-		<block>notebook</block>
 	</cat>
 </cat>
diff --git a/grc/blocks/notebook.xml b/grc/blocks/notebook.xml
deleted file mode 100644
index d41db9e2d..000000000
--- a/grc/blocks/notebook.xml
+++ /dev/null
@@ -1,69 +0,0 @@
-<?xml version="1.0"?>
-<!--
-###################################################
-##WX GUI Notebook
-###################################################
- -->
-<block>
-	<name>Notebook</name>
-	<key>notebook</key>
-	<import>from grc_gnuradio import wxgui as grc_wxgui</import>
-	<make>#set $parent = $notebook() and 'self.%s.GetPage(%s)'%$notebook() or 'self'
-self.$(id) = wx.Notebook($(parent).GetWin(), style=$style)
-#for $label in $labels()
-self.$(id).AddPage(grc_wxgui.Panel(self.$(id)), "$label")
-#end for
-#if not $grid_pos()
-$(parent).Add(self.$(id))
-#else
-$(parent).GridAdd(self.$(id), $(', '.join(map(str, $grid_pos()))))
-#end if</make>
-	<param>
-		<name>Tab Orientation</name>
-		<key>style</key>
-		<value>wx.NB_TOP</value>
-		<type>enum</type>
-		<option>
-			<name>Top</name>
-			<key>wx.NB_TOP</key>
-		</option>
-		<option>
-			<name>Right</name>
-			<key>wx.NB_RIGHT</key>
-		</option>
-		<option>
-			<name>Bottom</name>
-			<key>wx.NB_BOTTOM</key>
-		</option>
-		<option>
-			<name>Left</name>
-			<key>wx.NB_LEFT</key>
-		</option>
-	</param>
-	<param>
-		<name>Labels</name>
-		<key>labels</key>
-		<value>['tab1', 'tab2', 'tab3']</value>
-		<type>raw</type>
-	</param>
-	<param>
-		<name>Grid Position</name>
-		<key>grid_pos</key>
-		<value></value>
-		<type>grid_pos</type>
-	</param>
-	<param>
-		<name>Notebook</name>
-		<key>notebook</key>
-		<value></value>
-		<type>notebook</type>
-	</param>
-	<check>isinstance($labels, (list, tuple))</check>
-	<check>all(map(lambda x: isinstance(x, str), $labels))</check>
-	<check>len($labels) &gt; 0</check>
-	<doc>
-Use the Grid Position (row, column, row span, column span) to position the graphical element in the window.
-
-Use the Notebook Param (notebook-id, page-index) to place the graphical element inside of a notebook page.
-	</doc>
-</block>