Fix #1292/1294 by snapping to any edge when not hovering over a signal

[pulseview.git] / pv / dialogs / settings.hpp

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 40142056487c8fcc509437d76d1c9629b2986589..f68b31dd69cbff058079224dcae6e7de084fabdc 100644 (file)
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -25,6 +25,7 @@
 #include <QListWidget>
 #include <QPlainTextEdit>
 #include <QStackedWidget>
+#include <QLineEdit>
 
 namespace pv {
 
@@ -46,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;
 
@@ -63,10 +64,14 @@ private Q_SLOTS:
        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);
@@ -77,6 +82,10 @@ private:
        PageListWidget *page_list;
        QStackedWidget *pages;
 
+#ifdef ENABLE_DECODE
+       QLineEdit *ann_export_format_;
+#endif
+
        QPlainTextEdit *log_view_;
 };