gui/{main,mappings}: fix tab stops

6 files changed, 55 insertions, 18 deletions

diff --git a/gui/main-window.cpp b/gui/main-window.cpp
index 6cf9b56d..1f0b18af 100644
--- a/gui/main-window.cpp
+++ b/gui/main-window.cpp
@@ -41,7 +41,6 @@ MainWindow::MainWindow() :
     ui.setupUi(this);
     setFixedSize(size());
     updateButtonState(false, false);
-    ui.btnStartTracker->setFocus();
 
     refresh_config_list();
 
diff --git a/gui/main-window.ui b/gui/main-window.ui
index c977809d..3340aca0 100644
--- a/gui/main-window.ui
+++ b/gui/main-window.ui
@@ -26,7 +26,7 @@
      <verstretch>0</verstretch>
     </sizepolicy>
    </property>
-   <layout class="QVBoxLayout" name="verticalLayout_2">
+   <layout class="QHBoxLayout" name="horizontalLayout_5">
     <property name="spacing">
      <number>0</number>
     </property>
@@ -961,6 +961,9 @@
                   <property name="enabled">
                    <bool>true</bool>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::StrongFocus</enum>
+                  </property>
                   <property name="text">
                    <string>Profile</string>
                   </property>
@@ -980,6 +983,9 @@
                 </item>
                 <item>
                  <widget class="QComboBox" name="iconcomboProfile">
+                  <property name="focusPolicy">
+                   <enum>Qt::StrongFocus</enum>
+                  </property>
                   <property name="maxVisibleItems">
                    <number>20</number>
                   </property>
@@ -1161,6 +1167,9 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::TabFocus</enum>
+                  </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
@@ -1174,6 +1183,9 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::ClickFocus</enum>
+                  </property>
                   <property name="text">
                    <string>🔨</string>
                   </property>
@@ -1217,6 +1229,9 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::TabFocus</enum>
+                  </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
@@ -1230,6 +1245,9 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::ClickFocus</enum>
+                  </property>
                   <property name="text">
                    <string>🔨</string>
                   </property>
@@ -1273,6 +1291,9 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::TabFocus</enum>
+                  </property>
                  </widget>
                 </item>
                 <item row="0" column="1">
@@ -1286,6 +1307,9 @@
                     <verstretch>0</verstretch>
                    </sizepolicy>
                   </property>
+                  <property name="focusPolicy">
+                   <enum>Qt::ClickFocus</enum>
+                  </property>
                   <property name="text">
                    <string>🔨</string>
                   </property>
@@ -1317,19 +1341,12 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>btnStartTracker</tabstop>
   <tabstop>btnStopTracker</tabstop>
-  <tabstop>iconcomboTrackerSource</tabstop>
-  <tabstop>btnShowEngineControls</tabstop>
-  <tabstop>iconcomboProtocol</tabstop>
-  <tabstop>btnShowServerControls</tabstop>
-  <tabstop>iconcomboFilter</tabstop>
-  <tabstop>btnShowFilterControls</tabstop>
   <tabstop>profile_button</tabstop>
   <tabstop>iconcomboProfile</tabstop>
   <tabstop>btnShortcuts</tabstop>
   <tabstop>btnEditCurves</tabstop>
-  <tabstop>profile_button</tabstop>
-  <tabstop>iconcomboProfile</tabstop>
  </tabstops>
  <resources>
   <include location="opentrack-res.qrc"/>
diff --git a/gui/main.cpp b/gui/main.cpp
index 2e8d13ff..2e809d0f 100644
--- a/gui/main.cpp
+++ b/gui/main.cpp
@@ -154,7 +154,6 @@ main(int argc, char** argv)
         }
 
         app.setQuitOnLastWindowClosed(false);
-
         app.exec();
 
         qDebug() << "exit: main control";
diff --git a/gui/mapping-window.ui b/gui/mapping-window.ui
index 877feed4..c1a52021 100644
--- a/gui/mapping-window.ui
+++ b/gui/mapping-window.ui
@@ -387,14 +387,13 @@
   </customwidget>
  </customwidgets>
  <tabstops>
