diff options
author | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 16:02:20 +0200 |
---|---|---|
committer | Stanislaw Halik <sthalik@misaki.pl> | 2013-09-15 16:02:20 +0200 |
commit | 747dcf7cfbc2498312bdcdbd89eb741493dfb44b (patch) | |
tree | 866583dcf6cd03fd3de2e1e1021e355a46aeefc9 | |
parent | e481697ea6e156e456f3d51ba7c816ad4a908792 (diff) |
Make every tracker/protocol/filter dialog modal
This is since changing the tracker/protocol/filter
from a combobox will cause a use-after-free and a nasty crash.
-rw-r--r-- | ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui | 2 | ||||
-rw-r--r-- | ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui | 8 | ||||
-rw-r--r-- | ftnoir_protocol_fg/ftnoir_fgcontrols.ui | 7 | ||||
-rw-r--r-- | ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui | 5 | ||||
-rw-r--r-- | ftnoir_protocol_ft/ftnoir_ftcontrols.ui | 6 | ||||
-rw-r--r-- | ftnoir_protocol_ftn/ftnoir_ftncontrols.ui | 7 | ||||
-rw-r--r-- | ftnoir_protocol_mouse/ftnoir_mousecontrols.ui | 5 | ||||
-rw-r--r-- | ftnoir_protocol_sc/ftnoir_sccontrols.ui | 3 | ||||
-rw-r--r-- | ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui | 5 | ||||
-rw-r--r-- | ftnoir_protocol_wine/ftnoir_winecontrols.ui | 3 | ||||
-rw-r--r-- | ftnoir_tracker_aruco/aruco-trackercontrols.ui | 9 | ||||
-rw-r--r-- | ftnoir_tracker_ht/ht-trackercontrols.ui | 2 | ||||
-rw-r--r-- | ftnoir_tracker_hydra/ftnoir_hydra_clientcontrols.ui | 353 | ||||
-rw-r--r-- | ftnoir_tracker_sm/ftnoir_sm_controls.ui | 7 | ||||
-rw-r--r-- | ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui | 7 |
15 files changed, 207 insertions, 222 deletions
diff --git a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui index 305b1b1d..24b296ea 100644 --- a/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui +++ b/ftnoir_filter_accela/ftnoir_accela_filtercontrols.ui @@ -3,7 +3,7 @@ <class>AccelaUICFilterControls</class> <widget class="QWidget" name="AccelaUICFilterControls"> <property name="windowModality"> - <enum>Qt::NonModal</enum> + <enum>Qt::ApplicationModal</enum> </property> <property name="geometry"> <rect> diff --git a/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui b/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui index 0f31bcd3..8a0e485a 100644 --- a/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui +++ b/ftnoir_filter_ewma2/ftnoir_ewma_filtercontrols.ui @@ -2,11 +2,14 @@ <ui version="4.0"> <class>UICFilterControls</class> <widget class="QWidget" name="UICFilterControls"> + <property name="windowModality"> + <enum>Qt::ApplicationModal</enum> + </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> - <width>371</width> + <width>374</width> <height>380</height> </rect> </property> @@ -21,6 +24,9 @@ </property> <property name="windowIcon"> <iconset> + <normaloff> + images/facetracknoir.png + </normaloff> images/facetracknoir.png </iconset> </property> diff --git a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui index 116f830b..51b5693c 100644 --- a/ftnoir_protocol_fg/ftnoir_fgcontrols.ui +++ b/ftnoir_protocol_fg/ftnoir_fgcontrols.ui @@ -2,12 +2,15 @@ <ui version="4.0">
<class>UICFGControls</class>
<widget class="QWidget" name="UICFGControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>411</width>
- <height>194</height>
+ <width>486</width>
+ <height>210</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui b/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui index d02297f3..9ccfa119 100644 --- a/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui +++ b/ftnoir_protocol_fsuipc/ftnoir_fsuipccontrols.ui @@ -2,12 +2,15 @@ <ui version="4.0">
<class>UICFSUIPCControls</class>
<widget class="QWidget" name="UICFSUIPCControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>541</width>
- <height>127</height>
+ <height>139</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui index fc5abbcf..a2216314 100644 --- a/ftnoir_protocol_ft/ftnoir_ftcontrols.ui +++ b/ftnoir_protocol_ft/ftnoir_ftcontrols.ui @@ -2,6 +2,12 @@ <ui version="4.0">
<class>UICFTControls</class>
<widget class="QWidget" name="UICFTControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
diff --git a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui index d8efec61..15bc5531 100644 --- a/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui +++ b/ftnoir_protocol_ftn/ftnoir_ftncontrols.ui @@ -2,12 +2,15 @@ <ui version="4.0">
<class>UICFTNControls</class>
<widget class="QWidget" name="UICFTNControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>411</width>
- <height>156</height>
+ <height>162</height>
</rect>
</property>
<property name="windowTitle">
@@ -15,7 +18,7 @@ </property>
<property name="windowIcon">
<iconset>
- <normaloff>images/FaceTrackNoIR.png</normaloff>images/facetracknoir.png</iconset>
+ <normaloff>images/FaceTrackNoIR.png</normaloff>images/FaceTrackNoIR.png</iconset>
</property>
<property name="layoutDirection">
<enum>Qt::LeftToRight</enum>
diff --git a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui index 8794e9cd..ee15ded2 100644 --- a/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui +++ b/ftnoir_protocol_mouse/ftnoir_mousecontrols.ui @@ -2,12 +2,15 @@ <ui version="4.0">
<class>UICMOUSEControls</class>
<widget class="QWidget" name="UICMOUSEControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>250</width>
- <height>99</height>
+ <height>112</height>
</rect>
</property>
<property name="windowTitle">
diff --git a/ftnoir_protocol_sc/ftnoir_sccontrols.ui b/ftnoir_protocol_sc/ftnoir_sccontrols.ui index a0cbf393..be42072c 100644 --- a/ftnoir_protocol_sc/ftnoir_sccontrols.ui +++ b/ftnoir_protocol_sc/ftnoir_sccontrols.ui @@ -2,6 +2,9 @@ <ui version="4.0">
<class>UICSCControls</class>
<widget class="QWidget" name="UICSCControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
diff --git a/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui b/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui index 1a244410..94b229fb 100644 --- a/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui +++ b/ftnoir_protocol_vjoy/ftnoir_vjoy_controls.ui @@ -2,12 +2,15 @@ <ui version="4.0"> <class>UICVJoyControls</class> <widget class="QWidget" name="UICVJoyControls"> + <property name="windowModality"> + <enum>Qt::ApplicationModal</enum> + </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>228</width> - <height>64</height> + <height>69</height> </rect> </property> <property name="windowTitle"> diff --git a/ftnoir_protocol_wine/ftnoir_winecontrols.ui b/ftnoir_protocol_wine/ftnoir_winecontrols.ui index 71e99d88..c5e19f2c 100644 --- a/ftnoir_protocol_wine/ftnoir_winecontrols.ui +++ b/ftnoir_protocol_wine/ftnoir_winecontrols.ui @@ -2,6 +2,9 @@ <ui version="4.0"> <class>UICFTControls</class> <widget class="QWidget" name="UICFTControls"> + <property name="windowModality"> + <enum>Qt::ApplicationModal</enum> + </property> <property name="geometry"> <rect> <x>0</x> diff --git a/ftnoir_tracker_aruco/aruco-trackercontrols.ui b/ftnoir_tracker_aruco/aruco-trackercontrols.ui index 3ad9fa40..4fe97e51 100644 --- a/ftnoir_tracker_aruco/aruco-trackercontrols.ui +++ b/ftnoir_tracker_aruco/aruco-trackercontrols.ui @@ -3,7 +3,7 @@ <class>Form</class> <widget class="QWidget" name="Form"> <property name="windowModality"> - <enum>Qt::NonModal</enum> + <enum>Qt::ApplicationModal</enum> </property> <property name="geometry"> <rect> @@ -464,15 +464,18 @@ Rafael Muñoz Salinas <rmsalinas@uco.es></string> <widget class="QLineEdit" name="lineEdit"> <property name="geometry"> <rect> - <x>370</x> + <x>327</x> <y>200</y> - <width>181</width> + <width>255</width> <height>20</height> </rect> </property> <property name="text"> <string>https://github.com/rmsalinas/aruco</string> </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> <property name="readOnly"> <bool>true</bool> </property> diff --git a/ftnoir_tracker_ht/ht-trackercontrols.ui b/ftnoir_tracker_ht/ht-trackercontrols.ui index fbe7a41a..6153637a 100644 --- a/ftnoir_tracker_ht/ht-trackercontrols.ui +++ b/ftnoir_tracker_ht/ht-trackercontrols.ui @@ -3,7 +3,7 @@ <class>Form</class> <widget class="QWidget" name="Form"> <property name="windowModality"> - <enum>Qt::NonModal</enum> + <enum>Qt::ApplicationModal</enum> </property> <property name="geometry"> <rect> diff --git a/ftnoir_tracker_hydra/ftnoir_hydra_clientcontrols.ui b/ftnoir_tracker_hydra/ftnoir_hydra_clientcontrols.ui index 0cee05f0..94d22cb5 100644 --- a/ftnoir_tracker_hydra/ftnoir_hydra_clientcontrols.ui +++ b/ftnoir_tracker_hydra/ftnoir_hydra_clientcontrols.ui @@ -2,12 +2,15 @@ <ui version="4.0"> <class>UIHydraControls</class> <widget class="QWidget" name="UIHydraControls"> + <property name="windowModality"> + <enum>Qt::ApplicationModal</enum> + </property> <property name="geometry"> <rect> <x>0</x> <y>0</y> <width>411</width> - <height>142</height> + <height>145</height> </rect> </property> <property name="windowTitle"> @@ -45,210 +48,150 @@ </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> - - - - - - - - - <item row="0" column="0"> - <widget class="QLabel" name="label_61"> - <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_91"> - <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_111"> - <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> - - - - - - - - - - - - - - - - - - - - <item row="0" column="2"> - <widget class="QLabel" name="label_6"> - <property name="text"> - <string>X:</string> - </property> - </widget> - </item> - - <item row="0" column="3"> - <widget class="QCheckBox" name="chkEnableX"> - <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="2"> - <widget class="QLabel" name="label_9"> - <property name="text"> - <string>Y:</string> - </property> - </widget> - </item> - - - <item row="1" column="3"> - <widget class="QCheckBox" name="chkEnableY"> - <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="2"> - <widget class="QLabel" name="label_11"> - <property name="text"> - <string>Z:</string> - </property> - </widget> - </item> - - <item row="2" column="3"> - <widget class="QCheckBox" name="chkEnableZ"> - <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_61"> + <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_91"> + <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_111"> + <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> + <item row="0" column="2"> + <widget class="QLabel" name="label_6"> + <property name="text"> + <string>X:</string> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QCheckBox" name="chkEnableX"> + <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="2"> + <widget class="QLabel" name="label_9"> + <property name="text"> + <string>Y:</string> + </property> + </widget> + </item> + <item row="1" column="3"> + <widget class="QCheckBox" name="chkEnableY"> + <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="2"> + <widget class="QLabel" name="label_11"> + <property name="text"> + <string>Z:</string> + </property> + </widget> + </item> + <item row="2" column="3"> + <widget class="QCheckBox" name="chkEnableZ"> + <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> diff --git a/ftnoir_tracker_sm/ftnoir_sm_controls.ui b/ftnoir_tracker_sm/ftnoir_sm_controls.ui index 06ebc9ca..7d69059b 100644 --- a/ftnoir_tracker_sm/ftnoir_sm_controls.ui +++ b/ftnoir_tracker_sm/ftnoir_sm_controls.ui @@ -2,11 +2,14 @@ <ui version="4.0">
<class>UICSMClientControls</class>
<widget class="QWidget" name="UICSMClientControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
- <width>388</width>
+ <width>399</width>
<height>313</height>
</rect>
</property>
@@ -109,7 +112,7 @@ <x>10</x>
<y>20</y>
<width>55</width>
- <height>110</height>
+ <height>122</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
diff --git a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui index 5883e317..842ccb81 100644 --- a/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui +++ b/ftnoir_tracker_udp/ftnoir_ftnclientcontrols.ui @@ -2,12 +2,15 @@ <ui version="4.0">
<class>UICFTNClientControls</class>
<widget class="QWidget" name="UICFTNClientControls">
+ <property name="windowModality">
+ <enum>Qt::ApplicationModal</enum>
+ </property>
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>411</width>
- <height>210</height>
+ <height>222</height>
</rect>
</property>
<property name="windowTitle">
@@ -75,7 +78,7 @@ <x>10</x>
<y>20</y>
<width>143</width>
- <height>60</height>
+ <height>64</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout_2">
|