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 0611e0021c512e4c3fb7b654a5432bae168bc38d..71cad57817a0554ad832b8710e0dc39dbe8fcc91 100644 (file)
--- a/pv/mainwindow.hpp
+++ b/pv/mainwindow.hpp
@@ -25,10 +25,10 @@
 #include <memory>
 
 #include <QMainWindow>
+#include <QShortcut>
 #include <QSignalMapper>
-#include <QToolButton>
 #include <QTabWidget>
-#include <QShortcut>
+#include <QToolButton>
 
 #include "session.hpp"
 #include "views/viewbase.hpp"
@@ -70,9 +70,7 @@ private:
 
 public:
        explicit MainWindow(DeviceManager &device_manager,
-               string open_file_name = string(),
-               string open_file_format = string(),
-               QWidget *parent = 0);
+               QWidget *parent = nullptr);
 
        ~MainWindow();
 
@@ -87,11 +85,17 @@ public:
 
        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();
 
        shared_ptr<Session> get_tab_session(int index) const;
@@ -129,9 +133,11 @@ private Q_SLOTS:
        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_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();
 
@@ -156,6 +162,7 @@ private:
 
        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_;