X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=e9cecfb1deab73c4fcf3cb81578b3d5829c71c65;hb=3b84fd0b5f02dedfb6f7160477a63467b613c502;hp=3cd269f4ff50c162e6868cddd6741a1f9fb91115;hpb=33e1afbe17cfa91c24adb775aba923f07fbeed01;p=pulseview.git diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 3cd269f..e9cecfb 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(); @@ -118,7 +119,11 @@ private: std::list< std::shared_ptr > sessions_; std::map< std::shared_ptr, - std::shared_ptr > view_docks_; + 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_;