Diffstat (limited to 'noncore/net/opietooth/manager/bluebase.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 68 |
1 files changed, 15 insertions, 53 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index d023302..2001db1 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -43,9 +43,8 @@ #include <remotedevice.h> - +#include <services.h> namespace OpieTooth { - BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) : BluetoothBase( parent, name, fl ) { @@ -60,5 +59,4 @@ namespace OpieTooth { connect( ListView2, SIGNAL( clicked( QListViewItem* )), this, SLOT( startServiceActionClicked( QListViewItem* ) ) ); - // hehe, cast right later connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ), this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) ); @@ -71,5 +69,4 @@ namespace OpieTooth { //Load all icons needed - offPix = Resource::loadPixmap( "editdelete" ); onPix = Resource::loadPixmap( "installed" ); @@ -95,9 +92,10 @@ namespace OpieTooth { (void) new BTListItem( topLV2, "Serial" ,"", "service" ); (void) new BTListItem( topLV2, "BlueNiC" , "", "service" ); + writeToHciConfig(); // search conncetions addConnectedDevices(); - } - + iconLoader = new BTIconLoader(); + } /** @@ -109,5 +107,4 @@ namespace OpieTooth { cfg.setGroup( "bluezsettings" ); - deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak @@ -116,5 +113,4 @@ namespace OpieTooth { enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 ); enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 ); - } @@ -124,5 +120,4 @@ namespace OpieTooth { void BlueBase::writeConfig() { - Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); @@ -211,14 +206,10 @@ namespace OpieTooth { */ void BlueBase::writeSavedDevices() { - QListViewItemIterator it( ListView2 ); for ( ; it.current(); ++it ) { - // seperate config file for each device, to store more information in future. -// TO FIX: BTLISTITEM!!! qDebug( "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf"); Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf", Config::File ); - conf.setGroup( "Info" ); conf.writeEntry( "name", ((BTListItem*)it.current())->name() ); @@ -231,7 +222,5 @@ namespace OpieTooth { */ void BlueBase::initGui() { - StatusLabel->setText( getStatus() ); // maybe move it to getStatus() - cryptCheckBox->setChecked( useEncryption ); authCheckBox->setChecked( enableAuthentification ); @@ -250,5 +239,4 @@ namespace OpieTooth { */ QString BlueBase::getStatus(){ - QString infoString = tr( "<b>Device name : </b> Ipaq" ); infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); @@ -263,5 +251,4 @@ namespace OpieTooth { */ void BlueBase::applyConfigChanges() { - deviceName = deviceNameLine->text(); defaultPasskey = passkeyLine->text(); @@ -273,11 +260,8 @@ namespace OpieTooth { writeConfig(); - QMessageBox* box = new QMessageBox( this, "Test" ); box->setText( tr( "Changes applied" ) ); box->show(); - // falls nötig hcid killhupen - die funktionalität adden - } - + } /** @@ -286,12 +270,9 @@ namespace OpieTooth { */ void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { - BTListItem * deviceItem; - QListIterator<RemoteDevice> it( newDevices ); for( ; it.current() ; ++it ) { - RemoteDevice *dev = it.current(); deviceItem = new BTListItem( ListView2 , dev->name(), dev->mac(), "device" ); @@ -311,6 +292,4 @@ namespace OpieTooth { */ void BlueBase::startServiceActionClicked( QListViewItem *item ) { - - } @@ -321,10 +300,6 @@ namespace OpieTooth { QPopupMenu *menu = new QPopupMenu(); - int ret=0; - - //QSize s = menu->sizeHint ( ); - if ( ((BTListItem*)item)->type() == "device") { @@ -333,6 +308,6 @@ namespace OpieTooth { menu->insertItem( tr("rescan sevices:"), 0); menu->insertItem( tr("to group"), groups , 1); - menu->insertItem( tr("delete"), 2); - + menu->insertItem( tr("bound device"), 2); + menu->insertItem( tr("delete"), 3); ret = menu->exec( point , 0); @@ -344,4 +319,7 @@ namespace OpieTooth { break; case 2: + // make connection + break; + case 3: // delete childs too delete item; @@ -368,5 +346,4 @@ namespace OpieTooth { } } - delete menu; } @@ -377,15 +354,11 @@ namespace OpieTooth { */ void BlueBase::addServicesToDevice( BTListItem * item ) { - qDebug("addServicesToDevice"); // row of mac adress text(3) RemoteDevice *device = new RemoteDevice( item->mac(), item->name() ); - deviceList.insert( item->mac() , item ); - // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back localDevice->searchServices( *device ); - - // delete + delete device; } @@ -397,10 +370,8 @@ namespace OpieTooth { */ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { - qDebug("fill services list"); QMap<QString,BTListItem*>::Iterator it; - - BTListItem* deviceItem; + BTListItem* deviceItem = 0; // get the right devices which requested the search @@ -412,5 +383,4 @@ namespace OpieTooth { QValueList<OpieTooth::Services>::Iterator it2; - BTListItem * serviceItem; @@ -419,9 +389,8 @@ namespace OpieTooth { for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" ); - //serviceItem->setText(4, "service"); + serviceItem->setPixmap( 0, iconLoader->serviceIcon( (*it2).classIdList() ) ); } } else { serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" ); - //serviceItem->setText(4, "service"); } } @@ -438,5 +407,4 @@ namespace OpieTooth { void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) { - QValueList<OpieTooth::Connection>::Iterator it; BTListItem * connectionItem; @@ -459,5 +427,4 @@ namespace OpieTooth { */ void BlueBase::deviceActive( RemoteDevice *device ) { - // search by mac, async, gets a signal back localDevice->isAvailable( device->mac() ); @@ -470,10 +437,8 @@ namespace OpieTooth { */ void BlueBase::deviceActive( const QString& device, bool connected ) { - qDebug("deviceActive slot"); QMap<QString,BTListItem*>::Iterator it; - - BTListItem* deviceItem; + BTListItem* deviceItem = 0; // get the right devices which requested the search @@ -489,14 +454,10 @@ namespace OpieTooth { deviceItem->setPixmap( 1, offPix ); } - } - - /** * Open the "scan for devices" dialog */ void BlueBase::startScan() { - ScanDialog *scan = new ScanDialog( this, "", true); QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ), @@ -519,4 +480,5 @@ namespace OpieTooth { BlueBase::~BlueBase() { writeSavedDevices(); + delete iconLoader; } } |