From f0537a7da4571bd6aaab273a0588eaef04121648 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Fri, 21 Jan 2011 15:20:45 -0800
Subject: grc: moved wxgui blocks and python into gr-wxgui/grc

Prefixed wxgui blocks with WX GUI in the block names.
Added category to wxgui variables blocks (not in the main block tree.xml)
---
 gr-wxgui/grc/Makefile.am | 44 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 gr-wxgui/grc/Makefile.am

(limited to 'gr-wxgui/grc/Makefile.am')

diff --git a/gr-wxgui/grc/Makefile.am b/gr-wxgui/grc/Makefile.am
new file mode 100644
index 000000000..26217077a
--- /dev/null
+++ b/gr-wxgui/grc/Makefile.am
@@ -0,0 +1,44 @@
+#
+# Copyright 2011 Free Software Foundation, Inc.
+# 
+# This file is part of GNU Radio
+# 
+# GNU Radio is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3, or (at your option)
+# any later version.
+# 
+# GNU Radio is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# 
+# You should have received a copy of the GNU General Public License
+# along with GNU Radio; see the file COPYING.  If not, write to
+# the Free Software Foundation, Inc., 51 Franklin Street,
+# Boston, MA 02110-1301, USA.
+#
+
+include $(top_srcdir)/Makefile.common
+
+grcblocksdir = $(grc_blocksdir)
+dist_grcblocks_DATA = \
+	variable_check_box.xml \
+	variable_chooser.xml \
+	variable_slider.xml \
+	variable_static_text.xml \
+	variable_text_box.xml \
+	wxgui_constellationsink2.xml \
+	wxgui_fftsink2.xml \
+	wxgui_histosink2.xml \
+	wxgui_numbersink2.xml \
+	wxgui_scopesink2.xml \
+	wxgui_termsink.xml \
+	wxgui_waterfallsink2.xml
+
+#The wxgui module contains a top_block + wxgui frame.
+wxgui_pythondir = $(pythondir)/grc_gnuradio/wxgui
+wxgui_python_PYTHON = \
+	__init__.py \
+	panel.py \
+	top_block_gui.py
-- 
cgit 


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-wxgui/grc/Makefile.am | 1 +
 1 file changed, 1 insertion(+)

(limited to 'gr-wxgui/grc/Makefile.am')

diff --git a/gr-wxgui/grc/Makefile.am b/gr-wxgui/grc/Makefile.am
index 26217077a..d8c7b3471 100644
--- a/gr-wxgui/grc/Makefile.am
+++ b/gr-wxgui/grc/Makefile.am
@@ -23,6 +23,7 @@ include $(top_srcdir)/Makefile.common
 
 grcblocksdir = $(grc_blocksdir)
 dist_grcblocks_DATA = \
+	notebook.xml \
 	variable_check_box.xml \
 	variable_chooser.xml \
 	variable_slider.xml \
-- 
cgit