X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=618a10e0fb51b1097a2e3b91216dd0c46a5778ad;hp=35ccf0655d10b4e37699f87d47d9f308cb007822;hb=55547a4510d8ff310ab1ac57e69e3e51132b2c2f;hpb=dd3fd4df34d129c83f7f5d80ff1e8b998beca63d

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 35ccf065..618a10e0 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;
 
@@ -78,17 +79,23 @@ private:
 
 public:
 	explicit MainWindow(DeviceManager &device_manager,
-		const char *open_file_name = NULL,
+		std::string open_file_name = std::string(),
+		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;
 	QAction* action_connect() const;
 	QAction* action_quit() const;
 	QAction* action_view_zoom_in() const;
 	QAction* action_view_zoom_out() const;
 	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;
 
@@ -96,16 +103,28 @@ 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);
 
 public Q_SLOTS:
-	void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+	void export_file(std::shared_ptr<sigrok::OutputFormat> format,
+		bool selection_only = false);
+	void import_file(std::shared_ptr<sigrok::InputFormat> format);
 
 private:
 	void setup_ui();
 
+	void select_init_device();
+
+	void load_init_file(const std::string &file_name,
+		const std::string &format);
+
 	void save_ui_settings();
 
 	void restore_ui_settings();
@@ -117,22 +136,29 @@ private:
 	 */
 	void update_device_list();	
 
+	void load_file(QString file_name,
+		std::shared_ptr<sigrok::InputFormat> format = nullptr,
+		const std::map<std::string, Glib::VariantBase> &options =
+			std::map<std::string, Glib::VariantBase>());
+
+	void save_selection_to_file();
+
 private:
 	void closeEvent(QCloseEvent *event);
 
 	void keyReleaseEvent(QKeyEvent *event);
 
-private Q_SLOTS:
-	void load_file(QString file_name,
-		std::shared_ptr<sigrok::InputFormat> format = nullptr,
-		const std::map<std::string, Glib::VariantBase> &options =
-			std::map<std::string, Glib::VariantBase>());
+	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);
 
 	void on_actionOpen_triggered();
 	void on_actionSaveAs_triggered();
+	void on_actionSaveSelectionAs_triggered();
 	void on_actionQuit_triggered();
 
 	void on_actionConnect_triggered();
@@ -145,6 +171,10 @@ private Q_SLOTS:
 
 	void on_actionViewZoomOneToOne_triggered();
 
+	void on_actionViewStickyScrolling_triggered();
+
+	void on_actionViewColouredBg_triggered();
+
 	void on_actionViewShowCursors_triggered();
 
 	void on_actionAbout_triggered();
@@ -154,26 +184,31 @@ private Q_SLOTS:
 	void capture_state_changed(int state);
 	void device_selected();
 
+	void sticky_scrolling_changed(bool state);
+
+	void always_zoom_to_fit_changed(bool state);
+
 private:
 	DeviceManager &device_manager_;
 
 	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_;
 
 	QAction *const action_open_;
 	QAction *const action_save_as_;
+	QAction *const action_save_selection_as_;
 	QAction *const action_connect_;
 	QAction *const action_quit_;
 	QAction *const action_view_zoom_in_;
 	QAction *const action_view_zoom_out_;
 	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_;