X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=aa325e7373c0f3c21a414e35c0f045b07c8ffd9a;hb=0822e33a2eb713815ae2cd5d6fcca0865643bb00;hp=6d92b270dc6394f4fd5c2a66bb604766044b8c98;hpb=641574bcc118be0b6dc3a65039ab3497f9d7241a;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 6d92b270..aa325e73 100644
--- 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();
@@ -140,6 +151,11 @@ private Q_SLOTS:
 	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_scroll_to_start_triggered();
+	void on_scroll_to_end_triggered();
+
 	void on_close_current_tab();
 
 private:
@@ -149,6 +165,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_;
 
@@ -168,6 +185,12 @@ private:
 	QShortcut *run_stop_shortcut_;
 	QShortcut *close_application_shortcut_;
 	QShortcut *close_current_tab_shortcut_;
+	QShortcut *zoom_in_shortcut_;
+	QShortcut *zoom_in_shortcut_2_;
+	QShortcut *zoom_out_shortcut_;
+	QShortcut *zoom_out_shortcut_2_;
+	QShortcut *home_shortcut_;
+	QShortcut *end_shortcut_;
 };
 
 } // namespace pv