Session: Fix issue #67 by improving error handling

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

diff --git a/pv/dialogs/settings.hpp b/pv/dialogs/settings.hpp
index 71fbaf40c5c58191a9d56fb2be5c3877edbaf8a9..bd3572ff977620daeff29968a9fc50a163312543 100644 (file)
--- a/pv/dialogs/settings.hpp
+++ b/pv/dialogs/settings.hpp
@@ -17,14 +17,16 @@
  * along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef PULSEVIEW_PV_SETTINGS_HPP
-#define PULSEVIEW_PV_SETTINGS_HPP
+#ifndef PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
+#define PULSEVIEW_PV_DIALOGS_SETTINGS_HPP
 
 #include <QCheckBox>
+#include <QColor>
 #include <QDialog>
 #include <QListWidget>
 #include <QPlainTextEdit>
 #include <QStackedWidget>
+#include <QLineEdit>
 
 namespace pv {
 
@@ -45,27 +47,44 @@ public:
        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;
 
+private Q_SLOTS:
        void accept();
        void reject();
 
-private Q_SLOTS:
        void on_page_changed(QListWidgetItem *current, QListWidgetItem *previous);
+       void on_general_language_changed(const QString &text);
+       void on_general_theme_changed(int value);
+       void on_general_style_changed(int value);
+       void on_general_save_with_setup_changed(int state);
+       void on_general_start_all_sessions_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_coloredBG_changed(int state);
        void on_view_stickyScrolling_changed(int state);
+       void on_view_allowVerticalDragging_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_showHoverMarker_changed(int state);
+       void on_view_keepRulerItemSelected_changed(int state);
+       void on_view_snapDistance_changed(int value);
+       void on_view_cursorFillColor_changed(QColor color);
        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);
+       void on_dec_alwaysshowallrows_changed(int state);
+#endif
        void on_log_logLevel_changed(int value);
        void on_log_bufferSize_changed(int value);
        void on_log_saveToFile_clicked(bool checked);
@@ -76,10 +95,14 @@ private:
        PageListWidget *page_list;
        QStackedWidget *pages;
 
+#ifdef ENABLE_DECODE
+       QLineEdit *ann_export_format_;
+#endif
+
        QPlainTextEdit *log_view_;
 };
 
 } // namespace dialogs
 } // namespace pv
 
-#endif // PULSEVIEW_PV_SETTINGS_HPP
+#endif // PULSEVIEW_PV_DIALOGS_SETTINGS_HPP