7 files changed, 12 insertions, 16 deletions
diff --git a/gr-qtgui/grc/qtgui_check_box.block.yml b/gr-qtgui/grc/qtgui_check_box.block.yml
index a921a2bbca..a40d7f233e 100644
--- a/gr-qtgui/grc/qtgui_check_box.block.yml
+++ b/gr-qtgui/grc/qtgui_check_box.block.yml
@@ -48,7 +48,7 @@ templates:
         <%
             win = '_%s_check_box'%id
         %>
-        ${win} = Qt.QCheckBox(${(label if (len(label) - 2 > 0) else repr(id))})
+        ${win} = Qt.QCheckBox("${no_quotes(label,repr(id))}")
         self._${id}_choices = {True: ${true}, False: ${false}}
         self._${id}_choices_inv = dict((v,k) for k,v in self._${id}_choices.items())
         self._${id}_callback = lambda i: Qt.QMetaObject.invokeMethod(${win}, "setChecked", Qt.Q_ARG("bool", self._${id}_choices_inv[i]))
@@ -69,7 +69,7 @@ cpp_templates:
       <%
           win = '_%s'%id
       %>
-      ${win} = new QCheckBox("${(label.strip("'") if (len(label) - 2 > 0) else repr(id))}");
+      ${win} = new QCheckBox("${no_quotes(label,repr(id))}");
       if ( ${value} == ${true} ) {
           ${win}->setCheckState(Qt::Checked);
       }
diff --git a/gr-qtgui/grc/qtgui_chooser.block.yml b/gr-qtgui/grc/qtgui_chooser.block.yml
index a939454682..4589bcef97 100644
--- a/gr-qtgui/grc/qtgui_chooser.block.yml
+++ b/gr-qtgui/grc/qtgui_chooser.block.yml
@@ -150,11 +150,7 @@ templates:
             win = 'self._%s_tool_bar'%id
         %>\
         ${win} = Qt.QToolBar(self)
-        % if len(label) - 2 > 0:
-        ${win}.addWidget(Qt.QLabel(${label} + ": "))
-        % else:
-        ${win}.addWidget(Qt.QLabel("${id}: "))
-        % endif
+        ${win}.addWidget(Qt.QLabel("${no_quotes(label,repr(id))}" + ": "))
         self._${id}_combo_box = Qt.QComboBox()
         ${win}.addWidget(self._${id}_combo_box)
         for _label in self._${id}_labels: self._${id}_combo_box.addItem(_label)
@@ -168,7 +164,7 @@ templates:
         <%
             win = 'self._%s_group_box'%id
         %>\
-        ${win} = Qt.QGroupBox(${(label if (len(label) - 2 > 0) else repr(id))} + ": ")
+        ${win} = Qt.QGroupBox("${no_quotes(label,repr(id))}" + ": ")
         self._${id}_box = ${orient}()
         class variable_chooser_button_group(Qt.QButtonGroup):
             def __init__(self, parent=None):
diff --git a/gr-qtgui/grc/qtgui_entry.block.yml b/gr-qtgui/grc/qtgui_entry.block.yml
index 56352441de..56a89e8572 100644
--- a/gr-qtgui/grc/qtgui_entry.block.yml
+++ b/gr-qtgui/grc/qtgui_entry.block.yml
@@ -41,7 +41,7 @@ templates:
             win = 'self._%s_tool_bar'%id
         %>
         ${win} = Qt.QToolBar(self)
-        ${win}.addWidget(Qt.QLabel(${(label if (len(label) - 2 > 0) else repr(id))} + ": "))
+        ${win}.addWidget(Qt.QLabel("${no_quotes(label,repr(id))}" + ": "))
         self._${id}_line_edit = Qt.QLineEdit(str(self.${id}))
         self._${id}_tool_bar.addWidget(self._${id}_line_edit)
         self._${id}_line_edit.returnPressed.connect(
@@ -65,7 +65,7 @@ cpp_templates:
             win = 'this->_%s_tool_bar'%id
         %>
         this->_${id}_tool_bar = new QToolBar();
-        this->_${id}_label = new QLabel(QString::fromStdString(std::string("${label.strip("'")}")+ std::string(":")));
+        this->_${id}_label = new QLabel(QString::fromStdString(std::string("${no_quotes(label,repr(id))}")+ std::string(": ")));
         this->_${id}_tool_bar->addWidget(_${id}_label);
         this->_${id}_line_edit = new QLineEdit(QString::number(this->${id}));
         this->_${id}_tool_bar->addWidget(this->_${id}_line_edit);
diff --git a/gr-qtgui/grc/qtgui_label.block.yml b/gr-qtgui/grc/qtgui_label.block.yml
index f8f947bcd2..e72d9f2d47 100644
--- a/gr-qtgui/grc/qtgui_label.block.yml
+++ b/gr-qtgui/grc/qtgui_label.block.yml
@@ -52,7 +52,7 @@ templates:
         else:
             self._${id}_formatter = lambda x: ${type.str}(x)
 
-        ${win}.addWidget(Qt.QLabel(${(label if (len(label) - 2 > 0) else repr(id))}))
+        ${win}.addWidget(Qt.QLabel("${no_quotes(label,repr(id))}"))
         self._${id}_label = Qt.QLabel(str(self._${id}_formatter(self.${id})))
         self._${id}_tool_bar.addWidget(self._${id}_label)
         ${gui_hint() % win}
@@ -63,14 +63,14 @@ cpp_templates:
     var_make: ${id} = ${value};
     callbacks:
     - set_${id}(${value})
-    - QMetaObject::invokeMethod(this->_${id}_label, "setText", Q_ARG(QString, QString("${label.strip("'")}\%1").arg(${id})))
+    - QMetaObject::invokeMethod(this->_${id}_label, "setText", Q_ARG(QString, QString("${no_quotes(label)}\%1").arg(${id})))
     link: ['gnuradio::gnuradio-qtgui']
     make: |-
         <%
             win = 'this->_%s_label'%id
         %>\
         // Todo: use formatter
-        this->_${id}_label = new QLabel(QString("${(label.strip("'") if (len(label) - 2 > 0) else repr(id))}") +QString(": ") + QString("%1").arg(${value}));
+        this->_${id}_label = new QLabel(QString("${no_quotes(label,repr(id))}") +QString(": ") + QString("%1").arg(${value}));
 
         ${gui_hint() % win}
 
diff --git a/gr-qtgui/grc/qtgui_msgcheckbox.block.yml b/gr-qtgui/grc/qtgui_msgcheckbox.block.yml
index 34f6d6dc97..c31afc2f81 100644
--- a/gr-qtgui/grc/qtgui_msgcheckbox.block.yml
+++ b/gr-qtgui/grc/qtgui_msgcheckbox.block.yml
@@ -72,7 +72,7 @@ templates:
         %>\
         self._${id}_choices = {'Pressed': ${pressed}, 'Released': ${released}}
         	
-        ${win} = qtgui.MsgCheckBox(${ 'self.set_' + context.get('id')() }, ${(label if (len(label) - 2 > 0) else repr(id))}, self._${id}_choices, ${initPressed}, ${cellalignment}, ${verticalalignment},"${outputmsgname}".replace("'",""))
+        ${win} = qtgui.MsgCheckBox(${ 'self.set_' + context.get('id')() }, '${no_quotes(label,repr(id))}', self._${id}_choices, ${initPressed}, ${cellalignment}, ${verticalalignment},"${outputmsgname}".replace("'",""))
         self.${id} = ${win}
 
         ${gui_hint() % win}
diff --git a/gr-qtgui/grc/qtgui_range.block.yml b/gr-qtgui/grc/qtgui_range.block.yml
index 7cbf287d90..34e3317cd4 100644
--- a/gr-qtgui/grc/qtgui_range.block.yml
+++ b/gr-qtgui/grc/qtgui_range.block.yml
@@ -76,7 +76,7 @@ templates:
             range = 'self._%s_range'%id
         %>\
         ${range} = Range(${start}, ${stop}, ${step}, ${value}, ${min_len})
-        ${win} = RangeWidget(${range}, self.set_${id}, ${(label if (len(label) - 2 > 0) else repr(id))}, "${widget}", ${rangeType}, ${orient})
+        ${win} = RangeWidget(${range}, self.set_${id}, "${no_quotes(label,repr(id))}", "${widget}", ${rangeType}, ${orient})
         ${gui_hint() % win}
 
 documentation: |-
diff --git a/gr-qtgui/grc/qtgui_tab_widget.block.yml b/gr-qtgui/grc/qtgui_tab_widget.block.yml
index 5043128803..e83ebe516f 100644
--- a/gr-qtgui/grc/qtgui_tab_widget.block.yml
+++ b/gr-qtgui/grc/qtgui_tab_widget.block.yml
@@ -152,7 +152,7 @@ cpp_templates:
     QBoxLayout* ${id}_layout_${i} =new QBoxLayout(QBoxLayout::TopToBottom,${id}_widget_${i});
     QGridLayout* ${id}_grid_layout_${i} = new QGridLayout();
     ${id}_layout_${i}->addLayout(${id}_grid_layout_${i});
-    ${win}->addTab(${id}_widget_${i},"${label.strip("'")}");
+    ${win}->addTab(${id}_widget_${i},"${no_quotes(label)}");
     % endfor
     ${gui_hint() % win}