X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbool.cpp;h=0cd1604612661730348acd099580f7ac02947725;hp=0dd1c50f10698702a2397ea604b27d6c285ab230;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=9af565cbd6d2580a60286c4b3de21af6bbcf7e91 diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp index 0dd1c50f..0cd16046 100644 --- a/pv/prop/bool.cpp +++ b/pv/prop/bool.cpp @@ -20,6 +20,9 @@ #include #include +#include + +#include #include "bool.hpp" @@ -40,16 +43,19 @@ QWidget* Bool::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; - - bool value = Glib::VariantBase::cast_dynamic>( - variant).get(); + } check_box_ = new QCheckBox(name(), parent); check_box_->setToolTip(desc()); - check_box_->setCheckState(value ? Qt::Checked : Qt::Unchecked); + + update_widget(); if (auto_commit) connect(check_box_, SIGNAL(stateChanged(int)), @@ -63,6 +69,27 @@ bool Bool::labeled_widget() const return true; } +void Bool::update_widget() +{ + if (!check_box_) + 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()); + bool value = Glib::VariantBase::cast_dynamic>( + variant).get(); + + check_box_->setCheckState(value ? Qt::Checked : Qt::Unchecked); +} + void Bool::commit() { assert(setter_); @@ -70,8 +97,7 @@ void Bool::commit() if (!check_box_) return; - setter_(Glib::Variant::create( - check_box_->checkState() == Qt::Checked)); + setter_(Glib::Variant::create(check_box_->checkState() == Qt::Checked)); } void Bool::on_state_changed(int)