Add shortcuts to + and - buttons for zooming in and out horizontally

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 5f4609d90b42e3824d3116b1431cc05abcfc1ab3..6f2fded904d426a57257780c8be62b461c680c17 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -32,6 +32,7 @@
 
 #include "globalsettings.hpp"
 #include "session.hpp"
 
 #include "globalsettings.hpp"
 #include "session.hpp"

+#include "subwindows/subwindowbase.hpp"

 #include "views/viewbase.hpp"
 
 using std::list;
 #include "views/viewbase.hpp"
 
 using std::list;


@@ -84,11 +85,15 @@ public:
 
        void remove_view(shared_ptr<views::ViewBase> view);
 
 
        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);
 
        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();
 
 
        void add_default_session();
 


@@ -103,6 +108,8 @@ private:
        void save_ui_settings();
        void restore_ui_settings();
 
        void save_ui_settings();
        void restore_ui_settings();
 

+       void zoom_current_view(double steps);
+

        shared_ptr<Session> get_tab_session(int index) const;
 
        void closeEvent(QCloseEvent *event);
        shared_ptr<Session> get_tab_session(int index) const;
 
        void closeEvent(QCloseEvent *event);


@@ -131,15 +138,21 @@ private Q_SLOTS:
        void on_tab_changed(int index);
        void on_tab_close_requested(int index);
 
        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_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_settingViewShowSamplingPoints_changed(const QVariant new_value);
        void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
 

+       void on_zoom_out_shortcut_triggered();
+       void on_zoom_in_shortcut_triggered();
+

        void on_close_current_tab();
 
 private:
        void on_close_current_tab();
 
 private:


@@ -149,6 +162,7 @@ private:
        shared_ptr<Session> last_focused_session_;
 
        map< QDockWidget*, shared_ptr<views::ViewBase> > view_docks_;
        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_;
 
 
        map< shared_ptr<Session>, QMainWindow*> session_windows_;
 


@@ -164,10 +178,12 @@ private:
        QShortcut *view_sticky_scrolling_shortcut_;
        QShortcut *view_show_sampling_points_shortcut_;
        QShortcut *view_show_analog_minor_grid_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 *view_colored_bg_shortcut_;

        QShortcut *run_stop_shortcut_;
        QShortcut *close_application_shortcut_;
        QShortcut *close_current_tab_shortcut_;
        QShortcut *run_stop_shortcut_;
        QShortcut *close_application_shortcut_;
        QShortcut *close_current_tab_shortcut_;

+       QShortcut *zoom_in_shortcut_;
+       QShortcut *zoom_out_shortcut_;

 };
 
 } // namespace pv
 };
 
 } // namespace pv