Merge branch 'unstable' into trackhat

* unstable:
cmake: cleanup hydra
rename gui directory
move to subdirectory-based build system
cmake: switch to GNU CC 5.2.0 in mingw-w64 toolchain file
rift-080: forgot ovr_Initialize()
rift 025: fix name

1 files changed, 46 insertions, 0 deletions

diff --git a/gui/options-dialog.hpp b/gui/options-dialog.hpp
new file mode 100644
index 00000000..8fc16611
--- /dev/null
+++ b/gui/options-dialog.hpp
@@ -0,0 +1,46 @@
+#pragma once
+
+#include <QObject>
+#include <QWidget>
+#include <QTimer>
+#include "ui_settings.h"
+#include "opentrack/state.hpp"
+#include "opentrack/shortcuts.h"
+#include "tracker-pt/ftnoir_tracker_pt_settings.h"
+#include "trans_calib.h"
+#include "tracker-pt/ftnoir_tracker_pt.h"
+#include "filter-accela/ftnoir_filter_accela.h"
+
+class OptionsDialog: public QWidget
+{
+    Q_OBJECT
+signals:
+    void reload();
+public:
+    OptionsDialog(State &state);
+private:
+    Ui::UI_Settings ui;
+    Shortcuts::settings s;
+    settings_pt pt;
+    settings_accela acc;
+    QTimer timer;
+    State& state;
+    TranslationCalibrator trans_calib;
+    bool trans_calib_running;
+
+    Tracker_PT* get_pt();
+    void closeEvent(QCloseEvent *) override { doCancel(); }
+private slots:
+    void update_ewma_display(int value);
+    void update_rot_display(int value);
+    void update_trans_display(int value);
+    void update_rot_dz_display(int value);
+    void update_trans_dz_display(int value);
+
+    void doOK();
+    void doCancel();
+    void startstop_trans_calib(bool start);
+    void poll_tracker_info();
+    void trans_calib_step();
+    void bind_key(value<QString>& ret, QLabel* label);
+};