X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=0904845f983e5362c8ad56ee76633dcac8ce5e6e;hp=2bd8dadbf815d8ebdc594c9a3afb92208319a3ad;hb=cc9646457d64b0a74e59ef511c3ae3db345bdbe4;hpb=c9da51187f8db0c9822d544a0253e0e7a58945d7

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 2bd8dadb..0904845f 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,9 +26,11 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QToolButton>
+#include <QTabWidget>
 
 #include "session.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
@@ -57,6 +59,9 @@ class MainWindow : public QMainWindow
 {
 	Q_OBJECT
 
+private:
+	static const QString WindowTitle;
+
 public:
 	explicit MainWindow(DeviceManager &device_manager,
 		std::string open_file_name = std::string(),
@@ -69,13 +74,15 @@ public:
 	QAction* action_view_coloured_bg() const;
 	QAction* action_about() const;
 
-	std::shared_ptr<pv::view::View> get_active_view() const;
+	std::shared_ptr<views::ViewBase> get_active_view() const;
 
-	std::shared_ptr<pv::view::View> add_view(const QString &title,
-		view::ViewType type, Session &session);
+	std::shared_ptr<views::ViewBase> add_view(const QString &title,
+		views::ViewType type, Session &session);
 
 	std::shared_ptr<Session> add_session();
 
+	void remove_session(std::shared_ptr<Session> session);
+
 private:
 	void setup_ui();
 
@@ -83,6 +90,8 @@ private:
 
 	void restore_ui_settings();
 
+	std::shared_ptr<Session> get_tab_session(int index) const;
+
 private:
 	void closeEvent(QCloseEvent *event);
 
@@ -91,11 +100,19 @@ private:
 	virtual bool restoreState(const QByteArray &state, int version = 0);
 
 private Q_SLOTS:
-	void on_add_view(const QString &title, view::ViewType type,
+	void on_add_view(const QString &title, views::ViewType type,
 		Session *session);
 
-	void on_new_session();
+	void on_focus_changed();
+	void on_focused_session_changed(std::shared_ptr<Session> session);
+
+	void on_new_session_clicked();
+	void on_session_name_changed();
 	void on_new_view(Session *session);
+	void on_view_close_clicked();
+
+	void on_tab_changed(int index);
+	void on_tab_close_requested(int index);
 
 	void on_actionViewStickyScrolling_triggered();
 
@@ -106,10 +123,15 @@ private Q_SLOTS:
 private:
 	DeviceManager &device_manager_;
 
-	std::vector< std::shared_ptr<Session> > sessions_;
+	std::list< std::shared_ptr<Session> > sessions_;
+
+	std::map< QDockWidget*,	std::shared_ptr<views::ViewBase> > view_docks_;
+
+	std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
 
-	std::map< std::shared_ptr<QDockWidget>,
-		std::shared_ptr<pv::view::View> > view_docks_;
+	QWidget *static_tab_widget_;
+	QToolButton *new_session_button_;
+	QTabWidget session_selector_;
 
 	QAction *const action_view_sticky_scrolling_;
 	QAction *const action_view_coloured_bg_;