X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.hpp;h=1473aa59298ebf62fb6cebcc078d4dbe8eedbbd6;hp=11277f7ae9563ac653d3378a421873214f5dfa8e;hb=37b0bd3594a0effb8252c22377f003deafc55b19;hpb=4433246b9ef4247ff469ae7307606a6d872c573f

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 11277f7..1473aa5 100644
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -21,9 +21,12 @@
 #define PULSEVIEW_PV_SETTINGS_HPP
 
 #include <QCheckBox>
+#include <QColor>
 #include <QDialog>
 #include <QListWidget>
+#include <QPlainTextEdit>
 #include <QStackedWidget>
+#include <QLineEdit>
 
 namespace pv {
 
@@ -31,6 +34,8 @@ class DeviceManager;
 
 namespace dialogs {
 
+class PageListWidget;
+
 class Settings : public QDialog
 {
 	Q_OBJECT
@@ -40,31 +45,53 @@ public:
 
 	void create_pages();
 	QCheckBox *create_checkbox(const QString& key, const char* slot) const;
+	QPlainTextEdit *create_log_view() const;
 
+	QWidget *get_general_settings_form(QWidget *parent) const;
 	QWidget *get_view_settings_form(QWidget *parent) const;
-	QWidget *get_decoder_settings_form(QWidget *parent) const;
+	QWidget *get_decoder_settings_form(QWidget *parent);
 	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_general_theme_changed_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_triggerIsZero_changed(int state);
+	void on_view_coloredBG_changed(int state);
 	void on_view_stickyScrolling_changed(int state);
 	void on_view_showSamplingPoints_changed(int state);
+	void on_view_fillSignalHighAreas_changed(int state);
+	void on_view_fillSignalHighAreaColor_changed(QColor color);
 	void on_view_showAnalogMinorGrid_changed(int state);
-	void on_view_showConversionThresholds_changed(int state);
+	void on_view_showHoverMarker_changed(int state);
+	void on_view_snapDistance_changed(int value);
+	void on_view_conversionThresholdDispMode_changed(int state);
 	void on_view_defaultDivHeight_changed(int value);
 	void on_view_defaultLogicHeight_changed(int value);
+#ifdef ENABLE_DECODE
 	void on_dec_initialStateConfigurable_changed(int state);
+	void on_dec_exportFormat_changed(const QString &text);
+#endif
+	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;
+	PageListWidget *page_list;
 	QStackedWidget *pages;
+
+#ifdef ENABLE_DECODE
+	QLineEdit *ann_export_format_;
+#endif
+
+	QPlainTextEdit *log_view_;
 };
 
 } // namespace dialogs