-rw-r--r-- | Makefile | 14 | ||||
-rw-r--r-- | development/performance/opie-performance.control | 1 | ||||
-rw-r--r-- | noncore/multimedia/powerchord/opie-powerchord.control | 1 | ||||
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/OTMainGUI.ui | 273 | ||||
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.cpp | 32 | ||||
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/Opietooth.h | 31 | ||||
-rw-r--r-- | noncore/settings/networksettings2/opietooth2/opietooth2.pro | 2 | ||||
-rw-r--r-- | noncore/settings/packagemanager/opackagemanager.cpp | 7 |
8 files changed, 292 insertions, 69 deletions
@@ -136 +136,15 @@ mrproper : clean-configs | |||
136 | include $(TOPDIR)/Rules.make | 136 | include $(TOPDIR)/Rules.make |
137 | |||
138 | # to speed up (avoid include/generation of packaging rules) | ||
139 | ifneq ($(filter package%,$(MAKECMDGOALS)),) | ||
140 | |||
141 | # packaging requested | ||
142 | |||
143 | $(TOPDIR)/Package.make : | ||
144 | @echo "Generating packaging rules" | ||
145 | @$(TOPDIR)/scripts/GeneratePackageMake > $(TOPDIR)/Package.make | ||
146 | |||
147 | # load rules to make packages | ||
148 | -include $(TOPDIR)/Package.make | ||
149 | |||
150 | endif | ||
diff --git a/development/performance/opie-performance.control b/development/performance/opie-performance.control index 194b378..21c3433 100644 --- a/development/performance/opie-performance.control +++ b/development/performance/opie-performance.control | |||
@@ -1 +1,2 @@ | |||
1 | Package: opie-performance | ||
1 | Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop | 2 | Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop |
diff --git a/noncore/multimedia/powerchord/opie-powerchord.control b/noncore/multimedia/powerchord/opie-powerchord.control index 4b5bc88..490e8a2 100644 --- a/noncore/multimedia/powerchord/opie-powerchord.control +++ b/noncore/multimedia/powerchord/opie-powerchord.control | |||
@@ -1 +1,2 @@ | |||
1 | Package: opie-powercord | ||
1 | Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord | 2 | Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord |
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 | |||
@@ -13,4 +13,4 @@ | |||
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> |
@@ -36,23 +36,2 @@ | |||
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> |
@@ -178,3 +157,3 @@ | |||
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> |
@@ -285,3 +264,3 @@ | |||
285 | <name>name</name> | 264 | <name>name</name> |
286 | <cstring>Layout10</cstring> | 265 | <cstring>Layout13</cstring> |
287 | </property> | 266 | </property> |
@@ -299,3 +278,3 @@ | |||
299 | <name>name</name> | 278 | <name>name</name> |
300 | <cstring>Spacer7_2</cstring> | 279 | <cstring>Spacer7_2_2</cstring> |
301 | </property> | 280 | </property> |
@@ -318,17 +297,20 @@ | |||
318 | <widget> | 297 | <widget> |
319 | <class>QLayoutWidget</class> | 298 | <class>QLabel</class> |
320 | <property stdset="1"> | 299 | <property stdset="1"> |
321 | <name>name</name> | 300 | <name>name</name> |
322 | <cstring>Layout9</cstring> | 301 | <cstring>TextLabel5</cstring> |
323 | </property> | 302 | </property> |
324 | <grid> | ||
325 | <property stdset="1"> | 303 | <property stdset="1"> |
326 | <name>margin</name> | 304 | <name>sizePolicy</name> |
327 | <number>0</number> | 305 | <sizepolicy> |
306 | <hsizetype>0</hsizetype> | ||
307 | <vsizetype>1</vsizetype> | ||
308 | </sizepolicy> | ||
328 | </property> | 309 | </property> |
329 | <property stdset="1"> | 310 | <property stdset="1"> |
330 | <name>spacing</name> | 311 | <name>text</name> |
331 | <number>6</number> | 312 | <string>Use device :</string> |
332 | </property> | 313 | </property> |
333 | <widget row="0" column="1" > | 314 | </widget> |
315 | <widget> | ||
334 | <class>QComboBox</class> | 316 | <class>QComboBox</class> |
@@ -346,3 +328,3 @@ | |||
346 | </widget> | 328 | </widget> |
347 | <spacer row="0" column="2" > | 329 | <spacer> |
348 | <property> | 330 | <property> |
@@ -367,28 +349,41 @@ | |||
367 | </spacer> | 349 | </spacer> |
368 | <widget row="1" column="0" rowspan="1" colspan="3" > | 350 | </hbox> |
369 | <class>QLabel</class> | 351 | </widget> |
352 | <widget> | ||
353 | <class>QLayoutWidget</class> | ||
370 | <property stdset="1"> | 354 | <property stdset="1"> |
371 | <name>name</name> | 355 | <name>name</name> |
372 | <cstring>TextLabel1_2</cstring> | 356 | <cstring>Layout15</cstring> |
373 | </property> | 357 | </property> |
358 | <hbox> | ||
374 | <property stdset="1"> | 359 | <property stdset="1"> |
375 | <name>sizePolicy</name> | 360 | <name>margin</name> |
376 | <sizepolicy> | 361 | <number>0</number> |
377 | <hsizetype>7</hsizetype> | ||
378 | <vsizetype>1</vsizetype> | ||
379 | </sizepolicy> | ||
380 | </property> | 362 | </property> |
381 | <property stdset="1"> | 363 | <property stdset="1"> |
382 | <name>text</name> | 364 | <name>spacing</name> |
383 | <string>Select to scan the bluetooth network for reachable devices using the selected local device</string> | 365 | <number>6</number> |
366 | </property> | ||
367 | <spacer> | ||
368 | <property> | ||
369 | <name>name</name> | ||
370 | <cstring>Spacer7_2</cstring> | ||
384 | </property> | 371 | </property> |
385 | <property stdset="1"> | 372 | <property stdset="1"> |
386 | <name>alignment</name> | 373 | <name>orientation</name> |
387 | <set>WordBreak|AlignVCenter|AlignLeft</set> | 374 | <enum>Horizontal</enum> |
375 | </property> | ||
376 | <property stdset="1"> | ||
377 | <name>sizeType</name> | ||
378 | <enum>Fixed</enum> | ||
388 | </property> | 379 | </property> |
389 | <property> | 380 | <property> |
390 | <name>wordwrap</name> | 381 | <name>sizeHint</name> |
382 | <size> | ||
383 | <width>20</width> | ||
384 | <height>20</height> | ||
385 | </size> | ||
391 | </property> | 386 | </property> |
392 | </widget> | 387 | </spacer> |
393 | <widget row="0" column="0" > | 388 | <widget> |
394 | <class>QLabel</class> | 389 | <class>QLabel</class> |
@@ -396,3 +391,3 @@ | |||
396 | <name>name</name> | 391 | <name>name</name> |
397 | <cstring>TextLabel5</cstring> | 392 | <cstring>TextLabel1_2</cstring> |
398 | </property> | 393 | </property> |
@@ -401,4 +396,4 @@ | |||
401 | <sizepolicy> | 396 | <sizepolicy> |
402 | <hsizetype>0</hsizetype> | 397 | <hsizetype>7</hsizetype> |
403 | <vsizetype>1</vsizetype> | 398 | <vsizetype>5</vsizetype> |
404 | </sizepolicy> | 399 | </sizepolicy> |
@@ -407,6 +402,11 @@ | |||
407 | <name>text</name> | 402 | <name>text</name> |
408 | <string>Use device :</string> | 403 | <string>San the bluetooth network neighbourhood using the selected local device</string> |
404 | </property> | ||
405 | <property stdset="1"> | ||
406 | <name>alignment</name> | ||
407 | <set>WordBreak|AlignVCenter|AlignLeft</set> | ||
408 | </property> | ||
409 | <property> | ||
410 | <name>wordwrap</name> | ||
409 | </property> | 411 | </property> |
410 | </widget> | ||
411 | </grid> | ||
412 | </widget> | 412 | </widget> |
@@ -556,3 +556,3 @@ | |||
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> |
@@ -593,3 +593,3 @@ | |||
593 | <name>name</name> | 593 | <name>name</name> |
594 | <cstring>Layout2</cstring> | 594 | <cstring>Layout9_2</cstring> |
595 | </property> | 595 | </property> |
@@ -605,6 +605,83 @@ | |||
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> |
@@ -612,5 +689,71 @@ | |||
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> |
@@ -656,8 +799,9 @@ | |||
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> |
@@ -665,3 +809,2 @@ | |||
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> |
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 | |||
@@ -112,2 +112,23 @@ private : | |||
112 | 112 | ||
113 | OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) { | ||
114 | |||
115 | OT = OTGateway::getOTGateway(); | ||
116 | |||
117 | } | ||
118 | |||
119 | OTSniffing::~OTSniffing() { | ||
120 | } | ||
121 | |||
122 | void OTSniffing::SLOT_Trace( void ) { | ||
123 | } | ||
124 | |||
125 | void OTSniffing::SLOT_ClearLog( void ) { | ||
126 | } | ||
127 | |||
128 | // | ||
129 | // | ||
130 | // | ||
131 | // | ||
132 | // | ||
133 | |||
113 | OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) : | 134 | OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) : |
@@ -875,2 +896,3 @@ OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) { | |||
875 | Icons = new OTIcons(); | 896 | Icons = new OTIcons(); |
897 | SnifWindow = 0; | ||
876 | OT = OTGateway::getOTGateway(); | 898 | OT = OTGateway::getOTGateway(); |
@@ -1005 +1027,11 @@ void OTMain::SLOT_Pairing( void ) { | |||
1005 | } | 1027 | } |
1028 | |||
1029 | void 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 | |||
@@ -5,5 +5,5 @@ | |||
5 | 5 | ||
6 | #include <OTPairingGUI.h> | ||
7 | namespace Opie { namespace Ui { class OLedBox; }; }; | 6 | namespace Opie { namespace Ui { class OLedBox; }; }; |
8 | 7 | ||
8 | #include <OTSniffGUI.h> | ||
9 | namespace Opietooth2 { | 9 | namespace Opietooth2 { |
@@ -16,2 +16,29 @@ class PeerLVI; | |||
16 | 16 | ||
17 | class OTSniffing : public OTSniffGUI { | ||
18 | |||
19 | Q_OBJECT | ||
20 | |||
21 | public : | ||
22 | |||
23 | OTSniffing( QWidget * parent ); | ||
24 | ~OTSniffing(); | ||
25 | |||
26 | private slots : | ||
27 | |||
28 | void SLOT_Trace( void ); | ||
29 | void SLOT_ClearLog( void ); | ||
30 | |||
31 | signals : | ||
32 | |||
33 | protected : | ||
34 | |||
35 | private : | ||
36 | |||
37 | OTGateway * OT; | ||
38 | }; | ||
39 | }; | ||
40 | |||
41 | #include <OTPairingGUI.h> | ||
42 | |||
43 | namespace Opietooth2 { | ||
17 | class OTPairing : public OTPairingGUI { | 44 | class OTPairing : public OTPairingGUI { |
@@ -176,2 +203,3 @@ private slots : | |||
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 ); |
@@ -191,2 +219,3 @@ private : | |||
191 | OTGateway * OT; | 219 | OTGateway * OT; |
220 | OTSniffing * SnifWindow; | ||
192 | }; | 221 | }; |
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 | |||
@@ -32,3 +32,3 @@ DEPENDPATH += $(OPIEDIR)/include | |||
32 | LIBS += -lqpe -lopiecore2 -lbluetooth | 32 | LIBS += -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 |
diff --git a/noncore/settings/packagemanager/opackagemanager.cpp b/noncore/settings/packagemanager/opackagemanager.cpp index c9fdec1..ac16954 100644 --- a/noncore/settings/packagemanager/opackagemanager.cpp +++ b/noncore/settings/packagemanager/opackagemanager.cpp | |||
@@ -85,5 +85,6 @@ void OPackageManager::loadAvailablePackages() | |||
85 | // Load package info | 85 | // Load package info |
86 | if ( !m_packages.find( package->name() ) ) | 86 | if ( !m_packages.find( package->name() ) ) { |
87 | printf( "ADD AVAILABLE '%s'\n", package->name().latin1()); | ||
87 | m_packages.insert( package->name(), package ); | 88 | m_packages.insert( package->name(), package ); |
88 | else | 89 | } else |
89 | { | 90 | { |
@@ -140,2 +141,3 @@ void OPackageManager::loadInstalledPackages() | |||
140 | 141 | ||
142 | printf( "DESGTINATION %s\n", destination->name().latin1()); | ||
141 | OPackageList *packageList = m_ipkg.installedPackages( destination->name(), | 143 | OPackageList *packageList = m_ipkg.installedPackages( destination->name(), |
@@ -159,2 +161,3 @@ void OPackageManager::loadInstalledPackages() | |||
159 | // Package isn't in a current feed, add to list | 161 | // Package isn't in a current feed, add to list |
162 | printf( "ADD INSTALLED '%s'\n", package->name().latin1()); | ||
160 | m_packages.insert( package->name(), package ); | 163 | m_packages.insert( package->name(), package ); |