X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbinding%2Fbinding.cpp;h=062ce6676a34fbb2d6b218b9c358ba9e061f10af;hp=5d411686f4a820f8ea686e191091f1b6d8c5500b;hb=c1035a1452fa2aec5414975e83e531c10504b80c;hpb=9ba4ca3540ace02b1b5439ec2f4584f82f2aca77

diff --git a/pv/prop/binding/binding.cpp b/pv/prop/binding/binding.cpp
index 5d41168..062ce66 100644
--- a/pv/prop/binding/binding.cpp
+++ b/pv/prop/binding/binding.cpp
@@ -18,51 +18,75 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */
 
-#include <QFormLayout>
-#include <QWidget>
+#include <cassert>
 
-#include <boost/foreach.hpp>
+#include <QFormLayout>
 
-#include "binding.h"
+#include <pv/prop/property.hpp>
 
-#include <pv/prop/property.h>
+#include "binding.hpp"
 
-using namespace boost;
+using std::shared_ptr;
 
 namespace pv {
 namespace prop {
 namespace binding {
 
-Binding::Binding() :
-	_form(NULL)
+const std::vector< std::shared_ptr<Property> >& Binding::properties()
 {
+	return properties_;
 }
 
-QWidget* Binding::get_form(QWidget *parent)
+void Binding::commit()
 {
-	if (_form)
-		return _form;
+	for (shared_ptr<pv::prop::Property> p : properties_) {
+		assert(p);
+		p->commit();
+	}
+}
 
-	_form = new QWidget(parent);
-	QFormLayout *const layout = new QFormLayout(_form);
-	_form->setLayout(layout);
+void Binding::add_properties_to_form(QFormLayout *layout,
+	bool auto_commit) const
+{
+	assert(layout);
 
-	BOOST_FOREACH(shared_ptr<Property> p, _properties)
+	for (shared_ptr<pv::prop::Property> p : properties_)
 	{
 		assert(p);
-		layout->addRow(p->name(), 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);
 	}
+}
 
-	return _form;
+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;
 }
 
-void Binding::commit()
+QString Binding::print_gvariant(Glib::VariantBase gvar)
 {
-	BOOST_FOREACH(shared_ptr<Property> p, _properties)
-	{
-		assert(p);
-		p->commit();
-	}
+	QString s;
+
+	if (!gvar.gobj())
+		s = QString::fromStdString("(null)");
+	else if (gvar.is_of_type(Glib::VariantType("s")))
+		s = QString::fromStdString(
+			Glib::VariantBase::cast_dynamic<Glib::Variant<std::string>>(
+				gvar).get());
+	else
+		s = QString::fromStdString(gvar.print());
+
+	return s;
 }
 
 } // binding