| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 8ddc161..c29eb1a 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -119,257 +119,257 @@ using namespace OpieTooth; */ void BlueBase::writeConfig() { Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); cfg.writeEntry( "name" , m_deviceName ); cfg.writeEntryCrypt( "passkey" , m_defaultPasskey ); cfg.writeEntry( "useEncryption" , m_useEncryption ); cfg.writeEntry( "enableAuthentification" , m_enableAuthentification ); cfg.writeEntry( "enablePagescan" , m_enablePagescan ); cfg.writeEntry( "enableInquiryscan" , m_enableInquiryscan ); writeToHciConfig(); } void BlueBase::writeToHciConfig() { HciConfWrapper hciconf ( "/tmp/hcid.conf" ); hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" ); // hciconf->setPinHelper( "/bin/QtPalmtop/bin/blue-pin" ); hciconf.setName( m_deviceName ); hciconf.setEncrypt( m_useEncryption ); hciconf.setAuth( m_enableAuthentification ); hciconf.setPscan( m_enablePagescan ); hciconf.setIscan( m_enableInquiryscan ); } /** * Read the list of allready known devices * */ void BlueBase::readSavedDevices() { QValueList<RemoteDevice> loadedDevices; 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. 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( mac , name ); loadedDevices.append( currentDevice ); } 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. 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() ); } } /** * Set up the gui */ void BlueBase::initGui() { StatusLabel->setText( status() ); // maybe move it to getStatus() cryptCheckBox->setChecked( m_useEncryption ); authCheckBox->setChecked( m_enableAuthentification ); pagescanCheckBox->setChecked( m_enablePagescan ); inquiryscanCheckBox->setChecked( m_enableInquiryscan ); deviceNameLine->setText( m_deviceName ); passkeyLine->setText( m_defaultPasskey ); // set info tab setInfo(); } /** * Get the status informations and returns it * @return QString the status informations gathered */ QString BlueBase::status()const{ 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() { m_deviceName = deviceNameLine->text(); m_defaultPasskey = passkeyLine->text(); m_useEncryption = cryptCheckBox->isChecked(); m_enableAuthentification = authCheckBox->isChecked(); m_enablePagescan = pagescanCheckBox->isChecked(); m_enableInquiryscan = inquiryscanCheckBox->isChecked(); writeConfig(); QMessageBox::information( this, tr("Test") , tr("Changes were applied.") ); } /** * Add fresh found devices from scan dialog to the listing * */ - void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { + void BlueBase::addSearchedDevices( QValueList<RemoteDevice> &newDevices ) { BTListItem * deviceItem; QValueList<RemoteDevice>::ConstIterator it; for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { deviceItem = new BTListItem( ListView2 , (*it).name(), (*it).mac(), "device" ); deviceItem->setExpandable ( true ); // look if device is avail. atm, async deviceActive( (*it) ); // 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*/ ) { QPopupMenu *menu = new QPopupMenu(); int ret=0; if ( ((BTListItem*)item)->type() == "device") { QPopupMenu *groups = new QPopupMenu(); menu->insertItem( tr("rescan sevices:"), 0); menu->insertItem( tr("to group"), groups , 1); menu->insertItem( tr("bound device"), 2); menu->insertItem( tr("delete"), 3); ret = menu->exec( point , 0); switch(ret) { case 0: break; case 1: break; case 2: // make connection break; case 3: // delete childs too delete item; break; } delete groups; } else if ( ((BTListItem*)item)->type() == "service") { menu->insertItem( tr("Test1:"), 0); menu->insertItem( tr("connect"), 1); menu->insertItem( tr("delete"), 2); ret = menu->exec( point , 0); switch(ret) { case 0: break; case 1: break; case 2: // delete childs too delete item; break; } } delete menu; } /** * Search and display avail. services for a device (on expand from device listing) * */ void BlueBase::addServicesToDevice( BTListItem * item ) { qDebug("addServicesToDevice"); // row of mac adress text(3) RemoteDevice device( item->mac(), item->name() ); m_deviceList.insert( item->mac() , item ); // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back m_localDevice->searchServices( device ); } /** * 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,BTListItem*>::Iterator it; BTListItem* deviceItem = 0; // get the right devices which requested the search for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) { if ( it.key() == device ) { deviceItem = it.data(); } } QValueList<OpieTooth::Services>::Iterator it2; BTListItem * serviceItem; if (!servicesList.isEmpty() ) { // add services for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" ); serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) ); } } else { serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" ); } } /** * Add the existing connections (pairs) to the connections tab. * This one triggers the search */ diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index 73fac97..97ce8c3 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -1,85 +1,85 @@ #ifndef BLUEBASE_H #define BLUEBASE_H #include <qvariant.h> #include <qwidget.h> #include <qscrollview.h> #include <qsplitter.h> #include <qlist.h> #include <qpixmap.h> #include "bluetoothbase.h" #include "btlistitem.h" #include "bticonloader.h" #include <remotedevice.h> #include <manager.h> class QVBox; class QHBoxLayout; class QGridLayout; class QFrame; class QLabel; class QPushButton; class QTabWidget; class QCheckBox; namespace OpieTooth { class BlueBase : public BluetoothBase { Q_OBJECT public: BlueBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); ~BlueBase(); protected: private slots: void startScan(); private: void readConfig(); void writeConfig(); void readSavedDevices(); void writeSavedDevices(); void writeToHciConfig(); QString status()const; void initGui(); void setInfo(); Manager *m_localDevice; QMap<QString,BTListItem*> m_deviceList; void deviceActive( const RemoteDevice &device ); QString m_deviceName; QString m_defaultPasskey; bool m_useEncryption; bool m_enableAuthentification; bool m_enablePagescan; bool m_enableInquiryscan; QPixmap m_offPix; QPixmap m_onPix; BTIconLoader *m_iconLoader; private slots: - void addSearchedDevices( const QValueList<RemoteDevice> &newDevices ); + void addSearchedDevices( QValueList<RemoteDevice> &newDevices ); void addServicesToDevice( BTListItem *item ); void addServicesToDevice( const QString& device, Services::ValueList ); void addConnectedDevices(); void addConnectedDevices( Connection::ValueList ); void startServiceActionClicked( QListViewItem *item ); void startServiceActionHold( QListViewItem *, const QPoint &, int ); void deviceActive( const QString& mac, bool connected ); void applyConfigChanges(); }; } #endif |