diff options
| author | mm0zct <the_cartographer@hotmail.com> | 2013-11-01 23:41:43 +0000 |
|---|---|---|
| committer | mm0zct <the_cartographer@hotmail.com> | 2013-11-01 23:41:43 +0000 |
| commit | f445a2b4cf466dd03423ce89d9cab19656508eb5 (patch) | |
| tree | 3f25b47f2f43de54df426206c9c862b905432810 | |
| parent | a047a476bbb5ce1bab49f779d3f25e9d21ff1345 (diff) | |
| parent | b7418c2d7f554c91cd158ce4733433a271ad96ec (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack
| -rw-r--r-- | CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui | 38 |
2 files changed, 29 insertions, 11 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c7b0ca8e..c1cc757e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -607,7 +607,7 @@ endif() if(UNIX) add_library(opentrack-qxt-mini SHARED ${qxt-mini-c}) SET_TARGET_PROPERTIES(opentrack-qxt-mini PROPERTIES COMPILE_FLAGS "-DBUILD_QXT_CORE=42 -DBUILD_QXT_WIDGETS=42 -DBUILD_QXT_GUI=42") - target_link_libraries(opentrack-qxt-mini ${MY_QT_LIBS}) + target_link_libraries(opentrack-qxt-mini ${MY_QT_LIBS} X11) endif() add_executable(opentrack ${opentrack-win32-executable} ${opentrack-bin-c} ${opentrack-bin-h} ${opentrack-bin-moc} ${opentrack-bin-uih} ${opentrack-bin-rcc}) set_target_properties(opentrack PROPERTIES COMPILE_DEFINITIONS OPENTRACK_VERSION=\"${OPENTRACK__COMMIT}\") diff --git a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui index c3485a17..e868a9c3 100644 --- a/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui +++ b/ftnoir_tracker_rift/ftnoir_rift_clientcontrols.ui @@ -9,8 +9,8 @@ <rect> <x>0</x> <y>0</y> - <width>195</width> - <height>292</height> + <width>209</width> + <height>288</height> </rect> </property> <property name="sizePolicy"> @@ -32,8 +32,8 @@ <property name="autoFillBackground"> <bool>false</bool> </property> - <layout class="QVBoxLayout" name="verticalLayout"> - <item> + <layout class="QGridLayout" name="gridLayout_2"> + <item row="0" column="0"> <widget class="QGroupBox" name="groupBox_3"> <property name="title"> <string>Enable Axis</string> @@ -153,12 +153,12 @@ </layout> </widget> </item> - <item> + <item row="1" column="0"> <widget class="QGroupBox" name="groupBox"> <property name="title"> <string>Yaw spring</string> </property> - <layout class="QFormLayout" name="formLayout"> + <layout class="QGridLayout" name="gridLayout"> <item row="0" column="0"> <widget class="QCheckBox" name="yawSpring"> <property name="text"> @@ -176,11 +176,17 @@ <item row="1" column="1"> <widget class="QDoubleSpinBox" name="persistence"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>23</height> + </size> + </property> <property name="decimals"> <number>5</number> </property> @@ -205,11 +211,17 @@ <item row="2" column="1"> <widget class="QDoubleSpinBox" name="constantDrift"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>23</height> + </size> + </property> <property name="decimals"> <number>5</number> </property> @@ -234,11 +246,17 @@ <item row="3" column="1"> <widget class="QDoubleSpinBox" name="deadzone"> <property name="sizePolicy"> - <sizepolicy hsizetype="Minimum" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> + <property name="minimumSize"> + <size> + <width>0</width> + <height>23</height> + </size> + </property> <property name="decimals"> <number>5</number> </property> @@ -253,7 +271,7 @@ </layout> </widget> </item> - <item> + <item row="2" column="0"> <widget class="QDialogButtonBox" name="buttonBox"> <property name="sizePolicy"> <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> |