projects
/
pulseview.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DecodeSignal: Auto-assign only the channels of newly added decoders
[pulseview.git]
/
pv
/
dialogs
/
settings.hpp
diff --git
a/pv/dialogs/settings.hpp
b/pv/dialogs/settings.hpp
index b204d683ad24829edcfa6f94084206d7bf289d86..6477757f7f60e58f29ad48fcd791d359f6e4af7b 100644
(file)
--- a/
pv/dialogs/settings.hpp
+++ b/
pv/dialogs/settings.hpp
@@
-20,6
+20,7
@@
#ifndef PULSEVIEW_PV_SETTINGS_HPP
#define PULSEVIEW_PV_SETTINGS_HPP
#ifndef PULSEVIEW_PV_SETTINGS_HPP
#define PULSEVIEW_PV_SETTINGS_HPP
+#include <QCheckBox>
#include <QDialog>
#include <QListWidget>
#include <QStackedWidget>
#include <QDialog>
#include <QListWidget>
#include <QStackedWidget>
@@
-35,11
+36,13
@@
class Settings : public QDialog
Q_OBJECT
public:
Q_OBJECT
public:
- Settings(DeviceManager &device_manager, QWidget *parent =
0
);
+ Settings(DeviceManager &device_manager, QWidget *parent =
nullptr
);
void create_pages();
void create_pages();
+ QCheckBox *create_checkbox(const QString& key, const char* slot) const;
QWidget *get_view_settings_form(QWidget *parent) const;
QWidget *get_view_settings_form(QWidget *parent) const;
+ QWidget *get_decoder_settings_form(QWidget *parent) const;
QWidget *get_about_page(QWidget *parent) const;
void accept();
QWidget *get_about_page(QWidget *parent) const;
void accept();
@@
-47,9
+50,13
@@
public:
private Q_SLOTS:
void on_page_changed(QListWidgetItem *current, QListWidgetItem *previous);
private Q_SLOTS:
void on_page_changed(QListWidgetItem *current, QListWidgetItem *previous);
- void on_view_alwaysZoomToFit_changed(int state);
+ void on_view_zoomToFitDuringAcq_changed(int state);
+ void on_view_zoomToFitAfterAcq_changed(int state);
void on_view_colouredBG_changed(int state);
void on_view_stickyScrolling_changed(int state);
void on_view_colouredBG_changed(int state);
void on_view_stickyScrolling_changed(int state);
+ void on_view_showSamplingPoints_changed(int state);
+ void on_view_showAnalogMinorGrid_changed(int state);
+ void on_dec_initialStateConfigurable_changed(int state);
private:
DeviceManager &device_manager_;
private:
DeviceManager &device_manager_;