@@ -96,6 +101,17 @@ void Settings::create_pages()
viewButton->setTextAlignment(Qt::AlignHCenter);
viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#ifdef ENABLE_DECODE
+ // Decoder page
+ pages->addWidget(get_decoder_settings_form(pages));
+
+ QListWidgetItem *decoderButton = new QListWidgetItem(page_list);
+ decoderButton->setIcon(QIcon(":/icons/add-decoder.svg"));
+ decoderButton->setText(tr("Decoders"));
+ decoderButton->setTextAlignment(Qt::AlignHCenter);
+ decoderButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
+#endif
+
// About page
pages->addWidget(get_about_page(pages));
@@ -148,6 +164,32 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
return form;
}
+QWidget *Settings::get_decoder_settings_form(QWidget *parent) const
+{
+#ifdef ENABLE_DECODE
+ GlobalSettings settings;
+
+ QWidget *form = new QWidget(parent);
+ QVBoxLayout *form_layout = new QVBoxLayout(form);
+
+ // Decoder settings
+ QGroupBox *decoder_group = new QGroupBox(tr("Decoders"));
+ form_layout->addWidget(decoder_group);
+
+ QFormLayout *decoder_layout = new QFormLayout();
+ decoder_group->setLayout(decoder_layout);
+
+ QCheckBox *initial_state_configurable_cb = new QCheckBox();
+ initial_state_configurable_cb->setChecked(settings.value(GlobalSettings::Key_Dec_InitialStateConfigurable).toBool());
+ connect(initial_state_configurable_cb, SIGNAL(stateChanged(int)), this, SLOT(on_dec_initialStateConfigurable_changed(int)));
+ decoder_layout->addRow(tr("Allow configuration of &initial signal state"), initial_state_configurable_cb);
+
+ return form;
+#else
+ (void)parent;
+#endif
+}
+
#ifdef ENABLE_DECODE
static gint sort_pds(gconstpointer a, gconstpointer b)
{
@@ -187,17 +229,66 @@ QWidget *Settings::get_about_page(QWidget *parent) const
/* Library info */
s.append("| " +
- tr("Used libraries:") + " |
");
+ tr("Libraries and features:") + "");
+
s.append(QString("| %1 | %2 |
")
.arg(QString("Qt"), qVersion()));
- s.append(QString("| %1 | %2 (lib version %3) |
")
- .arg(QString("libsigrok"), sr_package_version_string_get(), sr_lib_version_string_get()));
+ s.append(QString("| %1 | %2 |
")
+ .arg(QString("glibmm"), PV_GLIBMM_VERSION));
+ s.append(QString("| %1 | %2 |
")
+ .arg(QString("Boost"), BOOST_LIB_VERSION));
+
+ s.append(QString("| %1 | %2/%3 (rt: %4/%5) |
")
+ .arg(QString("libsigrok"), SR_PACKAGE_VERSION_STRING,
+ SR_LIB_VERSION_STRING, sr_package_version_string_get(),
+ sr_lib_version_string_get()));
+
+ GSList *l_orig = sr_buildinfo_libs_get();
+ for (GSList *l = l_orig; l; l = l->next) {
+ GSList *m = (GSList *)l->data;
+ const char *lib = (const char *)m->data;
+ const char *version = (const char *)m->next->data;
+ s.append(QString("| - %1 | %2 |
")
+ .arg(QString(lib), QString(version)));
+ g_slist_free_full(m, g_free);
+ }
+ g_slist_free(l_orig);
+
+ char *host = sr_buildinfo_host_get();
+ s.append(QString("| - Host | %1 |
")
+ .arg(QString(host)));
+ g_free(host);
+
+ char *scpi_backends = sr_buildinfo_scpi_backends_get();
+ s.append(QString("| - SCPI backends | %1 |
")
+ .arg(QString(scpi_backends)));
+ g_free(scpi_backends);
+
#ifdef ENABLE_DECODE
- s.append(QString("| %1 | %2 (lib version %3) |
")
- .arg(QString("libsigrokdecode"), srd_package_version_string_get(), srd_lib_version_string_get()));
+ s.append(QString("| %1 | %2/%3 (rt: %4/%5) |
")
+ .arg(QString("libsigrokdecode"), SRD_PACKAGE_VERSION_STRING,
+ SRD_LIB_VERSION_STRING, srd_package_version_string_get(),
+ srd_lib_version_string_get()));
+
+ l_orig = srd_buildinfo_libs_get();
+ for (GSList *l = l_orig; l; l = l->next) {
+ GSList *m = (GSList *)l->data;
+ const char *lib = (const char *)m->data;
+ const char *version = (const char *)m->next->data;
+ s.append(QString("| - %1 | %2 |
")
+ .arg(QString(lib), QString(version)));
+ g_slist_free_full(m, g_free);
+ }
+ g_slist_free(l_orig);
+
+ host = srd_buildinfo_host_get();
+ s.append(QString("| - Host | %1 |
")
+ .arg(QString(host)));
+ g_free(host);
#endif
/* Set up the supported field */
+ s.append(" |
");
s.append("| " +
tr("Supported hardware drivers:") + " |
");
for (auto entry : context->drivers()) {
@@ -206,6 +297,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
QString::fromUtf8(entry.second->long_name().c_str())));
}
+ s.append(" |
");
s.append("| " +
tr("Supported input formats:") + " |
");
for (auto entry : context->input_formats()) {
@@ -214,6 +306,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
QString::fromUtf8(entry.second->description().c_str())));
}
+ s.append(" |
");
s.append("| " +
tr("Supported output formats:") + " |
");
for (auto entry : context->output_formats()) {
@@ -223,6 +316,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
}
#ifdef ENABLE_DECODE
+ s.append(" |
");
s.append("| " +
tr("Supported protocol decoders:") + " |
");
GSList *sl = g_slist_copy((GSList *)srd_decoder_list());
@@ -309,5 +403,11 @@ void Settings::on_view_showAnalogMinorGrid_changed(int state)
settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
}
+void Settings::on_dec_initialStateConfigurable_changed(int state)
+{
+ GlobalSettings settings;
+ settings.setValue(GlobalSettings::Key_Dec_InitialStateConfigurable, state ? true : false);
+}
+
} // namespace dialogs
} // namespace pv