X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fprop%2Fbool.cpp;h=0dd1c50f10698702a2397ea604b27d6c285ab230;hb=d8d053b6e51abf651ca31d0d4822035c06fb7f9b;hp=95cbb96e0caceea6c82e37367f933b1481ba3762;hpb=de1d99bbe58f825e30048baa48a9439c01686f10;p=pulseview.git
diff --git a/pv/prop/bool.cpp b/pv/prop/bool.cpp
index 95cbb96..0dd1c50 100644
--- a/pv/prop/bool.cpp
+++ b/pv/prop/bool.cpp
@@ -14,44 +14,48 @@
* 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 "bool.h"
-
-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;
+
+ Glib::VariantBase variant = getter_();
+ if (!variant.gobj())
+ return nullptr;
- _check_box = new QCheckBox(name(), parent);
+ bool value = Glib::VariantBase::cast_dynamic>(
+ variant).get();
- GVariant *const value = _getter ? _getter() : NULL;
+ check_box_ = new QCheckBox(name(), parent);
+ check_box_->setToolTip(desc());
+ check_box_->setCheckState(value ? Qt::Checked : Qt::Unchecked);
- 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
@@ -61,14 +65,19 @@ bool Bool::labeled_widget() const
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::create(
+ check_box_->checkState() == Qt::Checked));
+}
+
+void Bool::on_state_changed(int)
+{
+ commit();
}
-} // prop
-} // pv
+} // namespace prop
+} // namespace pv