X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=71ed19e6e2c12de2ff5cc4900417e8a46cd0357d;hp=54fe5fedca8284b15dc2f051a44a7f5e3e1dba22;hb=c6246dc56ed01d7e99aa65ab88b8c191300b1ebd;hpb=793f8096c486d0fba871227d9772a510f7496c08

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 54fe5fed..71ed19e6 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -22,59 +22,67 @@
 
 #include <QComboBox>
 
-#include "enum.h"
+#include "enum.hpp"
 
-using namespace boost;
-using namespace std;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace prop {
 
 Enum::Enum(QString name,
-	vector<pair<const void*, QString> > values,
-	function<const void* ()> getter,
-	function<void (const void*)> setter) :
-	Property(name),
-	_values(values),
-	_getter(getter),
-	_setter(setter),
-	_selector(NULL)
+	vector<pair<Glib::VariantBase, QString> > values,
+	Getter getter, Setter setter) :
+	Property(name, getter, setter),
+	values_(values),
+	selector_(nullptr)
 {
 }
 
-QWidget* Enum::get_widget(QWidget *parent)
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
-	if (_selector)
-		return _selector;
-
-	const void *value = NULL;
-	if (_getter)
-		value = _getter();
-
-	_selector = new QComboBox(parent);
-	for (unsigned int i = 0; i < _values.size(); i++) {
-		const pair<const void*, QString> &v = _values[i];
-		_selector->addItem(v.second,
-			qVariantFromValue((void*)v.first));
-		if (v.first == value)
-			_selector->setCurrentIndex(i);
+	if (selector_)
+		return selector_;
+
+	if (!getter_)
+		return nullptr;
+
+	Glib::VariantBase variant = getter_();
+	if (!variant.gobj())
+		return nullptr;
+
+	selector_ = new QComboBox(parent);
+	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);
 	}
 
-	return _selector;
+	if (auto_commit)
+		connect(selector_, SIGNAL(currentIndexChanged(int)),
+			this, SLOT(on_current_item_changed(int)));
+
+	return selector_;
 }
 
 void Enum::commit()
 {
-	assert(_setter);
+	assert(setter_);
 
-	if (!_selector)
+	if (!selector_)
 		return;
 
-	const int index = _selector->currentIndex();
+	const int index = selector_->currentIndex();
 	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