X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fmainwindow.hpp;h=e10d1817f947ecb68387cf2f8bd154a3736050cf;hp=522ab1c0478ea7d1def85a90ada942733735f182;hb=HEAD;hpb=f1f3fa718b6ad2640dfb2fef1d7212b2ed450b71 diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp index 522ab1c0..493e3a55 100644 --- a/pv/mainwindow.hpp +++ b/pv/mainwindow.hpp @@ -31,7 +31,6 @@ #include "session.hpp" #include "subwindows/subwindowbase.hpp" -#include "views/viewbase.hpp" using std::list; using std::map; @@ -53,6 +52,7 @@ class MainBar; namespace view { class View; +class ViewBase; } namespace widgets { @@ -61,6 +61,9 @@ class DecoderMenu; #endif } +using pv::views::ViewBase; +using pv::views::ViewType; + class MainWindow : public QMainWindow { Q_OBJECT @@ -78,9 +81,9 @@ public: shared_ptr get_active_view() const; - shared_ptr add_view(views::ViewType type, Session &session); + shared_ptr add_view(ViewType type, Session &session); - void remove_view(shared_ptr view); + void remove_view(shared_ptr view); shared_ptr add_subwindow( subwindows::SubWindowType type, Session &session); @@ -112,14 +115,20 @@ private: virtual bool restoreState(const QByteArray &state, int version = 0); +Q_SIGNALS: + void session_error_raised(const QString text, const QString info_text); + +public Q_SLOTS: + void on_run_stop_clicked(); + void on_session_error_raised(const QString text, const QString info_text); + private Q_SLOTS: - void on_add_view(views::ViewType type, Session *session); + void on_add_view(ViewType type, Session *session); void on_focus_changed(); void on_focused_session_changed(shared_ptr session); void on_new_session_clicked(); - void on_run_stop_clicked(); void on_settings_clicked(); void on_session_name_changed();