diff options
| author | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 11:50:35 -0400 |
|---|---|---|
| committer | Tom Rondeau <trondeau@vt.edu> | 2013-04-04 12:37:40 -0400 |
| commit | 8b1303bbb0bf72569a5149082796f50b6e8f9a5b (patch) | |
| tree | 5809962a19338db21f28957535529552d12992a1 /gr-qtgui/grc | |
| parent | 2930f1b4265b794599d814e9a3d68fd03bde010f (diff) | |
docs: fixes for merge conflicts and differences between master/next.
Diffstat (limited to 'gr-qtgui/grc')
| -rw-r--r-- | gr-qtgui/grc/qtgui_block_tree.xml | 6 | ||||
| -rw-r--r-- | gr-qtgui/grc/qtgui_chooser.xml | 1 |
2 files changed, 3 insertions, 4 deletions
diff --git a/gr-qtgui/grc/qtgui_block_tree.xml b/gr-qtgui/grc/qtgui_block_tree.xml index 3eaaf49295..ac6eef7599 100644 --- a/gr-qtgui/grc/qtgui_block_tree.xml +++ b/gr-qtgui/grc/qtgui_block_tree.xml @@ -29,16 +29,16 @@ <cat> <name></name> <!-- Blank for Root Name --> <cat> - <name>QT GUI Sinks</name> - <block>qtgui_sink_x</block> + <name>Instrumentation/QT</name> <block>qtgui_freq_sink_x</block> <block>qtgui_time_sink_x</block> <block>qtgui_const_sink_x</block> <block>qtgui_waterfall_sink_x</block> <block>qtgui_time_raster_sink_x</block> + <block>qtgui_sink_x</block> </cat> <cat> - <name>QT GUI Widgets</name> + <name>GUI Widgets/QT</name> <block>qtgui_tab_widget</block> <block>variable_qtgui_range</block> <block>variable_qtgui_chooser</block> diff --git a/gr-qtgui/grc/qtgui_chooser.xml b/gr-qtgui/grc/qtgui_chooser.xml index 98c94b5e5b..6a8760cbe6 100644 --- a/gr-qtgui/grc/qtgui_chooser.xml +++ b/gr-qtgui/grc/qtgui_chooser.xml @@ -8,7 +8,6 @@ <block> <name>QT GUI Chooser</name> <key>variable_qtgui_chooser</key> - <category>GUI Widgets/QT</category> <import>from PyQt4 import Qt</import> <var_make>self.$(id) = $(id) = $value</var_make> <make>#slurp |