summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorStanislaw Halik <sthalik@misaki.pl>2015-10-11 09:50:05 +0200
committerStanislaw Halik <sthalik@misaki.pl>2015-10-11 09:50:05 +0200
commit0f8c7ac6658514cb85f69e6bd5b162aaac022530 (patch)
tree7eee8563bc17b3a4065e57682465d16a54cdbc08
parent79a415aad234fe8718d6571375c1af51a1edf2a5 (diff)
parent009b46ad75319b268566cace02db3bd448a213f4 (diff)
Merge branch 'unstable' into trackhat
* unstable: ui: edit tab key order ui: set focus to start/stop buttons ft: game support
-rw-r--r--bin/settings/facetracknoir supported games.csv2
-rw-r--r--facetracknoir/ui.cpp6
2 files changed, 8 insertions, 0 deletions
diff --git a/bin/settings/facetracknoir supported games.csv b/bin/settings/facetracknoir supported games.csv
index af645517..cf43d7f6 100644
--- a/bin/settings/facetracknoir supported games.csv
+++ b/bin/settings/facetracknoir supported games.csv
@@ -239,6 +239,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID
188;Inglobe;FreeTrack20;V160;;;20360;00BCE7A7FAA27B2DA82700
189;Innovatec Simulator;FreeTrack20;V160;;;20036;00BD22FD7935B23DB82C00
190;Insurgency;FreeTrack20;V160;;;9401;00BEB6C61427B3EA744B00
+575;Interstellar Rift;FreeTrack20;V160;;;4550;023FF83230A370CBC6AC00
191;Intific;FreeTrack20;V160;;;20655;00BF2BCA747F2AA8309D00
566;Into the Dungeon;FreeTrack20;V160;;;4375;0236B346990ACCFC047A00
192;iRacing;FreeTrack20;V160;V;vn88holden ;14101;00C0103AF1AA730A236900
@@ -374,6 +375,7 @@ No;Game Name;Game protocol;Supported since;Verified;By;INTERNATIONAL_ID;FTN_ID
301;RailWorks 2;FreeTrack20;V160;;;2750;012D3919C4972D9D299000
507;RailWorks 5 (TS2014);FreeTrack20;V160;;;1551;01FB8B5232CB1502C95A00
302;Raydon Driving Simulator;FreeTrack20;V160;;;3701;012E5485D941DBE2FB5300
+574;RCPlugin;FreeTrack20;V160;;;23090;023E0448BCFD48E0149D00
304;Real Time Visual;FreeTrack20;V160;;;9901;0130B1C664862297365500
305;RealFlight;FreeTrack20;V160;;;4001;0131AC6E87892E993A8B00
306;Reality Manager;FreeTrack20;V160;;;20046;0132DB242B65872FA42A00
diff --git a/facetracknoir/ui.cpp b/facetracknoir/ui.cpp
index 50250d7c..1123d6d9 100644
--- a/facetracknoir/ui.cpp
+++ b/facetracknoir/ui.cpp
@@ -90,6 +90,8 @@ MainWindow::MainWindow() :
"Configuration not saved.",
"Can't create configuration directory! Expect major malfunction.",
QMessageBox::Ok, QMessageBox::NoButton);
+
+ ui.btnStartTracker->setFocus();
}
void MainWindow::closeEvent(QCloseEvent *e)
@@ -282,6 +284,8 @@ void MainWindow::startTracker() {
updateButtonState(true, is_inertial);
maybe_save();
+
+ ui.btnStopTracker->setFocus();
}
void MainWindow::stopTracker( ) {
@@ -303,6 +307,8 @@ void MainWindow::stopTracker( ) {
updateButtonState(false, false);
set_title();
+
+ ui.btnStartTracker->setFocus();
}
void MainWindow::display_pose(const double *mapped, const double *raw)