From d4a35684220c9e06b64ce3d39df06616f0147bdc Mon Sep 17 00:00:00 2001 From: Stanislaw Halik Date: Fri, 12 Jun 2015 05:36:59 +0200 Subject: trackhat: some stubs --- facetracknoir/main.ui | 527 ++++++++++++++++++++------------------------------ facetracknoir/ui.cpp | 14 +- facetracknoir/ui.h | 4 +- opentrack/options.hpp | 2 +- 4 files changed, 218 insertions(+), 329 deletions(-) diff --git a/facetracknoir/main.ui b/facetracknoir/main.ui index 77a3ef3a..b6211698 100644 --- a/facetracknoir/main.ui +++ b/facetracknoir/main.ui @@ -7,8 +7,8 @@ 0 0 - 708 - 504 + 750 + 511 @@ -53,94 +53,7 @@ 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 0 - 0 - - - - - 480 - 360 - - - - - 480 - 360 - - - - - - 0 - 0 - 480 - 360 - - - - - 0 - 0 - - - - - - 0 - 0 - 480 - 360 - - - - - 0 - 0 - - - - - 480 - 360 - - - - - 480 - 360 - - - - - - - - - + @@ -802,8 +715,83 @@ + + + + + 0 + 0 + + + + + 480 + 360 + + + + + 480 + 360 + + + + + + 0 + 0 + 480 + 360 + + + + + 0 + 0 + + + + + + 0 + 0 + 480 + 360 + + + + + 0 + 0 + + + + + 480 + 360 + + + + + 480 + 360 + + + + + + + + + - + + + QFrame::NoFrame + + + QFrame::Plain + 0 @@ -811,152 +799,120 @@ 0 - - 6 - 0 - - + + + + + 0 + 0 + + - Controls + Profile true - + 4 - 12 + 0 4 - 12 + 4 - - + + 2 + + + - false + true - + 0 0 - Stop + Save... - - + + - + 0 0 - Start + Load - - - - - - - Settings - - - true - - - - 4 - - - 0 - - - 4 - - - 4 - - - 2 - - - + + - + 0 0 - - Options - - - - :/images/tools.png:/images/tools.png - - - - 80 - 24 - + + 10 - - + + + + true + - + 0 0 - Mapping - - - - :/images/curves.png:/images/curves.png - - - - 80 - 24 - + Save - - + + + + + 0 + 0 + + - Filter + Controls true - + 4 - 0 + 12 4 @@ -964,193 +920,142 @@ 4 - - 2 - - - - - + - true + false - - ... + + + 0 + 0 + - - false + + Stop - - - - - - - Tracker - - - true - - - - 4 - - - 0 - - - 4 - - - 4 - - - 2 - - - - - - - true + + + + 0 + 0 + - ... - - - false + Start - - + + + + QGroupBox { border: 0; } + - Protocol + true - - - 4 - - - 0 - - - 4 + + + 6 4 - - 2 - - - - - true - - - ... + + + + Protocol - + false + + + 5 + + + 0 + + + 18 + + + 0 + + + 0 + + + + + + + + true + + + ... + + + false + + + + - - - - - - - - - - Profile - - - true - - - - 4 - - - 0 - - - 4 - - - 4 - - - 2 - - - + + - + 0 0 - - 10 + + Mapping - - - - - - - 0 - 0 - + + + :/images/curves.png:/images/curves.png - - Load + + + 80 + 24 + - - - - true - + + - + 0 0 - Save - - - - - - - true + Options - - - 0 - 0 - + + + :/images/tools.png:/images/tools.png - - Save... + + + 80 + 24 + @@ -1176,12 +1081,8 @@ btnStartTracker btnStopTracker - iconcomboTrackerSource - btnShowEngineControls iconcomboProtocol btnShowServerControls - iconcomboFilter - btnShowFilterControls iconcomboProfile btnLoad btnSave diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp index 284367ce..d1d43a24 100644 --- a/facetracknoir/ui.cpp +++ b/facetracknoir/ui.cpp @@ -51,26 +51,16 @@ MainWindow::MainWindow() : connect(ui.btnEditCurves, SIGNAL(clicked()), this, SLOT(showCurveConfiguration())); connect(ui.btnShortcuts, SIGNAL(clicked()), this, SLOT(showKeyboardShortcuts())); - connect(ui.btnShowEngineControls, SIGNAL(clicked()), this, SLOT(showTrackerSettings())); connect(ui.btnShowServerControls, SIGNAL(clicked()), this, SLOT(showProtocolSettings())); - connect(ui.btnShowFilterControls, SIGNAL(clicked()), this, SLOT(showFilterSettings())); modules.filters().push_front(std::make_shared("", dylib::Filter)); - for (auto x : modules.trackers()) - ui.iconcomboTrackerSource->addItem(x->icon, x->name); - for (auto x : modules.protocols()) ui.iconcomboProtocol->addItem(x->icon, x->name); - for (auto x : modules.filters()) - ui.iconcomboFilter->addItem(x->icon, x->name); - fill_profile_combobox(); - tie_setting(s.tracker_dll, ui.iconcomboTrackerSource); tie_setting(s.protocol_dll, ui.iconcomboProtocol); - tie_setting(s.filter_dll, ui.iconcomboFilter); connect(ui.btnStartTracker, SIGNAL(clicked()), this, SLOT(startTracker())); connect(ui.btnStopTracker, SIGNAL(clicked()), this, SLOT(stopTracker())); @@ -184,7 +174,7 @@ void MainWindow::fill_profile_combobox() { QStringList ini_list = group::ini_list(); QString current = QFileInfo(group::ini_pathname()).fileName(); - setWindowTitle(QString( const_cast(opentrack_version) + QStringLiteral(" :: ")) + current); + setWindowTitle(QStringLiteral("TrackHat") + QString( const_cast(opentrack_version) + QStringLiteral(" :: ")) + current); ui.iconcomboProfile->clear(); for (auto x : ini_list) ui.iconcomboProfile->addItem(QIcon(":/images/settings16.png"), x); @@ -198,8 +188,6 @@ void MainWindow::updateButtonState(bool running, bool inertialp) ui.btnStartTracker->setEnabled ( not_running ); ui.btnStopTracker->setEnabled ( running ); ui.iconcomboProtocol->setEnabled ( not_running ); - ui.iconcomboFilter->setEnabled ( not_running ); - ui.iconcomboTrackerSource->setEnabled(not_running); ui.video_frame_label->setVisible(not_running || inertialp); ui.btnSaveAs->setEnabled(not_running); ui.btnLoad->setEnabled(not_running); diff --git a/facetracknoir/ui.h b/facetracknoir/ui.h index f2758d81..10f5c814 100644 --- a/facetracknoir/ui.h +++ b/facetracknoir/ui.h @@ -78,7 +78,7 @@ class MainWindow : public QMainWindow, private State mem current_tracker() { - return modules.trackers().value(ui.iconcomboTrackerSource->currentIndex(), nullptr); + return modules.trackers().value(0, nullptr); } mem current_protocol() { @@ -86,7 +86,7 @@ class MainWindow : public QMainWindow, private State } mem current_filter() { - return modules.filters().value(ui.iconcomboFilter->currentIndex(), nullptr); + return modules.filters().value(0, nullptr); } void changeEvent(QEvent* e) override; diff --git a/opentrack/options.hpp b/opentrack/options.hpp index c33c2f53..a8880cad 100644 --- a/opentrack/options.hpp +++ b/opentrack/options.hpp @@ -97,7 +97,7 @@ namespace options { } conf.endGroup(); } - static constexpr const char* org = "opentrack-2.3"; + static constexpr const char* org = "trackhat opentrack-2.3"; void save() { -- cgit v1.2.3