X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=6439a725c7adbdca16d90865c622da719fe9ef3b;hp=f762bd1a8ab83e56a1d8f2e9d3e733e54d9dc573;hb=8bd26d8b9c831b509ee3241ea4dac6f50c023622;hpb=8a017a8bbc52e19c4d83362dbf58eb7ae447fd8b

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index f762bd1a..6439a725 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,35 +24,53 @@
 
 #include "enum.h"
 
-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),
+	vector<pair<GVariant*, QString> > values,
+	Getter getter, Setter setter) :
+	Property(name, getter, setter),
 	_values(values),
-	_getter(getter),
-	_setter(setter),
 	_selector(NULL)
 {
+	for (vector< pair<GVariant*, QString> >::const_iterator i =
+		_values.begin(); i != _values.end(); i++)
+		g_variant_ref((*i).first);
 }
 
-QWidget* Enum::get_widget(QWidget *parent)
+Enum::~Enum()
+{
+	for (vector< pair<GVariant*, QString> >::const_iterator i =
+		_values.begin(); i != _values.end(); i++)
+		g_variant_unref((*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;
 }
@@ -68,7 +86,12 @@ void Enum::commit()
 	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