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

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index 87e8755b..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
@@ -26,9 +25,13 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QSignalMapper>
+#include <QToolButton>
+#include <QTabWidget>
+#include <QShortcut>
 
 #include "session.hpp"
-#include "view/viewwidget.hpp"
+#include "views/viewbase.hpp"
 
 struct srd_decoder;
 
@@ -57,6 +60,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 +75,17 @@ 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<views::ViewBase> add_view(const QString &title,
+		views::ViewType type, Session &session);
 
-	std::shared_ptr<pv::view::View> add_view(const QString &title,
-		view::ViewType type, Session &session);
+	void remove_view(std::shared_ptr<views::ViewBase> view);
 
 	std::shared_ptr<Session> add_session();
 
+	void remove_session(std::shared_ptr<Session> session);
+
 private:
 	void setup_ui();
 
@@ -83,34 +93,71 @@ private:
 
 	void restore_ui_settings();
 
-private:
+	std::shared_ptr<Session> get_tab_session(int index) const;
+
 	void closeEvent(QCloseEvent *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 on_add_view(const QString &title, view::ViewType type,
+	void show_session_error(const QString text, const QString info_text);
+
+	void on_add_view(const QString &title, views::ViewType type,
 		Session *session);
 
+	void on_focus_changed();
+	void on_focused_session_changed(std::shared_ptr<Session> session);
+
+	void on_new_session_clicked();
+	void on_run_stop_clicked();
+
+	void on_session_name_changed();
+	void on_capture_state_changed(QObject *obj);
+
+	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();
 
 	void on_actionViewColouredBg_triggered();
 
 	void on_actionAbout_triggered();
 
+	void on_close_current_tab();
+
 private:
 	DeviceManager &device_manager_;
 
-	std::vector< std::shared_ptr<Session> > sessions_;
+	std::list< std::shared_ptr<Session> > sessions_;
+	std::shared_ptr<Session> last_focused_session_;
 
-	std::map< std::shared_ptr<QDockWidget>,
-		std::shared_ptr<pv::view::View> > view_docks_;
+	std::map< QDockWidget*,	std::shared_ptr<views::ViewBase> > view_docks_;
+
+	std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
+
+	QWidget *static_tab_widget_;
+	QToolButton *new_session_button_, *run_stop_button_, *settings_button_;
+	QTabWidget session_selector_;
+	QSignalMapper session_state_mapper_;
 
 	QAction *const action_view_sticky_scrolling_;
 	QAction *const action_view_coloured_bg_;
 	QAction *const action_about_;
+
+	QIcon icon_red_;
+	QIcon icon_green_;
+	QIcon icon_grey_;
+
+	QShortcut *run_stop_shortcut_;
+	QShortcut *close_application_shortcut_;
+	QShortcut *close_current_tab_shortcut_;
 };
 
 } // namespace pv