X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=06eba40ac212760373defba5fbdac8b7c46b9037;hb=81dc02212c05c99554194a15f9b584e6b500cda9;hp=ac098b21ae3580b9a8350d377f74e5773e0b6faa;hpb=9eae6de4dd0a3c628026eca6ca55cef8b70bfa86;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index ac098b21..06eba40a 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,14 +25,20 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QShortcut>
 #include <QSignalMapper>
-#include <QToolButton>
 #include <QTabWidget>
-#include <QShortcut>
+#include <QToolButton>
 
 #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;
@@ -65,33 +71,40 @@ 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();
 
-	QAction* action_about() const;
+	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(views::ViewType type, Session &session);
+
+	void remove_view(shared_ptr<views::ViewBase> view);
 
-	std::shared_ptr<views::ViewBase> get_active_view() const;
+	shared_ptr<subwindows::SubWindowBase> add_subwindow(
+		subwindows::SubWindowType type, Session &session);
 
-	std::shared_ptr<views::ViewBase> add_view(const QString &title,
-		views::ViewType type, Session &session);
+	shared_ptr<Session> add_session();
 
-	void remove_view(std::shared_ptr<views::ViewBase> view);
+	void remove_session(shared_ptr<Session> session);
 
-	std::shared_ptr<Session> add_session();
+	void add_session_with_file(string open_file_name, string open_file_format,
+		string open_setup_file_name);
 
-	void remove_session(std::shared_ptr<Session> session);
+	void add_default_session();
+
+	void save_sessions();
+	void restore_sessions();
 
 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);
 
@@ -99,60 +112,59 @@ 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_add_view(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();
+	void on_settings_clicked();
 
 	void on_session_name_changed();
 	void on_capture_state_changed(QObject *obj);
 
-	void on_new_view(Session *session);
+	void on_new_view(Session *session, int view_type);
 	void on_view_close_clicked();
 
 	void on_tab_changed(int index);
 	void on_tab_close_requested(int index);
 
-	void on_view_sticky_scrolling_shortcut();
-
-	void on_view_coloured_bg_shortcut();
+	void on_show_decoder_selector(Session *session);
+	void on_sub_window_close_clicked();
 
-	void on_actionAbout_triggered();
+	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_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_;
 	QTabWidget session_selector_;
 	QSignalMapper session_state_mapper_;
 
-	QAction *const action_about_;
-
 	QIcon icon_red_;
 	QIcon icon_green_;
 	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_;