ui: fix tab order

Signed-off-by: Stanislaw Halik <sthalik@misaki.pl>

2 files changed, 233 insertions, 238 deletions

diff --git a/facetracknoir/ftnoir_curves.ui b/facetracknoir/ftnoir_curves.ui
index 2b843303..213e8f9a 100644
--- a/facetracknoir/ftnoir_curves.ui
+++ b/facetracknoir/ftnoir_curves.ui
@@ -29,8 +29,8 @@
   <property name="styleSheet">

    <string notr="true">background-color: #ccc;</string>

   </property>

-  <layout class="QGridLayout" name="gridLayout_2">

-   <item row="0" column="0">

+  <layout class="QVBoxLayout" name="verticalLayout">

+   <item>

     <widget class="QTabWidget" name="tabWidget">

      <property name="styleSheet">

       <string notr="true">background-color: #ccc;</string>

@@ -763,7 +763,7 @@
      </widget>

     </widget>

    </item>

-   <item row="1" column="0">

+   <item>

     <widget class="QDialogButtonBox" name="buttonBox">

      <property name="standardButtons">

       <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>

@@ -779,6 +779,23 @@
    <header>qfunctionconfigurator.h</header>

   </customwidget>

  </customwidgets>

+ <tabstops>

+  <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>checkBox</tabstop>

+  <tabstop>tz_altp</tabstop>

+  <tabstop>ty_altp</tabstop>

+  <tabstop>tabWidget</tabstop>

+  <tabstop>ry_altp</tabstop>

+  <tabstop>buttonBox</tabstop>

+  <tabstop>rz_altp</tabstop>

+  <tabstop>rx_altp</tabstop>

+  <tabstop>tx_altp</tabstop>

+ </tabstops>

  <resources/>

  <connections/>

  <slots>

diff --git a/facetracknoir/ftnoir_keyboardshortcuts.ui b/facetracknoir/ftnoir_keyboardshortcuts.ui
index a189b680..565c0e77 100644
--- a/facetracknoir/ftnoir_keyboardshortcuts.ui
+++ b/facetracknoir/ftnoir_keyboardshortcuts.ui
@@ -29,241 +29,219 @@
   <property name="autoFillBackground">

    <bool>false</bool>

   </property>

-  <widget class="QPushButton" name="btnCancel">

-   <property name="geometry">

-    <rect>

-     <x>120</x>

-     <y>90</y>

-     <width>100</width>

-     <height>23</height>

-    </rect>

-   </property>

-   <property name="sizePolicy">

-    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-     <horstretch>0</horstretch>

-     <verstretch>0</verstretch>

-    </sizepolicy>

-   </property>

-   <property name="minimumSize">

-    <size>

-     <width>100</width>

-     <height>0</height>

-    </size>

-   </property>

-   <property name="maximumSize">

-    <size>

-     <width>100</width>

-     <height>16777215</height>

-    </size>

-   </property>

-   <property name="text">

-    <string>Cancel</string>

-   </property>

-  </widget>

-  <widget class="QPushButton" name="btnOK">

-   <property name="geometry">

-    <rect>

-     <x>230</x>

-     <y>90</y>

-     <width>100</width>

-     <height>23</height>

-    </rect>

-   </property>

-   <property name="sizePolicy">

-    <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

-     <horstretch>0</horstretch>

-     <verstretch>0</verstretch>

-    </sizepolicy>

-   </property>

-   <property name="minimumSize">

-    <size>

-     <width>100</width>

-     <height>0</height>

-    </size>

-   </property>

-   <property name="maximumSize">

-    <size>

-     <width>100</width>

-     <height>16777215</height>

-    </size>

-   </property>

-   <property name="text">

-    <string>OK</string>

-   </property>

-  </widget>

-  <widget class="QWidget" name="layoutWidget">

-   <property name="geometry">

-    <rect>

-     <x>5</x>

-     <y>0</y>

-     <width>321</width>

-     <height>75</height>

-    </rect>

-   </property>

