From 9ae8997e5f682bc16e58c0a0bba21794dbd705c5 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Mon, 6 Dec 2010 22:46:39 -0500 Subject: qtgui: created a forms module with a slider and text box, implemented in grc --- gr-qtgui/grc/Makefile.am | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 gr-qtgui/grc/Makefile.am (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am new file mode 100644 index 000000000..226e9d137 --- /dev/null +++ b/gr-qtgui/grc/Makefile.am @@ -0,0 +1,28 @@ +# +# Copyright 2010 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 = \ + qtgui_sink_x.xml \ + qtgui_variable_slider.xml -- cgit From e30f0a7ca02801732ad7a25ab83e1d27dc45c6ce Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Thu, 20 Jan 2011 22:31:31 -0800 Subject: grc: added tabbed widget in qtgui for grc created gui_hint type to handle tab descriptor + position markup, and to handle the generation of the name of the parent widget. No support python modules required in gr-qtgui. --- gr-qtgui/grc/Makefile.am | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am index 226e9d137..132d1a2e0 100644 --- a/gr-qtgui/grc/Makefile.am +++ b/gr-qtgui/grc/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright 2010 Free Software Foundation, Inc. +# Copyright 2010-2011 Free Software Foundation, Inc. # # This file is part of GNU Radio # @@ -25,4 +25,5 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ qtgui_sink_x.xml \ + qtgui_tab_widget.xml \ qtgui_variable_slider.xml -- cgit From 2c263e9640f2812b241d724286aaa1f13c57935f Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Fri, 21 Jan 2011 14:33:27 -0800 Subject: qtgui: work on variable chooser --- gr-qtgui/grc/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am index 132d1a2e0..e69d3a9af 100644 --- a/gr-qtgui/grc/Makefile.am +++ b/gr-qtgui/grc/Makefile.am @@ -26,4 +26,5 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ qtgui_sink_x.xml \ qtgui_tab_widget.xml \ + qtgui_variable_chooser.xml \ qtgui_variable_slider.xml -- cgit From 931332448227a6b509a9b39bb68044fa55d8b1cb Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 1 Mar 2011 00:32:55 -0800 Subject: grc-qtgui: added variable text box and static text widgets --- gr-qtgui/grc/Makefile.am | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am index e69d3a9af..1153fc976 100644 --- a/gr-qtgui/grc/Makefile.am +++ b/gr-qtgui/grc/Makefile.am @@ -25,6 +25,8 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ qtgui_sink_x.xml \ + qtgui_static_text.xml \ qtgui_tab_widget.xml \ - qtgui_variable_chooser.xml \ - qtgui_variable_slider.xml + qtgui_text_box.xml \ + qtgui_chooser.xml \ + qtgui_slider.xml -- cgit From a09e0096cf717c137126cd5fb721c0331a1a8df6 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 1 Mar 2011 13:03:36 -0800 Subject: grc-qtgui: creaded check box widget with qtgui, cleanup label code --- gr-qtgui/grc/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am index 1153fc976..23e01a2c6 100644 --- a/gr-qtgui/grc/Makefile.am +++ b/gr-qtgui/grc/Makefile.am @@ -24,6 +24,7 @@ include $(top_srcdir)/Makefile.common grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ + qtgui_check_box.xml \ qtgui_sink_x.xml \ qtgui_static_text.xml \ qtgui_tab_widget.xml \ -- cgit From fb5d1b80dc97bf940079b5a4b3b3f35002cc60aa Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Tue, 1 Mar 2011 18:05:34 -0800 Subject: qtgui-grc: rename the text entry and label blocks --- gr-qtgui/grc/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am index 23e01a2c6..3045a8779 100644 --- a/gr-qtgui/grc/Makefile.am +++ b/gr-qtgui/grc/Makefile.am @@ -25,9 +25,9 @@ grcblocksdir = $(grc_blocksdir) dist_grcblocks_DATA = \ qtgui_check_box.xml \ + qtgui_entry.xml \ + qtgui_label.xml \ qtgui_sink_x.xml \ - qtgui_static_text.xml \ qtgui_tab_widget.xml \ - qtgui_text_box.xml \ qtgui_chooser.xml \ qtgui_slider.xml -- cgit From 19c0865b4b6c94f86679151e9f52c99331b1f0b9 Mon Sep 17 00:00:00 2001 From: Josh Blum Date: Sat, 5 Mar 2011 20:37:40 -0800 Subject: qtgui-grc: moved slider to range, added knob and gui tweaks --- gr-qtgui/grc/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gr-qtgui/grc/Makefile.am') diff --git a/gr-qtgui/grc/Makefile.am b/gr-qtgui/grc/Makefile.am index 3045a8779..b3114268c 100644 --- a/gr-qtgui/grc/Makefile.am +++ b/gr-qtgui/grc/Makefile.am @@ -27,7 +27,7 @@ dist_grcblocks_DATA = \ qtgui_check_box.xml \ qtgui_entry.xml \ qtgui_label.xml \ + qtgui_range.xml \ qtgui_sink_x.xml \ qtgui_tab_widget.xml \ - qtgui_chooser.xml \ - qtgui_slider.xml + qtgui_chooser.xml -- cgit