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/qtgui_label.xml | 65 ++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 gr-qtgui/grc/qtgui_label.xml

(limited to 'gr-qtgui/grc/qtgui_label.xml')

diff --git a/gr-qtgui/grc/qtgui_label.xml b/gr-qtgui/grc/qtgui_label.xml
new file mode 100644
index 000000000..90286d0b2
--- /dev/null
+++ b/gr-qtgui/grc/qtgui_label.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<!--
+###################################################
+##Variable Label Text:
+##	a gui static text form
+###################################################
+ -->
+<block>
+	<name>QT GUI Label</name>
+	<key>variable_qtgui_label</key>
+	<category>QT GUI Widgets</category>
+	<import>from PyQt4 import Qt</import>
+	<var_make>self.$(id) = $(id) = $value</var_make>
+	<make>#set $win = 'self._%s_tool_bar'%$id
+$win = Qt.QToolBar(self)
+#if not $label()
+	#set $label = '"%s"'%$id
+#end if
+$(win).addWidget(Qt.QLabel($label+" ", None))
+self._$(id)_label = Qt.QLabel(str(self.$id))
+self._$(id)_tool_bar.addWidget(self._$(id)_label)
+$(gui_hint()($win))</make>
+	<callback>self.set_$(id)($value)</callback>
+	<callback>self._$(id)_label.setText(str($id))</callback>
+	<param>
+		<name>Label</name>
+		<key>label</key>
+		<value></value>
+		<type>string</type>
+		<hide>#if $label() then 'none' else 'part'#</hide>
+	</param>
+	<param>
+		<name>Type</name>
+		<key>type</key>
+		<value>int</value>
+		<type>enum</type>
+		<hide>part</hide>
+		<option><name>Float</name><key>real</key><opt>conv:float</opt></option>
+		<option><name>Integer</name><key>int</key><opt>conv:int</opt></option>
+		<option><name>String</name><key>string</key><opt>conv:str</opt></option>
+		<option><name>Boolean</name><key>bool</key><opt>conv:bool</opt></option>
+		<option><name>Any</name><key>raw</key><opt>conv:eval</opt></option>
+	</param>
+	<param>
+		<name>Default Value</name>
+		<key>value</key>
+		<value>0</value>
+		<type>$type</type>
+	</param>
+	<param>
+		<name>GUI Hint</name>
+		<key>gui_hint</key>
+		<value></value>
+		<type>gui_hint</type>
+		<hide>part</hide>
+	</param>
+	<doc>
+This block creates a variable with a label widget for text. \
+Leave the label blank to use the variable id as the label.
+
+The GUI hint can be used to position the widget within the application. \
+The hint is of the form [tab_id@tab_index]: [row, col, row_span, col_span]. \
+Both the tab specification and the grid position are optional.
+	</doc>
+</block>
-- 
cgit 


From 47096a9ec323ad88c83afbaefa4686284449048c Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Wed, 2 Mar 2011 22:13:11 -0800
Subject: qtgui-grc: add engineering notation to entry and label + other tweaks

---
 gr-qtgui/grc/qtgui_label.xml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

(limited to 'gr-qtgui/grc/qtgui_label.xml')

diff --git a/gr-qtgui/grc/qtgui_label.xml b/gr-qtgui/grc/qtgui_label.xml
index 90286d0b2..96354688e 100644
--- a/gr-qtgui/grc/qtgui_label.xml
+++ b/gr-qtgui/grc/qtgui_label.xml
@@ -10,18 +10,19 @@
 	<key>variable_qtgui_label</key>
 	<category>QT GUI Widgets</category>
 	<import>from PyQt4 import Qt</import>
+	<import>from gnuradio import eng_notation</import>
 	<var_make>self.$(id) = $(id) = $value</var_make>
 	<make>#set $win = 'self._%s_tool_bar'%$id
 $win = Qt.QToolBar(self)
 #if not $label()
 	#set $label = '"%s"'%$id
 #end if
-$(win).addWidget(Qt.QLabel($label+" ", None))
+$(win).addWidget(Qt.QLabel($label+": ", None))
 self._$(id)_label = Qt.QLabel(str(self.$id))
 self._$(id)_tool_bar.addWidget(self._$(id)_label)
 $(gui_hint()($win))</make>
 	<callback>self.set_$(id)($value)</callback>
-	<callback>self._$(id)_label.setText(str($id))</callback>
+	<callback>self._$(id)_label.setText($(type.str)($id))</callback>
 	<param>
 		<name>Label</name>
 		<key>label</key>
@@ -35,11 +36,11 @@ $(gui_hint()($win))</make>
 		<value>int</value>
 		<type>enum</type>
 		<hide>part</hide>
-		<option><name>Float</name><key>real</key><opt>conv:float</opt></option>
-		<option><name>Integer</name><key>int</key><opt>conv:int</opt></option>
-		<option><name>String</name><key>string</key><opt>conv:str</opt></option>
-		<option><name>Boolean</name><key>bool</key><opt>conv:bool</opt></option>
-		<option><name>Any</name><key>raw</key><opt>conv:eval</opt></option>
+		<option><name>Float</name><key>real</key><opt>conv:eng_notation.str_to_num</opt><opt>str:eng_notation.num_to_str</opt></option>
+		<option><name>Integer</name><key>int</key><opt>conv:int</opt><opt>str:str</opt></option>
+		<option><name>String</name><key>string</key><opt>conv:str</opt><opt>str:str</opt></option>
+		<option><name>Boolean</name><key>bool</key><opt>conv:bool</opt><opt>str:str</opt></option>
+		<option><name>Any</name><key>raw</key><opt>conv:eval</opt><opt>str:repr</opt></option>
 	</param>
 	<param>
 		<name>Default Value</name>
-- 
cgit 


From 9121b75d68a0c90deee814edffe387480b52019b Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Mon, 7 Mar 2011 18:40:57 -0800
Subject: qtgui-grc: minor tweaks to the various things

---
 gr-qtgui/grc/qtgui_label.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'gr-qtgui/grc/qtgui_label.xml')

diff --git a/gr-qtgui/grc/qtgui_label.xml b/gr-qtgui/grc/qtgui_label.xml
index 96354688e..5049118c4 100644
--- a/gr-qtgui/grc/qtgui_label.xml
+++ b/gr-qtgui/grc/qtgui_label.xml
@@ -17,7 +17,7 @@ $win = Qt.QToolBar(self)
 #if not $label()
 	#set $label = '"%s"'%$id
 #end if
-$(win).addWidget(Qt.QLabel($label+": ", None))
+$(win).addWidget(Qt.QLabel($label+": "))
 self._$(id)_label = Qt.QLabel(str(self.$id))
 self._$(id)_tool_bar.addWidget(self._$(id)_label)
 $(gui_hint()($win))</make>
-- 
cgit