X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=aa325e7373c0f3c21a414e35c0f045b07c8ffd9a;hp=0611e0021c512e4c3fb7b654a5432bae168bc38d;hb=c2d0c4848c574365a028e68d0c28831f088b4405;hpb=6f925ba9d6faf1077b73c5a5808259576081716a

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 0611e002..aa325e73 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,12 +25,14 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QShortcut>
 #include <QSignalMapper>
-#include <QToolButton>
 #include <QTabWidget>
-#include <QShortcut>
+#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 = 0);
+		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,17 +85,32 @@ 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,
+		string open_setup_file_name);
+
+	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();
 
+	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);
@@ -102,11 +119,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 +139,22 @@ 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_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();
 
@@ -142,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_;
 
@@ -156,10 +180,17 @@ 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_;
+	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