X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=2448a3570d45b9f10187a480d6ef7a85dcf5a83d;hp=3cd269f4ff50c162e6868cddd6741a1f9fb91115;hb=cbf7b5db5c3c04b95daf77bc0e6dc112c15e0195;hpb=33e1afbe17cfa91c24adb775aba923f07fbeed01 diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 3cd269f4..2448a357 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -26,9 +26,10 @@ #include #include +#include #include "session.hpp" -#include "view/viewwidget.hpp" +#include "views/viewbase.hpp" struct srd_decoder; @@ -72,10 +73,10 @@ public: QAction* action_view_coloured_bg() const; QAction* action_about() const; - std::shared_ptr get_active_view() const; + std::shared_ptr get_active_view() const; - std::shared_ptr add_view(const QString &title, - view::ViewType type, Session &session); + std::shared_ptr add_view(const QString &title, + views::ViewType type, Session &session); std::shared_ptr add_session(); @@ -96,7 +97,7 @@ private: virtual bool restoreState(const QByteArray &state, int version = 0); private Q_SLOTS: - void on_add_view(const QString &title, view::ViewType type, + void on_add_view(const QString &title, views::ViewType type, Session *session); void on_focus_changed(); @@ -117,8 +118,11 @@ private: std::list< std::shared_ptr > sessions_; - std::map< std::shared_ptr, - std::shared_ptr > view_docks_; + std::map< QDockWidget*, std::shared_ptr > view_docks_; + + std::map< std::shared_ptr, QMainWindow*> session_windows_; + + QTabWidget session_selector_; QAction *const action_view_sticky_scrolling_; QAction *const action_view_coloured_bg_;