MainWindow: Fix "main_window may be uninitialized" error

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index ddad67050f03a5a78317ae00fd00d17750ad53c0..02e1f06e205faab0d014c02aeddf1390b101bc9d 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -26,6 +26,9 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QSignalMapper>
+#include <QToolButton>
+#include <QTabWidget>
 
 #include "session.hpp"
 #include "views/viewbase.hpp"
@@ -88,24 +91,37 @@ 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 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_new_session();
        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();
@@ -116,13 +132,24 @@ private:
        DeviceManager &device_manager_;
 
        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<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_;
 };
 
 } // namespace pv