projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
logging: Minor consistency fixes.
[pulseview.git]
/
pv
/
mainwindow.hpp
diff --git
a/pv/mainwindow.hpp
b/pv/mainwindow.hpp
index e3e98e36b6daa6a0b6432f5b78f10d69e6fcf2af..3cffb54b47ce85f36a49d5a2c85216714751d0ea 100644
(file)
--- a/
pv/mainwindow.hpp
+++ b/
pv/mainwindow.hpp
@@
-25,11
+25,12
@@
#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 "globalsettings.hpp"
#include "session.hpp"
#include "views/viewbase.hpp"
#include "session.hpp"
#include "views/viewbase.hpp"
@@
-61,7
+62,7
@@
class DecoderMenu;
#endif
}
#endif
}
-class MainWindow : public QMainWindow
+class MainWindow : public QMainWindow
, public GlobalSettingsInterface
{
Q_OBJECT
{
Q_OBJECT
@@
-70,8
+71,6
@@
private:
public:
explicit MainWindow(DeviceManager &device_manager,
public:
explicit MainWindow(DeviceManager &device_manager,
- string open_file_name = string(),
- string open_file_format = string(),
QWidget *parent = nullptr);
~MainWindow();
QWidget *parent = nullptr);
~MainWindow();
@@
-87,11
+86,19
@@
public:
void remove_session(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();
+
+ void on_setting_changed(const QString &key, const QVariant &value);
+
private:
void setup_ui();
void save_ui_settings();
private:
void setup_ui();
void save_ui_settings();
-
void restore_ui_settings();
shared_ptr<Session> get_tab_session(int index) const;
void restore_ui_settings();
shared_ptr<Session> get_tab_session(int index) const;
@@
-129,9
+136,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
+165,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_;