diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
| commit | 0669a40347ffa233bc6042b0f65d244509a61394 (patch) | |
| tree | 36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /ftnoir_protocol_mouse/ftnoir_mousecontrols.ui | |
| parent | 72540e0a96a3120a5d02271e714aba29e136ab78 (diff) | |
| parent | 7454496476ba17ea622781d280606161581c9544 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files:
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to 'ftnoir_protocol_mouse/ftnoir_mousecontrols.ui')
| -rw-r--r-- | ftnoir_protocol_mouse/ftnoir_mousecontrols.ui | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui index 8794e9cd..2705fff7 100644 --- a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui +++ b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui @@ -2,20 +2,23 @@ <ui version="4.0">
<class>UICMOUSEControls</class>
<widget class="QWidget" name="UICMOUSEControls">
+ <property name="windowModality">
+ <enum>Qt::NonModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>250</width>
- <height>99</height>
+ <width>257</width>
+ <height>114</height>
</rect>
</property>
<property name="windowTitle">
- <string>MouseLook settings FaceTrackNoIR</string>
+ <string>Mouse protocol settings</string>
</property>
<property name="windowIcon">
- <iconset>
- <normaloff>:/images/Mouse.png</normaloff>:/images/Mouse.png</iconset>
+ <iconset resource="win32-mouse-protocol.qrc">
+ <normaloff>:/images/mouse.png</normaloff>:/images/mouse.png</iconset>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
@@ -190,7 +193,9 @@ </item>
</layout>
</widget>
- <resources/>
+ <resources>
+ <include location="win32-mouse-protocol.qrc"/>
+ </resources>
<connections/>
<slots>
<slot>startEngineClicked()</slot>
|