X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fstring.cpp;h=511fe6c4352de19356c36604b5d1479e8ab46319;hb=e8d009288de28cb194bc7964f96677c2baf900c9;hp=b9de789b90298042104bd0b60b2ea94e8bd45668;hpb=7112a4581822c43241a55fbd61c98bee062d452b;p=pulseview.git

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
index b9de789..511fe6c 100644
--- a/pv/prop/string.cpp
+++ b/pv/prop/string.cpp
@@ -20,12 +20,14 @@
 
 #include <assert.h>
 
+#include <QLineEdit>
 #include <QSpinBox>
 
 #include "string.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+
+using Glib::ustring;
 
 namespace pv {
 namespace prop {
@@ -38,19 +40,27 @@ String::String(QString name,
 {
 }
 
-QWidget* String::get_widget(QWidget *parent)
+QWidget* String::get_widget(QWidget *parent, bool auto_commit)
 {
 	if (_line_edit)
 		return _line_edit;
 
+	if (!_getter)
+		return NULL;
+
+	Glib::VariantBase variant = _getter();
+	if (!variant.gobj())
+		return NULL;
+
+	string value = Glib::VariantBase::cast_dynamic<Glib::Variant<ustring>>(
+		variant).get();
+
 	_line_edit = new QLineEdit(parent);
+	_line_edit->setText(QString::fromStdString(value));
 
-	GVariant *const value = _getter ? _getter() : NULL;
-	if (value) {
-		_line_edit->setText(QString(
-			g_variant_get_string(value, NULL)));
-		g_variant_unref(value);
-	}
+	if (auto_commit)
+		connect(_line_edit, SIGNAL(textEdited(const QString&)),
+			this, SLOT(on_text_edited(const QString&)));
 
 	return _line_edit;
 }
@@ -63,7 +73,12 @@ void String::commit()
 		return;
 
 	QByteArray ba = _line_edit->text().toLocal8Bit();
-	_setter(g_variant_new_string(ba.data()));
+	_setter(Glib::Variant<ustring>::create(ba.data()));
+}
+
+void String::on_text_edited(const QString&)
+{
+	commit();
 }
 
 } // prop