X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=aa325e7373c0f3c21a414e35c0f045b07c8ffd9a;hp=3cffb54b47ce85f36a49d5a2c85216714751d0ea;hb=HEAD;hpb=d0c0573b3ee694827a747727f862c5f91736ca05

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 3cffb54b..493e3a55 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,13 +26,11 @@
 
 #include <QMainWindow>
 #include <QShortcut>
-#include <QSignalMapper>
 #include <QTabWidget>
 #include <QToolButton>
 
-#include "globalsettings.hpp"
 #include "session.hpp"
-#include "views/viewbase.hpp"
+#include "subwindows/subwindowbase.hpp"
 
 using std::list;
 using std::map;
@@ -54,6 +52,7 @@ class MainBar;
 
 namespace view {
 class View;
+class ViewBase;
 }
 
 namespace widgets {
@@ -62,7 +61,10 @@ class DecoderMenu;
 #endif
 }
 
-class MainWindow : public QMainWindow, public GlobalSettingsInterface
+using pv::views::ViewBase;
+using pv::views::ViewType;
+
+class MainWindow : public QMainWindow
 {
 	Q_OBJECT
 
@@ -75,28 +77,32 @@ public:
 
 	~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,
-		views::ViewType type, Session &session);
+	shared_ptr<views::ViewBase> add_view(ViewType type, Session &session);
+
+	void remove_view(shared_ptr<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);
 
-	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 save_sessions();
 	void restore_sessions();
 
-	void on_setting_changed(const QString &key, const QVariant &value);
-
 private:
 	void setup_ui();
+	void update_acq_button(Session *session);
 
 	void save_ui_settings();
 	void restore_ui_settings();
@@ -109,39 +115,40 @@ private:
 
 	virtual bool restoreState(const QByteArray &state, int version = 0);
 
-	void session_error(const QString text, const QString info_text);
+Q_SIGNALS:
+	void session_error_raised(const QString text, const QString info_text);
 
-private Q_SLOTS:
-	void show_session_error(const QString text, const QString info_text);
+public Q_SLOTS:
+	void on_run_stop_clicked();
+	void on_session_error_raised(const QString text, const QString info_text);
 
-	void on_add_view(const QString &title, views::ViewType type,
-		Session *session);
+private Q_SLOTS:
+	void on_add_view(ViewType type, Session *session);
 
 	void on_focus_changed();
 	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_session_device_changed();
+	void on_session_capture_state_changed(int state);
 
-	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_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_settingViewShowSamplingPoints_changed(const QVariant new_value);
-	void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
-
 	void on_close_current_tab();
 
 private:
@@ -151,13 +158,13 @@ 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_;
 
 	QWidget *static_tab_widget_;
 	QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
 	QTabWidget session_selector_;
-	QSignalMapper session_state_mapper_;
 
 	QIcon icon_red_;
 	QIcon icon_green_;
@@ -166,7 +173,7 @@ private:
 	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_;