X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=d93d78eddf72589190cee89a2f0a082c76a9204b;hb=dbed5609ae31cdfc3e9db10f3ab91b7607c08372;hp=a488e89a3b1fd5d7e30dd615e619ee248f8d908b;hpb=eb8269e3b5eebdd77e6a82d42bcfdfbc3f7613a9;p=pulseview.git diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp index a488e89..d93d78e 100644 --- a/pv/prop/string.cpp +++ b/pv/prop/string.cpp @@ -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>( - 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>( + 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