X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=2a2dabcdc542cfd0d71490c99f3842e6852dc0c6;hp=a99e0adf9c7b4604c8b04c22869c45805531890a;hb=97378470ded88af84edaa0f1063d10d834475665;hpb=9b64f2dfe9179f665ef97c0d0ac992274864f4a4

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index a99e0adf..2a2dabcd 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,14 +25,21 @@
 #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;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
 struct srd_decoder;
 
 class QVBoxLayout;
@@ -56,7 +63,7 @@ class DecoderMenu;
 #endif
 }
 
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow, public GlobalSettingsInterface
 {
 	Q_OBJECT
 
@@ -65,31 +72,42 @@ private:
 
 public:
 	explicit MainWindow(DeviceManager &device_manager,
-		std::string open_file_name = std::string(),
-		std::string open_file_format = std::string(),
-		QWidget *parent = 0);
+		QWidget *parent = nullptr);
 
 	~MainWindow();
 
-	std::shared_ptr<views::ViewBase> get_active_view() const;
+	static void show_session_error(const QString text, const QString info_text);
+
+	shared_ptr<views::ViewBase> get_active_view() const;
 
-	std::shared_ptr<views::ViewBase> add_view(const QString &title,
+	shared_ptr<views::ViewBase> add_view(const QString &title,
 		views::ViewType type, Session &session);
 
-	void remove_view(std::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();
 
-	std::shared_ptr<Session> add_session();
+	void remove_session(shared_ptr<Session> session);
 
-	void remove_session(std::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();
 
-	std::shared_ptr<Session> get_tab_session(int index) const;
+	shared_ptr<Session> get_tab_session(int index) const;
 
 	void closeEvent(QCloseEvent *event);
 
@@ -97,16 +115,12 @@ 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);
 
 	void on_focus_changed();
-	void on_focused_session_changed(std::shared_ptr<Session> session);
+	void on_focused_session_changed(shared_ptr<Session> session);
 
 	void on_new_session_clicked();
 	void on_run_stop_clicked();
@@ -121,22 +135,30 @@ 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();
 
 private:
 	DeviceManager &device_manager_;
 
-	std::list< std::shared_ptr<Session> > sessions_;
-	std::shared_ptr<Session> last_focused_session_;
+	list< shared_ptr<Session> > sessions_;
+	shared_ptr<Session> last_focused_session_;
 
-	std::map< QDockWidget*,	std::shared_ptr<views::ViewBase> > view_docks_;
+	map< QDockWidget*, shared_ptr<views::ViewBase> > view_docks_;
+	map< QDockWidget*, shared_ptr<subwindows::SubWindowBase> > sub_windows_;
 
-	std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
+	map< shared_ptr<Session>, QMainWindow*> session_windows_;
 
 	QWidget *static_tab_widget_;
 	QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
@@ -148,7 +170,9 @@ private:
 	QIcon icon_grey_;
 
 	QShortcut *view_sticky_scrolling_shortcut_;
-	QShortcut *view_coloured_bg_shortcut_;
+	QShortcut *view_show_sampling_points_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_;