From 47f621a14c9a6e3696155dd5a223da40bcb7721c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sun, 27 Feb 2011 23:18:11 -0800
Subject: 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
---
 gr-qtgui/grc/qtgui_sink_x.xml           | 2 +-
 gr-qtgui/grc/qtgui_tab_widget.xml       | 3 ++-
 gr-qtgui/grc/qtgui_variable_chooser.xml | 6 +++---
 gr-qtgui/grc/qtgui_variable_slider.xml  | 2 +-
 4 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'gr-qtgui/grc')

diff --git a/gr-qtgui/grc/qtgui_sink_x.xml b/gr-qtgui/grc/qtgui_sink_x.xml
index 6e5c9549b..7a5f5ec13 100644
--- a/gr-qtgui/grc/qtgui_sink_x.xml
+++ b/gr-qtgui/grc/qtgui_sink_x.xml
@@ -7,7 +7,7 @@
 <block>
 	<name>QT GUI Sink</name>
 	<key>qtgui_sink_x</key>
-	<category>Graphical Sinks</category>
+	<category>QT GUI Widgets</category>
 	<import>from PyQt4 import Qt</import>
 	<import>from gnuradio.qtgui import qtgui</import>
 	<import>from gnuradio.gr import firdes</import>
diff --git a/gr-qtgui/grc/qtgui_tab_widget.xml b/gr-qtgui/grc/qtgui_tab_widget.xml
index 66597b454..3c4edfd35 100644
--- a/gr-qtgui/grc/qtgui_tab_widget.xml
+++ b/gr-qtgui/grc/qtgui_tab_widget.xml
@@ -7,9 +7,10 @@
 <block>
 	<name>QT GUI Tab Widget</name>
 	<key>qtgui_tab_widget</key>
+	<category>QT GUI Widgets</category>
 	<import>from PyQt4 import Qt</import>
 	<make>#set $win = 'self.%s'%$id
-$win = Qt.QTabWidget(None)
+Qt.QTabWidget(None)
 #for i, label in enumerate([$label0, $label1, $label2, $label3, $label4])
 #if int($num_tabs()) > $i
 self.$(id)_widget_$(i) = Qt.QWidget()
diff --git a/gr-qtgui/grc/qtgui_variable_chooser.xml b/gr-qtgui/grc/qtgui_variable_chooser.xml
index 46e302bc7..d9c9c8f3f 100644
--- a/gr-qtgui/grc/qtgui_variable_chooser.xml
+++ b/gr-qtgui/grc/qtgui_variable_chooser.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0"?>
 <!--
 ###################################################
-##Variable Slider:
-##	a combined slider and text box form
+##Variable Chooser:
+##	A chooser, radio buttons
 ###################################################
  -->
 <block>
 	<name>QT GUI Chooser</name>
 	<key>variable_qtgui_chooser</key>
-	<category>Variables</category>
+	<category>QT GUI Widgets</category>
 	<import>from PyQt4 import Qt</import>
 	<import>import PyQt4.Qwt5 as Qwt</import>
 	<var_make>self.$(id) = $(id) = $value</var_make>
diff --git a/gr-qtgui/grc/qtgui_variable_slider.xml b/gr-qtgui/grc/qtgui_variable_slider.xml
index 4eeb7a29b..68000fa2f 100644
--- a/gr-qtgui/grc/qtgui_variable_slider.xml
+++ b/gr-qtgui/grc/qtgui_variable_slider.xml
@@ -8,7 +8,7 @@
 <block>
 	<name>QT GUI Slider</name>
 	<key>variable_qtgui_slider</key>
-	<category>Variables</category>
+	<category>QT GUI Widgets</category>
 	<import>from PyQt4 import Qt</import>
 	<import>import PyQt4.Qwt5 as Qwt</import>
 	<var_make>self.$(id) = $(id) = $value</var_make>
-- 
cgit