X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=b82b496eed42175f7361cd792a4ab8196036eee7;hb=21f5864602c5c1920fc9b44813f31e789bee6895;hp=b8ecf738630bdea67568e9781357211145215db8;hpb=2acdb232d6bb452cfdfaea3ef5218fb4da592329;p=pulseview.git
diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index b8ecf73..b82b496 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -14,15 +14,17 @@
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * along with this program; if not, see .
*/
-#include
+#include
+#include
#include
#include
+#include
+
#include "string.hpp"
using std::string;
@@ -33,10 +35,11 @@ namespace pv {
namespace prop {
String::String(QString name,
+ QString desc,
Getter getter,
Setter setter) :
- Property(name, getter, setter),
- line_edit_(NULL)
+ Property(name, desc, getter, setter),
+ line_edit_(nullptr)
{
}
@@ -46,17 +49,20 @@ QWidget* String::get_widget(QWidget *parent, bool auto_commit)
return line_edit_;
if (!getter_)
- return NULL;
+ return nullptr;
- Glib::VariantBase variant = getter_();
- if (!variant.gobj())
- return NULL;
-
- string value = Glib::VariantBase::cast_dynamic>(
- variant).get();
+ 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;
+ }
line_edit_ = new QLineEdit(parent);
- line_edit_->setText(QString::fromStdString(value));
+
+ update_widget();
if (auto_commit)
connect(line_edit_, SIGNAL(textEdited(const QString&)),
@@ -65,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_);
@@ -81,5 +109,5 @@ void String::on_text_edited(const QString&)
commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv