author | wimpie <wimpie> | 2005-01-05 02:42:18 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-05 02:42:18 (UTC) |
commit | bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e (patch) (unidiff) | |
tree | ec61a57a8ace5c74e6cae46a676f40d849f4b9b1 | |
parent | 2f343aab63dd30e97a893e3691501cdd55114e82 (diff) | |
download | opie-bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e.zip opie-bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e.tar.gz opie-bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e.tar.bz2 |
Slightly better layout for OTMainGUI.
Fixed segfault bug in disconnectNotify call (signal string could be NULL)
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/OTGateway.cpp | 4 | ||||
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/OTMainGUI.ui | 270 |
2 files changed, 158 insertions, 116 deletions
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp index 2d13ce9..6531cf6 100644 --- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp +++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp | |||
@@ -147,55 +147,55 @@ bool OTGateway::isEnabled() { | |||
147 | if( getOTDevice()->deviceNr() >= 0 && | 147 | if( getOTDevice()->deviceNr() >= 0 && |
148 | driver( getOTDevice()->deviceNr() )->isUp() ) | 148 | driver( getOTDevice()->deviceNr() )->isUp() ) |
149 | return TRUE; | 149 | return TRUE; |
150 | 150 | ||
151 | // else check system | 151 | // else check system |
152 | return getOTDevice()->isAttached(); | 152 | return getOTDevice()->isAttached(); |
153 | } | 153 | } |
154 | 154 | ||
155 | void OTGateway::SLOT_ShowError( const QString & S ) { | 155 | void OTGateway::SLOT_ShowError( const QString & S ) { |
156 | 156 | ||
157 | owarn << S << oendl; | 157 | owarn << S << oendl; |
158 | 158 | ||
159 | if( ErrorConnectCount > 0 ) { | 159 | if( ErrorConnectCount > 0 ) { |
160 | // pass error | 160 | // pass error |
161 | emit error( QString( "<p>" ) + S + "</p>" ); | 161 | emit error( QString( "<p>" ) + S + "</p>" ); |
162 | return; | 162 | return; |
163 | } | 163 | } |
164 | 164 | ||
165 | QMessageBox::warning( 0, | 165 | QMessageBox::warning( 0, |
166 | tr("OTGateway error"), | 166 | tr("OTGateway error"), |
167 | S ); | 167 | S ); |
168 | } | 168 | } |
169 | 169 | ||
170 | void OTGateway::connectNotify( const char * S ) { | 170 | void OTGateway::connectNotify( const char * S ) { |
171 | if( strcmp( S, "error(const QString&)" ) == 0 ) { | 171 | if( S && strcmp( S, "error(const QString&)" ) == 0 ) { |
172 | ErrorConnectCount ++; | 172 | ErrorConnectCount ++; |
173 | } | 173 | } |
174 | } | 174 | } |
175 | 175 | ||
176 | void OTGateway::disconnectNotify( const char * S ) { | 176 | void OTGateway::disconnectNotify( const char * S ) { |
177 | if( strcmp( S, "error(const QString&)" ) == 0 ) { | 177 | if( S && strcmp( S, "error(const QString&)" ) == 0 ) { |
178 | ErrorConnectCount --; | 178 | ErrorConnectCount --; |
179 | } | 179 | } |
180 | } | 180 | } |
181 | 181 | ||
182 | void OTGateway::timerEvent( QTimerEvent * ) { | 182 | void OTGateway::timerEvent( QTimerEvent * ) { |
183 | 183 | ||
184 | OTDriver * D; | 184 | OTDriver * D; |
185 | unsigned int oldc = AllDrivers.count(); | 185 | unsigned int oldc = AllDrivers.count(); |
186 | bool old; | 186 | bool old; |
187 | 187 | ||
188 | AllDrivers.update(); | 188 | AllDrivers.update(); |
189 | 189 | ||
190 | if( oldc != AllDrivers.count() ) { | 190 | if( oldc != AllDrivers.count() ) { |
191 | updateDrivers(); | 191 | updateDrivers(); |
192 | } else { | 192 | } else { |
193 | for( unsigned int i = 0; | 193 | for( unsigned int i = 0; |
194 | i < AllDrivers.count(); | 194 | i < AllDrivers.count(); |
195 | i ++ ) { | 195 | i ++ ) { |
196 | D = AllDrivers[i]; | 196 | D = AllDrivers[i]; |
197 | old = D->isUp(); | 197 | old = D->isUp(); |
198 | if( D->currentState() >= 0 ) { | 198 | if( D->currentState() >= 0 ) { |
199 | if( old != D->isUp() ) { | 199 | if( old != D->isUp() ) { |
200 | emit stateChange( D, D->isUp() ); | 200 | emit stateChange( D, D->isUp() ); |
201 | } | 201 | } |
diff --git a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui index 6005504..d9038ae 100644 --- a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui +++ b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui | |||
@@ -1,55 +1,55 @@ | |||
1 | <!DOCTYPE UI><UI> | 1 | <!DOCTYPE UI><UI> |
2 | <class>OTMainGUI</class> | 2 | <class>OTMainGUI</class> |
3 | <widget> | 3 | <widget> |
4 | <class>QWidget</class> | 4 | <class>QWidget</class> |
5 | <property stdset="1"> | 5 | <property stdset="1"> |
6 | <name>name</name> | 6 | <name>name</name> |
7 | <cstring>OTMainGUI</cstring> | 7 | <cstring>OTMainGUI</cstring> |
8 | </property> | 8 | </property> |
9 | <property stdset="1"> | 9 | <property stdset="1"> |
10 | <name>geometry</name> | 10 | <name>geometry</name> |
11 | <rect> | 11 | <rect> |
12 | <x>0</x> | 12 | <x>0</x> |
13 | <y>0</y> | 13 | <y>0</y> |
14 | <width>228</width> | 14 | <width>257</width> |
15 | <height>347</height> | 15 | <height>296</height> |
16 | </rect> | 16 | </rect> |
17 | </property> | 17 | </property> |
18 | <property stdset="1"> | 18 | <property stdset="1"> |
19 | <name>caption</name> | 19 | <name>caption</name> |
20 | <string>Bluetooth Manager</string> | 20 | <string>Bluetooth Manager</string> |
21 | </property> | 21 | </property> |
22 | <property> | 22 | <property> |
23 | <name>layoutMargin</name> | 23 | <name>layoutMargin</name> |
24 | </property> | 24 | </property> |
25 | <property> | 25 | <property> |
26 | <name>layoutSpacing</name> | 26 | <name>layoutSpacing</name> |
27 | </property> | 27 | </property> |
28 | <vbox> | 28 | <vbox> |
29 | <property stdset="1"> | 29 | <property stdset="1"> |
30 | <name>margin</name> | 30 | <name>margin</name> |
31 | <number>5</number> | 31 | <number>3</number> |
32 | </property> | 32 | </property> |
33 | <property stdset="1"> | 33 | <property stdset="1"> |
34 | <name>spacing</name> | 34 | <name>spacing</name> |
35 | <number>0</number> | 35 | <number>0</number> |
36 | </property> | 36 | </property> |
37 | <spacer> | 37 | <spacer> |
38 | <property> | 38 | <property> |
39 | <name>name</name> | 39 | <name>name</name> |
40 | <cstring>Spacer20</cstring> | 40 | <cstring>Spacer20</cstring> |
41 | </property> | 41 | </property> |
42 | <property stdset="1"> | 42 | <property stdset="1"> |
43 | <name>orientation</name> | 43 | <name>orientation</name> |
44 | <enum>Vertical</enum> | 44 | <enum>Vertical</enum> |
45 | </property> | 45 | </property> |
46 | <property stdset="1"> | 46 | <property stdset="1"> |
47 | <name>sizeType</name> | 47 | <name>sizeType</name> |
48 | <enum>Expanding</enum> | 48 | <enum>Expanding</enum> |
49 | </property> | 49 | </property> |
50 | <property> | 50 | <property> |
51 | <name>sizeHint</name> | 51 | <name>sizeHint</name> |
52 | <size> | 52 | <size> |
53 | <width>20</width> | 53 | <width>20</width> |
54 | <height>20</height> | 54 | <height>20</height> |
55 | </size> | 55 | </size> |
@@ -83,48 +83,69 @@ | |||
83 | </widget> | 83 | </widget> |
84 | <spacer> | 84 | <spacer> |
85 | <property> | 85 | <property> |
86 | <name>name</name> | 86 | <name>name</name> |
87 | <cstring>Spacer9_2</cstring> | 87 | <cstring>Spacer9_2</cstring> |
88 | </property> | 88 | </property> |
89 | <property stdset="1"> | 89 | <property stdset="1"> |
90 | <name>orientation</name> | 90 | <name>orientation</name> |
91 | <enum>Horizontal</enum> | 91 | <enum>Horizontal</enum> |
92 | </property> | 92 | </property> |
93 | <property stdset="1"> | 93 | <property stdset="1"> |
94 | <name>sizeType</name> | 94 | <name>sizeType</name> |
95 | <enum>Expanding</enum> | 95 | <enum>Expanding</enum> |
96 | </property> | 96 | </property> |
97 | <property> | 97 | <property> |
98 | <name>sizeHint</name> | 98 | <name>sizeHint</name> |
99 | <size> | 99 | <size> |
100 | <width>20</width> | 100 | <width>20</width> |
101 | <height>20</height> | 101 | <height>20</height> |
102 | </size> | 102 | </size> |
103 | </property> | 103 | </property> |
104 | </spacer> | 104 | </spacer> |
105 | </hbox> | 105 | </hbox> |
106 | </widget> | 106 | </widget> |
107 | <spacer> | ||
108 | <property> | ||
109 | <name>name</name> | ||
110 | <cstring>Spacer20_3</cstring> | ||
111 | </property> | ||
112 | <property stdset="1"> | ||
113 | <name>orientation</name> | ||
114 | <enum>Vertical</enum> | ||
115 | </property> | ||
116 | <property stdset="1"> | ||
117 | <name>sizeType</name> | ||
118 | <enum>Expanding</enum> | ||
119 | </property> | ||
120 | <property> | ||
121 | <name>sizeHint</name> | ||
122 | <size> | ||
123 | <width>20</width> | ||
124 | <height>20</height> | ||
125 | </size> | ||
126 | </property> | ||
127 | </spacer> | ||
107 | <widget> | 128 | <widget> |
108 | <class>QLayoutWidget</class> | 129 | <class>QLayoutWidget</class> |
109 | <property stdset="1"> | 130 | <property stdset="1"> |
110 | <name>name</name> | 131 | <name>name</name> |
111 | <cstring>Layout2</cstring> | 132 | <cstring>Layout2</cstring> |
112 | </property> | 133 | </property> |
113 | <hbox> | 134 | <hbox> |
114 | <property stdset="1"> | 135 | <property stdset="1"> |
115 | <name>margin</name> | 136 | <name>margin</name> |
116 | <number>0</number> | 137 | <number>0</number> |
117 | </property> | 138 | </property> |
118 | <property stdset="1"> | 139 | <property stdset="1"> |
119 | <name>spacing</name> | 140 | <name>spacing</name> |
120 | <number>6</number> | 141 | <number>6</number> |
121 | </property> | 142 | </property> |
122 | <spacer> | 143 | <spacer> |
123 | <property> | 144 | <property> |
124 | <name>name</name> | 145 | <name>name</name> |
125 | <cstring>Spacer7</cstring> | 146 | <cstring>Spacer7</cstring> |
126 | </property> | 147 | </property> |
127 | <property stdset="1"> | 148 | <property stdset="1"> |
128 | <name>orientation</name> | 149 | <name>orientation</name> |
129 | <enum>Horizontal</enum> | 150 | <enum>Horizontal</enum> |
130 | </property> | 151 | </property> |
@@ -216,178 +237,199 @@ | |||
216 | </widget> | 237 | </widget> |
217 | <spacer> | 238 | <spacer> |
218 | <property> | 239 | <property> |
219 | <name>name</name> | 240 | <name>name</name> |
220 | <cstring>Spacer9</cstring> | 241 | <cstring>Spacer9</cstring> |
221 | </property> | 242 | </property> |
222 | <property stdset="1"> | 243 | <property stdset="1"> |
223 | <name>orientation</name> | 244 | <name>orientation</name> |
224 | <enum>Horizontal</enum> | 245 | <enum>Horizontal</enum> |
225 | </property> | 246 | </property> |
226 | <property stdset="1"> | 247 | <property stdset="1"> |
227 | <name>sizeType</name> | 248 | <name>sizeType</name> |
228 | <enum>Expanding</enum> | 249 | <enum>Expanding</enum> |
229 | </property> | 250 | </property> |
230 | <property> | 251 | <property> |
231 | <name>sizeHint</name> | 252 | <name>sizeHint</name> |
232 | <size> | 253 | <size> |
233 | <width>20</width> | 254 | <width>20</width> |
234 | <height>20</height> | 255 | <height>20</height> |
235 | </size> | 256 | </size> |
236 | </property> | 257 | </property> |
237 | </spacer> | 258 | </spacer> |
238 | </hbox> | 259 | </hbox> |
239 | </widget> | 260 | </widget> |
240 | <widget> | 261 | <spacer> |
241 | <class>QLayoutWidget</class> | 262 | <property> |
242 | <property stdset="1"> | ||
243 | <name>name</name> | 263 | <name>name</name> |
244 | <cstring>Layout5</cstring> | 264 | <cstring>Spacer20_4</cstring> |
245 | </property> | 265 | </property> |
246 | <hbox> | 266 | <property stdset="1"> |
247 | <property stdset="1"> | 267 | <name>orientation</name> |
248 | <name>margin</name> | 268 | <enum>Vertical</enum> |
249 | <number>0</number> | 269 | </property> |
250 | </property> | 270 | <property stdset="1"> |
251 | <property stdset="1"> | 271 | <name>sizeType</name> |
252 | <name>spacing</name> | 272 | <enum>Expanding</enum> |
253 | <number>6</number> | 273 | </property> |
254 | </property> | 274 | <property> |
255 | <spacer> | 275 | <name>sizeHint</name> |
256 | <property> | 276 | <size> |
257 | <name>name</name> | 277 | <width>20</width> |
258 | <cstring>Spacer4</cstring> | 278 | <height>20</height> |
259 | </property> | 279 | </size> |
260 | <property stdset="1"> | 280 | </property> |
261 | <name>orientation</name> | 281 | </spacer> |
262 | <enum>Horizontal</enum> | ||
263 | </property> | ||
264 | <property stdset="1"> | ||
265 | <name>sizeType</name> | ||
266 | <enum>Expanding</enum> | ||
267 | </property> | ||
268 | <property> | ||
269 | <name>sizeHint</name> | ||
270 | <size> | ||
271 | <width>20</width> | ||
272 | <height>20</height> | ||
273 | </size> | ||
274 | </property> | ||
275 | </spacer> | ||
276 | <widget> | ||
277 | <class>QLabel</class> | ||
278 | <property stdset="1"> | ||
279 | <name>name</name> | ||
280 | <cstring>TextLabel5</cstring> | ||
281 | </property> | ||
282 | <property stdset="1"> | ||
283 | <name>sizePolicy</name> | ||
284 | <sizepolicy> | ||
285 | <hsizetype>0</hsizetype> | ||
286 | <vsizetype>1</vsizetype> | ||
287 | </sizepolicy> | ||
288 | </property> | ||
289 | <property stdset="1"> | ||
290 | <name>text</name> | ||
291 | <string>Use device :</string> | ||
292 | </property> | ||
293 | </widget> | ||
294 | <widget> | ||
295 | <class>QComboBox</class> | ||
296 | <property stdset="1"> | ||
297 | <name>name</name> | ||
298 | <cstring>DeviceList_CB</cstring> | ||
299 | </property> | ||
300 | <property stdset="1"> | ||
301 | <name>sizePolicy</name> | ||
302 | <sizepolicy> | ||
303 | <hsizetype>7</hsizetype> | ||
304 | <vsizetype>0</vsizetype> | ||
305 | </sizepolicy> | ||
306 | </property> | ||
307 | </widget> | ||
308 | </hbox> | ||
309 | </widget> | ||
310 | <widget> | 282 | <widget> |
311 | <class>QLayoutWidget</class> | 283 | <class>QLayoutWidget</class> |
312 | <property stdset="1"> | 284 | <property stdset="1"> |
313 | <name>name</name> | 285 | <name>name</name> |
314 | <cstring>Layout4</cstring> | 286 | <cstring>Layout10</cstring> |
315 | </property> | 287 | </property> |
316 | <hbox> | 288 | <hbox> |
317 | <property stdset="1"> | 289 | <property stdset="1"> |
318 | <name>margin</name> | 290 | <name>margin</name> |
319 | <number>0</number> | 291 | <number>0</number> |
320 | </property> | 292 | </property> |
321 | <property stdset="1"> | 293 | <property stdset="1"> |
322 | <name>spacing</name> | 294 | <name>spacing</name> |
323 | <number>6</number> | 295 | <number>6</number> |
324 | </property> | 296 | </property> |
325 | <spacer> | 297 | <spacer> |
326 | <property> | 298 | <property> |
327 | <name>name</name> | 299 | <name>name</name> |
328 | <cstring>Spacer7_2</cstring> | 300 | <cstring>Spacer7_2</cstring> |
329 | </property> | 301 | </property> |
330 | <property stdset="1"> | 302 | <property stdset="1"> |
331 | <name>orientation</name> | 303 | <name>orientation</name> |
332 | <enum>Horizontal</enum> | 304 | <enum>Horizontal</enum> |
333 | </property> | 305 | </property> |
334 | <property stdset="1"> | 306 | <property stdset="1"> |
335 | <name>sizeType</name> | 307 | <name>sizeType</name> |
336 | <enum>Fixed</enum> | 308 | <enum>Fixed</enum> |
337 | </property> | 309 | </property> |
338 | <property> | 310 | <property> |
339 | <name>sizeHint</name> | 311 | <name>sizeHint</name> |
340 | <size> | 312 | <size> |
341 | <width>20</width> | 313 | <width>20</width> |
342 | <height>20</height> | 314 | <height>20</height> |
343 | </size> | 315 | </size> |
344 | </property> | 316 | </property> |
345 | </spacer> | 317 | </spacer> |
346 | <widget> | 318 | <widget> |
347 | <class>QLabel</class> | 319 | <class>QLayoutWidget</class> |
348 | <property stdset="1"> | 320 | <property stdset="1"> |
349 | <name>name</name> | 321 | <name>name</name> |
350 | <cstring>TextLabel1_2</cstring> | 322 | <cstring>Layout9</cstring> |
351 | </property> | 323 | </property> |
352 | <property stdset="1"> | 324 | <grid> |
353 | <name>sizePolicy</name> | 325 | <property stdset="1"> |
354 | <sizepolicy> | 326 | <name>margin</name> |
355 | <hsizetype>7</hsizetype> | 327 | <number>0</number> |
356 | <vsizetype>1</vsizetype> | 328 | </property> |
357 | </sizepolicy> | 329 | <property stdset="1"> |
358 | </property> | 330 | <name>spacing</name> |
359 | <property stdset="1"> | 331 | <number>6</number> |
360 | <name>text</name> | 332 | </property> |
361 | <string>Select to scan the bluetooth network for reachable devices using the selected local device</string> | 333 | <widget row="0" column="1" > |
362 | </property> | 334 | <class>QComboBox</class> |
363 | <property stdset="1"> | 335 | <property stdset="1"> |
364 | <name>alignment</name> | 336 | <name>name</name> |
365 | <set>WordBreak|AlignVCenter|AlignLeft</set> | 337 | <cstring>DeviceList_CB</cstring> |
366 | </property> | 338 | </property> |
367 | <property> | 339 | <property stdset="1"> |
368 | <name>wordwrap</name> | 340 | <name>sizePolicy</name> |
369 | </property> | 341 | <sizepolicy> |
342 | <hsizetype>7</hsizetype> | ||
343 | <vsizetype>0</vsizetype> | ||
344 | </sizepolicy> | ||
345 | </property> | ||
346 | </widget> | ||
347 | <spacer row="0" column="2" > | ||
348 | <property> | ||
349 | <name>name</name> | ||
350 | <cstring>Spacer16</cstring> | ||
351 | </property> | ||
352 | <property stdset="1"> | ||
353 | <name>orientation</name> | ||
354 | <enum>Horizontal</enum> | ||
355 | </property> | ||
356 | <property stdset="1"> | ||
357 | <name>sizeType</name> | ||
358 | <enum>Expanding</enum> | ||
359 | </property> | ||
360 | <property> | ||
361 | <name>sizeHint</name> | ||
362 | <size> | ||
363 | <width>20</width> | ||
364 | <height>20</height> | ||
365 | </size> | ||
366 | </property> | ||
367 | </spacer> | ||
368 | <widget row="1" column="0" rowspan="1" colspan="3" > | ||
369 | <class>QLabel</class> | ||
370 | <property stdset="1"> | ||
371 | <name>name</name> | ||
372 | <cstring>TextLabel1_2</cstring> | ||
373 | </property> | ||
374 | <property stdset="1"> | ||
375 | <name>sizePolicy</name> | ||
376 | <sizepolicy> | ||
377 | <hsizetype>7</hsizetype> | ||
378 | <vsizetype>1</vsizetype> | ||
379 | </sizepolicy> | ||
380 | </property> | ||
381 | <property stdset="1"> | ||
382 | <name>text</name> | ||
383 | <string>Select to scan the bluetooth network for reachable devices using the selected local device</string> | ||
384 | </property> | ||
385 | <property stdset="1"> | ||
386 | <name>alignment</name> | ||
387 | <set>WordBreak|AlignVCenter|AlignLeft</set> | ||
388 | </property> | ||
389 | <property> | ||
390 | <name>wordwrap</name> | ||
391 | </property> | ||
392 | </widget> | ||
393 | <widget row="0" column="0" > | ||
394 | <class>QLabel</class> | ||
395 | <property stdset="1"> | ||
396 | <name>name</name> | ||
397 | <cstring>TextLabel5</cstring> | ||
398 | </property> | ||
399 | <property stdset="1"> | ||
400 | <name>sizePolicy</name> | ||
401 | <sizepolicy> | ||
402 | <hsizetype>0</hsizetype> | ||
403 | <vsizetype>1</vsizetype> | ||
404 | </sizepolicy> | ||
405 | </property> | ||
406 | <property stdset="1"> | ||
407 | <name>text</name> | ||
408 | <string>Use device :</string> | ||
409 | </property> | ||
410 | </widget> | ||
411 | </grid> | ||
370 | </widget> | 412 | </widget> |
371 | </hbox> | 413 | </hbox> |
372 | </widget> | 414 | </widget> |
373 | <spacer> | 415 | <spacer> |
374 | <property> | 416 | <property> |
375 | <name>name</name> | 417 | <name>name</name> |
376 | <cstring>Spacer20_2_2</cstring> | 418 | <cstring>Spacer20_2_2</cstring> |
377 | </property> | 419 | </property> |
378 | <property stdset="1"> | 420 | <property stdset="1"> |
379 | <name>orientation</name> | 421 | <name>orientation</name> |
380 | <enum>Vertical</enum> | 422 | <enum>Vertical</enum> |
381 | </property> | 423 | </property> |
382 | <property stdset="1"> | 424 | <property stdset="1"> |
383 | <name>sizeType</name> | 425 | <name>sizeType</name> |
384 | <enum>Expanding</enum> | 426 | <enum>Expanding</enum> |
385 | </property> | 427 | </property> |
386 | <property> | 428 | <property> |
387 | <name>sizeHint</name> | 429 | <name>sizeHint</name> |
388 | <size> | 430 | <size> |
389 | <width>20</width> | 431 | <width>20</width> |
390 | <height>20</height> | 432 | <height>20</height> |
391 | </size> | 433 | </size> |
392 | </property> | 434 | </property> |
393 | </spacer> | 435 | </spacer> |
@@ -419,48 +461,69 @@ | |||
419 | </widget> | 461 | </widget> |
420 | <spacer> | 462 | <spacer> |
421 | <property> | 463 | <property> |
422 | <name>name</name> | 464 | <name>name</name> |
423 | <cstring>Spacer9_3</cstring> | 465 | <cstring>Spacer9_3</cstring> |
424 | </property> | 466 | </property> |
425 | <property stdset="1"> | 467 | <property stdset="1"> |
426 | <name>orientation</name> | 468 | <name>orientation</name> |
427 | <enum>Horizontal</enum> | 469 | <enum>Horizontal</enum> |
428 | </property> | 470 | </property> |
429 | <property stdset="1"> | 471 | <property stdset="1"> |
430 | <name>sizeType</name> | 472 | <name>sizeType</name> |
431 | <enum>Expanding</enum> | 473 | <enum>Expanding</enum> |
432 | </property> | 474 | </property> |
433 | <property> | 475 | <property> |
434 | <name>sizeHint</name> | 476 | <name>sizeHint</name> |
435 | <size> | 477 | <size> |
436 | <width>20</width> | 478 | <width>20</width> |
437 | <height>20</height> | 479 | <height>20</height> |
438 | </size> | 480 | </size> |
439 | </property> | 481 | </property> |
440 | </spacer> | 482 | </spacer> |
441 | </hbox> | 483 | </hbox> |
442 | </widget> | 484 | </widget> |
485 | <spacer> | ||
486 | <property> | ||
487 | <name>name</name> | ||
488 | <cstring>Spacer20_5</cstring> | ||
489 | </property> | ||
490 | <property stdset="1"> | ||
491 | <name>orientation</name> | ||
492 | <enum>Vertical</enum> | ||
493 | </property> | ||
494 | <property stdset="1"> | ||
495 | <name>sizeType</name> | ||
496 | <enum>Expanding</enum> | ||
497 | </property> | ||
498 | <property> | ||
499 | <name>sizeHint</name> | ||
500 | <size> | ||
501 | <width>20</width> | ||
502 | <height>20</height> | ||
503 | </size> | ||
504 | </property> | ||
505 | </spacer> | ||
443 | <widget> | 506 | <widget> |
444 | <class>QLayoutWidget</class> | 507 | <class>QLayoutWidget</class> |
445 | <property stdset="1"> | 508 | <property stdset="1"> |
446 | <name>name</name> | 509 | <name>name</name> |
447 | <cstring>Layout6</cstring> | 510 | <cstring>Layout6</cstring> |
448 | </property> | 511 | </property> |
449 | <hbox> | 512 | <hbox> |
450 | <property stdset="1"> | 513 | <property stdset="1"> |
451 | <name>margin</name> | 514 | <name>margin</name> |
452 | <number>0</number> | 515 | <number>0</number> |
453 | </property> | 516 | </property> |
454 | <property stdset="1"> | 517 | <property stdset="1"> |
455 | <name>spacing</name> | 518 | <name>spacing</name> |
456 | <number>6</number> | 519 | <number>6</number> |
457 | </property> | 520 | </property> |
458 | <spacer> | 521 | <spacer> |
459 | <property> | 522 | <property> |
460 | <name>name</name> | 523 | <name>name</name> |
461 | <cstring>Spacer7_3</cstring> | 524 | <cstring>Spacer7_3</cstring> |
462 | </property> | 525 | </property> |
463 | <property stdset="1"> | 526 | <property stdset="1"> |
464 | <name>orientation</name> | 527 | <name>orientation</name> |
465 | <enum>Horizontal</enum> | 528 | <enum>Horizontal</enum> |
466 | </property> | 529 | </property> |
@@ -529,69 +592,48 @@ | |||
529 | <property stdset="1"> | 592 | <property stdset="1"> |
530 | <name>name</name> | 593 | <name>name</name> |
531 | <cstring>Layout2</cstring> | 594 | <cstring>Layout2</cstring> |
532 | </property> | 595 | </property> |
533 | <hbox> | 596 | <hbox> |
534 | <property stdset="1"> | 597 | <property stdset="1"> |
535 | <name>margin</name> | 598 | <name>margin</name> |
536 | <number>0</number> | 599 | <number>0</number> |
537 | </property> | 600 | </property> |
538 | <property stdset="1"> | 601 | <property stdset="1"> |
539 | <name>spacing</name> | 602 | <name>spacing</name> |
540 | <number>6</number> | 603 | <number>6</number> |
541 | </property> | 604 | </property> |
542 | <widget> | 605 | <widget> |
543 | <class>QCheckBox</class> | 606 | <class>QCheckBox</class> |
544 | <property stdset="1"> | 607 | <property stdset="1"> |
545 | <name>name</name> | 608 | <name>name</name> |
546 | <cstring>EnableTracing_CB</cstring> | 609 | <cstring>EnableTracing_CB</cstring> |
547 | </property> | 610 | </property> |
548 | <property stdset="1"> | 611 | <property stdset="1"> |
549 | <name>text</name> | 612 | <name>text</name> |
550 | <string>Trace Bluetooth</string> | 613 | <string>Trace Bluetooth</string> |
551 | </property> | 614 | </property> |
552 | </widget> | 615 | </widget> |
553 | <spacer> | ||
554 | <property> | ||
555 | <name>name</name> | ||
556 | <cstring>Spacer4_2</cstring> | ||
557 | </property> | ||
558 | <property stdset="1"> | ||
559 | <name>orientation</name> | ||
560 | <enum>Horizontal</enum> | ||
561 | </property> | ||
562 | <property stdset="1"> | ||
563 | <name>sizeType</name> | ||
564 | <enum>Expanding</enum> | ||
565 | </property> | ||
566 | <property> | ||
567 | <name>sizeHint</name> | ||
568 | <size> | ||
569 | <width>20</width> | ||
570 | <height>20</height> | ||
571 | </size> | ||
572 | </property> | ||
573 | </spacer> | ||
574 | <widget> | 616 | <widget> |
575 | <class>QCheckBox</class> | 617 | <class>QCheckBox</class> |
576 | <property stdset="1"> | 618 | <property stdset="1"> |
577 | <name>name</name> | 619 | <name>name</name> |
578 | <cstring>MustBeEnabled_CB</cstring> | 620 | <cstring>MustBeEnabled_CB</cstring> |
579 | </property> | 621 | </property> |
580 | <property stdset="1"> | 622 | <property stdset="1"> |
581 | <name>text</name> | 623 | <name>text</name> |
582 | <string>Bluetooth Enabled</string> | 624 | <string>Bluetooth Enabled</string> |
583 | </property> | 625 | </property> |
584 | </widget> | 626 | </widget> |
585 | </hbox> | 627 | </hbox> |
586 | </widget> | 628 | </widget> |
587 | </vbox> | 629 | </vbox> |
588 | </widget> | 630 | </widget> |
589 | <connections> | 631 | <connections> |
590 | <connection> | 632 | <connection> |
591 | <sender>ManageLocalHW_But</sender> | 633 | <sender>ManageLocalHW_But</sender> |
592 | <signal>clicked()</signal> | 634 | <signal>clicked()</signal> |
593 | <receiver>OTMainGUI</receiver> | 635 | <receiver>OTMainGUI</receiver> |
594 | <slot>SLOT_Manage()</slot> | 636 | <slot>SLOT_Manage()</slot> |
595 | </connection> | 637 | </connection> |
596 | <connection> | 638 | <connection> |
597 | <sender>Scan_But</sender> | 639 | <sender>Scan_But</sender> |