Fix #957 and #874 by implementing the pane splitter

[pulseview.git] / pv / mainwindow.cpp

diff --git a/pv/mainwindow.cpp b/pv/mainwindow.cpp
index 5c399e43c38d1523abe748e52cb9c0d44039d792..86a015533f824cb8483e7ef7b456d080266d9ebc 100644 (file)
--- a/pv/mainwindow.cpp
+++ b/pv/mainwindow.cpp
@@ -88,6 +88,9 @@ MainWindow::MainWindow(DeviceManager &device_manager,
        GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowSamplingPoints,
                bind(&MainWindow::on_settingViewShowSamplingPoints_changed, this, _1));
 
+       GlobalSettings::register_change_handler(GlobalSettings::Key_View_ShowAnalogMinorGrid,
+               bind(&MainWindow::on_settingViewShowAnalogMinorGrid_changed, this, _1));
+
        setup_ui();
        restore_ui_settings();
 
@@ -185,6 +188,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
        dock_main->setCentralWidget(v.get());
        dock->setWidget(dock_main);
 
+       dock->setContextMenuPolicy(Qt::PreventContextMenu);
        dock->setFeatures(QDockWidget::DockWidgetMovable |
                QDockWidget::DockWidgetFloatable | QDockWidget::DockWidgetClosable);
 
@@ -205,6 +209,7 @@ shared_ptr<views::ViewBase> MainWindow::add_view(const QString &title,
 
                tv->enable_coloured_bg(settings.value(GlobalSettings::Key_View_ColouredBG).toBool());
                tv->enable_show_sampling_points(settings.value(GlobalSettings::Key_View_ShowSamplingPoints).toBool());
+               tv->enable_show_analog_minor_grid(settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool());
 
                if (!main_bar) {
                        /* Initial view, create the main bar */
@@ -348,6 +353,9 @@ void MainWindow::setup_ui()
        view_show_sampling_points_shortcut_ = new QShortcut(QKeySequence(Qt::Key_Period), this, SLOT(on_view_show_sampling_points_shortcut()));
        view_show_sampling_points_shortcut_->setAutoRepeat(false);
 
+       view_show_analog_minor_grid_shortcut_ = new QShortcut(QKeySequence(Qt::Key_G), this, SLOT(on_view_show_analog_minor_grid_shortcut()));
+       view_show_analog_minor_grid_shortcut_->setAutoRepeat(false);
+
        view_coloured_bg_shortcut_ = new QShortcut(QKeySequence(Qt::Key_B), this, SLOT(on_view_coloured_bg_shortcut()));
        view_coloured_bg_shortcut_->setAutoRepeat(false);
 
@@ -367,8 +375,8 @@ void MainWindow::setup_ui()
        run_stop_shortcut_->setAutoRepeat(false);
 
        settings_button_ = new QToolButton();
-       settings_button_->setIcon(QIcon::fromTheme("configure",
-               QIcon(":/icons/configure.png")));
+       settings_button_->setIcon(QIcon::fromTheme("preferences-system",
+               QIcon(":/icons/preferences-system.png")));
        settings_button_->setToolTip(tr("Settings"));
        settings_button_->setAutoRaise(true);
 
@@ -745,6 +753,14 @@ void MainWindow::on_view_show_sampling_points_shortcut()
        settings.setValue(GlobalSettings::Key_View_ShowSamplingPoints, !state);
 }
 
+void MainWindow::on_view_show_analog_minor_grid_shortcut()
+{
+       GlobalSettings settings;
+
+       bool state = settings.value(GlobalSettings::Key_View_ShowAnalogMinorGrid).toBool();
+       settings.setValue(GlobalSettings::Key_View_ShowAnalogMinorGrid, !state);
+}
+
 void MainWindow::on_settingViewColouredBg_changed(const QVariant new_value)
 {
        bool state = new_value.toBool();
@@ -775,6 +791,21 @@ void MainWindow::on_settingViewShowSamplingPoints_changed(const QVariant new_val
        }
 }
 
+void MainWindow::on_settingViewShowAnalogMinorGrid_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_show_analog_minor_grid(state);
+       }
+}
+
 void MainWindow::on_close_current_tab()
 {
        int tab = session_selector_.currentIndex();