Main(Window): Let the UI and sessions be restored after w.show()

[pulseview.git] / pv / mainwindow.hpp

diff --git a/pv/mainwindow.hpp b/pv/mainwindow.hpp
index d2653d26952c51f5078a18a17695deab5cfb01fe..71cad57817a0554ad832b8710e0dc39dbe8fcc91 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,14 +25,19 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QShortcut>
 #include <QSignalMapper>
-#include <QToolButton>
 #include <QTabWidget>
-#include <QShortcut>
+#include <QToolButton>
 
 #include "session.hpp"
 #include "views/viewbase.hpp"
 
+using std::list;
+using std::map;
+using std::shared_ptr;
+using std::string;
+
 struct srd_decoder;
 
 class QVBoxLayout;
@@ -65,35 +70,35 @@ private:
 
 public:
        explicit MainWindow(DeviceManager &device_manager,
-               std::string open_file_name = std::string(),
-               std::string open_file_format = std::string(),
-               QWidget *parent = 0);
+               QWidget *parent = nullptr);
 
        ~MainWindow();
 
-       QAction* action_view_sticky_scrolling() const;
-       QAction* action_view_coloured_bg() const;
-       QAction* action_about() const;
-
-       std::shared_ptr<views::ViewBase> get_active_view() const;
+       shared_ptr<views::ViewBase> get_active_view() const;
 
-       std::shared_ptr<views::ViewBase> add_view(const QString &title,
+       shared_ptr<views::ViewBase> add_view(const QString &title,
                views::ViewType type, Session &session);
 
-       void remove_view(std::shared_ptr<views::ViewBase> view);
+       void remove_view(shared_ptr<views::ViewBase> view);
 
-       std::shared_ptr<Session> add_session();
+       shared_ptr<Session> add_session();
 
-       void remove_session(std::shared_ptr<Session> session);
+       void remove_session(shared_ptr<Session> session);
+
+       void add_session_with_file(string open_file_name, string open_file_format);
+
+       void add_default_session();
+
+       void save_sessions();
+       void restore_sessions();
 
 private:
        void setup_ui();
 
        void save_ui_settings();
-
        void restore_ui_settings();
 
-       std::shared_ptr<Session> get_tab_session(int index) const;
+       shared_ptr<Session> get_tab_session(int index) const;
 
        void closeEvent(QCloseEvent *event);
 
@@ -110,10 +115,11 @@ private Q_SLOTS:
                Session *session);
 
        void on_focus_changed();
-       void on_focused_session_changed(std::shared_ptr<Session> session);
+       void on_focused_session_changed(shared_ptr<Session> session);
 
        void on_new_session_clicked();
        void on_run_stop_clicked();
+       void on_settings_clicked();
 
        void on_session_name_changed();
        void on_capture_state_changed(QObject *obj);
@@ -124,37 +130,40 @@ private Q_SLOTS:
        void on_tab_changed(int index);
        void on_tab_close_requested(int index);
 
-       void on_actionViewStickyScrolling_triggered();
-
-       void on_actionViewColouredBg_triggered();
+       void on_view_coloured_bg_shortcut();
+       void on_view_sticky_scrolling_shortcut();
+       void on_view_show_sampling_points_shortcut();
+       void on_view_show_analog_minor_grid_shortcut();
 
-       void on_actionAbout_triggered();
+       void on_settingViewColouredBg_changed(const QVariant new_value);
+       void on_settingViewShowSamplingPoints_changed(const QVariant new_value);
+       void on_settingViewShowAnalogMinorGrid_changed(const QVariant new_value);
 
        void on_close_current_tab();
 
 private:
        DeviceManager &device_manager_;
 
-       std::list< std::shared_ptr<Session> > sessions_;
-       std::shared_ptr<Session> last_focused_session_;
+       list< shared_ptr<Session> > sessions_;
+       shared_ptr<Session> last_focused_session_;
 
-       std::map< QDockWidget*, std::shared_ptr<views::ViewBase> > view_docks_;
+       map< QDockWidget*, shared_ptr<views::ViewBase> > view_docks_;
 
-       std::map< std::shared_ptr<Session>, QMainWindow*> session_windows_;
+       map< 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 *view_sticky_scrolling_shortcut_;
+       QShortcut *view_show_sampling_points_shortcut_;
+       QShortcut *view_show_analog_minor_grid_shortcut_;
+       QShortcut *view_coloured_bg_shortcut_;
        QShortcut *run_stop_shortcut_;
        QShortcut *close_application_shortcut_;
        QShortcut *close_current_tab_shortcut_;