Random simplifications, cosmetics/whitespace/consistency fixes.

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

diff --git a/pv/dialogs/settings.cpp b/pv/dialogs/settings.cpp
index 5346e5c91fc2b16ba1fcdecda2a3e8c8241a06c1..b8f9bf9fa5910ec906f4b4a84e1487a5cb3374a0 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,11 +57,12 @@ 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;
        create_pages();
+       page_list->setCurrentIndex(page_list->model()->index(0, 0));
 
        QHBoxLayout *tab_layout = new QHBoxLayout;
        tab_layout->addWidget(page_list);
@@ -88,7 +91,7 @@ void Settings::create_pages()
        pages->addWidget(get_view_settings_form(pages));
 
        QListWidgetItem *viewButton = new QListWidgetItem(page_list);
-       viewButton->setIcon(QIcon(":/icons/sigrok-logo-notext.svg"));
+       viewButton->setIcon(QIcon(":/icons/settings-views.svg"));
        viewButton->setText(tr("Views"));
        viewButton->setTextAlignment(Qt::AlignHCenter);
        viewButton->setFlags(Qt::ItemIsSelectable | Qt::ItemIsEnabled);
@@ -125,7 +128,17 @@ QWidget *Settings::get_view_settings_form(QWidget *parent) const
        QCheckBox *always_zoom_to_fit_cb = new QCheckBox();
        always_zoom_to_fit_cb->setChecked(settings.value(GlobalSettings::Key_View_AlwaysZoomToFit).toBool());
        connect(always_zoom_to_fit_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_alwaysZoomToFit_changed(int)));
-       trace_view_layout->addRow(tr("&Always zoom-to-fit during capture"), always_zoom_to_fit_cb);
+       trace_view_layout->addRow(tr("Constantly perform &zoom-to-fit during capture"), always_zoom_to_fit_cb);
+
+       QCheckBox *sticky_scrolling_cb = new QCheckBox();
+       sticky_scrolling_cb->setChecked(settings.value(GlobalSettings::Key_View_StickyScrolling).toBool());
+       connect(sticky_scrolling_cb, SIGNAL(stateChanged(int)), this, SLOT(on_view_stickyScrolling_changed(int)));
+       trace_view_layout->addRow(tr("Always keep &newest samples at the right edge during capture"), sticky_scrolling_cb);
+
+       QCheckBox *show_sampling_points_cb = new QCheckBox();
+       show_sampling_points_cb->setChecked(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+       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);
 
        return form;
 }
@@ -148,15 +161,20 @@ 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()));
+
        /* 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()),
@@ -164,8 +182,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()),
@@ -173,8 +190,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()),
@@ -183,8 +199,7 @@ 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>");
+               tr("Supported protocol decoders:") + "</b></td></tr>");
        for (const GSList *l = srd_decoder_list(); l; l = l->next) {
                dec = (struct srd_decoder *)l->data;
                s.append(QString("<tr><td><i>%1</i></td><td>%2</td></tr>")
@@ -248,5 +263,17 @@ void Settings::on_view_colouredBG_changed(int state)
        settings.setValue(GlobalSettings::Key_View_ColouredBG, state ? true : false);
 }
 
+void Settings::on_view_stickyScrolling_changed(int state)
+{
+       GlobalSettings settings;
+       settings.setValue(GlobalSettings::Key_View_StickyScrolling, state ? true : false);
+}
+
+void Settings::on_view_showSamplingPoints_changed(int state)
+{
+       GlobalSettings settings;
+       settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, state ? true : false);
+}
+
 } // namespace dialogs
 } // namespace pv