-   <layout class="QGridLayout" name="gridLayout">

-    <item row="0" column="4">

-     <widget class="QLabel" name="textLabel2_4">

-      <property name="sizePolicy">

-       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-        <horstretch>0</horstretch>

-        <verstretch>0</verstretch>

-       </sizepolicy>

-      </property>

-      <property name="text">

-       <string>Keyboard</string>

-      </property>

-      <property name="alignment">

-       <set>Qt::AlignCenter</set>

-      </property>

-      <property name="wordWrap">

-       <bool>false</bool>

-      </property>

-     </widget>

-    </item>

-    <item row="1" column="0">

-     <widget class="QLabel" name="textLabel2_3">

-      <property name="sizePolicy">

-       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-        <horstretch>0</horstretch>

-        <verstretch>0</verstretch>

-       </sizepolicy>

-      </property>

-      <property name="text">

-       <string>Center</string>

-      </property>

-      <property name="wordWrap">

-       <bool>false</bool>

-      </property>

-     </widget>

-    </item>

-    <item row="1" column="1">

-     <widget class="QCheckBox" name="chkCenterShift">

-      <property name="maximumSize">

-       <size>

-        <width>50</width>

-        <height>16777215</height>

-       </size>

-      </property>

-      <property name="text">

-       <string>Shift</string>

-      </property>

-     </widget>

-    </item>

-    <item row="1" column="2">

-     <widget class="QCheckBox" name="chkCenterCtrl">

-      <property name="maximumSize">

-       <size>

-        <width>50</width>

-        <height>16777215</height>

-       </size>

-      </property>

-      <property name="text">

-       <string>Ctrl</string>

-      </property>

-     </widget>

-    </item>

-    <item row="1" column="3">

-     <widget class="QCheckBox" name="chkCenterAlt">

-      <property name="maximumSize">

-       <size>

-        <width>50</width>

-        <height>16777215</height>

-       </size>

-      </property>

-      <property name="text">

-       <string>Alt</string>

-      </property>

-     </widget>

-    </item>

-    <item row="1" column="4">

-     <widget class="QComboBox" name="cbxCenterKey">

-      <property name="minimumSize">

-       <size>

-        <width>90</width>

-        <height>0</height>

-       </size>

-      </property>

-      <property name="toolTip">

-       <string>Select Number</string>

-      </property>

-      <property name="insertPolicy">

-       <enum>QComboBox::InsertAlphabetically</enum>

-      </property>

-     </widget>

-    </item>

-    <item row="2" column="0">

-     <widget class="QLabel" name="textLabel2_5">

-      <property name="sizePolicy">

-       <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

-        <horstretch>0</horstretch>

-        <verstretch>0</verstretch>

-       </sizepolicy>

-      </property>

-      <property name="text">

-       <string>Toggle</string>

-      </property>

-      <property name="wordWrap">

-       <bool>false</bool>

-      </property>

-     </widget>

-    </item>

-    <item row="2" column="1">

-     <widget class="QCheckBox" name="chkToggleShift">

-      <property name="maximumSize">

-       <size>

-        <width>50</width>

-        <height>16777215</height>

-       </size>

-      </property>

-      <property name="text">

-       <string>Shift</string>

-      </property>

-     </widget>

-    </item>

-    <item row="2" column="2">

-     <widget class="QCheckBox" name="chkToggleCtrl">

-      <property name="maximumSize">

-       <size>

-        <width>50</width>

-        <height>16777215</height>

-       </size>

-      </property>

-      <property name="text">

-       <string>Ctrl</string>

-      </property>

-     </widget>

-    </item>

-    <item row="2" column="3">

-     <widget class="QCheckBox" name="chkToggleAlt">

-      <property name="maximumSize">

-       <size>

-        <width>50</width>

-        <height>16777215</height>

-       </size>

-      </property>

-      <property name="text">

-       <string>Alt</string>

-      </property>

-     </widget>

-    </item>

-    <item row="2" column="4">

-     <widget class="QComboBox" name="cbxToggleKey">

