From 27bbb01ff3d49bd37daa9649f5c2320663c46aa4 Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Thu, 2 Jul 2015 07:57:15 +0200 Subject: more changes --- facetracknoir/trackhat-wizard.ui | 11 +++++++++-- facetracknoir/wizard.cpp | 6 ++++++ facetracknoir/wizard.h | 18 ++++++++++++++++++ opentrack/main-settings.hpp | 5 +++-- 4 files changed, 36 insertions(+), 4 deletions(-) create mode 100644 facetracknoir/wizard.cpp create mode 100644 facetracknoir/wizard.h 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 @@ + + + + Cap, add a big logo + + + @@ -128,9 +135,9 @@ - + - Cap, add a big logo + Clip, left-handed 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 + +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 tcomp_p, tcomp_tz; value tray_enabled; value camera_yaw, camera_pitch, camera_roll; - value center_at_startup; + value 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) {} }; -- cgit v1.2.3