X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fenum.cpp;h=a6a53764ca040b9366d5f589e1667607a6701ea1;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hp=9e4fcd0e35dd706baf15bb65e463a5e5e5bdb8da;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;p=pulseview.git

diff --git a/pv/prop/enum.cpp b/pv/prop/enum.cpp
index 9e4fcd0..a6a5376 100644
--- a/pv/prop/enum.cpp
+++ b/pv/prop/enum.cpp
@@ -29,10 +29,10 @@ using std::vector;
 namespace pv {
 namespace prop {
 
-Enum::Enum(QString name,
+Enum::Enum(QString name, QString desc,
 	vector<pair<Glib::VariantBase, QString> > values,
 	Getter getter, Setter setter) :
-	Property(name, getter, setter),
+	Property(name, desc, getter, setter),
 	values_(values),
 	selector_(nullptr)
 {
@@ -54,10 +54,10 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 	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);
 	}
 
+	update_widget();
+
 	if (auto_commit)
 		connect(selector_, SIGNAL(currentIndexChanged(int)),
 			this, SLOT(on_current_item_changed(int)));
@@ -65,6 +65,21 @@ QWidget* Enum::get_widget(QWidget *parent, bool auto_commit)
 	return selector_;
 }
 
+void Enum::update_widget()
+{
+	if (!selector_)
+		return;
+
+	Glib::VariantBase variant = getter_();
+	assert(variant.gobj());
+
+	for (unsigned int i = 0; i < values_.size(); i++) {
+		const pair<Glib::VariantBase, QString> &v = values_[i];
+		if (v.first.equal(variant))
+			selector_->setCurrentIndex(i);
+	}
+}
+
 void Enum::commit()
 {
 	assert(setter_);
@@ -84,5 +99,5 @@ void Enum::on_current_item_changed(int)
 	commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv