X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=03524344048d5ca27e4a06b3a7f72f3f17e18fd6;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=a222c70bab490b2db8837a97f2ddb1efc59473a1;hpb=9ba4ca3540ace02b1b5439ec2f4584f82f2aca77;p=pulseview.git

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index a222c70..0352434 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,34 +24,48 @@
 
 #include "enum.h"
 
-using namespace std;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace prop {
 
 Enum::Enum(QString name,
-	std::vector<std::pair<const void*, QString> > values,
-	boost::function<const void* ()> getter,
-	boost::function<void (const void*)> setter) :
-	Property(name),
+	vector<pair<Glib::VariantBase, QString> > values,
+	Getter getter, Setter setter) :
+	Property(name, getter, setter),
 	_values(values),
-	_getter(getter),
-	_setter(setter),
 	_selector(NULL)
 {
 }
 
-QWidget* Enum::get_widget(QWidget *parent)
+Enum::~Enum()
+{
+}
+
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
 	if (_selector)
 		return _selector;
 
+	if (!_getter)
+		return NULL;
+
+	Glib::VariantBase variant = _getter();
+	if (!variant.gobj())
+		return NULL;
+
 	_selector = new QComboBox(parent);
-	for (vector< pair<const void*, QString> >::const_iterator i =
-			_values.begin();
-		i != _values.end(); i++)
-		_selector->addItem((*i).second,
-			qVariantFromValue((void*)(*i).first));
+	for (unsigned int i = 0; i < _values.size(); i++) {
+		const pair<Glib::VariantBase, QString> &v = _values[i];
+		_selector->addItem(v.second, qVariantFromValue(v.first));
+		if (v.first.equal(variant))
+			_selector->setCurrentIndex(i);
+	}
+
+	if (auto_commit)
+		connect(_selector, SIGNAL(currentIndexChanged(int)),
+			this, SLOT(on_current_item_changed(int)));
 
 	return _selector;
 }
@@ -67,7 +81,12 @@ void Enum::commit()
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter(_selector->itemData(index).value<Glib::VariantBase>());
+}
+
+void Enum::on_current_item_changed(int)
+{
+	commit();
 }
 
 } // prop