From 98dd4c49f5d7a3c0569e3f6ff92f39451734070c Mon Sep 17 00:00:00 2001 From: wimpie Date: Thu, 06 Jan 2005 03:53:17 +0000 Subject: 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 --- diff --git a/Makefile b/Makefile index a1fc32c..89c3470 100644 --- a/Makefile +++ b/Makefile @@ -134,3 +134,17 @@ mrproper : clean-configs find . -name "*.pro"|xargs touch include $(TOPDIR)/Rules.make + +# to speed up (avoid include/generation of packaging rules) +ifneq ($(filter package%,$(MAKECMDGOALS)),) + +# packaging requested + +$(TOPDIR)/Package.make : + @echo "Generating packaging rules" + @$(TOPDIR)/scripts/GeneratePackageMake > $(TOPDIR)/Package.make + +# load rules to make packages +-include $(TOPDIR)/Package.make + +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,3 +1,4 @@ +Package: opie-performance Files: plugins/applications/libperformance.so* bin/performance apps/Applications/performance.desktop Priority: optional Section: opie/other 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,3 +1,4 @@ +Package: opie-powercord Files: plugins/applications/libpowerchord.so* bin/powerchord apps/Applications/powerchord.desktop pics/powerchord share/powerchord Priority: optional Section: opie/multimedia 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 @@ -11,8 +11,8 @@ 0 0 - 257 - 296 + 225 + 334 @@ -34,27 +34,6 @@ spacing 0 - - - name - Spacer20 - - - orientation - Vertical - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - QLayoutWidget @@ -176,7 +155,7 @@ text - Select to manage your local Bluetooth hardware + Manage your local Bluetooth hardware alignment @@ -283,7 +262,98 @@ QLayoutWidget name - Layout10 + Layout13 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer7_2_2 + + + orientation + Horizontal + + + sizeType + Fixed + + + sizeHint + + 20 + 20 + + + + + QLabel + + name + TextLabel5 + + + sizePolicy + + 0 + 1 + + + + text + Use device : + + + + QComboBox + + name + DeviceList_CB + + + sizePolicy + + 7 + 0 + + + + + + name + Spacer16 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QLayoutWidget + + name + Layout15 @@ -316,99 +386,29 @@ - QLayoutWidget + QLabel name - Layout9 - - - - margin - 0 - - - spacing - 6 - - - QComboBox - - name - DeviceList_CB - - - sizePolicy - - 7 - 0 - - - - - - name - Spacer16 - - - orientation - Horizontal - - - sizeType - Expanding - - - sizeHint - - 20 - 20 - - - - - QLabel - - name - TextLabel1_2 - - - sizePolicy - - 7 - 1 - - - - text - Select to scan the bluetooth network for reachable devices using the selected local device - - - alignment - WordBreak|AlignVCenter|AlignLeft - - - wordwrap - - - - QLabel - - name - TextLabel5 - - - sizePolicy - - 0 - 1 - - - - text - Use device : - - - + TextLabel1_2 + + + sizePolicy + + 7 + 5 + + + + text + San the bluetooth network neighbourhood using the selected local device + + + alignment + WordBreak|AlignVCenter|AlignLeft + + + wordwrap + @@ -554,7 +554,7 @@ text - Select to manage all pairings known on the local device to any remote device regardless if it is currently reachable or not + Manage device pairings to or from the local device alignment @@ -591,7 +591,7 @@ QLayoutWidget name - Layout2 + Layout9_2 @@ -603,16 +603,159 @@ 6 - QCheckBox + QPushButton + + name + BTSniffing_But + + + text + Sniffing + + + + + name + Spacer9_3_2 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + + + QLayoutWidget + + name + Layout6_2 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer7_3_2 + + + orientation + Horizontal + + + sizeType + Fixed + + + sizeHint + + 20 + 20 + + + + + QLabel name - EnableTracing_CB + TextLabel1_2_2_2 + + + sizePolicy + + 7 + 1 + text - Trace Bluetooth + Sniff the bluetooth network + + + alignment + WordBreak|AlignVCenter|AlignLeft + + + wordwrap + + + + + name + Spacer20_2_2_2_3 + + + orientation + Vertical + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + + + QLayoutWidget + + name + Layout11 + + + + margin + 0 + + + spacing + 6 + + + + name + Spacer21 + + + orientation + Horizontal + + + sizeType + Expanding + + + sizeHint + + 20 + 20 + + + QCheckBox @@ -654,15 +797,15 @@ SLOT_Pairing() - EnableTracing_CB - toggled(bool) + BTSniffing_But + clicked() OTMainGUI - SLOT_EnableTracing( bool ) + SLOT_Sniffing() SLOT_EnableBluetooth(bool) + SLOT_Sniffing() SLOT_Manage() SLOT_Pairing() SLOT_Scan() - SLOT_EnableTracing( bool ) 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 @@ -110,6 +110,27 @@ private : // // +OTSniffing::OTSniffing( QWidget * parent ) : OTSniffGUI( parent ) { + + OT = OTGateway::getOTGateway(); + +} + +OTSniffing::~OTSniffing() { +} + +void OTSniffing::SLOT_Trace( void ) { +} + +void OTSniffing::SLOT_ClearLog( void ) { +} + +// +// +// +// +// + OTPairing::OTPairing( QWidget * parent, OTIcons * _IC ) : OTPairingGUI( parent ) { @@ -873,6 +894,7 @@ void OTManage::SLOT_SetRefreshTimer( int v ) { OTMain::OTMain( QWidget * parent ) : OTMainGUI( parent ) { Icons = new OTIcons(); + SnifWindow = 0; OT = OTGateway::getOTGateway(); connect( OT, @@ -1003,3 +1025,13 @@ void OTMain::SLOT_Pairing( void ) { delete Dlg; } + +void OTMain::SLOT_Sniffing( void ) { + + if( SnifWindow == 0 ) { + SnifWindow = new OTSniffing( this ); + } + + SnifWindow->showMaximized(); + SnifWindow->show(); +} 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 @@ -3,9 +3,9 @@ #include -#include namespace Opie { namespace Ui { class OLedBox; }; }; +#include namespace Opietooth2 { class OTGateway; @@ -14,6 +14,33 @@ class OTInquiry; class OTPeer; class PeerLVI; +class OTSniffing : public OTSniffGUI { + + Q_OBJECT + +public : + + OTSniffing( QWidget * parent ); + ~OTSniffing(); + +private slots : + + void SLOT_Trace( void ); + void SLOT_ClearLog( void ); + +signals : + +protected : + +private : + + OTGateway * OT; +}; +}; + +#include + +namespace Opietooth2 { class OTPairing : public OTPairingGUI { Q_OBJECT @@ -174,6 +201,7 @@ private slots : void SLOT_Pairing( void ); void SLOT_Manage( void ); + void SLOT_Sniffing( void ); void SLOT_Scan( void ); void SLOT_EnableBluetooth( bool ); void SLOT_DriverListChanged(); @@ -189,6 +217,7 @@ private : // load scanned devices OTIcons * Icons; OTGateway * OT; + OTSniffing * SnifWindow; }; }; #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 @@ -30,7 +30,7 @@ SOURCES = OTDevice.cpp \ INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopiecore2 -lbluetooth -INTERFACES = OTMainGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui +INTERFACES = OTMainGUI.ui OTSniffGUI.ui OTScanGUI.ui OTManageGUI.ui OTPairingGUI.ui TARGET = opietooth2 VERSION = 1.0.0 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 @@ -83,9 +83,10 @@ void OPackageManager::loadAvailablePackages() OPackage *package = packageIt.current(); // Load package info - if ( !m_packages.find( package->name() ) ) + if ( !m_packages.find( package->name() ) ) { + printf( "ADD AVAILABLE '%s'\n", package->name().latin1()); m_packages.insert( package->name(), package ); - else + } else { // If new package is newer version, replace existing package OPackage *currPackage = m_packages[package->name()]; @@ -138,6 +139,7 @@ void OPackageManager::loadInstalledPackages() emit statusBar( destCount ); qApp->processEvents(); + printf( "DESGTINATION %s\n", destination->name().latin1()); OPackageList *packageList = m_ipkg.installedPackages( destination->name(), destination->value() ); if ( packageList ) @@ -157,6 +159,7 @@ void OPackageManager::loadInstalledPackages() else { // Package isn't in a current feed, add to list + printf( "ADD INSTALLED '%s'\n", package->name().latin1()); m_packages.insert( package->name(), package ); // Add category to list if it doesn't already exist -- cgit v0.9.0.2