Fix #1147 by implementing decoder selector subwindow

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index a0a6d3375b0f5225b97ced6c27b8a0fe1c12bd01..2a2dabcdc542cfd0d71490c99f3842e6852dc0c6 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -30,7 +30,9 @@
 #include <QTabWidget>
 #include <QToolButton>
 
+#include "globalsettings.hpp"
 #include "session.hpp"
+#include "subwindows/subwindowbase.hpp"
 #include "views/viewbase.hpp"
 
 using std::list;
@@ -61,7 +63,7 @@ class DecoderMenu;
 #endif
 }
 
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, public GlobalSettingsInterface
 {
        Q_OBJECT
 
@@ -70,12 +72,12 @@ private:
 
 public:
        explicit MainWindow(DeviceManager &device_manager,
-               string open_file_name = string(),
-               string open_file_format = string(),
                QWidget *parent = nullptr);
 
        ~MainWindow();
 
+       static void show_session_error(const QString text, const QString info_text);
+
        shared_ptr<views::ViewBase> get_active_view() const;
 
        shared_ptr<views::ViewBase> add_view(const QString &title,
@@ -83,15 +85,26 @@ public:
 
        void remove_view(shared_ptr<views::ViewBase> view);
 
+       shared_ptr<subwindows::SubWindowBase> add_subwindow(
+               subwindows::SubWindowType type, Session &session);
+
        shared_ptr<Session> add_session();
 
        void remove_session(shared_ptr<Session> session);
 
+       void add_session_with_file(string open_file_name, string open_file_format);
+
+       void add_default_session();
+
+       void save_sessions();
+       void restore_sessions();
+
+       void on_setting_changed(const QString &key, const QVariant &value);
+
 private:
        void setup_ui();
 
        void save_ui_settings();
-
        void restore_ui_settings();
 
        shared_ptr<Session> get_tab_session(int index) const;
@@ -102,11 +115,7 @@ private:
 
        virtual bool restoreState(const QByteArray &state, int version = 0);
 
-       void session_error(const QString text, const QString info_text);
-
 private Q_SLOTS:
-       void show_session_error(const QString text, const QString info_text);
-
        void on_add_view(const QString &title, views::ViewType type,
                Session *session);
 
@@ -126,12 +135,17 @@ private Q_SLOTS:
        void on_tab_changed(int index);
        void on_tab_close_requested(int index);
 
-       void on_view_coloured_bg_shortcut();
+       void on_show_decoder_selector(Session *session);
+       void on_sub_window_close_clicked();
+
+       void on_view_colored_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_settingViewColoredBg_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();
 
@@ -142,6 +156,7 @@ private:
        shared_ptr<Session> last_focused_session_;
 
        map< QDockWidget*, shared_ptr<views::ViewBase> > view_docks_;
+       map< QDockWidget*, shared_ptr<subwindows::SubWindowBase> > sub_windows_;
 
        map< shared_ptr<Session>, QMainWindow*> session_windows_;
 
@@ -156,7 +171,8 @@ private:
 
        QShortcut *view_sticky_scrolling_shortcut_;
        QShortcut *view_show_sampling_points_shortcut_;
-       QShortcut *view_coloured_bg_shortcut_;
+       QShortcut *view_show_analog_minor_grid_shortcut_;
+       QShortcut *view_colored_bg_shortcut_;
        QShortcut *run_stop_shortcut_;
        QShortcut *close_application_shortcut_;
        QShortcut *close_current_tab_shortcut_;