Merge branch 'unstable' into trackhat

* unstable:
  ui: edit tab key order
  ui: set focus to start/stop buttons
  ft: game support

1 files changed, 6 insertions, 0 deletions

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)