refactor 1/2 (?)

1 files changed, 59 insertions, 66 deletions

diff --git a/facetracknoir/ftnoir_keyboardshortcuts.ui b/facetracknoir/ftnoir_keyboardshortcuts.ui
index 245b503a..f576d8fb 100644
--- a/facetracknoir/ftnoir_keyboardshortcuts.ui
+++ b/facetracknoir/ftnoir_keyboardshortcuts.ui
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>371</width>
-    <height>125</height>
+    <width>415</width>
+    <height>143</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -30,6 +30,38 @@
    <bool>false</bool>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <item row="2" column="0">
+    <widget class="QLabel" name="textLabel2_5">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" 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="1" column="0">
+    <widget class="QLabel" name="textLabel2_3">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" 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="2" column="1">
     <widget class="QCheckBox" name="chkToggleShift">
      <property name="maximumSize">
@@ -59,22 +91,6 @@
      </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="1" column="3">
     <widget class="QCheckBox" name="chkCenterAlt">
      <property name="maximumSize">
@@ -88,8 +104,8 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="2">
-    <widget class="QCheckBox" name="chkCenterCtrl">
+   <item row="2" column="2">
+    <widget class="QCheckBox" name="chkToggleCtrl">
      <property name="maximumSize">
       <size>
        <width>50</width>
@@ -101,22 +117,6 @@
      </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="0" column="4">
     <widget class="QLabel" name="textLabel2_4">
      <property name="sizePolicy">
@@ -136,15 +136,8 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3" colspan="2">
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="2">
-    <widget class="QCheckBox" name="chkToggleCtrl">
+   <item row="2" column="3">
+    <widget class="QCheckBox" name="chkToggleAlt">
      <property name="maximumSize">
       <size>
        <width>50</width>
@@ -152,28 +145,19 @@
       </size>
      </property>
      <property name="text">
-      <string>Ctrl</string>
+      <string>Alt</string>
      </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>
+   <item row="3" column="3" colspan="2">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
      </property>
     </widget>
    </item>
-   <item row="2" column="3">
-    <widget class="QCheckBox" name="chkToggleAlt">
+   <item row="1" column="2">
+    <widget class="QCheckBox" name="chkCenterCtrl">
      <property name="maximumSize">
       <size>
        <width>50</width>
@@ -181,7 +165,7 @@
       </size>
      </property>
      <property name="text">
-      <string>Alt</string>
+      <string>Ctrl</string>
      </property>
     </widget>
    </item>
@@ -198,10 +182,19 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2">
-    <widget class="QCheckBox" name="ding">
-     <property name="text">
-      <string>Ding!</string>
+   <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>