-      <property name="minimumSize">

-       <size>

-        <width>90</width>

-        <height>0</height>

-       </size>

-      </property>

-      <property name="toolTip">

-       <string>Select Number</string>

-      </property>

-      <property name="insertPolicy">

-       <enum>QComboBox::InsertAlphabetically</enum>

-      </property>

-     </widget>

-    </item>

-   </layout>

-  </widget>

+  <layout class="QGridLayout" name="gridLayout">

+   <item row="0" column="4">

+    <widget class="QLabel" name="textLabel2_4">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="text">

+      <string>Keyboard</string>

+     </property>

+     <property name="alignment">

+      <set>Qt::AlignCenter</set>

+     </property>

+     <property name="wordWrap">

+      <bool>false</bool>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="0">

+    <widget class="QLabel" name="textLabel2_3">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="text">

+      <string>Center</string>

+     </property>

+     <property name="wordWrap">

+      <bool>false</bool>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="1">

+    <widget class="QCheckBox" name="chkCenterShift">

+     <property name="maximumSize">

+      <size>

+       <width>50</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Shift</string>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="2">

+    <widget class="QCheckBox" name="chkCenterCtrl">

+     <property name="maximumSize">

+      <size>

+       <width>50</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Ctrl</string>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="3">

+    <widget class="QCheckBox" name="chkCenterAlt">

+     <property name="maximumSize">

+      <size>

+       <width>50</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Alt</string>

+     </property>

+    </widget>

+   </item>

+   <item row="1" column="4">

+    <widget class="QComboBox" name="cbxCenterKey">

+     <property name="minimumSize">

+      <size>

+       <width>90</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="toolTip">

+      <string>Select Number</string>

+     </property>

+     <property name="insertPolicy">

+      <enum>QComboBox::InsertAlphabetically</enum>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="0">

+    <widget class="QLabel" name="textLabel2_5">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Minimum" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="text">

+      <string>Toggle</string>

+     </property>

+     <property name="wordWrap">

+      <bool>false</bool>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="1">

+    <widget class="QCheckBox" name="chkToggleShift">

+     <property name="maximumSize">

+      <size>

+       <width>50</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Shift</string>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="2">

+    <widget class="QCheckBox" name="chkToggleCtrl">

+     <property name="maximumSize">

+      <size>

+       <width>50</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Ctrl</string>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="3">

+    <widget class="QCheckBox" name="chkToggleAlt">

+     <property name="maximumSize">

+      <size>

+       <width>50</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Alt</string>

+     </property>

+    </widget>

+   </item>

+   <item row="2" column="4">

+    <widget class="QComboBox" name="cbxToggleKey">

+     <property name="minimumSize">

+      <size>

+       <width>90</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="toolTip">

+      <string>Select Number</string>

+     </property>

+     <property name="insertPolicy">

+      <enum>QComboBox::InsertAlphabetically</enum>

+     </property>

+    </widget>

+   </item>

+   <item row="3" column="0" colspan="2">

+    <widget class="QPushButton" name="btnCancel">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="minimumSize">

+      <size>

+       <width>100</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="maximumSize">

+      <size>

+       <width>100</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>Cancel</string>

+     </property>

+    </widget>

+   </item>

+   <item row="3" column="3" colspan="2">

+    <widget class="QPushButton" name="btnOK">

+     <property name="sizePolicy">

+      <sizepolicy hsizetype="Preferred" vsizetype="Fixed">

+       <horstretch>0</horstretch>

+       <verstretch>0</verstretch>

+      </sizepolicy>

+     </property>

+     <property name="minimumSize">

+      <size>

+       <width>100</width>

+       <height>0</height>

+      </size>

+     </property>

+     <property name="maximumSize">

+      <size>

+       <width>100</width>

+       <height>16777215</height>

+      </size>

+     </property>

+     <property name="text">

+      <string>OK</string>

+     </property>

+    </widget>

+   </item>

+  </layout>

  </widget>

  <resources/>

  <connections/>