summaryrefslogtreecommitdiff
authorwimpie <wimpie>2005-01-05 02:42:18 (UTC)
committer wimpie <wimpie>2005-01-05 02:42:18 (UTC)
commitbf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e (patch) (unidiff)
treeec61a57a8ace5c74e6cae46a676f40d849f4b9b1
parent2f343aab63dd30e97a893e3691501cdd55114e82 (diff)
downloadopie-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)
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/opietooth2/OTGateway.cpp4
-rw-r--r--noncore/settings/networksettings2/opietooth2/OTMainGUI.ui270
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
@@ -168,13 +168,13 @@ void OTGateway::SLOT_ShowError( const QString & S ) {
168} 168}
169 169
170void OTGateway::connectNotify( const char * S ) { 170void 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
176void OTGateway::disconnectNotify( const char * S ) { 176void 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}
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
@@ -11,8 +11,8 @@
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">
@@ -28,7 +28,7 @@
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>
@@ -104,6 +104,27 @@
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">
@@ -237,81 +258,32 @@
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">
@@ -344,29 +316,99 @@
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>
@@ -440,6 +482,27 @@
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">
@@ -550,27 +613,6 @@
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">