X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=b82b496eed42175f7361cd792a4ab8196036eee7;hb=baef263a884ee4ff4d3dd15cd4d334fa9178b090;hp=1cba8e4a7c2341103be17cfe7b2d214ad2aecaf7;hpb=efdec55aec1a137460fa362a381ed1904182bfed;p=pulseview.git
diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index 1cba8e4..b82b496 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -17,11 +17,14 @@
* along with this program; if not, see .
*/
-#include
+#include
+#include
#include
#include
+#include
+
#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>(
- 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>(
+ variant).get();
+
+ line_edit_->setText(QString::fromStdString(value));
+}
+
void String::commit()
{
assert(setter_);
@@ -80,5 +109,5 @@ void String::on_text_edited(const QString&)
commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv