summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-07-02 07:57:15 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-07-02 07:58:09 +0200
commit27bbb01ff3d49bd37daa9649f5c2320663c46aa4 (patch)
treec84a81e6f5531e2322ce80189671dd6e9a216cc1
parent307d9030edbc3e97a49fd1f2266b0e22fcfa552a (diff)
more changes
-rw-r--r--facetracknoir/trackhat-wizard.ui11
-rw-r--r--facetracknoir/wizard.cpp6
-rw-r--r--facetracknoir/wizard.h18
-rw-r--r--opentrack/main-settings.hpp5
4 files changed, 36 insertions, 4 deletions
diff --git a/facetracknoir/trackhat-wizard.ui b/facetracknoir/trackhat-wizard.ui
index 6498ead9..7d5febaa 100644
--- a/facetracknoir/trackhat-wizard.ui
+++ b/facetracknoir/trackhat-wizard.ui
@@ -120,6 +120,13 @@
<string/>
</property>
<layout class="QGridLayout" name="gridLayout_5">
+ <item row="2" column="0">
+ <widget class="QRadioButton" name="cap_model">
+ <property name="text">
+ <string>Cap, add a big logo</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="0">
<widget class="QRadioButton" name="clip_model">
<property name="text">
@@ -128,9 +135,9 @@
</widget>
</item>
<item row="1" column="0">
- <widget class="QRadioButton" name="cap_model">
+ <widget class="QRadioButton" name="clip_model_left">
<property name="text">
- <string>Cap, add a big logo</string>
+ <string>Clip, left-handed</string>
</property>
</widget>
</item>
diff --git a/facetracknoir/wizard.cpp b/facetracknoir/wizard.cpp
new file mode 100644
index 00000000..2ce81689
--- /dev/null
+++ b/facetracknoir/wizard.cpp
@@ -0,0 +1,6 @@
+#include "wizard.h"
+
+Wizard::Wizard(QWidget* parent = nullptr) : QWizard(parent)
+{
+ ui.setupUi(this);
+}
diff --git a/facetracknoir/wizard.h b/facetracknoir/wizard.h
new file mode 100644
index 00000000..bf135f80
--- /dev/null
+++ b/facetracknoir/wizard.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "opentrack/options.hpp"
+#include "opentrack/main-settings.hpp"
+#include "opentrack/mappings.hpp"
+#include "ui_trackhat-wizard.h"
+#include "ftnoir_tracker_pt/ftnoir_tracker_pt_settings.h"
+#include <QWizard>
+
+class Wizard : public QWizard
+{
+ Q_OBJECT
+ Ui_Form ui;
+ settings_pt pt;
+ main_settings s;
+public:
+ Wizard(QWidget* parent);
+};
diff --git a/opentrack/main-settings.hpp b/opentrack/main-settings.hpp
index 8e56ebab..d3a49a83 100644
--- a/opentrack/main-settings.hpp
+++ b/opentrack/main-settings.hpp
@@ -26,7 +26,7 @@ struct main_settings : opts {
value<bool> tcomp_p, tcomp_tz;
value<bool> tray_enabled;
value<int> camera_yaw, camera_pitch, camera_roll;
- value<bool> center_at_startup;
+ value<bool> center_at_startup, wizard_done;
main_settings() :
opts("opentrack-ui"),
protocol_dll(b, "protocol-dll", ""),
@@ -42,6 +42,7 @@ struct main_settings : opts {
camera_yaw(b, "camera-yaw", 0),
camera_pitch(b, "camera-pitch", 0),
camera_roll(b, "camera-roll", 0),
- center_at_startup(b, "center-at-startup", true)
+ center_at_startup(b, "center-at-startup", true),
+ wizard_done(b, "wizard-done", false)
{}
};