X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=9044c6bae9d3c6335589c26e7be65835186a7b81;hp=1694840a1c7a69357e860bbe047e4af2b681f4fe;hb=f352b9bbeafc33fab0d003573b86ceed17565b5e;hpb=24bb0bd140f7f8b00ea3c0cbe0c5d26dc03a3b69

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 1694840a..9044c6ba 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,34 +24,49 @@
 
 #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<GVariant*, 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()
 {
-	if(_selector)
+	for (unsigned int i = 0; i < _values.size(); i++)
+		g_variant_unref(_values[i].first);
+}
+
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
+{
+	if (_selector)
 		return _selector;
 
+	GVariant *const value = _getter ? _getter() : NULL;
+	if (!value)
+		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<GVariant*, QString> &v = _values[i];
+		_selector->addItem(v.second, qVariantFromValue((void*)v.first));
+		if (value && g_variant_equal(v.first, value))
+			_selector->setCurrentIndex(i);
+	}
+
+	g_variant_unref(value);
+
+	if (auto_commit)
+		connect(_selector, SIGNAL(currentIndexChanged(int)),
+			this, SLOT(on_current_item_changed(int)));
 
 	return _selector;
 }
@@ -60,14 +75,19 @@ void Enum::commit()
 {
 	assert(_setter);
 
-	if(!_selector)
+	if (!_selector)
 		return;
 
 	const int index = _selector->currentIndex();
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter((GVariant*)_selector->itemData(index).value<void*>());
+}
+
+void Enum::on_current_item_changed(int)
+{
+	commit();
 }
 
 } // prop