X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fprop%2Fbool.cpp;h=0cd1604612661730348acd099580f7ac02947725;hp=95cbb96e0caceea6c82e37367f933b1481ba3762;hb=b571a8e7e0dc3e3b6daa58f27050e76466f006dd;hpb=de1d99bbe58f825e30048baa48a9439c01686f10

diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index 95cbb96e..0cd16046 100644
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -14,44 +14,54 @@
  * 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 <http://www.gnu.org/licenses/>.
  */
 
-#include <assert.h>
+#include <cassert>
 
 #include <QCheckBox>
+#include <QDebug>
 
-#include "bool.h"
+#include <libsigrokcxx/libsigrokcxx.hpp>
 
-using namespace std;
-using namespace boost;
+#include "bool.hpp"
 
 namespace pv {
 namespace prop {
 
-Bool::Bool(QString name, Getter getter, Setter setter) :
-	Property(name, getter, setter),
-	_check_box(NULL)
+Bool::Bool(QString name, QString desc, Getter getter, Setter setter) :
+	Property(name, desc, getter, setter),
+	check_box_(nullptr)
 {
 }
 
-QWidget* Bool::get_widget(QWidget *parent)
+QWidget* Bool::get_widget(QWidget *parent, bool auto_commit)
 {
-	if (_check_box)
-		return _check_box;
+	if (check_box_)
+		return check_box_;
+
+	if (!getter_)
+		return nullptr;
+
+	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;
+	}
 
-	_check_box = new QCheckBox(name(), parent);
+	check_box_ = new QCheckBox(name(), parent);
+	check_box_->setToolTip(desc());
 
-	GVariant *const value = _getter ? _getter() : NULL;
+	update_widget();
 
-	if (value) {
-		_check_box->setCheckState(g_variant_get_boolean(value) ?
-			Qt::Checked : Qt::Unchecked);
-		g_variant_unref(value);
-	}
+	if (auto_commit)
+		connect(check_box_, SIGNAL(stateChanged(int)),
+			this, SLOT(on_state_changed(int)));
 
-	return _check_box;
+	return check_box_;
 }
 
 bool Bool::labeled_widget() const
@@ -59,16 +69,41 @@ bool Bool::labeled_widget() const
 	return true;
 }
 
+void Bool::update_widget()
+{
+	if (!check_box_)
+		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());
+	bool value = Glib::VariantBase::cast_dynamic<Glib::Variant<bool>>(
+		variant).get();
+
+	check_box_->setCheckState(value ? Qt::Checked : Qt::Unchecked);
+}
+
 void Bool::commit()
 {
-	assert(_setter);
+	assert(setter_);
 
-	if (!_check_box)
+	if (!check_box_)
 		return;
 
-	_setter(g_variant_new_boolean(
-		_check_box->checkState() == Qt::Checked));
+	setter_(Glib::Variant<bool>::create(check_box_->checkState() == Qt::Checked));
+}
+
+void Bool::on_state_changed(int)
+{
+	commit();
 }
 
-} // prop
-} // pv
+}  // namespace prop
+}  // namespace pv