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

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 2860c681..0904845f 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -22,21 +22,20 @@
 #define PULSEVIEW_PV_MAINWINDOW_HPP
 
 #include <list>
+#include <map>
 #include <memory>
 
 #include <QMainWindow>
+#include <QToolButton>
+#include <QTabWidget>
 
 #include "session.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
-namespace sigrok {
-class Device;
-class OutputFormat;
-}
-
 namespace pv {
 
 class DeviceManager;
@@ -61,44 +60,28 @@ class MainWindow : public QMainWindow
 	Q_OBJECT
 
 private:
-	/**
-	 * Name of the setting used to remember the directory
-	 * containing the last file that was opened.
-	 */
-	static const char *SettingOpenDirectory;
-
-	/**
-	 * Name of the setting used to remember the directory
-	 * containing the last file that was saved.
-	 */
-	static const char *SettingSaveDirectory;
+	static const QString WindowTitle;
 
 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);
 
-	QAction* action_open() const;
-	QAction* action_save_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_show_cursors() const;
+	~MainWindow();
+
+	QAction* action_view_sticky_scrolling() const;
+	QAction* action_view_coloured_bg() const;
 	QAction* action_about() const;
 
-#ifdef ENABLE_DECODE
-	QMenu* menu_decoder_add() const;
-#endif
+	std::shared_ptr<views::ViewBase> get_active_view() const;
 
-	void run_stop();
+	std::shared_ptr<views::ViewBase> add_view(const QString &title,
+		views::ViewType type, Session &session);
 
-	void select_device(std::shared_ptr<sigrok::Device> device);
+	std::shared_ptr<Session> add_session();
 
-public Q_SLOTS:
-	void export_file(std::shared_ptr<sigrok::OutputFormat> format);
+	void remove_session(std::shared_ptr<Session> session);
 
 private:
 	void setup_ui();
@@ -107,73 +90,52 @@ private:
 
 	void restore_ui_settings();
 
-	void session_error(const QString text, const QString info_text);
-
-	/**
-	 * Updates the device list in the toolbar
-	 */
-	void update_device_list();	
+	std::shared_ptr<Session> get_tab_session(int index) const;
 
 private:
 	void closeEvent(QCloseEvent *event);
 
-	void keyReleaseEvent(QKeyEvent *event);
-
-private Q_SLOTS:
-	void load_file(QString file_name);
+	virtual QMenu* createPopupMenu();
 
-	void show_session_error(
-		const QString text, const QString info_text);
+	virtual bool restoreState(const QByteArray &state, int version = 0);
 
-	void on_actionOpen_triggered();
-	void on_actionSaveAs_triggered();
-	void on_actionQuit_triggered();
-
-	void on_actionConnect_triggered();
+private Q_SLOTS:
+	void on_add_view(const QString &title, views::ViewType type,
+		Session *session);
 
-	void on_actionViewZoomIn_triggered();
+	void on_focus_changed();
+	void on_focused_session_changed(std::shared_ptr<Session> session);
 
-	void on_actionViewZoomOut_triggered();
+	void on_new_session_clicked();
+	void on_session_name_changed();
+	void on_new_view(Session *session);
+	void on_view_close_clicked();
 
-	void on_actionViewZoomFit_triggered();
+	void on_tab_changed(int index);
+	void on_tab_close_requested(int index);
 
-	void on_actionViewZoomOneToOne_triggered();
+	void on_actionViewStickyScrolling_triggered();
 
-	void on_actionViewShowCursors_triggered();
+	void on_actionViewColouredBg_triggered();
 
 	void on_actionAbout_triggered();
 
-	void add_decoder(srd_decoder *decoder);
-
-	void capture_state_changed(int state);
-	void device_selected();
-
 private:
 	DeviceManager &device_manager_;
 
-	Session session_;
+	std::list< std::shared_ptr<Session> > sessions_;
 
-	pv::view::View *view_;
+	std::map< QDockWidget*,	std::shared_ptr<views::ViewBase> > view_docks_;
 
-	QWidget *central_widget_;
-	QVBoxLayout *vertical_layout_;
+	std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
 
-	toolbars::MainBar *main_bar_;
+	QWidget *static_tab_widget_;
+	QToolButton *new_session_button_;
+	QTabWidget session_selector_;
 
-	QAction *const action_open_;
-	QAction *const action_save_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_show_cursors_;
+	QAction *const action_view_sticky_scrolling_;
+	QAction *const action_view_coloured_bg_;
 	QAction *const action_about_;
-
-#ifdef ENABLE_DECODE
-	QMenu *const menu_decoders_add_;
-#endif
 };
 
 } // namespace pv