X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fbinding.cpp;h=3a6c73fb09afbdc162e181d54b7718c62d45be5b;hb=5b1994c45194a95069dfcadf637723f3db8249da;hp=90e5214e86c08dad3eb208c5b3ccf873e609662a;hpb=819f4c25391a9c74d3d2f528d462142d5c4aad4d;p=pulseview.git

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 90e5214e..3a6c73fb 100644
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -53,9 +53,13 @@ void Binding::add_properties_to_form(QFormLayout *layout,
 	BOOST_FOREACH(shared_ptr<pv::prop::Property> p, _properties)
 	{
 		assert(p);
-		const QString label = p->labeled_widget() ? QString() : p->name();
-		layout->addRow(label, p->get_widget(layout->parentWidget(),
-			auto_commit));
+
+		QWidget *const widget = p->get_widget(layout->parentWidget(),
+			auto_commit);
+		if (p->labeled_widget())
+			layout->addRow(widget);
+		else
+			layout->addRow(p->name(), widget);
 	}
 }
 
@@ -69,6 +73,22 @@ QWidget* Binding::get_property_form(QWidget *parent,
 	return form;
 }
 
+QString Binding::print_gvariant(GVariant *const gvar)
+{
+	QString s;
+
+	if (g_variant_is_of_type(gvar, G_VARIANT_TYPE("s")))
+		s = QString::fromUtf8(g_variant_get_string(gvar, NULL));
+	else
+	{
+		gchar *const text = g_variant_print(gvar, FALSE);
+		s = QString::fromUtf8(text);
+		g_free(text);
+	}
+
+	return s;
+}
+
 } // binding
 } // prop
 } // pv