| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 5d742b7..cc51405 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -58,49 +58,48 @@ namespace OpieTooth { this, SLOT( startServiceActionClicked( QListViewItem* ) ) ); connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ), this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); //Load all icons needed offPix = Resource::loadPixmap( "editdelete" ); 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 *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); topLV2->setPixmap( 1, onPix ); (void) new QListViewItem( topLV2, "Serial" ); (void) new QListViewItem( topLV2, "BlueNiC" ); } /** * Reads all options from the config file */ void BlueBase::readConfig() { Config cfg( "bluetoothmanager" ); 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 useEncryption = cfg.readNumEntry( "useEncryption" , 1 ); enableAuthentification = cfg.readNumEntry( "enableAuthentification" , 1 ); enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 ); @@ -113,54 +112,67 @@ namespace OpieTooth { */ void BlueBase::writeConfig() { Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); cfg.writeEntry( "name" , deviceName ); cfg.writeEntryCrypt( "passkey" , defaultPasskey ); cfg.writeEntry( "useEncryption" , useEncryption ); cfg.writeEntry( "enableAuthentification" , enableAuthentification ); cfg.writeEntry( "enablePagescan" , enablePagescan ); cfg.writeEntry( "enableInquiryscan" , enableInquiryscan ); } /** * Read the list of allready known devices * */ void BlueBase::readSavedDevices() { QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>; - Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File ); + QDir deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/"); + // list of .conf files + QStringList devicesFileList = deviceListSave.entryList(); + // cut .conf of to get the mac and also read the name entry in it. - // RemoteDevice *currentDevice = RemoteDevice( , ); - //loadedDevices->append( currentDevice ); + for ( QStringList::Iterator it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { + QString name; + QString mac; + qDebug((*it).latin1() ); + Config conf((*it)); + conf.setGroup("Info"); + name = conf.readEntry("name", "Error"); + qDebug("MAC: " + mac); + qDebug("NAME: " + name); + RemoteDevice currentDevice = RemoteDevice( mac , name ); + loadedDevices->append( ¤tDevice ); + } addSearchedDevices( *loadedDevices ); } /** * Write the list of allready known devices * */ void BlueBase::writeSavedDevices() { QListViewItemIterator it( ListView2 ); for ( ; it.current(); ++it ) { // seperate config file for each device, to store more information in future. Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(3)) + ".conf", Config::File ); conf.setGroup( "Info" ); conf.writeEntry( "name", it.current()->text(0) ); } } /** * Set up the gui @@ -170,201 +182,194 @@ namespace OpieTooth { StatusLabel->setText( getStatus() ); // maybe move it to getStatus() cryptCheckBox->setChecked( useEncryption ); authCheckBox->setChecked( enableAuthentification ); pagescanCheckBox->setChecked( enablePagescan ); inquiryscanCheckBox->setChecked( enableInquiryscan ); deviceNameLine->setText( deviceName ); passkeyLine->setText( defaultPasskey ); // set info tab setInfo(); } /** * Get the status informations and returns it * @return QString the status informations gathered */ QString BlueBase::getStatus(){ QString infoString = tr( "<b>Device name : </b> Ipaq" ); infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); return (infoString); - } /** * Read the current values from the gui and invoke writeConfig() */ void BlueBase::applyConfigChanges() { deviceName = deviceNameLine->text(); defaultPasskey = passkeyLine->text(); useEncryption = cryptCheckBox->isChecked(); enableAuthentification = authCheckBox->isChecked(); enablePagescan = pagescanCheckBox->isChecked(); enableInquiryscan = inquiryscanCheckBox->isChecked(); writeConfig(); QMessageBox* box = new QMessageBox( this, "Test" ); box->setText( tr( "Changes applied" ) ); box->show(); - // falls nötig hcid killhupen - die funktionalität adden } /** * 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->setExpandable ( true ); 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. */ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { qDebug("fill services list"); QMap<QString,QListViewItem*>::Iterator it; 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 ) { serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); } } /** * Add the existing connections (pairs) to the connections tab. * */ void BlueBase::addConnectedDevices() { //mac address } /** * Find out if a device can currently be reached */ bool BlueBase::deviceActive( RemoteDevice *device ) { // search by mac - // localDevice->isAvailable( device->mac() ); return true; } /** * Open the "scan for devices" dialog */ void BlueBase::startScan() { ScanDialog *scan = new ScanDialog( this, "", true); QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ), this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) ); scan->showMaximized(); } /** * Set the informations about the local device in information Tab */ void BlueBase::setInfo() { StatusLabel->setText( getStatus() ); } /** * Decontructor */ BlueBase::~BlueBase() { writeSavedDevices(); } - } |