X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fbinding.cpp;h=3a6c73fb09afbdc162e181d54b7718c62d45be5b;hb=1d7edbbdee97217630fed14cc39883d715633f26;hp=3c9bba5aee16483c14596def207d5ca6d0b0249b;hpb=8481fbdf89e8f26a0d5ef0b69e32d25be5e2f6e4;p=pulseview.git

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 3c9bba5..3a6c73f 100644
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -26,7 +26,7 @@
 
 #include "binding.h"
 
-using namespace boost;
+using boost::shared_ptr;
 
 namespace pv {
 namespace prop {
@@ -45,22 +45,50 @@ void Binding::commit()
 	}
 }
 
-QWidget* Binding::get_property_form(QWidget *parent) const
+void Binding::add_properties_to_form(QFormLayout *layout,
+	bool auto_commit) const
 {
-	QWidget *const form = new QWidget(parent);
-	QFormLayout *const layout = new QFormLayout(form);
-	form->setLayout(layout);
+	assert(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(form));
+
+		QWidget *const widget = p->get_widget(layout->parentWidget(),
+			auto_commit);
+		if (p->labeled_widget())
+			layout->addRow(widget);
+		else
+			layout->addRow(p->name(), widget);
 	}
+}
 
+QWidget* Binding::get_property_form(QWidget *parent,
+	bool auto_commit) const
+{
+	QWidget *const form = new QWidget(parent);
+	QFormLayout *const layout = new QFormLayout(form);
+	form->setLayout(layout);
+	add_properties_to_form(layout, auto_commit);
 	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