Settings: About: alpha-sort list of protocol decoders

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

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 068d99b3108ead8c35a5c2dce0e1884a096f6d9d..15655a7065cb32363897012f26e7d7305f3db2c1 100644 (file)
--- a/pv/dialogs/settings.cpp
+++ b/pv/dialogs/settings.cpp
@@ -40,6 +40,8 @@
 #include <libsigrokdecode/libsigrokdecode.h>
 #endif
 
+using std::shared_ptr;
+
 namespace pv {
 namespace dialogs {
 
@@ -55,7 +57,7 @@ Settings::Settings(DeviceManager &device_manager, QWidget *parent) :
        page_list->setViewMode(QListView::IconMode);
        page_list->setIconSize(QSize(icon_size, icon_size));
        page_list->setMovement(QListView::Static);
-       page_list->setMaximumWidth(icon_size + icon_size/2);
+       page_list->setMaximumWidth(icon_size + (icon_size / 2));
        page_list->setSpacing(12);
 
        pages = new QStackedWidget;
@@ -138,9 +140,25 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
        connect(show_sampling_points_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showSamplingPoints_changed(int)));
        trace_view_layout->addRow(tr("Show data &sampling points"), show_sampling_points_cb);
 
+       QCheckBox *show_analog_minor_grid_cb = new QCheckBox();
+       show_analog_minor_grid_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
+       connect(show_analog_minor_grid_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_showAnalogMinorGrid_changed(int)));
+       trace_view_layout->addRow(tr("Show analog minor grid in addition to vdiv grid"), show_analog_minor_grid_cb);
+
        return form;
 }
 
+#ifdef ENABLE_DECODE
+static gint sort_pds(gconstpointer a, gconstpointer b)
+{
+       const struct srd_decoder *sda, *sdb;
+
+       sda = (const struct srd_decoder *)a;
+       sdb = (const struct srd_decoder *)b;
+       return strcmp(sda->id, sdb->id);
+}
+#endif
+
 QWidget *Settings::get_about_page(QWidget *parent) const
 {
 #ifdef ENABLE_DECODE
@@ -159,15 +177,26 @@ QWidget *Settings::get_about_page(QWidget *parent) const
                QApplication::organizationDomain()));
        version_info->setOpenExternalLinks(true);
 
-       std::shared_ptr<sigrok::Context> context = device_manager_.context();
+       shared_ptr<sigrok::Context> context = device_manager_.context();
 
        QString s;
        s.append("<table>");
 
+       /* Library info */
+       s.append("<tr><td colspan=\"2\"><b>" +
+               tr("Used libraries:") + "</b></td></tr>");
+       s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
+               .arg(QString("Qt"), qVersion()));
+       s.append(QString("<tr><td><i>%1</i></td><td>%2 (lib version %3)</td></tr>")
+               .arg(QString("libsigrok"), sr_package_version_string_get(), sr_lib_version_string_get()));
+#ifdef ENABLE_DECODE
+       s.append(QString("<tr><td><i>%1</i></td><td>%2 (lib version %3)</td></tr>")
+               .arg(QString("libsigrokdecode"), srd_package_version_string_get(), srd_lib_version_string_get()));
+#endif
+
        /* Set up the supported field */
        s.append("<tr><td colspan=\"2\"><b>" +
-               tr("Supported hardware drivers:") +
-               "</b></td></tr>");
+               tr("Supported hardware drivers:") + "</b></td></tr>");
        for (auto entry : context->drivers()) {
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                        .arg(QString::fromUtf8(entry.first.c_str()),
@@ -175,8 +204,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
        }
 
        s.append("<tr><td colspan=\"2\"><b>" +
-               tr("Supported input formats:") +
-               "</b></td></tr>");
+               tr("Supported input formats:") + "</b></td></tr>");
        for (auto entry : context->input_formats()) {
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                        .arg(QString::fromUtf8(entry.first.c_str()),
@@ -184,8 +212,7 @@ QWidget *Settings::get_about_page(QWidget *parent) const
        }
 
        s.append("<tr><td colspan=\"2\"><b>" +
-               tr("Supported output formats:") +
-               "</b></td></tr>");
+               tr("Supported output formats:") + "</b></td></tr>");
        for (auto entry : context->output_formats()) {
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                        .arg(QString::fromUtf8(entry.first.c_str()),
@@ -194,14 +221,16 @@ QWidget *Settings::get_about_page(QWidget *parent) const
 
 #ifdef ENABLE_DECODE
        s.append("<tr><td colspan=\"2\"><b>" +
-               tr("Supported protocol decoders:") +
-               "</b></td></tr>");
-       for (const GSList *l = srd_decoder_list(); l; l = l->next) {
+               tr("Supported protocol decoders:") + "</b></td></tr>");
+       GSList *sl = g_slist_copy((GSList *)srd_decoder_list());
+       sl = g_slist_sort(sl, sort_pds);
+       for (const GSList *l = sl; l; l = l->next) {
                dec = (struct srd_decoder *)l->data;
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
                        .arg(QString::fromUtf8(dec->id),
                                QString::fromUtf8(dec->longname)));
        }
+       g_slist_free(sl);
 #endif
 
        s.append("</table>");
@@ -271,5 +300,11 @@ void Settings::on_view_showSamplingPoints_changed(int state)
        settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, state ? true : false);
 }
 
+void Settings::on_view_showAnalogMinorGrid_changed(int state)
+{
+       GlobalSettings settings;
+       settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, state ? true : false);
+}
+
 } // namespace dialogs
 } // namespace pv