Added a String property

diff --git a/CMakeLists.txt b/CMakeLists.txt
index f633cd5505562c585bfca86c683cdafd1b85a49e..74b91af9601c3102e06d38da89f27f5e2b8fe15a 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -121,6 +121,7 @@ set(pulseview_SOURCES
        pv/prop/enum.cpp
        pv/prop/int.cpp
        pv/prop/property.cpp
+       pv/prop/string.cpp
        pv/prop/binding/binding.cpp
        pv/prop/binding/decoderoptions.cpp
        pv/prop/binding/deviceoptions.cpp

diff --git a/pv/prop/string.cpp b/pv/prop/string.cpp
new file mode 100644 (file)
index 0000000..b9de789
--- /dev/null
+++ b/pv/prop/string.cpp
@@ -0,0 +1,70 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
+
+#include <assert.h>
+
+#include <QSpinBox>
+
+#include "string.h"
+
+using namespace std;
+using namespace boost;
+
+namespace pv {
+namespace prop {
+
+String::String(QString name,
+       Getter getter,
+       Setter setter) :
+       Property(name, getter, setter),
+       _line_edit(NULL)
+{
+}
+
+QWidget* String::get_widget(QWidget *parent)
+{
+       if (_line_edit)
+               return _line_edit;
+
+       _line_edit = new QLineEdit(parent);
+
+       GVariant *const value = _getter ? _getter() : NULL;
+       if (value) {
+               _line_edit->setText(QString(
+                       g_variant_get_string(value, NULL)));
+               g_variant_unref(value);
+       }
+
+       return _line_edit;
+}
+
+void String::commit()
+{
+       assert(_setter);
+
+       if (!_line_edit)
+               return;
+
+       QByteArray ba = _line_edit->text().toLocal8Bit();
+       _setter(g_variant_new_string(ba.data()));
+}
+
+} // prop
+} // pv

diff --git a/pv/prop/string.h b/pv/prop/string.h
new file mode 100644 (file)
index 0000000..bd95d9b
--- /dev/null
+++ b/pv/prop/string.h
@@ -0,0 +1,47 @@
+/*
+ * This file is part of the PulseView project.
+ *
+ * Copyright (C) 2013 Joel Holdsworth <joel@airwebreathe.org.uk>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * 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
+ */
+
+#ifndef PULSEVIEW_PV_PROP_STRING_H
+#define PULSEVIEW_PV_PROP_STRING_H
+
+#include "property.h"
+
+class QLineEdit;
+
+namespace pv {
+namespace prop {
+
+class String : public Property
+{
+public:
+       String(QString name, Getter getter, Setter setter);
+
+       QWidget* get_widget(QWidget *parent);
+
+       void commit();
+
+private:
+       QLineEdit *_line_edit;
+};
+
+} // prop
+} // pv
+
+#endif // PULSEVIEW_PV_PROP_STRING_H