Fixes for clang build on OS X

[pulseview.git] / pv / dialogs / decoder.cpp

diff --git a/pv/dialogs/decoder.cpp b/pv/dialogs/decoder.cpp
index 97df5d45f43c605f3d774d25848d4d0557247e93..88ccf76021f9acc7b7888695257cacc6f673c684 100644 (file)
--- a/pv/dialogs/decoder.cpp
+++ b/pv/dialogs/decoder.cpp
@@ -40,10 +40,10 @@ namespace pv {
 namespace dialogs {
 
 Decoder::Decoder(QWidget *parent, const srd_decoder *decoder,
-       const vector< shared_ptr<view::Signal> > &sigs) :
+       const vector< shared_ptr<view::Signal> > &sigs, GHashTable *options) :
        QDialog(parent),
-       _decoder(decoder),
        _sigs(sigs),
+       _binding(decoder, options),
        _layout(this),
        _form(this),
        _form_layout(&_form),
@@ -69,7 +69,7 @@ Decoder::Decoder(QWidget *parent, const srd_decoder *decoder,
        _layout.addWidget(&_form);
        _layout.addWidget(&_button_box);
 
-       _form_layout.addRow(new QLabel("<h3>Probes</h3>", &_form));
+       _form_layout.addRow(new QLabel(tr("<h3>Probes</h3>"), &_form));
 
        // Add the mandatory probes
        for(probe = decoder->probes; probe; probe = probe->next) {
@@ -97,6 +97,19 @@ Decoder::Decoder(QWidget *parent, const srd_decoder *decoder,
 
        _form_layout.addRow(new QLabel(
                tr("<i>* Required Probes</i>"), &_form));
+
+       // Add the options
+       if (!_binding.properties().empty()) {
+               _form_layout.addRow(new QLabel(tr("<h3>Options</h3>"),
+                       &_form));
+               _binding.add_properties_to_form(&_form_layout);
+       }
+}
+
+void Decoder::accept()
+{
+       QDialog::accept();
+       _binding.commit();
 }
 
 QComboBox* Decoder::create_probe_selector(