Fix #1201 by letting more accurate matches replace previous ones

[pulseview.git] / pv / prop / string.cpp

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index 1cba8e4a7c2341103be17cfe7b2d214ad2aecaf7..d93d78eddf72589190cee89a2f0a082c76a9204b 100644 (file)
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -17,7 +17,7 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QLineEdit>
 #include <QSpinBox>
@@ -32,9 +32,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)
 {
 }
@@ -51,11 +52,9 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
        if (!variant.gobj())
                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 +63,20 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
        return line_edit_;
 }
 
+void String::update_widget()
+{
+       if (!line_edit_)
+               return;
+
+       Glib::VariantBase variant = getter_();
+       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_);
@@ -80,5 +93,5 @@ void String::on_text_edited(const QString&)
        commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv