summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings2
authorwimpie <wimpie>2005-01-06 03:53:17 (UTC)
committer wimpie <wimpie>2005-01-06 03:53:17 (UTC)
commit98dd4c49f5d7a3c0569e3f6ff92f39451734070c (patch) (unidiff)
treecbe132a0ea78b67baa24f61c9fa04f1a3fcc15c9 /noncore/settings/networksettings2
parent807241b7466840034a5284b0202705b096d41458 (diff)
downloadopie-98dd4c49f5d7a3c0569e3f6ff92f39451734070c.zip
opie-98dd4c49f5d7a3c0569e3f6ff92f39451734070c.tar.gz
opie-98dd4c49f5d7a3c0569e3f6ff92f39451734070c.tar.bz2
Some more changes for NS2
updated toplevel Makefile added new target packages-mt and packages these replaces, render obsolete and dramatically improve : ipks ipks-mt see separate mail
Diffstat (limited to 'noncore/settings/networksettings2') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings2/opietooth2/OTMainGUI.ui393
-rw-r--r--noncore/settings/networksettings2/opietooth2/Opietooth.cpp32
-rw-r--r--noncore/settings/networksettings2/opietooth2/Opietooth.h31
-rw-r--r--noncore/settings/networksettings2/opietooth2/opietooth2.pro2
4 files changed, 331 insertions, 127 deletions
diff --git a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
index d9038ae..5bce0e1 100644
--- a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
+++ b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
@@ -2,68 +2,47 @@
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>257</width> 14 <width>225</width>
15 <height>296</height> 15 <height>334</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>3</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>
38 <property>
39 <name>name</name>
40 <cstring>Spacer20</cstring>
41 </property>
42 <property stdset="1">
43 <name>orientation</name>
44 <enum>Vertical</enum>
45 </property>
46 <property stdset="1">
47 <name>sizeType</name>
48 <enum>Expanding</enum>
49 </property>
50 <property>
51 <name>sizeHint</name>
52 <size>
53 <width>20</width>
54 <height>20</height>
55 </size>
56 </property>
57 </spacer>
58 <widget> 37 <widget>
59 <class>QLayoutWidget</class> 38 <class>QLayoutWidget</class>
60 <property stdset="1"> 39 <property stdset="1">
61 <name>name</name> 40 <name>name</name>
62 <cstring>Layout7</cstring> 41 <cstring>Layout7</cstring>
63 </property> 42 </property>
64 <hbox> 43 <hbox>
65 <property stdset="1"> 44 <property stdset="1">
66 <name>margin</name> 45 <name>margin</name>
67 <number>0</number> 46 <number>0</number>
68 </property> 47 </property>
69 <property stdset="1"> 48 <property stdset="1">
@@ -167,25 +146,25 @@
167 <name>name</name> 146 <name>name</name>
168 <cstring>TextLabel1</cstring> 147 <cstring>TextLabel1</cstring>
169 </property> 148 </property>
170 <property stdset="1"> 149 <property stdset="1">
171 <name>sizePolicy</name> 150 <name>sizePolicy</name>
172 <sizepolicy> 151 <sizepolicy>
173 <hsizetype>7</hsizetype> 152 <hsizetype>7</hsizetype>
174 <vsizetype>1</vsizetype> 153 <vsizetype>1</vsizetype>
175 </sizepolicy> 154 </sizepolicy>
176 </property> 155 </property>
177 <property stdset="1"> 156 <property stdset="1">
178 <name>text</name> 157 <name>text</name>
179 <string>Select to manage your local Bluetooth hardware</string> 158 <string>Manage your local Bluetooth hardware</string>
180 </property> 159 </property>
181 <property stdset="1"> 160 <property stdset="1">
182 <name>alignment</name> 161 <name>alignment</name>
183 <set>WordBreak|AlignVCenter|AlignLeft</set> 162 <set>WordBreak|AlignVCenter|AlignLeft</set>
184 </property> 163 </property>
185 <property> 164 <property>
186 <name>wordwrap</name> 165 <name>wordwrap</name>
187 </property> 166 </property>
188 </widget> 167 </widget>
189 </hbox> 168 </hbox>
190 </widget> 169 </widget>
191 <spacer> 170 <spacer>
@@ -274,25 +253,116 @@
274 <property> 253 <property>
275 <name>sizeHint</name> 254 <name>sizeHint</name>
276 <size> 255 <size>
277 <width>20</width> 256 <width>20</width>
278 <height>20</height> 257 <height>20</height>
279 </size> 258 </size>
280 </property> 259 </property>
281 </spacer> 260 </spacer>
282 <widget> 261 <widget>
283 <class>QLayoutWidget</class> 262 <class>QLayoutWidget</class>
284 <property stdset="1"> 263 <property stdset="1">
285 <name>name</name> 264 <name>name</name>
286 <cstring>Layout10</cstring> 265 <cstring>Layout13</cstring>
266 </property>
267 <hbox>
268 <property stdset="1">
269 <name>margin</name>
270 <number>0</number>
271 </property>
272 <property stdset="1">
273 <name>spacing</name>
274 <number>6</number>
275 </property>
276 <spacer>
277 <property>
278 <name>name</name>
279 <cstring>Spacer7_2_2</cstring>
280 </property>
281 <property stdset="1">
282 <name>orientation</name>
283 <enum>Horizontal</enum>
284 </property>
285 <property stdset="1">
286 <name>sizeType</name>
287 <enum>Fixed</enum>
288 </property>
289 <property>
290 <name>sizeHint</name>
291 <size>
292 <width>20</width>
293 <height>20</height>
294 </size>
295 </property>
296 </spacer>
297 <widget>
298 <class>QLabel</class>
299 <property stdset="1">
300 <name>name</name>
301 <cstring>TextLabel5</cstring>
302 </property>
303 <property stdset="1">
304 <name>sizePolicy</name>
305 <sizepolicy>
306 <hsizetype>0</hsizetype>
307 <vsizetype>1</vsizetype>
308 </sizepolicy>
309 </property>
310 <property stdset="1">
311 <name>text</name>
312 <string>Use device :</string>
313 </property>
314 </widget>
315 <widget>
316 <class>QComboBox</class>
317 <property stdset="1">
318 <name>name</name>
319 <cstring>DeviceList_CB</cstring>
320 </property>
321 <property stdset="1">
322 <name>sizePolicy</name>
323 <sizepolicy>
324 <hsizetype>7</hsizetype>
325 <vsizetype>0</vsizetype>
326 </sizepolicy>
327 </property>
328 </widget>
329 <spacer>
330 <property>
331 <name>name</name>
332 <cstring>Spacer16</cstring>
333 </property>
334 <property stdset="1">
335 <name>orientation</name>
336 <enum>Horizontal</enum>
337 </property>
338 <property stdset="1">
339 <name>sizeType</name>
340 <enum>Expanding</enum>
341 </property>
342 <property>
343 <name>sizeHint</name>
344 <size>
345 <width>20</width>
346 <height>20</height>
347 </size>
348 </property>
349 </spacer>
350 </hbox>
351 </widget>
352 <widget>
353 <class>QLayoutWidget</class>
354 <property stdset="1">
355 <name>name</name>
356 <cstring>Layout15</cstring>
287 </property> 357 </property>
288 <hbox> 358 <hbox>
289 <property stdset="1"> 359 <property stdset="1">
290 <name>margin</name> 360 <name>margin</name>
291 <number>0</number> 361 <number>0</number>
292 </property> 362 </property>
293 <property stdset="1"> 363 <property stdset="1">
294 <name>spacing</name> 364 <name>spacing</name>
295 <number>6</number> 365 <number>6</number>
296 </property> 366 </property>
297 <spacer> 367 <spacer>
298 <property> 368 <property>
@@ -307,117 +377,47 @@
307 <name>sizeType</name> 377 <name>sizeType</name>
308 <enum>Fixed</enum> 378 <enum>Fixed</enum>
309 </property> 379 </property>
310 <property> 380 <property>
311 <name>sizeHint</name> 381 <name>sizeHint</name>
312 <size> 382 <size>
313 <width>20</width> 383 <width>20</width>
314 <height>20</height> 384 <height>20</height>
315 </size> 385 </size>
316 </property> 386 </property>
317 </spacer> 387 </spacer>
318 <widget> 388 <widget>
319 <class>QLayoutWidget</class> 389 <class>QLabel</class>
320 <property stdset="1"> 390 <property stdset="1">
321 <name>name</name> 391 <name>name</name>
322 <cstring>Layout9</cstring> 392 <cstring>TextLabel1_2</cstring>
323 </property> 393 </property>
324 <grid> 394 <property stdset="1">
325 <property stdset="1"> 395 <name>sizePolicy</name>
326 <name>margin</name> 396 <sizepolicy>
327 <number>0</number> 397 <hsizetype>7</hsizetype>
328 </property> 398 <vsizetype>5</vsizetype>
329 <property stdset="1"> 399 </sizepolicy>
330 <name>spacing</name> 400 </property>
331 <number>6</number> 401 <property stdset="1">
332 </property> 402 <name>text</name>
333 <widget row="0" column="1" > 403 <string>San the bluetooth network neighbourhood using the selected local device</string>
334 <class>QComboBox</class> 404 </property>
335 <property stdset="1"> 405 <property stdset="1">
336 <name>name</name> 406 <name>alignment</name>
337 <cstring>DeviceList_CB</cstring> 407 <set>WordBreak|AlignVCenter|AlignLeft</set>
338 </property> 408 </property>
339 <property stdset="1"> 409 <property>
340 <name>sizePolicy</name> 410 <name>wordwrap</name>
341 <sizepolicy> 411 </property>
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>
412 </widget> 412 </widget>
413 </hbox> 413 </hbox>
414 </widget> 414 </widget>
415 <spacer> 415 <spacer>
416 <property> 416 <property>
417 <name>name</name> 417 <name>name</name>
418 <cstring>Spacer20_2_2</cstring> 418 <cstring>Spacer20_2_2</cstring>
419 </property> 419 </property>
420 <property stdset="1"> 420 <property stdset="1">
421 <name>orientation</name> 421 <name>orientation</name>
422 <enum>Vertical</enum> 422 <enum>Vertical</enum>
423 </property> 423 </property>
@@ -545,25 +545,25 @@
545 <name>name</name> 545 <name>name</name>
546 <cstring>TextLabel1_2_2</cstring> 546 <cstring>TextLabel1_2_2</cstring>
547 </property> 547 </property>
548 <property stdset="1"> 548 <property stdset="1">
549 <name>sizePolicy</name> 549 <name>sizePolicy</name>
550 <sizepolicy> 550 <sizepolicy>
551 <hsizetype>7</hsizetype> 551 <hsizetype>7</hsizetype>
552 <vsizetype>1</vsizetype> 552 <vsizetype>1</vsizetype>
553 </sizepolicy> 553 </sizepolicy>
554 </property> 554 </property>
555 <property stdset="1"> 555 <property stdset="1">
556 <name>text</name> 556 <name>text</name>
557 <string>Select to manage all pairings known on the local device to any remote device regardless if it is currently reachable or not</string> 557 <string>Manage device pairings to or from the local device</string>
558 </property> 558 </property>
559 <property stdset="1"> 559 <property stdset="1">
560 <name>alignment</name> 560 <name>alignment</name>
561 <set>WordBreak|AlignVCenter|AlignLeft</set> 561 <set>WordBreak|AlignVCenter|AlignLeft</set>
562 </property> 562 </property>
563 <property> 563 <property>
564 <name>wordwrap</name> 564 <name>wordwrap</name>
565 </property> 565 </property>
566 </widget> 566 </widget>
567 </hbox> 567 </hbox>
568 </widget> 568 </widget>
569 <spacer> 569 <spacer>
@@ -582,46 +582,189 @@
582 <property> 582 <property>
583 <name>sizeHint</name> 583 <name>sizeHint</name>
584 <size> 584 <size>
585 <width>20</width> 585 <width>20</width>
586 <height>20</height> 586 <height>20</height>
587 </size> 587 </size>
588 </property> 588 </property>
589 </spacer> 589 </spacer>
590 <widget> 590 <widget>
591 <class>QLayoutWidget</class> 591 <class>QLayoutWidget</class>
592 <property stdset="1"> 592 <property stdset="1">
593 <name>name</name> 593 <name>name</name>
594 <cstring>Layout2</cstring> 594 <cstring>Layout9_2</cstring>
595 </property> 595 </property>
596 <hbox> 596 <hbox>
597 <property stdset="1"> 597 <property stdset="1">
598 <name>margin</name> 598 <name>margin</name>
599 <number>0</number> 599 <number>0</number>
600 </property> 600 </property>
601 <property stdset="1"> 601 <property stdset="1">
602 <name>spacing</name> 602 <name>spacing</name>
603 <number>6</number> 603 <number>6</number>
604 </property> 604 </property>
605 <widget> 605 <widget>
606 <class>QCheckBox</class> 606 <class>QPushButton</class>
607 <property stdset="1">
608 <name>name</name>
609 <cstring>BTSniffing_But</cstring>
610 </property>
611 <property stdset="1">
612 <name>text</name>
613 <string>Sniffing</string>
614 </property>
615 </widget>
616 <spacer>
617 <property>
618 <name>name</name>
619 <cstring>Spacer9_3_2</cstring>
620 </property>
621 <property stdset="1">
622 <name>orientation</name>
623 <enum>Horizontal</enum>
624 </property>
625 <property stdset="1">
626 <name>sizeType</name>
627 <enum>Expanding</enum>
628 </property>
629 <property>
630 <name>sizeHint</name>
631 <size>
632 <width>20</width>
633 <height>20</height>
634 </size>
635 </property>
636 </spacer>
637 </hbox>
638 </widget>
639 <widget>
640 <class>QLayoutWidget</class>
641 <property stdset="1">
642 <name>name</name>
643 <cstring>Layout6_2</cstring>
644 </property>
645 <hbox>
646 <property stdset="1">
647 <name>margin</name>
648 <number>0</number>
649 </property>
650 <property stdset="1">
651 <name>spacing</name>
652 <number>6</number>
653 </property>
654 <spacer>
655 <property>
656 <name>name</name>
657 <cstring>Spacer7_3_2</cstring>
658 </property>
659 <property stdset="1">
660 <name>orientation</name>
661 <enum>Horizontal</enum>
662 </property>
663 <property stdset="1">
664 <name>sizeType</name>
665 <enum>Fixed</enum>
666 </property>
667 <property>
668 <name>sizeHint</name>
669 <size>
670 <width>20</width>
671 <height>20</height>
672 </size>
673 </property>
674 </spacer>
675 <widget>
676 <class>QLabel</class>
607 <property stdset="1"> 677 <property stdset="1">
608 <name>name</name> 678 <name>name</name>
609 <cstring>EnableTracing_CB</cstring> 679 <cstring>TextLabel1_2_2_2</cstring>
680 </property>
681 <property stdset="1">
682 <name>sizePolicy</name>
683 <sizepolicy>
684 <hsizetype>7</hsizetype>
685 <vsizetype>1</vsizetype>
686 </sizepolicy>
610 </property> 687 </property>
611 <property stdset="1"> 688 <property stdset="1">
612 <name>text</name> 689 <name>text</name>
613 <string>Trace Bluetooth</string> 690 <string>Sniff the bluetooth network</string>
691 </property>
692 <property stdset="1">
693 <name>alignment</name>
694 <set>WordBreak|AlignVCenter|AlignLeft</set>
695 </property>
696 <property>
697 <name>wordwrap</name>
614 </property> 698 </property>
615 </widget> 699 </widget>
700 </hbox>
701 </widget>
702 <spacer>
703 <property>
704 <name>name</name>
705 <cstring>Spacer20_2_2_2_3</cstring>
706 </property>
707 <property stdset="1">
708 <name>orientation</name>
709 <enum>Vertical</enum>
710 </property>
711 <property stdset="1">
712 <name>sizeType</name>
713 <enum>Expanding</enum>
714 </property>
715 <property>
716 <name>sizeHint</name>
717 <size>
718 <width>20</width>
719 <height>20</height>
720 </size>
721 </property>
722 </spacer>
723 <widget>
724 <class>QLayoutWidget</class>
725 <property stdset="1">
726 <name>name</name>
727 <cstring>Layout11</cstring>
728 </property>
729 <hbox>
730 <property stdset="1">
731 <name>margin</name>
732 <number>0</number>
733 </property>
734 <property stdset="1">
735 <name>spacing</name>
736 <number>6</number>
737 </property>
738 <spacer>
739 <property>
740 <name>name</name>
741 <cstring>Spacer21</cstring>
742 </property>
743 <property stdset="1">
744 <name>orientation</name>
745 <enum>Horizontal</enum>
746 </property>
747 <property stdset="1">
748 <name>sizeType</name>
749 <enum>Expanding</enum>
750 </property>
751 <property>
752 <name>sizeHint</name>
753 <size>
754 <width>20</width>
755 <height>20</height>
756 </size>
757 </property>
758 </spacer>
616 <widget> 759 <widget>
617 <class>QCheckBox</class> 760 <class>QCheckBox</class>
618 <property stdset="1"> 761 <property stdset="1">
619 <name>name</name> 762 <name>name</name>
620 <cstring>MustBeEnabled_CB</cstring> 763 <cstring>MustBeEnabled_CB</cstring>
621 </property> 764 </property>
622 <property stdset="1"> 765 <property stdset="1">
623 <name>text</name> 766 <name>text</name>
624 <string>Bluetooth Enabled</string> 767 <string>Bluetooth Enabled</string>
625 </property> 768 </property>
626 </widget> 769 </widget>
627 </hbox> 770 </hbox>
@@ -645,24 +788,24 @@
645 <sender>MustBeEnabled_CB</sender> 788 <sender>MustBeEnabled_CB</sender>
646 <signal>toggled(bool)</signal> 789 <signal>toggled(bool)</signal>
647 <receiver>OTMainGUI</receiver> 790 <receiver>OTMainGUI</receiver>
648 <slot>SLOT_EnableBluetooth(bool)</slot> 791 <slot>SLOT_EnableBluetooth(bool)</slot>
649 </connection> 792 </connection>
650 <connection> 793 <connection>
651 <sender>Pairing_But</sender> 794 <sender>Pairing_But</sender>
652 <signal>clicked()</signal> 795 <signal>clicked()</signal>
653 <receiver>OTMainGUI</receiver> 796 <receiver>OTMainGUI</receiver>
654 <slot>SLOT_Pairing()</slot> 797 <slot>SLOT_Pairing()</slot>
655 </connection> 798 </connection>
656 <connection> 799 <connection>
657 <sender>EnableTracing_CB</sender> 800 <sender>BTSniffing_But</sender>
658 <signal>toggled(bool)</signal> 801 <signal>clicked()</signal>
659 <receiver>OTMainGUI</receiver> 802 <receiver>OTMainGUI</receiver>
660 <slot>SLOT_EnableTracing( bool )</slot> 803 <slot>SLOT_Sniffing()</slot>
661 </connection> 804 </connection>
662 <slot access="public">SLOT_EnableBluetooth(bool)</slot> 805 <slot access="public">SLOT_EnableBluetooth(bool)</slot>
806 <slot access="public">SLOT_Sniffing()</slot>
663 <slot access="public">SLOT_Manage()</slot> 807 <slot access="public">SLOT_Manage()</slot>
664 <slot access="public">SLOT_Pairing()</slot> 808 <slot access="public">SLOT_Pairing()</slot>
665 <slot access="public">SLOT_Scan()</slot> 809 <slot access="public">SLOT_Scan()</slot>
666 <slot access="public">SLOT_EnableTracing( bool )</slot>
667</connections> 810</connections>
668</UI> 811</UI>
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
index 8ea3a48..2d4885c 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.cpp
@@ -101,24 +101,45 @@ public :
101private : 101private :
102 102
103 int LinkKey; 103 int LinkKey;
104}; 104};
105}; 105};
106 106
107// 107//
108// 108//
109// 109//
110// 110//
111// 111//
112 112
113OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) {
114
115 OT = OTGateway::getOTGateway();
116
117}
118
119OTSniffing::~OTSniffing() {
120}
121
122void OTSniffing::SLOT_Trace( void ) {
123}
124
125void OTSniffing::SLOT_ClearLog( void ) {
126}
127
128//
129//
130//
131//
132//
133
113OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) : 134OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) :
114 OTPairingGUI( parent ) { 135 OTPairingGUI( parent ) {
115 136
116 OT = OTGateway::getOTGateway(); 137 OT = OTGateway::getOTGateway();
117 Icons = (_IC ) ? _IC : new OTIcons(); 138 Icons = (_IC ) ? _IC : new OTIcons();
118 MyIcons = (_IC == 0 ); 139 MyIcons = (_IC == 0 );
119 140
120 // unpairing can only be done if bluetooth is disabled 141 // unpairing can only be done if bluetooth is disabled
121 Unpair_But->setEnabled( ! OT->isEnabled() ); 142 Unpair_But->setEnabled( ! OT->isEnabled() );
122 if( ! OT->isEnabled() ) { 143 if( ! OT->isEnabled() ) {
123 Unpair_LBL->hide(); 144 Unpair_LBL->hide();
124 } else { 145 } else {
@@ -864,24 +885,25 @@ void OTManage::SLOT_SetRefreshTimer( int v ) {
864 OT->setRefreshTimer( v * 1000 ); 885 OT->setRefreshTimer( v * 1000 );
865} 886}
866 887
867// 888//
868// 889//
869// 890//
870// 891//
871// 892//
872 893
873OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) { 894OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) {
874 895
875 Icons = new OTIcons(); 896 Icons = new OTIcons();
897 SnifWindow = 0;
876 OT = OTGateway::getOTGateway(); 898 OT = OTGateway::getOTGateway();
877 899
878 connect( OT, 900 connect( OT,
879 SIGNAL( deviceEnabled( bool ) ), 901 SIGNAL( deviceEnabled( bool ) ),
880 this, 902 this,
881 SLOT( SLOT_DeviceIsEnabled( bool ) ) 903 SLOT( SLOT_DeviceIsEnabled( bool ) )
882 ); 904 );
883 connect( OT, 905 connect( OT,
884 SIGNAL( driverListChanged() ), 906 SIGNAL( driverListChanged() ),
885 this, 907 this,
886 SLOT( SLOT_DriverListChanged() ) 908 SLOT( SLOT_DriverListChanged() )
887 ); 909 );
@@ -994,12 +1016,22 @@ void OTMain::SLOT_StateChange( OTDriver * D, bool Up ) {
994void OTMain::SLOT_Pairing( void ) { 1016void OTMain::SLOT_Pairing( void ) {
995 QDialog * Dlg = new QDialog( this, 0, TRUE ); 1017 QDialog * Dlg = new QDialog( this, 0, TRUE );
996 QVBoxLayout * V = new QVBoxLayout( Dlg ); 1018 QVBoxLayout * V = new QVBoxLayout( Dlg );
997 OTPairing * Pair = new OTPairing( Dlg, Icons ); 1019 OTPairing * Pair = new OTPairing( Dlg, Icons );
998 1020
999 V->addWidget( Pair ); 1021 V->addWidget( Pair );
1000 Dlg->showMaximized(); 1022 Dlg->showMaximized();
1001 Dlg->setCaption( tr("Manage pairing" ) ); 1023 Dlg->setCaption( tr("Manage pairing" ) );
1002 Dlg->exec(); 1024 Dlg->exec();
1003 1025
1004 delete Dlg; 1026 delete Dlg;
1005} 1027}
1028
1029void OTMain::SLOT_Sniffing( void ) {
1030
1031 if( SnifWindow == 0 ) {
1032 SnifWindow = new OTSniffing( this );
1033 }
1034
1035 SnifWindow->showMaximized();
1036 SnifWindow->show();
1037}
diff --git a/noncore/settings/networksettings2/opietooth2/Opietooth.h b/noncore/settings/networksettings2/opietooth2/Opietooth.h
index 16a22d6..211ae65 100644
--- a/noncore/settings/networksettings2/opietooth2/Opietooth.h
+++ b/noncore/settings/networksettings2/opietooth2/Opietooth.h
@@ -1,28 +1,55 @@
1#ifndef OPIETOOTH_H 1#ifndef OPIETOOTH_H
2#define OPIETOOTH_H 2#define OPIETOOTH_H
3 3
4#include <OTIcons.h> 4#include <OTIcons.h>
5 5
6#include <OTPairingGUI.h>
7namespace Opie { namespace Ui { class OLedBox; }; }; 6namespace Opie { namespace Ui { class OLedBox; }; };
8 7
8#include <OTSniffGUI.h>
9namespace Opietooth2 { 9namespace Opietooth2 {
10 10
11class OTGateway; 11class OTGateway;
12class OTDriver; 12class OTDriver;
13class OTInquiry; 13class OTInquiry;
14class OTPeer; 14class OTPeer;
15class PeerLVI; 15class PeerLVI;
16 16
17class OTSniffing : public OTSniffGUI {
18
19 Q_OBJECT
20
21public :
22
23 OTSniffing( QWidget * parent );
24 ~OTSniffing();
25
26private slots :
27
28 void SLOT_Trace( void );
29 void SLOT_ClearLog( void );
30
31signals :
32
33protected :
34
35private :
36
37 OTGateway * OT;
38};
39};
40
41#include <OTPairingGUI.h>
42
43namespace Opietooth2 {
17class OTPairing : public OTPairingGUI { 44class OTPairing : public OTPairingGUI {
18 45
19 Q_OBJECT 46 Q_OBJECT
20 47
21public : 48public :
22 49
23 OTPairing( QWidget * parent, 50 OTPairing( QWidget * parent,
24 OTIcons * _Ic = 0 ); 51 OTIcons * _Ic = 0 );
25 ~OTPairing(); 52 ~OTPairing();
26 53
27private slots : 54private slots :
28 55
@@ -165,30 +192,32 @@ class OTMain : public OTMainGUI {
165 192
166public : 193public :
167 194
168 OTMain( QWidget * parent ); 195 OTMain( QWidget * parent );
169 ~OTMain(); 196 ~OTMain();
170 197
171public slots : 198public slots :
172 199
173private slots : 200private slots :
174 201
175 void SLOT_Pairing( void ); 202 void SLOT_Pairing( void );
176 void SLOT_Manage( void ); 203 void SLOT_Manage( void );
204 void SLOT_Sniffing( void );
177 void SLOT_Scan( void ); 205 void SLOT_Scan( void );
178 void SLOT_EnableBluetooth( bool ); 206 void SLOT_EnableBluetooth( bool );
179 void SLOT_DriverListChanged(); 207 void SLOT_DriverListChanged();
180 void SLOT_DeviceIsEnabled( bool ); 208 void SLOT_DeviceIsEnabled( bool );
181 void SLOT_StateChange( OTDriver * , bool ); 209 void SLOT_StateChange( OTDriver * , bool );
182 210
183signals : 211signals :
184 212
185protected : 213protected :
186 214
187private : 215private :
188 216
189 // load scanned devices 217 // load scanned devices
190 OTIcons * Icons; 218 OTIcons * Icons;
191 OTGateway * OT; 219 OTGateway * OT;
220 OTSniffing * SnifWindow;
192}; 221};
193}; 222};
194#endif 223#endif
diff --git a/noncore/settings/networksettings2/opietooth2/opietooth2.pro b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
index 590b656..cfb527d 100644
--- a/noncore/settings/networksettings2/opietooth2/opietooth2.pro
+++ b/noncore/settings/networksettings2/opietooth2/opietooth2.pro
@@ -21,17 +21,17 @@ SOURCES = OTDevice.cpp \
21 OTInquiry.cpp \ 21 OTInquiry.cpp \
22 OTDeviceAddress.cpp \ 22 OTDeviceAddress.cpp \
23 OTUUID.cpp \ 23 OTUUID.cpp \
24 OTSDPAttribute.cpp \ 24 OTSDPAttribute.cpp \
25 OTSDPService.cpp \ 25 OTSDPService.cpp \
26 OTIcons.cpp \ 26 OTIcons.cpp \
27 OTPeer.cpp \ 27 OTPeer.cpp \
28 OTGateway.cpp \ 28 OTGateway.cpp \
29 Opietooth.cpp 29 Opietooth.cpp
30 INCLUDEPATH+= $(OPIEDIR)/include 30 INCLUDEPATH+= $(OPIEDIR)/include
31 DEPENDPATH+= $(OPIEDIR)/include 31 DEPENDPATH+= $(OPIEDIR)/include
32LIBS += -lqpe -lopiecore2 -lbluetooth 32LIBS += -lqpe -lopiecore2 -lbluetooth
33 INTERFACES= OTMainGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui 33 INTERFACES= OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui
34 TARGET = opietooth2 34 TARGET = opietooth2
35 VERSION = 1.0.0 35 VERSION = 1.0.0
36 36
37include ( $(OPIEDIR)/include.pro ) 37include ( $(OPIEDIR)/include.pro )