Diffstat (limited to 'noncore/net/opietooth/manager/bluebase.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 201 |
1 files changed, 131 insertions, 70 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 2e68984..0ea45d2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -21,13 +21,14 @@ #include "devicehandler.h" #include "btconnectionitem.h" #include "rfcommassigndialogimpl.h" -#include <remotedevice.h> -#include <services.h> - -#include <stdlib.h> +/* OPIE */ +#include <qpe/qpeapplication.h> +#include <qpe/resource.h> +#include <qpe/config.h> +/* QT */ #include <qframe.h> #include <qlabel.h> #include <qpushbutton.h> #include <qlayout.h> @@ -45,17 +46,18 @@ #include <qpopupmenu.h> #include <qtimer.h> #include <qlist.h> -#include <qpe/qpeapplication.h> -#include <qpe/resource.h> -#include <qpe/config.h> - +/* STD */ +#include <remotedevice.h> +#include <services.h> +#include <stdlib.h> using namespace OpieTooth; BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) - : BluetoothBase( parent, name, fl ) { + : BluetoothBase( parent, name, fl ) +{ m_localDevice = new Manager( "hci0" ); connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); @@ -114,9 +116,10 @@ BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) /** * Reads all options from the config file */ -void BlueBase::readConfig() { +void BlueBase::readConfig() +{ Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); @@ -130,9 +133,10 @@ void BlueBase::readConfig() { /** * Writes all options to the config file */ -void BlueBase::writeConfig() { +void BlueBase::writeConfig() +{ Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); @@ -148,9 +152,10 @@ void BlueBase::writeConfig() { /** * Modify the hcid.conf file to our needs */ -void BlueBase::writeToHciConfig() { +void BlueBase::writeToHciConfig() +{ qWarning("writeToHciConfig"); HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); hciconf.load(); hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); @@ -165,9 +170,10 @@ void BlueBase::writeToHciConfig() { /** * Read the list of allready known devices */ -void BlueBase::readSavedDevices() { +void BlueBase::readSavedDevices() +{ QValueList<RemoteDevice> loadedDevices; DeviceHandler handler; loadedDevices = handler.load(); @@ -178,14 +184,16 @@ void BlueBase::readSavedDevices() { /** * Write the list of allready known devices */ -void BlueBase::writeSavedDevices() { +void BlueBase::writeSavedDevices() +{ QListViewItemIterator it( ListView2 ); BTListItem* item; BTDeviceItem* device; RemoteDevice::ValueList list; - for ( ; it.current(); ++it ) { + for ( ; it.current(); ++it ) + { item = (BTListItem*)it.current(); if(item->typeId() != BTListItem::Device ) continue; device = (BTDeviceItem*)item; @@ -204,9 +212,10 @@ void BlueBase::writeSavedDevices() { /** * Set up the gui */ -void BlueBase::initGui() { +void BlueBase::initGui() +{ StatusLabel->setText( status() ); // maybe move it to getStatus() cryptCheckBox->setChecked( m_useEncryption ); authCheckBox->setChecked( m_enableAuthentification ); pagescanCheckBox->setChecked( m_enablePagescan ); @@ -221,9 +230,10 @@ void BlueBase::initGui() { /** * Get the status informations and returns it * @return QString the status informations gathered */ -QString BlueBase::status()const{ +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" ); @@ -233,9 +243,10 @@ QString BlueBase::status()const{ /** * Read the current values from the gui and invoke writeConfig() */ -void BlueBase::applyConfigChanges() { +void BlueBase::applyConfigChanges() +{ m_deviceName = deviceNameLine->text(); m_defaultPasskey = passkeyLine->text(); m_useEncryption = cryptCheckBox->isChecked(); m_enableAuthentification = authCheckBox->isChecked(); @@ -250,27 +261,29 @@ void BlueBase::applyConfigChanges() { /** * Launch Rfcomm Bind dialog * */ -void BlueBase::rfcommDialog() { +void BlueBase::rfcommDialog() +{ RfcommAssignDialog rfcommAssign ( this, "RfcommAssignDialog", true, WStyle_ContextHelp ); - rfcommAssign.showMaximized(); - - if ( rfcommAssign.exec() == QDialog::Accepted ) { + if ( QPEApplication::execDialog( &rfcommAssign ) == QDialog::Accepted ) + { rfcommAssign.saveConfig(); } } /** * Add fresh found devices from scan dialog to the listing * */ -void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { +void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) +{ BTDeviceItem * deviceItem; QValueList<RemoteDevice>::ConstIterator it; - for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { + for( it = newDevices.begin(); it != newDevices.end() ; ++it ) + { if (find( (*it) )) // is already inserted continue; @@ -289,23 +302,25 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) /** * Action that is toggled on entrys on click */ -void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { -} +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*/ ) { +void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) +{ if (!item ) return; QPopupMenu *menu = new QPopupMenu(); int ret=0; - if ( ((BTListItem*)item)->type() == "device") { + if ( ((BTListItem*)item)->type() == "device") + { QPopupMenu *groups = new QPopupMenu(); menu->insertItem( ((BTDeviceItem*)item)->name(),0 ); @@ -315,9 +330,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin menu->insertItem( tr("delete"), 4); ret = menu->exec( point , 0); - switch(ret) { + switch(ret) + { case -1: break; case 2: addServicesToDevice( (BTDeviceItem*)item ); @@ -342,33 +358,41 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin * delete the PopupMenu otherwise it's the responsibility of * the PopupMenu to delete itself * */ - else if ( ((BTListItem*)item)->type() == "service") { + else if ( ((BTListItem*)item)->type() == "service") + { BTServiceItem* service = (BTServiceItem*)item; QMap<int, QString> list = service->services().classIdList(); QMap<int, QString>::Iterator it = list.begin(); QPopupMenu *popup =0l; - if ( it != list.end() ) { + if ( it != list.end() ) + { qWarning("Searching id %d %s", it.key(), it.data().latin1() ); popup = m_popHelper.find( it.key(), service->services(), (BTDeviceItem*)service->parent() ); - }else { + } + else + { qWarning("Empty"); } - if ( popup == 0l ) { + if ( popup == 0l ) + { qWarning("factory returned 0l"); popup = new QPopupMenu(); } int test1 = popup->insertItem( tr("Test1:"), 2); ret = popup->exec( point ); qWarning("returned from exec() "); - if ( ret == -1 ) { + if ( ret == -1 ) + { ; - } else if ( ret == test1 ) { + } + else if ( ret == test1 ) + { ; } delete popup; } @@ -379,9 +403,10 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin /** * Search and display avail. services for a device (on expand from device listing) * @param item the service item returned */ -void BlueBase::addServicesToDevice( BTDeviceItem * item ) { +void BlueBase::addServicesToDevice( BTDeviceItem * item ) +{ qDebug("addServicesToDevice"); // row of mac adress text(3) RemoteDevice device = item->remoteDevice(); m_deviceList.insert( item->mac() , item ); @@ -395,9 +420,10 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) { ted 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 ) { +void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) +{ qDebug("fill services list"); QMap<QString,BTDeviceItem*>::Iterator it; BTDeviceItem* deviceItem = 0; @@ -411,9 +437,10 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s // remove previous entries QList<QListViewItem> tempList; tempList.setAutoDelete( true ); QListViewItem * child = deviceItem->firstChild(); - while( child ) { + while( child ) + { tempList.append( child ); child = child->nextSibling(); } tempList.clear(); @@ -421,24 +448,29 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s QValueList<OpieTooth::Services>::Iterator it2; BTServiceItem* serviceItem; - if (!servicesList.isEmpty() ) { + if (!servicesList.isEmpty() ) + { // add services QMap<int, QString> list; QMap<int, QString>::Iterator classIt; - for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { + for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) + { serviceItem = new BTServiceItem( deviceItem, (*it2) ); list = (*it2).classIdList(); classIt = list.begin(); int classId=0; - if ( classIt != list.end() ) { + if ( classIt != list.end() ) + { classId = classIt.key(); } serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) ); } - } else { + } + else + { Services s1; s1.setServiceName( tr("no services found") ); serviceItem = new BTServiceItem( deviceItem, s1 ); } @@ -449,23 +481,28 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s -void BlueBase::addSignalStrength() { +void BlueBase::addSignalStrength() +{ QListViewItemIterator it( ListView4 ); - for ( ; it.current(); ++it ) { + for ( ; it.current(); ++it ) + { m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() ); } QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) ); } -void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) { +void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) +{ QListViewItemIterator it( ListView4 ); - for ( ; it.current(); ++it ) { - if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) { + for ( ; it.current(); ++it ) + { + if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) + { ((BTConnectionItem*)it.current() )->setSignalStrength( strength ); } } } @@ -473,60 +510,74 @@ void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) /** * Add the existing connections (pairs) to the connections tab. * This one triggers the search */ -void BlueBase::addConnectedDevices() { +void BlueBase::addConnectedDevices() +{ m_localDevice->searchConnections(); } /** * This adds the found connections to the connection tab. * @param connectionList the ValueList with all current connections */ -void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) { +void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) +{ QValueList<OpieTooth::ConnectionState>::Iterator it; BTConnectionItem * connectionItem; - if ( !connectionList.isEmpty() ) { + if ( !connectionList.isEmpty() ) + { - for (it = connectionList.begin(); it != connectionList.end(); ++it) { + for (it = connectionList.begin(); it != connectionList.end(); ++it) + { QListViewItemIterator it2( ListView4 ); bool found = false; - for ( ; it2.current(); ++it2 ) { - if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) { + for ( ; it2.current(); ++it2 ) + { + if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) + { found = true; } } - if ( found == false ) { + if ( found == false ) + { connectionItem = new BTConnectionItem( ListView4, (*it) ); - if( m_deviceList.find((*it).mac()).data() ) { + if( m_deviceList.find((*it).mac()).data() ) + { connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() ); } } } QListViewItemIterator it2( ListView4 ); - for ( ; it2.current(); ++it2 ) { + for ( ; it2.current(); ++it2 ) + { bool found = false; - for (it = connectionList.begin(); it != connectionList.end(); ++it) { - if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) { + for (it = connectionList.begin(); it != connectionList.end(); ++it) + { + if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) + { found = true; } } - if ( !found ) { + if ( !found ) + { delete it2.current(); } } - } else { + } + else + { ListView4->clear(); ConnectionState con; con.setMac( tr("No connections found") ); connectionItem = new BTConnectionItem( ListView4 , con ); @@ -540,9 +591,10 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) /** * Find out if a device can currently be reached * @param device */ -void BlueBase::deviceActive( const RemoteDevice &device ) { +void BlueBase::deviceActive( const RemoteDevice &device ) +{ // search by mac, async, gets a signal back // We should have a BTDeviceItem there or where does it get added to the map -zecke m_localDevice->isAvailable( device.mac() ); } @@ -552,9 +604,10 @@ void BlueBase::deviceActive( const RemoteDevice &device ) { * The signal catcher. Set the avail. status on device. * @param device - the mac address * @param connected - if it is avail. or not */ -void BlueBase::deviceActive( const QString& device, bool connected ) { +void BlueBase::deviceActive( const QString& device, bool connected ) +{ qDebug("deviceActive slot"); QMap<QString,BTDeviceItem*>::Iterator it; @@ -564,11 +617,14 @@ void BlueBase::deviceActive( const QString& device, bool connected ) { BTDeviceItem* deviceItem = it.data(); - if ( connected ) { + if ( connected ) + { deviceItem->setPixmap( 1, m_onPix ); - } else { + } + else + { deviceItem->setPixmap( 1, m_offPix ); } m_deviceList.remove( it ); } @@ -576,30 +632,33 @@ void BlueBase::deviceActive( const QString& device, bool connected ) { /** * Open the "scan for devices" dialog */ -void BlueBase::startScan() { +void BlueBase::startScan() +{ ScanDialog *scan = new ScanDialog( this, "ScanDialog", true, WDestructiveClose ); QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ), this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) ); - scan->showMaximized(); + QPEApplication::showDialog( scan ); } /** * Set the informations about the local device in information Tab */ -void BlueBase::setInfo() { +void BlueBase::setInfo() +{ StatusLabel->setText( status() ); } /** * Decontructor */ -BlueBase::~BlueBase() { +BlueBase::~BlueBase() +{ writeSavedDevices(); delete m_iconLoader; } @@ -609,13 +668,15 @@ BlueBase::~BlueBase() { * the same Device if found return true else false * @param dev RemoteDevice to find * @return returns true if found */ -bool BlueBase::find( const RemoteDevice& rem ) { +bool BlueBase::find( const RemoteDevice& rem ) +{ QListViewItemIterator it( ListView2 ); BTListItem* item; BTDeviceItem* device; - for (; it.current(); ++it ) { + for (; it.current(); ++it ) + { item = (BTListItem*) it.current(); if ( item->typeId() != BTListItem::Device ) continue; |