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

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 6d92b270..06eba40a 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -30,8 +30,8 @@
 #include <QTabWidget>
 #include <QToolButton>
 
-#include "globalsettings.hpp"
 #include "session.hpp"
+#include "subwindows/subwindowbase.hpp"
 #include "views/viewbase.hpp"
 
 using std::list;
@@ -62,7 +62,7 @@ class DecoderMenu;
 #endif
 }
 
-class MainWindow : public QMainWindow, public GlobalSettingsInterface
+class MainWindow : public QMainWindow
 {
 	Q_OBJECT
 
@@ -79,24 +79,25 @@ public:
 
 	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(views::ViewType type, Session &session);
 
 	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();
 
@@ -112,8 +113,7 @@ private:
 	virtual bool restoreState(const QByteArray &state, int version = 0);
 
 private Q_SLOTS:
-	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(shared_ptr<Session> session);
@@ -125,21 +125,20 @@ private Q_SLOTS:
 	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_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_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:
@@ -149,6 +148,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_;