X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=d4a04cbb748ae066fb66cebe29b244eca52c6a8f;hp=065fd548f22b336151d03da49f0c03e43456bce1;hb=941c1ba74ba3ba6dd44bf23aafee28809138032b;hpb=9b25892767cee1d871ac18beb025033e905b28ae

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 065fd548..d4a04cbb 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -24,8 +24,8 @@
 
 #include "enum.h"
 
-using namespace boost;
-using namespace std;
+using std::pair;
+using std::vector;
 
 namespace pv {
 namespace prop {
@@ -45,24 +45,27 @@ Enum::~Enum()
 		g_variant_unref(_values[i].first);
 }
 
-QWidget* Enum::get_widget(QWidget *parent)
+QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 {
 	if (_selector)
 		return _selector;
 
 	GVariant *const value = _getter ? _getter() : NULL;
-	assert(value);
 
 	_selector = new QComboBox(parent);
 	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 (g_variant_compare(v.first, value) == 0)
+		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;
 }
 
@@ -80,5 +83,10 @@ void Enum::commit()
 	_setter((GVariant*)_selector->itemData(index).value<void*>());
 }
 
+void Enum::on_current_item_changed(int)
+{
+	commit();
+}
+
 } // prop
 } // pv