Tie the "use coloured bg" setting in with the settings mgmt

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 500d2a435625cd20cde87f66f87c906c73cfa50a..879c8a522d9121f8c27a907a9d1fc2bf78717dc4 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -39,9 +39,11 @@
 #include "mainwindow.hpp"
 
 #include "devicemanager.hpp"
+#include "globalsettings.hpp"
 #include "util.hpp"
 #include "devices/hardwaredevice.hpp"
 #include "dialogs/about.hpp"
+#include "dialogs/settings.hpp"
 #include "toolbars/mainbar.hpp"
 #include "view/view.hpp"
 #include "views/trace/standardbar.hpp"
@@ -65,6 +67,9 @@ class ViewItem;
 
 using toolbars::MainBar;
 
+using std::bind;
+using std::placeholders::_1;
+
 const QString MainWindow::WindowTitle = tr("PulseView");
 
 MainWindow::MainWindow(DeviceManager &device_manager,
@@ -74,8 +79,6 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        device_manager_(device_manager),
        session_selector_(this),
        session_state_mapper_(this),
-       action_view_sticky_scrolling_(new QAction(this)),
-       action_view_coloured_bg_(new QAction(this)),
        action_about_(new QAction(this)),
        icon_red_(":/icons/status-red.svg"),
        icon_green_(":/icons/status-green.svg"),
@@ -84,6 +87,9 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        qRegisterMetaType<util::Timestamp>("util::Timestamp");
        qRegisterMetaType<uint64_t>("uint64_t");
 
+       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ColouredBG,
+               bind(&MainWindow::on_settingViewColouredBg_changed, this, _1));
+
        setup_ui();
        restore_ui_settings();
 
@@ -119,16 +125,6 @@ MainWindow::~MainWindow()
                remove_session(sessions_.front());
 }
 
-QAction* MainWindow::action_view_sticky_scrolling() const
-{
-       return action_view_sticky_scrolling_;
-}
-
-QAction* MainWindow::action_view_coloured_bg() const
-{
-       return action_view_coloured_bg_;
-}
-
 QAction* MainWindow::action_about() const
 {
        return action_about_;
@@ -162,6 +158,8 @@ shared_ptr<views::ViewBase> MainWindow::get_active_view() const
 shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
        views::ViewType type, Session &session)
 {
+       GlobalSettings settings;
+
        QMainWindow *main_window = nullptr;
        for (auto entry : session_windows_)
                if (entry.first.get() == &session)
@@ -201,8 +199,8 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
                                qobject_cast<views::ViewBase*>(v.get()),
                                SLOT(trigger_event(util::Timestamp)));
 
-                       v->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
-                       v->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+                       v->enable_sticky_scrolling(true);
+                       v->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
 
                        shared_ptr<MainBar> main_bar = session.main_bar();
                        if (!main_bar) {
@@ -344,19 +342,11 @@ void MainWindow::setup_ui()
        icon.addFile(QString(":/icons/sigrok-logo-notext.png"));
        setWindowIcon(icon);
 
-       action_view_sticky_scrolling_->setCheckable(true);
-       action_view_sticky_scrolling_->setChecked(true);
-       action_view_sticky_scrolling_->setShortcut(QKeySequence(Qt::Key_S));
-       action_view_sticky_scrolling_->setObjectName(
-               QString::fromUtf8("actionViewStickyScrolling"));
-       action_view_sticky_scrolling_->setText(tr("&Sticky Scrolling"));
+       view_sticky_scrolling_shortcut_ = new QShortcut(QKeySequence(Qt::Key_S), this, SLOT(on_view_sticky_scrolling_shortcut()));
+       view_sticky_scrolling_shortcut_->setAutoRepeat(false);
 
-       action_view_coloured_bg_->setCheckable(true);
-       action_view_coloured_bg_->setChecked(true);
-       action_view_coloured_bg_->setShortcut(QKeySequence(Qt::Key_B));
-       action_view_coloured_bg_->setObjectName(
-               QString::fromUtf8("actionViewColouredBg"));
-       action_view_coloured_bg_->setText(tr("Use &Coloured Backgrounds"));
+       view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
+       view_coloured_bg_shortcut_->setAutoRepeat(false);
 
        action_about_->setObjectName(QString::fromUtf8("actionAbout"));
        action_about_->setToolTip(tr("&About..."));
@@ -412,6 +402,8 @@ void MainWindow::setup_ui()
                this, SLOT(on_run_stop_clicked()));
        connect(&session_state_mapper_, SIGNAL(mapped(QObject*)),
                this, SLOT(on_capture_state_changed(QObject*)));
+       connect(settings_button_, SIGNAL(clicked(bool)),
+               this, SLOT(on_settings_clicked()));
 
        connect(&session_selector_, SIGNAL(tabCloseRequested(int)),
                this, SLOT(on_tab_close_requested(int)));
@@ -611,6 +603,12 @@ void MainWindow::on_run_stop_clicked()
        }
 }
 
+void MainWindow::on_settings_clicked()
+{
+       dialogs::Settings dlg;
+       dlg.exec();
+}
+
 void MainWindow::on_session_name_changed()
 {
        // Update the corresponding dock widget's name(s)
@@ -723,22 +721,36 @@ void MainWindow::on_tab_close_requested(int index)
                remove_session(session);
 }
 
-void MainWindow::on_actionViewStickyScrolling_triggered()
+void MainWindow::on_view_sticky_scrolling_shortcut()
 {
        shared_ptr<views::ViewBase> viewbase = get_active_view();
        views::TraceView::View* view =
                qobject_cast<views::TraceView::View*>(viewbase.get());
        if (view)
-               view->enable_sticky_scrolling(action_view_sticky_scrolling_->isChecked());
+               view->toggle_sticky_scrolling();
 }
 
-void MainWindow::on_actionViewColouredBg_triggered()
+void MainWindow::on_view_coloured_bg_shortcut()
 {
-       shared_ptr<views::ViewBase> viewbase = get_active_view();
-       views::TraceView::View* view =
-                       qobject_cast<views::TraceView::View*>(viewbase.get());
-       if (view)
-               view->enable_coloured_bg(action_view_coloured_bg_->isChecked());
+       GlobalSettings settings;
+
+       bool state = settings.value(GlobalSettings::Key_View_ColouredBG).toBool();
+       settings.setValue(GlobalSettings::Key_View_ColouredBG, !state);
+}
+
+void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
+{
+       bool state = new_value.toBool();
+
+       for (auto entry : view_docks_) {
+               shared_ptr<views::ViewBase> viewbase = entry.second;
+
+               // Only trace views have this setting
+               views::TraceView::View* view =
+                               qobject_cast<views::TraceView::View*>(viewbase.get());
+               if (view)
+                       view->enable_coloured_bg(state);
+       }
 }
 
 void MainWindow::on_actionAbout_triggered()