X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.hpp;h=81d09fcee7865c3cc4becedd384a55d7a8adb17d;hp=40b2a56a3e1231f3eed689e2873350ef012f71b2;hb=bcb4c327ee9b8d2172d126429ba017884d079d4c;hpb=669686c18ca6f1ee0697ae7804bfddf4fc6bd1e1

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 40b2a56a..81d09fce 100644
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -20,8 +20,10 @@
 #ifndef PULSEVIEW_PV_SETTINGS_HPP
 #define PULSEVIEW_PV_SETTINGS_HPP
 
+#include <QCheckBox>
 #include <QDialog>
 #include <QListWidget>
+#include <QPlainTextEdit>
 #include <QStackedWidget>
 
 namespace pv {
@@ -38,26 +40,41 @@ public:
 	Settings(DeviceManager &device_manager, QWidget *parent = nullptr);
 
 	void create_pages();
+	QCheckBox *create_checkbox(const QString& key, const char* slot) const;
+	QPlainTextEdit *create_log_view() const;
 
 	QWidget *get_view_settings_form(QWidget *parent) const;
 	QWidget *get_decoder_settings_form(QWidget *parent) const;
 	QWidget *get_about_page(QWidget *parent) const;
+	QWidget *get_logging_page(QWidget *parent) const;
 
 	void accept();
 	void reject();
 
 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_triggerIsZero_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_view_conversionThresholdDispMode_changed(int state);
+	void on_view_defaultDivHeight_changed(int value);
+	void on_view_defaultLogicHeight_changed(int value);
+	void on_dec_initialStateConfigurable_changed(int state);
+	void on_log_logLevel_changed(int value);
+	void on_log_bufferSize_changed(int value);
+	void on_log_saveToFile_clicked(bool checked);
+	void on_log_popOut_clicked(bool checked);
 
 private:
 	DeviceManager &device_manager_;
 	QListWidget *page_list;
 	QStackedWidget *pages;
+
+	QPlainTextEdit *log_view_;
 };
 
 } // namespace dialogs