Merge remote branch 'jblum/mergeme/qtgui/grc' into next

* jblum/mergeme/qtgui/grc: (27 commits)
  qtgui: removed python directory that was added, never used
  qtgui-grc: added suport in main template for theme icon
  qtgui-grc: minor tweaks to the various things
  qtgui-grc: added read-only thermo widget to range block
  qtgui-grc: fix for list option working in chooser block
  qtgui-grc: added check for pyqwt in config
  grc: added function args to probe block and documentation
  grc: rework the probe blocks and how they fit into grc
  qtgui-grc: moved slider to range, added knob and gui tweaks
  qtgui-grc: use a vboxlayout for the top_layout
  qtgui-grc: made slider widget components (counter/slider) optional
  qtgui-grc: add engineering notation to entry and label + other tweaks
  qtgui-grc: enable start/stop control through qt widgets
  qtgui-grc: rename the text entry and label blocks
  grc-qtgui: creaded check box widget with qtgui, cleanup label code
  grc-qtgui: added variable text box and static text widgets
  grc-qtgui: pick correct signal overload for variable chooser
  grc-qtgui: added radio button support, tweaks, more options
  grc-qtgui: work on variable chooser block
  grc: work on generator for gui flowgraphs to simplify generation
  ...

1 files changed, 7 insertions, 34 deletions

diff --git a/grc/blocks/gr_probe_mpsk_snr_c.xml b/grc/blocks/gr_probe_mpsk_snr_c.xml
index 7f562d2f3..5687e867d 100644
--- a/grc/blocks/gr_probe_mpsk_snr_c.xml
+++ b/grc/blocks/gr_probe_mpsk_snr_c.xml
@@ -7,49 +7,22 @@
 <block>
 	<name>Probe MPSK SNR</name>
 	<key>gr_probe_mpsk_snr_c</key>
-	<import>from grc_gnuradio import blks2 as grc_blks2</import>
-	<make>grc_blks2.probe_mpsk_snr_c(
-	type='$type',
-	alpha=$alpha,
-	probe_rate=$probe_rate,
-)</make>
+	<import>from gnuradio import gr</import>
+	<make>gr.probe_mpsk_snr_c($alpha)</make>
 	<callback>set_alpha($alpha)</callback>
-	<callback>set_probe_rate($probe_rate)</callback>
-	<param>
-		<name>Type</name>
-		<key>type</key>
-		<type>enum</type>
-		<option>
-			<name>SNR</name>
-			<key>snr</key>
-		</option>
-		<option>
-			<name>Signal Mean</name>
-			<key>signal_mean</key>
-		</option>
-		<option>
-			<name>Noise Variance</name>
-			<key>noise_variance</key>
-		</option>
-	</param>
 	<param>
 		<name>Alpha</name>
 		<key>alpha</key>
 		<value>1</value>
 		<type>real</type>
 	</param>
-	<param>
-		<name>Probe Rate</name>
-		<key>probe_rate</key>
-		<value>10</value>
-		<type>real</type>
-	</param>
 	<sink>
 		<name>in</name>
 		<type>complex</type>
 	</sink>
-	<source>
-		<name>out</name>
-		<type>float</type>
-	</source>
+	<doc>
+Available functions to probe: signal_mean(), noise_variance()
+
+Use with the function probe block.
+	</doc>
 </block>