X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=d2653d26952c51f5078a18a17695deab5cfb01fe;hp=9a66b3452dc00292151d7c054b6be5627af6cc6c;hb=763945bb95fb3f5871d8b8241c8d9db2f0f66d4c;hpb=d290e89f9b28f90b898a57c9f5e288602367cb3d

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 9a66b345..d2653d26 100644
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -14,8 +14,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef PULSEVIEW_PV_MAINWINDOW_HPP
@@ -25,22 +24,19 @@
 #include <map>
 #include <memory>
 
-#include <glibmm/variant.h>
-
 #include <QMainWindow>
+#include <QSignalMapper>
+#include <QToolButton>
+#include <QTabWidget>
+#include <QShortcut>
 
 #include "session.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
 class QVBoxLayout;
 
-namespace sigrok {
-class InputFormat;
-class OutputFormat;
-}
-
 namespace pv {
 
 class DeviceManager;
@@ -65,17 +61,7 @@ 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,
@@ -85,134 +71,93 @@ public:
 
 	~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;
 
-#ifdef ENABLE_DECODE
-	QMenu* menu_decoder_add() const;
-#endif
-
-	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);
 
-	void run_stop();
+	void remove_view(std::shared_ptr<views::ViewBase> view);
 
-	void select_device(std::shared_ptr<devices::Device> device);
+	std::shared_ptr<Session> add_session();
 
-public Q_SLOTS:
-	void export_file(std::shared_ptr<sigrok::OutputFormat> format,
-		bool selection_only = false);
-	void import_file(std::shared_ptr<sigrok::InputFormat> format);
+	void remove_session(std::shared_ptr<Session> session);
 
 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();
 
-	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;
 
-	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);
-
 	virtual QMenu* createPopupMenu();
 
+	virtual bool restoreState(const QByteArray &state, int version = 0);
+
+	void session_error(const QString text, const QString info_text);
+
 private Q_SLOTS:
-	void show_session_error(
-		const QString text, const QString info_text);
+	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_add_view(const QString &title, views::ViewType type,
+		Session *session);
 
-	void on_actionConnect_triggered();
+	void on_focus_changed();
+	void on_focused_session_changed(std::shared_ptr<Session> session);
 
-	void on_actionViewZoomIn_triggered();
+	void on_new_session_clicked();
+	void on_run_stop_clicked();
 
-	void on_actionViewZoomOut_triggered();
+	void on_session_name_changed();
+	void on_capture_state_changed(QObject *obj);
 
-	void on_actionViewZoomFit_triggered();
+	void on_new_view(Session *session);
+	void on_view_close_clicked();
 
-	void on_actionViewZoomOneToOne_triggered();
+	void on_tab_changed(int index);
+	void on_tab_close_requested(int index);
 
 	void on_actionViewStickyScrolling_triggered();
 
 	void on_actionViewColouredBg_triggered();
 
-	void on_actionViewShowCursors_triggered();
-
 	void on_actionAbout_triggered();
 
-	void add_decoder(srd_decoder *decoder);
-
-	void capture_state_changed(int state);
-	void device_selected();
-
-	void sticky_scrolling_changed(bool state);
-
-	void always_zoom_to_fit_changed(bool state);
+	void on_close_current_tab();
 
 private:
 	DeviceManager &device_manager_;
 
-	Session session_;
+	std::list< std::shared_ptr<Session> > sessions_;
+	std::shared_ptr<Session> last_focused_session_;
+
+	std::map< QDockWidget*,	std::shared_ptr<views::ViewBase> > view_docks_;
 
-	std::map< std::shared_ptr<QDockWidget>,
-		std::shared_ptr<pv::view::View> > view_docks_;
+	std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
 
-	toolbars::MainBar *main_bar_;
+	QWidget *static_tab_widget_;
+	QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
+	QTabWidget session_selector_;
+	QSignalMapper session_state_mapper_;
 
-	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_;
 
-#ifdef ENABLE_DECODE
-	QMenu *const menu_decoders_add_;
-#endif
+	QIcon icon_red_;
+	QIcon icon_green_;
+	QIcon icon_grey_;
+
+	QShortcut *run_stop_shortcut_;
+	QShortcut *close_application_shortcut_;
+	QShortcut *close_current_tab_shortcut_;
 };
 
 } // namespace pv