Trace: Removed coloured_bg state

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 0611e0021c512e4c3fb7b654a5432bae168bc38d..6541ccc6dff181e2cf386ed75657f5c0ecf11d1c 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,10 +25,10 @@
 #include <memory>
 
 #include <QMainWindow>
 #include <memory>
 
 #include <QMainWindow>

+#include <QShortcut>

 #include <QSignalMapper>
 #include <QSignalMapper>

-#include <QToolButton>

 #include <QTabWidget>
 #include <QTabWidget>

-#include <QShortcut>
+#include <QToolButton>

 
 #include "session.hpp"
 #include "views/viewbase.hpp"
 
 #include "session.hpp"
 #include "views/viewbase.hpp"


@@ -72,7 +72,7 @@ public:
        explicit MainWindow(DeviceManager &device_manager,
                string open_file_name = string(),
                string open_file_format = string(),
        explicit MainWindow(DeviceManager &device_manager,
                string open_file_name = string(),
                string open_file_format = string(),

-               QWidget *parent = 0);
+               QWidget *parent = nullptr);

 
        ~MainWindow();
 
 
        ~MainWindow();
 


@@ -129,9 +129,11 @@ private Q_SLOTS:
        void on_view_coloured_bg_shortcut();
        void on_view_sticky_scrolling_shortcut();
        void on_view_show_sampling_points_shortcut();
        void on_view_coloured_bg_shortcut();
        void on_view_sticky_scrolling_shortcut();
        void on_view_show_sampling_points_shortcut();

+       void on_view_show_analog_minor_grid_shortcut();

 
        void on_settingViewColouredBg_changed(const QVariant new_value);
        void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
 
        void on_settingViewColouredBg_changed(const QVariant new_value);
        void on_settingViewShowSamplingPoints_changed(const QVariant new_value);

+       void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);

 
        void on_close_current_tab();
 
 
        void on_close_current_tab();
 


@@ -156,6 +158,7 @@ private:
 
        QShortcut *view_sticky_scrolling_shortcut_;
        QShortcut *view_show_sampling_points_shortcut_;
 
        QShortcut *view_sticky_scrolling_shortcut_;
        QShortcut *view_show_sampling_points_shortcut_;

+       QShortcut *view_show_analog_minor_grid_shortcut_;

        QShortcut *view_coloured_bg_shortcut_;
        QShortcut *run_stop_shortcut_;
        QShortcut *close_application_shortcut_;
        QShortcut *view_coloured_bg_shortcut_;
        QShortcut *run_stop_shortcut_;
        QShortcut *close_application_shortcut_;