Axis inhibitor shortkey added.

git-svn-id: svn+ssh://svn.code.sf.net/p/facetracknoir/code@26 19e81ba0-9b1a-49c3-bd6c-561e1906d5fb

1 files changed, 197 insertions, 17 deletions

diff --git a/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui b/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui
index f495d38a..02f2028f 100644
--- a/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui
+++ b/FaceTrackNoIR/FTNoIR_KeyboardShortcuts.ui
@@ -6,8 +6,8 @@
    <rect>

     <x>0</x>

     <y>0</y>

-    <width>346</width>

-    <height>180</height>

+    <width>638</width>

+    <height>165</height>

    </rect>

   </property>

   <property name="windowTitle">

@@ -25,8 +25,8 @@
   </property>

   <layout class="QVBoxLayout" name="_vertical_layout">

    <item>

-    <layout class="QHBoxLayout" name="horLayCenter">

-     <item>

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

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

       <widget class="QLabel" name="textLabel2">

        <property name="sizePolicy">

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

@@ -42,28 +42,46 @@
        </property>

       </widget>

      </item>

-     <item>

+     <item row="0" 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>

+     <item row="0" 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>

+     <item row="0" 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>

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

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

        <property name="minimumSize">

         <size>

@@ -79,39 +97,53 @@
        </property>

       </widget>

      </item>

-    </layout>

-   </item>

-   <item>

-    <layout class="QHBoxLayout" name="horizontalLayout_3">

-     <item>

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

       <widget class="QLabel" name="label">

        <property name="text">

         <string>Start/stop</string>

        </property>

       </widget>

      </item>

-     <item>

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

       <widget class="QCheckBox" name="chkStartStopShift">

+       <property name="maximumSize">

+        <size>

+         <width>50</width>

+         <height>16777215</height>

+        </size>

+       </property>

        <property name="text">

         <string>Shift</string>

        </property>

       </widget>

      </item>

-     <item>

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

       <widget class="QCheckBox" name="chkStartStopCtrl">

+       <property name="maximumSize">

+        <size>

+         <width>50</width>

+         <height>16777215</height>

+        </size>

+       </property>

        <property name="text">

         <string>Ctrl</string>

        </property>

       </widget>

      </item>

-     <item>

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

       <widget class="QCheckBox" name="chkStartStopAlt">

+       <property name="maximumSize">

+        <size>

+         <width>50</width>

+         <height>16777215</height>

+        </size>

+       </property>

        <property name="text">

         <string>Alt</string>

        </property>

       </widget>

      </item>

-     <item>

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

       <widget class="QComboBox" name="cbxStartStopKey">

        <property name="minimumSize">

         <size>

@@ -121,6 +153,147 @@
        </property>

       </widget>

      </item>

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

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

+       <property name="text">

+        <string>Axis Inhibitor</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <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="chkInhibitCtrl">

+       <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="chkInhibitAlt">

+       <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="cbxInhibitKey">

+       <property name="minimumSize">

+        <size>

+         <width>90</width>

+         <height>0</height>

+        </size>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="maximumSize">

+        <size>

+         <width>50</width>

+         <height>16777215</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>Pitch</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="maximumSize">

+        <size>

+         <width>50</width>

+         <height>16777215</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>Yaw</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="maximumSize">

+        <size>

+         <width>50</width>

+         <height>16777215</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>Roll</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="maximumSize">

+        <size>

+         <width>30</width>

+         <height>16777215</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>X</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="maximumSize">

+        <size>

+         <width>30</width>

+         <height>16777215</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>Y</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="maximumSize">

+        <size>

+         <width>30</width>

+         <height>16777215</height>

+        </size>

+       </property>

+       <property name="text">

+        <string>Z</string>

+       </property>

+      </widget>

+     </item>

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

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

+       <property name="text">

+        <string>Disables:</string>

+       </property>

+      </widget>

+     </item>

     </layout>

    </item>

    <item>

@@ -138,6 +311,13 @@
        </property>

       </spacer>

      </item>

+     <item>

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

+       <property name="text">

+        <string>The axis inhibitor shortkey toggles the selected axis Off/On</string>

+       </property>

+      </widget>

+     </item>

     </layout>

    </item>

    <item>