projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Integrate the about dialog into the settings dialog
[pulseview.git]
/
pv
/
dialogs
/
settings.hpp
diff --git
a/pv/dialogs/settings.hpp
b/pv/dialogs/settings.hpp
index 913da27ead3d94ef34ffa74c38fd6b82ce505642..f050112051085e57672d058a03f7b0fefd73b6a7 100644
(file)
--- a/
pv/dialogs/settings.hpp
+++ b/
pv/dialogs/settings.hpp
@@
-25,6
+25,9
@@
#include <QStackedWidget>
namespace pv {
#include <QStackedWidget>
namespace pv {
+
+class DeviceManager;
+
namespace dialogs {
class Settings : public QDialog
namespace dialogs {
class Settings : public QDialog
@@
-32,11
+35,12
@@
class Settings : public QDialog
Q_OBJECT
public:
Q_OBJECT
public:
- Settings(QWidget *parent = 0);
+ Settings(
DeviceManager &device_manager,
QWidget *parent = 0);
void create_pages();
QWidget *get_view_settings_form(QWidget *parent) const;
void create_pages();
QWidget *get_view_settings_form(QWidget *parent) const;
+ QWidget *get_about_page(QWidget *parent) const;
void accept();
void reject();
void accept();
void reject();
@@
-47,6
+51,7
@@
private Q_SLOTS:
void on_view_colouredBG_changed(int state);
private:
void on_view_colouredBG_changed(int state);
private:
+ DeviceManager &device_manager_;
QListWidget *page_list;
QStackedWidget *pages;
};
QListWidget *page_list;
QStackedWidget *pages;
};