diff options
| author | mm0zct <the_cartographer@hotmail.com> | 2013-06-29 19:26:59 +0100 |
|---|---|---|
| committer | mm0zct <the_cartographer@hotmail.com> | 2013-06-29 19:26:59 +0100 |
| commit | 5368b98cd09f61a1e3344efed9ad90ac9989726e (patch) | |
| tree | 9dcf4c45582087a5bbac2d0c00cb61f0f90afde8 /ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui | |
| parent | 8ab86902935f402c4ab529741a0afa5baf972ca1 (diff) | |
Merged in fixes to hydra and rift code, along with a bug in the pitch inversion of FTNoIR itself.
Also added an include directory the Rift needs which was absent before.
Diffstat (limited to 'ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui')
| -rw-r--r-- | ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui | 165 |
1 files changed, 92 insertions, 73 deletions
diff --git a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui index 789d2d25..eaf5b9d6 100644 --- a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui +++ b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> <ui version="4.0"> <class>UIRiftControls</class> - <widget class="QWidget" name="UIRiftControls"> + <widget class="QWidget" name="UIHydraControls"> <property name="geometry"> <rect> <x>0</x> @@ -45,78 +45,97 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="0" column="0"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>Roll:</string> - </property> - </widget> - </item> - <item row="2" column="0"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Yaw:</string> - </property> - </widget> - </item> - <item row="1" column="1"> - <widget class="QCheckBox" name="chkEnablePitch"> - <property name="maximumSize"> - <size> - <width>20</width> - <height>16777215</height> - </size> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Pitch:</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <widget class="QCheckBox" name="chkEnableRoll"> - <property name="maximumSize"> - <size> - <width>20</width> - <height>16777215</height> - </size> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="styleSheet"> - <string notr="true"/> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> - <item row="2" column="1"> - <widget class="QCheckBox" name="chkEnableYaw"> - <property name="maximumSize"> - <size> - <width>20</width> - <height>16777215</height> - </size> - </property> - <property name="layoutDirection"> - <enum>Qt::LeftToRight</enum> - </property> - <property name="text"> - <string/> - </property> - </widget> - </item> + + + + <item row="0" column="0"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>Pitch:</string> + </property> + </widget> + </item> + + <item row="0" column="1"> + <widget class="QCheckBox" name="chkEnablePitch"> + <property name="maximumSize"> + <size> + <width>20</width> + <height>16777215</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="styleSheet"> + <string notr="true"/> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + + <item row="1" column="0"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Yaw:</string> + </property> + </widget> + </item> + + + <item row="1" column="1"> + <widget class="QCheckBox" name="chkEnableYaw"> + <property name="maximumSize"> + <size> + <width>20</width> + <height>16777215</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + + + + <item row="2" column="0"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Roll:</string> + </property> + </widget> + </item> + + <item row="2" column="1"> + <widget class="QCheckBox" name="chkEnableRoll"> + <property name="maximumSize"> + <size> + <width>20</width> + <height>16777215</height> + </size> + </property> + <property name="layoutDirection"> + <enum>Qt::LeftToRight</enum> + </property> + <property name="text"> + <string/> + </property> + </widget> + </item> + + + + + + + + </layout> </widget> </widget> |