+  <tabstop>tabWidget</tabstop>
+  <tabstop>rx_altp</tabstop>
   <tabstop>ry_altp</tabstop>
   <tabstop>rz_altp</tabstop>
   <tabstop>tx_altp</tabstop>
   <tabstop>ty_altp</tabstop>
   <tabstop>tz_altp</tabstop>
-  <tabstop>tabWidget</tabstop>
-  <tabstop>buttonBox</tabstop>
-  <tabstop>rx_altp</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/gui/options-dialog.ui b/gui/options-dialog.ui
index 9a095b35..aa06b407 100644
--- a/gui/options-dialog.ui
+++ b/gui/options-dialog.ui
@@ -24,7 +24,7 @@
    <bool>false</bool>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
-   <item alignment="Qt::AlignTop">
+   <item>
     <widget class="QTabWidget" name="tabWidget">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -1273,11 +1273,11 @@ It won't work properly with translation compensation enabled.</string>
              <item>
               <widget class="QLineEdit" name="tracklogging_filenameedit">
                <property name="enabled">
-                <bool>false</bool>
-               </property>
-               <property name="acceptDrops">
                 <bool>true</bool>
                </property>
+               <property name="focusPolicy">
+                <enum>Qt::NoFocus</enum>
+               </property>
                <property name="inputMask">
                 <string notr="true"/>
                </property>
@@ -1374,17 +1374,28 @@ It won't work properly with translation compensation enabled.</string>
  </customwidgets>
  <tabstops>
   <tabstop>tabWidget</tabstop>
+  <tabstop>bind_center</tabstop>
+  <tabstop>bind_toggle</tabstop>
+  <tabstop>bind_toggle_held</tabstop>
+  <tabstop>bind_zero</tabstop>
+  <tabstop>bind_zero_held</tabstop>
+  <tabstop>bind_start</tabstop>
+  <tabstop>bind_stop</tabstop>
+  <tabstop>bind_toggle_tracking</tabstop>
+  <tabstop>bind_restart_tracking</tabstop>
   <tabstop>center_at_startup</tabstop>
   <tabstop>trayp</tabstop>
   <tabstop>camera_yaw</tabstop>
   <tabstop>camera_pitch</tabstop>
   <tabstop>camera_roll</tabstop>
+  <tabstop>use_center_as_translation_camera_offset</tabstop>
   <tabstop>pos_rx</tabstop>
   <tabstop>pos_ry</tabstop>
   <tabstop>pos_rz</tabstop>
   <tabstop>pos_tx</tabstop>
   <tabstop>pos_ty</tabstop>
   <tabstop>pos_tz</tabstop>
+  <tabstop>center_method</tabstop>
   <tabstop>tcomp_enable</tabstop>
   <tabstop>tcomp_rz</tabstop>
   <tabstop>src_yaw</tabstop>
@@ -1399,6 +1410,9 @@ It won't work properly with translation compensation enabled.</string>
   <tabstop>invert_y</tabstop>
   <tabstop>src_z</tabstop>
   <tabstop>invert_z</tabstop>
+  <tabstop>tracklogging_enabled</tabstop>
+  <tabstop>tracklogging_fileselectbtn</tabstop>
+  <tabstop>tracklogging_filenameedit</tabstop>
  </tabstops>
  <resources/>
  <connections/>
diff --git a/gui/process_widget.ui b/gui/process_widget.ui
index aec0cf36..2fa30d38 100644
--- a/gui/process_widget.ui
+++ b/gui/process_widget.ui
@@ -22,6 +22,9 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="focusPolicy">
+      <enum>Qt::NoFocus</enum>
+     </property>
      <column>
       <property name="text">
        <string>Executable</string>
@@ -116,6 +119,12 @@
    <header>process-detector-fancy-table.hpp</header>
   </customwidget>
  </customwidgets>
+ <tabstops>
+  <tabstop>tableWidget</tabstop>
+  <tabstop>add</tabstop>
+  <tabstop>remove</tabstop>
+  <tabstop>enabled</tabstop>
+ </tabstops>
  <resources/>
  <connections/>
 </ui>