X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=894ba9f8e2754ded46f9e07b783484871d25eade;hb=2db7704ab7ca681917b0eb091ea49378fe18c4a8;hp=f762bd1a8ab83e56a1d8f2e9d3e733e54d9dc573;hpb=8a017a8bbc52e19c4d83362dbf58eb7ae447fd8b;p=pulseview.git

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index f762bd1..894ba9f 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -20,6 +20,7 @@
 
 #include <assert.h>
 
+#include <glib-2.0/glib.h>
 #include <QComboBox>
 
 #include "enum.h"
@@ -32,8 +33,8 @@ namespace prop {
 
 Enum::Enum(QString name,
 	vector<pair<const void*, QString> > values,
-	function<const void* ()> getter,
-	function<void (const void*)> setter) :
+	function<GVariant* ()> getter,
+	function<void (GVariant*)> setter) :
 	Property(name),
 	_values(values),
 	_getter(getter),
@@ -47,12 +48,18 @@ QWidget* Enum::get_widget(QWidget *parent)
 	if (_selector)
 		return _selector;
 
+	const void *value = NULL;
+	if (_getter)
+		value = _getter();
+
 	_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<const void*, QString> &v = _values[i];
+		_selector->addItem(v.second,
+			qVariantFromValue((void*)v.first));
+		if (v.first == value)
+			_selector->setCurrentIndex(i);
+	}
 
 	return _selector;
 }
@@ -68,7 +75,7 @@ void Enum::commit()
 	if (index < 0)
 		return;
 
-	_setter(_selector->itemData(index).value<void*>());
+	_setter(_selector->itemData(index).value<GVariant*>());
 }
 
 } // prop