X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=b82b496eed42175f7361cd792a4ab8196036eee7;hb=f4ab4b5c657e5613caba82feaa81a8a400e4f331;hp=23c7f91321d567bbc59c31bad53b139cd8f1728a;hpb=870ea3dbf35b182e120c5d84ab89bf9cb7691232;p=pulseview.git

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index 23c7f91..b82b496 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -19,9 +19,12 @@
 
 #include <cassert>
 
+#include <QDebug>
 #include <QLineEdit>
 #include <QSpinBox>
 
+#include <libsigrokcxx/libsigrokcxx.hpp>
+
 #include "string.hpp"
 
 using std::string;
@@ -32,9 +35,10 @@ namespace pv {
 namespace prop {
 
 String::String(QString name,
+	QString desc,
 	Getter getter,
 	Setter setter) :
-	Property(name, getter, setter),
+	Property(name, desc, getter, setter),
 	line_edit_(nullptr)
 {
 }
@@ -47,15 +51,18 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
 	if (!getter_)
 		return nullptr;
 
-	Glib::VariantBase variant = getter_();
-	if (!variant.gobj())
+	try {
+		Glib::VariantBase variant = getter_();
+		if (!variant.gobj())
+			return nullptr;
+	} catch (const sigrok::Error &e) {
+		qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
 		return nullptr;
-
-	string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
-		variant).get();
+	}
 
 	line_edit_ = new QLineEdit(parent);
-	line_edit_->setText(QString::fromStdString(value));
+
+	update_widget();
 
 	if (auto_commit)
 		connect(line_edit_, SIGNAL(textEdited(const QString&)),
@@ -64,6 +71,28 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
 	return line_edit_;
 }
 
+void String::update_widget()
+{
+	if (!line_edit_)
+		return;
+
+	Glib::VariantBase variant;
+
+	try {
+		variant = getter_();
+	} catch (const sigrok::Error &e) {
+		qWarning() << tr("Querying config key %1 resulted in %2").arg(name_, e.what());
+		return;
+	}
+
+	assert(variant.gobj());
+
+	string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
+		variant).get();
+
+	line_edit_->setText(QString::fromStdString(value));
+}
+
 void String::commit()
 {
 	assert(setter_);