X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=618a10e0fb51b1097a2e3b91216dd0c46a5778ad;hb=55547a4510d8ff310ab1ac57e69e3e51132b2c2f;hp=bf0aa125b090ebe43ebd5951ad4f03b334cce884;hpb=7d6984a5ccd1c7fee225240d7cfd5685796cfea0;p=pulseview.git

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index bf0aa12..618a10e 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -30,6 +30,7 @@
 #include <QMainWindow>
 
 #include "session.hpp"
+#include "view/viewwidget.hpp"
 
 struct srd_decoder;
 
@@ -82,6 +83,8 @@ public:
 		std::string open_file_format = std::string(),
 		QWidget *parent = 0);
 
+	~MainWindow();
+
 	QAction* action_open() const;
 	QAction* action_save_as() const;
 	QAction* action_save_selection_as() const;
@@ -92,6 +95,7 @@ public:
 	QAction* action_view_zoom_fit() const;
 	QAction* action_view_zoom_one_to_one() const;
 	QAction* action_view_sticky_scrolling() const;
+	QAction* action_view_coloured_bg() const;
 	QAction* action_view_show_cursors() const;
 	QAction* action_about() const;
 
@@ -99,6 +103,11 @@ public:
 	QMenu* menu_decoder_add() const;
 #endif
 
+	std::shared_ptr<pv::view::View> get_active_view() const;
+
+	std::shared_ptr<pv::view::View> add_view(const QString &title,
+		view::ViewType type, Session &session);
+
 	void run_stop();
 
 	void select_device(std::shared_ptr<devices::Device> device);
@@ -139,6 +148,10 @@ private:
 
 	void keyReleaseEvent(QKeyEvent *event);
 
+	virtual QMenu* createPopupMenu();
+
+	virtual bool restoreState(const QByteArray &state, int version = 0);
+
 private Q_SLOTS:
 	void show_session_error(
 		const QString text, const QString info_text);
@@ -160,6 +173,8 @@ private Q_SLOTS:
 
 	void on_actionViewStickyScrolling_triggered();
 
+	void on_actionViewColouredBg_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
@@ -178,10 +193,8 @@ private:
 
 	Session session_;
 
-	pv::view::View *view_;
-
-	QWidget *central_widget_;
-	QVBoxLayout *vertical_layout_;
+	std::map< std::shared_ptr<QDockWidget>,
+		std::shared_ptr<pv::view::View> > view_docks_;
 
 	toolbars::MainBar *main_bar_;
 
@@ -195,6 +208,7 @@ private:
 	QAction *const action_view_zoom_fit_;
 	QAction *const action_view_zoom_one_to_one_;
 	QAction *const action_view_sticky_scrolling_;
+	QAction *const action_view_coloured_bg_;
 	QAction *const action_view_show_cursors_;
 	QAction *const action_about_;