X-Git-Url: http://git.code-monkey.de/?p=pulseview.git;a=blobdiff_plain;f=pv%2Fdialogs%2Fsettings.hpp;h=f68b31dd69cbff058079224dcae6e7de084fabdc;hp=81d09fcee7865c3cc4becedd384a55d7a8adb17d;hb=fb64180193664005567570724d52b685913e15ed;hpb=bcb4c327ee9b8d2172d126429ba017884d079d4c

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 81d09fc..f68b31d 100644
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -25,6 +25,7 @@
 #include <QListWidget>
 #include <QPlainTextEdit>
 #include <QStackedWidget>
+#include <QLineEdit>
 
 namespace pv {
 
@@ -32,6 +33,8 @@ class DeviceManager;
 
 namespace dialogs {
 
+class PageListWidget;
+
 class Settings : public QDialog
 {
 	Q_OBJECT
@@ -44,7 +47,7 @@ public:
 	QPlainTextEdit *create_log_view() 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;
 
@@ -56,14 +59,19 @@ private Q_SLOTS:
 	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_coloredBG_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_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);
@@ -71,9 +79,13 @@ private Q_SLOTS:
 
 private:
 	DeviceManager &device_manager_;
-	QListWidget *page_list;
+	PageListWidget *page_list;
 	QStackedWidget *pages;
 
+#ifdef ENABLE_DECODE
+	QLineEdit *ann_export_format_;
+#endif
+
 	QPlainTextEdit *log_view_;
 };