| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 29 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 8 |
2 files changed, 20 insertions, 17 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index c7e1fe4..6328b59 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -37,71 +37,70 @@ #include <qdir.h> #include <qpe/resource.h> #include <qpe/config.h> #include <remotedevice.h> namespace OpieTooth { BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) : BluetoothBase( parent, name, fl ) { localDevice = new Manager( "hci0" ); - QObject::connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); - QObject::connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); - QObject::connect( ListView2, SIGNAL( expanded( QListViewItem * item ) ), - this, SLOT( addServicesToDevice( QListViewItem * item ) ) ); - QObject::connect( ListView2, SIGNAL( clicked( QListViewItem * )), - this, SLOT( startServiceActionClicked( QListViewItem * item ) ) ); - connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ), + connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); + connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); + connect( ListView2, SIGNAL( expanded ( QListViewItem *item ) ), + this, SLOT( addServicesToDevice( QListViewItem *item ) ) ); + connect( ListView2, SIGNAL( clicked( QListViewItem* )), + this, SLOT( startServiceActionClicked( QListViewItem *item ) ) ); + connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ), this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) ); - // QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) ); //Load all icons needed QPixmap offPix = Resource::loadPixmap( "editdelete" ); QPixmap onPix = Resource::loadPixmap( "installed" ); QPalette pal = this->palette(); QColor col = pal.color(QPalette::Active, QColorGroup::Background); pal.setColor(QPalette::Active, QColorGroup::Button, col); pal.setColor(QPalette::Inactive, QColorGroup::Button, col); pal.setColor(QPalette::Normal, QColorGroup::Button, col); pal.setColor(QPalette::Disabled, QColorGroup::Button, col); this->setPalette(pal); setCaption( tr( "Bluetooth Manager" ) ); readConfig(); initGui(); //TESTING ListView2->setRootIsDecorated(true); QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes"); topLV->setPixmap( 0, offPix ); - (void) new QListViewItem( topLV, "on" ); - (void) new QListViewItem( topLV, "off" ); + // (void) new QListViewItem( topLV, "on" ); + //(void) new QListViewItem( topLV, "off" ); QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); topLV2->setPixmap( 0, onPix ); (void) new QListViewItem( topLV2, "on" ); (void) new QListViewItem( topLV2, "off" ); } /** * Reads all options from the config file */ void BlueBase::readConfig() { Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); @@ -226,67 +225,71 @@ namespace OpieTooth { /* * Add fresh found devices from scan dialog to the listing * */ void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { QListViewItem * deviceItem; QListIterator<RemoteDevice> it( newDevices ); for( ; it.current() ; ++it ) { RemoteDevice *dev = it.current(); - deviceItem = new QListViewItem( ListView2, dev->name() ); + deviceItem = new QListViewItem( ListView2 , dev->name() ); if ( deviceActive( dev ) ) { deviceItem->setPixmap( 1 , onPix ); } else { deviceItem->setPixmap( 1, offPix ); } deviceItem->setText( 3, dev->mac() ); + + // ggf auch hier? + addServicesToDevice( deviceItem ); } } /* * Action that is toggled on entrys on click */ void BlueBase::startServiceActionClicked( QListViewItem * item ) { } /* * Action that are toggled on hold (mostly QPopups i guess) */ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) { } /* * Search and display avail. services for a device (on expand from device listing) * */ void BlueBase::addServicesToDevice( QListViewItem * item ) { + qDebug("addServicesToDevice"); // row of mac adress RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0)); deviceList.insert( item->text(3) , item ); // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back localDevice->searchServices( *device ); // delete } /** * Overloaded. This one it the one that is connected to the foundServices signal * @param device the mac address of the remote device * @param servicesList the list with the service the device has. @@ -300,34 +303,34 @@ namespace OpieTooth { QListViewItem* deviceItem; for( it = deviceList.begin(); it != deviceList.end(); ++it ) { if (it.key() == device ) { deviceItem = it.data(); } } QValueList<OpieTooth::Services>::Iterator it2; QListViewItem * serviceItem; for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { - it2.serviceName() - serviceItem = new QListViewItem( deviceItem , it2.serviceName() ); +// it2.serviceName() + serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); } } /* * Find out if a device can currently be reached */ bool BlueBase::deviceActive( RemoteDevice *device ) { return true; } /** * Open the "scan for devices" dialog */ diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index dcb7681..d20d05c 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -52,29 +52,29 @@ namespace OpieTooth { void setInfo(); Manager *localDevice; QMap<QString,QListViewItem*> deviceList; bool deviceActive( RemoteDevice *device ); QString deviceName; QString defaultPasskey; int useEncryption; int enableAuthentification; int enablePagescan; int enableInquiryscan; QPixmap offPix; QPixmap onPix; - private slots: + public slots: void addSearchedDevices( QList<RemoteDevice> &newDevices ); - void addServicesToDevice( QListViewItem * item ); + void addServicesToDevice( QListViewItem *item ); void addServicesToDevice( const QString& device, Services::ValueList ); - void startServiceActionClicked( QListViewItem * item ); - void startServiceActionHold( QListViewItem * item, const QPoint & point, int column); + void startServiceActionClicked( QListViewItem *item ); + void startServiceActionHold( QListViewItem *item, const QPoint &point, int column); void applyConfigChanges(); }; } #endif |