Fix #1440 by moving shortcuts from the main window to the view

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 6d92b270dc6394f4fd5c2a66bb604766044b8c98..ea549c502a27c841001569bfe20b43d1d065f111 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -32,6 +32,7 @@
 
 #include "globalsettings.hpp"
 #include "session.hpp"
+#include "subwindows/subwindowbase.hpp"
 #include "views/viewbase.hpp"
 
 using std::list;
@@ -84,11 +85,15 @@ 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_session_with_file(string open_file_name, string open_file_format,
+               string open_setup_file_name);
 
        void add_default_session();
 
@@ -103,6 +108,9 @@ private:
        void save_ui_settings();
        void restore_ui_settings();
 
+       void zoom_current_view(double steps);
+       void scroll_to_start_or_end(bool start);
+
        shared_ptr<Session> get_tab_session(int index) const;
 
        void closeEvent(QCloseEvent *event);
@@ -131,6 +139,9 @@ private Q_SLOTS:
        void on_tab_changed(int index);
        void on_tab_close_requested(int index);
 
+       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();
@@ -149,6 +160,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_;