Integrate the about dialog into the settings dialog

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 9ba532bf6cc8fc3e15a23efd826d36515ebd6383..e3a51c6d88f5b32a62c2801eed7c743e3b33d4bf 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -71,10 +71,6 @@ public:
 
        ~MainWindow();
 
-       QAction* action_view_sticky_scrolling() const;
-       QAction* action_view_coloured_bg() const;
-       QAction* action_about() const;
-
        std::shared_ptr<views::ViewBase> get_active_view() const;
 
        std::shared_ptr<views::ViewBase> add_view(const QString &title,
@@ -114,6 +110,7 @@ private Q_SLOTS:
 
        void on_new_session_clicked();
        void on_run_stop_clicked();
+       void on_settings_clicked();
 
        void on_session_name_changed();
        void on_capture_state_changed(QObject *obj);
@@ -124,11 +121,12 @@ private Q_SLOTS:
        void on_tab_changed(int index);
        void on_tab_close_requested(int index);
 
-       void on_actionViewStickyScrolling_triggered();
+       void on_view_sticky_scrolling_shortcut();
+       void on_view_coloured_bg_shortcut();
 
-       void on_actionViewColouredBg_triggered();
+       void on_settingViewColouredBg_changed(const QVariant new_value);
 
-       void on_actionAbout_triggered();
+       void on_close_current_tab();
 
 private:
        DeviceManager &device_manager_;
@@ -145,15 +143,15 @@ private:
        QTabWidget session_selector_;
        QSignalMapper session_state_mapper_;
 
-       QAction *const action_view_sticky_scrolling_;
-       QAction *const action_view_coloured_bg_;
-       QAction *const action_about_;
-
        QIcon icon_red_;
        QIcon icon_green_;
        QIcon icon_grey_;
 
+       QShortcut *view_sticky_scrolling_shortcut_;
+       QShortcut *view_coloured_bg_shortcut_;
        QShortcut *run_stop_shortcut_;
+       QShortcut *close_application_shortcut_;
+       QShortcut *close_current_tab_shortcut_;
 };
 
 } // namespace pv