projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix #862 by implementing -c / --clean
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index 0611e0021c512e4c3fb7b654a5432bae168bc38d..ab0f871e924ad7d90c7203ab91a502f32ea3344d 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-25,10
+25,10
@@
#include <memory>
#include <QMainWindow>
#include <memory>
#include <QMainWindow>
+#include <QShortcut>
#include <QSignalMapper>
#include <QSignalMapper>
-#include <QToolButton>
#include <QTabWidget>
#include <QTabWidget>
-#include <Q
Shortcut
>
+#include <Q
ToolButton
>
#include "session.hpp"
#include "views/viewbase.hpp"
#include "session.hpp"
#include "views/viewbase.hpp"
@@
-72,7
+72,8
@@
public:
explicit MainWindow(DeviceManager &device_manager,
string open_file_name = string(),
string open_file_format = string(),
explicit MainWindow(DeviceManager &device_manager,
string open_file_name = string(),
string open_file_format = string(),
- QWidget *parent = 0);
+ bool restore_sessions = true,
+ QWidget *parent = nullptr);
~MainWindow();
~MainWindow();
@@
-92,7
+93,7
@@
private:
void save_ui_settings();
void save_ui_settings();
- void restore_ui_settings();
+ void restore_ui_settings(
bool restore_sessions
);
shared_ptr<Session> get_tab_session(int index) const;
shared_ptr<Session> get_tab_session(int index) const;
@@
-129,9
+130,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_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_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();
void on_close_current_tab();
@@
-156,6
+159,7
@@
private:
QShortcut *view_sticky_scrolling_shortcut_;
QShortcut *view_show_sampling_points_shortcut_;
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 *view_coloured_bg_shortcut_;
QShortcut *run_stop_shortcut_;
QShortcut *close_application_shortcut_;