From 51af4269d3eebd3d611be918f8c799c96c650496 Mon Sep 17 00:00:00 2001
From: jblum
Date: Sat, 13 Jun 2009 21:26:25 +0000
Subject: Merged wxgui/forms branch r11124:11183

The forms module is set of wxgui forms wrapped in pubsub aware convenience classes.
The forms module will be used by the wxgui window classes (fft, scope, waterfall...)
The forms module will be used in grc generated flowgraphs.
The forms module will be used by future gui apps (usrp siggen...).

Tasks:
Moved forms module into wxgui.
Modified *_window classes to use the forms module.
Added features to forms as required.
Removed pubsub aware forms in common.py.
Switched grc to use the forms module in wxgui.



git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@11184 221aa14e-8319-0410-a670-987f0aec2ac5
---
 grc/data/platforms/python/blocks/variable_chooser.xml  | 2 +-
 grc/data/platforms/python/blocks/variable_slider.xml   | 2 +-
 grc/data/platforms/python/blocks/variable_text_box.xml | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'grc/data/platforms/python/blocks')

diff --git a/grc/data/platforms/python/blocks/variable_chooser.xml b/grc/data/platforms/python/blocks/variable_chooser.xml
index 6827c3675..3ca33045a 100644
--- a/grc/data/platforms/python/blocks/variable_chooser.xml
+++ b/grc/data/platforms/python/blocks/variable_chooser.xml
@@ -9,7 +9,7 @@
 <block>
 	<name>Variable Chooser</name>
 	<key>variable_chooser</key>
-	<import>from grc_gnuradio.wxgui import forms</import>
+	<import>from gnuradio.wxgui import forms</import>
 	<make>$value
 self['$id'] = $id
 self.subscribe('$id', self.set_$(id))
diff --git a/grc/data/platforms/python/blocks/variable_slider.xml b/grc/data/platforms/python/blocks/variable_slider.xml
index 9c8e7ece9..f8a5543f0 100644
--- a/grc/data/platforms/python/blocks/variable_slider.xml
+++ b/grc/data/platforms/python/blocks/variable_slider.xml
@@ -8,7 +8,7 @@
 <block>
 	<name>Variable Slider</name>
 	<key>variable_slider</key>
-	<import>from grc_gnuradio.wxgui import forms</import>
+	<import>from gnuradio.wxgui import forms</import>
 	<make>$value
 self['$id'] = $id
 self.subscribe('$id', self.set_$(id))
diff --git a/grc/data/platforms/python/blocks/variable_text_box.xml b/grc/data/platforms/python/blocks/variable_text_box.xml
index 2857fa366..b5acd9d2e 100644
--- a/grc/data/platforms/python/blocks/variable_text_box.xml
+++ b/grc/data/platforms/python/blocks/variable_text_box.xml
@@ -8,7 +8,7 @@
 <block>
 	<name>Variable Text Box</name>
 	<key>variable_text_box</key>
-	<import>from grc_gnuradio.wxgui import forms</import>
+	<import>from gnuradio.wxgui import forms</import>
 	<make>$value
 self['$id'] = $id
 self.subscribe('$id', self.set_$(id))
-- 
cgit