show signal strength for connections

7 files changed, 117 insertions, 4 deletions

diff --git a/noncore/net/opietooth/lib/manager.cc b/noncore/net/opietooth/lib/manager.cc
index 8ddcfe8..c89d325 100644
--- a/noncore/net/opietooth/lib/manager.cc
+++ b/noncore/net/opietooth/lib/manager.cc
@@ -199,105 +199,136 @@ void Manager::slotHCIOut(OProcess* proc,  char* ch,  int len) {
         qWarning("slotHCIOut ");
         string = it.data();
     }
     string.append( str );
 
     m_devices.replace( proc->name(),  string );
 }
 RemoteDevice::ValueList Manager::parseHCIOutput(const QString& output ) {
     qWarning("parseHCI %s",  output.latin1() );
     RemoteDevice::ValueList list;
     QStringList strList = QStringList::split('\n',  output );
     QStringList::Iterator it;
     QString str;
     for ( it = strList.begin(); it != strList.end(); ++it ) {
         str = (*it).stripWhiteSpace();
         qWarning("OpieTooth %s", str.latin1() );
         int pos = str.findRev(':' );
         if ( pos > 0 ) {
             QString mac = str.left(17 );
             str.remove( 0,  17 );
             qWarning("mac %s",  mac.latin1() );
             qWarning("rest:%s",  str.latin1() );
             RemoteDevice rem( mac , str.stripWhiteSpace() );
             list.append( rem );
         }
     }
     return list;
 }
 
 ////// hcitool cc and hcitool con
 
 /**
  * Create it on the stack as don't care
  * so we don't need to care for it
  * cause hcitool gets reparented
  */
 void Manager::connectTo( const QString& mac) {
     OProcess proc;
     proc << "hcitool";
     proc << "cc";
     proc << mac;
     proc.start(OProcess::DontCare); // the lib does not care at this point
 }
 
 
 void Manager::searchConnections() {
     qWarning("searching connections?");
     OProcess* proc = new OProcess();
     m_hcitoolCon = QString::null;
 
     connect(proc, SIGNAL(processExited(OProcess*) ),
             this, SLOT(slotConnectionExited( OProcess*) ) );
     connect(proc, SIGNAL(receivedStdout(OProcess*, char*, int) ),
             this, SLOT(slotConnectionOutput(OProcess*, char*, int) ) );
     *proc << "hcitool";
     *proc << "con";
 
     if (!proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
         ConnectionState::ValueList list;
         emit connections( list  );
         delete proc;
     }
 }
 void Manager::slotConnectionExited( OProcess* proc ) {
-    qWarning("<<<<<<<<<<<<<<<<<exited");
     ConnectionState::ValueList list;
     list = parseConnections( m_hcitoolCon );
     emit connections(list );
     delete proc;
 }
 void Manager::slotConnectionOutput(OProcess* /*proc*/, char* cha, int len) {
     QCString str(cha, len );
     m_hcitoolCon.append( str );
     //delete proc;
 }
 ConnectionState::ValueList Manager::parseConnections( const QString& out ) {
     ConnectionState::ValueList list2;
     QStringList list = QStringList::split('\n',  out );
     QStringList::Iterator it;
     // remove the first line ( "Connections:")
     it = list.begin();
     it = list.remove( it );
     for (; it != list.end(); ++it ) {
         QString row = (*it).stripWhiteSpace();
         QStringList value = QStringList::split(' ', row );
         qWarning("0: %s", value[0].latin1() );
         qWarning("1: %s", value[1].latin1() );
         qWarning("2: %s", value[2].latin1() );
         qWarning("3: %s", value[3].latin1() );
         qWarning("4: %s", value[4].latin1() );
         qWarning("5: %s", value[5].latin1() );
         qWarning("6: %s", value[6].latin1() );
         qWarning("7: %s", value[7].latin1() );
         qWarning("8: %s", value[8].latin1() );
         ConnectionState con;
         con.setDirection( value[0] == QString::fromLatin1("<") ? Outgoing : Incoming );
         con.setConnectionMode( value[1] );
         con.setMac( value[2] );
         con.setHandle( value[4].toInt() );
         con.setState( value[6].toInt() );
         con.setLinkMode( value[8] == QString::fromLatin1("MASTER") ? Master : Client );
         list2.append( con );
     }
     return list2;
 }
+
+void Manager::signalStrength( const QString &mac ) {
+
+    OProcess* sig_proc = new OProcess();
+
+    connect(sig_proc, SIGNAL(processExited(OProcess*) ),
+            this, SLOT(slotSignalStrengthExited( OProcess*) ) );
+    connect(sig_proc, SIGNAL(receivedStdout(OProcess*, char*, int) ),
+            this, SLOT(slotSignalStrengthOutput(OProcess*, char*, int) ) );
+    *sig_proc << "hcitool";
+    *sig_proc << "lq";
+    *sig_proc << mac;
+
+    sig_proc->setName( mac.latin1() );
+
+    if (!sig_proc->start(OProcess::NotifyOnExit, OProcess::AllOutput) ) {
+        emit signalStrength( mac, "-1" );
+        delete sig_proc;
+    }
+}
+
+void Manager::slotSignalStrengthOutput(OProcess* proc, char* cha, int len) {
+    QCString str(cha, len );
+    QString temp = QString(str).stripWhiteSpace();
+    QStringList value = QStringList::split(' ', temp );
+    emit signalStrength( proc->name(), value[2].latin1() );
+}
+
+
+void Manager::slotSignalStrengthExited( OProcess* proc ) {
+     delete proc;
+}
diff --git a/noncore/net/opietooth/lib/manager.h b/noncore/net/opietooth/lib/manager.h
index 0ebe1b3..abc8ba1 100644
--- a/noncore/net/opietooth/lib/manager.h
+++ b/noncore/net/opietooth/lib/manager.h
@@ -63,104 +63,111 @@ namespace OpieTooth {
 
         /**
          * same as above
          */
         void isAvailable(Device *dev );
 
         /** this searchs for devices reachable from the
          *  currently managed device
          *  or from device if @param device is not empty
          */
         void searchDevices(const QString& device= QString::null );
         /** same as above
          *
          */
         void searchDevices(Device *d );
 
         /**
          * This will add the service @param name
          * to the sdpd daemon
          * It will start the daemon if necessary
          */
         void addService(const QString &name );
 
         /**
          * This will add the services @param names
          * to the sdpd daemon
          * It will start the daemon if necessary
          */
         void addServices( const QStringList& names );
 
         /**
          * This removes a service from the sdps
          */
         void removeService(const QString &name );
 
         /**
          * Removes a list from the sdpd
          */
         void removeServices(const QStringList& );
 
         /**
          * search for services on a remote device
          *
          */
         void searchServices( const QString& remDevice );
 
         /**
          * search for services on a remote device
          */
         void searchServices( const RemoteDevice& );
 
         /**
          * Starts to connect to the device
          * in @param
          */
         void connectTo(const QString& );
 
         /**
          * Searches for active connections
          * the result is emitted with the
          * connections signal
          */
         void searchConnections();
 
+	void signalStrength( const QString &mac );
 //// not implemented yet
         /*static*/ QString toDevice( const QString& mac );
         /*static*/ QString toMac( const QString &device );
 //// not implemented yet over
 
     signals:
         // device either mac or dev name
         // the first device is the device which you access
         void available( const QString& device, bool connected );
         void addedService(  const QString& service, bool added );
         void removedService( const QString& service, bool removed );
         void foundServices( const QString& device, Services::ValueList );
         void foundDevices( const QString& device, RemoteDevice::ValueList );
         void connections( ConnectionState::ValueList );
+	void signalStrength( const QString& mac, const QString& strengh );
 
 private slots:
         void slotProcessExited(OProcess* );
 
         void slotSDPExited(OProcess*);
         void slotSDPOut(OProcess*, char*, int);
 
         void slotHCIExited(OProcess* );
         void slotHCIOut(OProcess*, char*, int );
 
         void slotConnectionExited(OProcess* );
         void slotConnectionOutput(OProcess*, char*, int );
+
+	void slotSignalStrengthOutput( OProcess*, char*, int );
+	void slotSignalStrengthExited( OProcess* );
     private:
         Services::ValueList parseSDPOutput( const QString& );
         RemoteDevice::ValueList parseHCIOutput( const QString& );
         ConnectionState::ValueList parseConnections( const QString& );
         OProcess *m_hcitool;
         OProcess *m_sdp; // not only one
         QString m_device;
+	QMap<QString, int> m_signalStrength;
         QMap<QString, QString> m_out;
         QMap<QString, QString> m_devices;
+	QMap<OProcess*, QString> m_signalMac;
         QString m_hcitoolCon;
     };
 };
 
 #endif
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 8b15c4f..9663b52 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -11,157 +11,161 @@
  *   This program is free software; you can redistribute it and/or modify  *
  *   it under the terms of the GNU General Public License as published by  *
  *   the Free Software Foundation; either version 2 of the License, or     *
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
 
 #include "bluebase.h"
 #include "scandialog.h"
 #include "hciconfwrapper.h"
 #include "devicehandler.h"
 #include "btconnectionitem.h"
 
 #include <remotedevice.h>
 #include <services.h>
 
 #include <stdlib.h>
 
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qimage.h>
 #include <qpixmap.h>
 #include <qtabwidget.h>
 #include <qscrollview.h>
 #include <qvbox.h>
 #include <qmessagebox.h>
 #include <qcheckbox.h>
 #include <qlineedit.h>
 #include <qlistview.h>
 #include <qdir.h>
 #include <qpopupmenu.h>
 #include <qtimer.h>
 #include <qlist.h>
 
 #include <qpe/qpeapplication.h>
 #include <qpe/resource.h>
 #include <qpe/config.h>
 
 
 using namespace OpieTooth;
 
 BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
     : BluetoothBase( parent, name, fl ) {
 
     m_localDevice = new Manager( "hci0" );
 
     connect( PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
     connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
     // not good since lib is async
     //       connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ),
     //                  this, SLOT( addServicesToDevice( QListViewItem * ) ) );
     connect( ListView2, SIGNAL( clicked( QListViewItem* )),
              this, SLOT( startServiceActionClicked( QListViewItem* ) ) );
     connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
              this,  SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
     connect( m_localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
              this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
     connect( m_localDevice, SIGNAL( available( const QString&, bool ) ),
              this, SLOT( deviceActive( const QString& , bool ) ) );
     connect( m_localDevice, SIGNAL( connections( ConnectionState::ValueList ) ),
              this, SLOT( addConnectedDevices( ConnectionState::ValueList ) ) );
+    connect( m_localDevice, SIGNAL( signalStrength( const QString&, const QString& ) ),
+    	     this, SLOT( addSignalStrength( const QString&, const QString& ) ) );
 
 
     // let hold be rightButtonClicked()
     QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold);
     QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold);
 
     //Load all icons needed
     m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
     m_onPix = Resource::loadPixmap( "opietooth/connected" );
     m_findPix = Resource::loadPixmap( "opietooth/find" );
 
     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();
 
     ListView2->setRootIsDecorated(true);
 
+
     writeToHciConfig();
     // search conncetions
     addConnectedDevices();
+    addSignalStrength();
     m_iconLoader = new BTIconLoader();
     readSavedDevices();
 }
 
 /**
  * Reads all options from the config file
  */
 void BlueBase::readConfig() {
 
     Config cfg( "bluetoothmanager" );
     cfg.setGroup( "bluezsettings" );
 
     m_deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with
     m_defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak
     m_useEncryption = cfg.readBoolEntry( "useEncryption" , TRUE );
     m_enableAuthentification = cfg.readBoolEntry( "enableAuthentification" , TRUE );
     m_enablePagescan = cfg.readBoolEntry( "enablePagescan" , TRUE );
     m_enableInquiryscan = cfg.readBoolEntry( "enableInquiryscan" , TRUE );
 }
 
 /**
  * Writes all options to the config file
  */
 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();
 }
 
 /**
  * Modify the hcid.conf file to our needs
  */
 void BlueBase::writeToHciConfig() {
     qWarning("writeToHciConfig");
     HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
     hciconf.load();
     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 );
     hciconf.save();
 }
 
 
 /**
  * Read the list of allready known devices
  */
 void BlueBase::readSavedDevices() {
 
     QValueList<RemoteDevice> loadedDevices;
     DeviceHandler handler;
     loadedDevices = handler.load();
 
@@ -309,208 +313,236 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
         }
         delete groups;
 
     }
 
     /*
      * We got service sensitive PopupMenus in our factory
      * We will create one through the factory and will insert
      * our Separator + ShowInfo into the menu or create a new
      * one if the factory returns 0
      * PopupMenu deletion is kind of weird.
      * If escaped( -1 ) or any of our items were chosen we'll
      * delete the PopupMenu otherwise it's the responsibility of
      * the PopupMenu to delete itself
      *
      */
     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() ) {
 	    qWarning("Searching id %d %s", it.key(), it.data().latin1() );
             popup = m_popHelper.find( it.key() /*1*/,
                                       service->services(),
                                       (BTDeviceItem*)service->parent() );
 	}else {
 	    qWarning("Empty");
 	}
 
         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 ) {
             ;
         } else if ( ret == test1 ) {
             ;
         }
         delete popup;
     }
     delete menu;
 }
 
 
 /**
  * Search and display avail. services for a device (on expand from device listing)
  * @param item the service item returned
  */
 void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
     qDebug("addServicesToDevice");
     // row of mac adress text(3)
     RemoteDevice device = item->remoteDevice();
     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
+ * Overloaded. This one it the one that is
+ 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 ) {
     qDebug("fill services list");
 
     QMap<QString,BTDeviceItem*>::Iterator it;
     BTDeviceItem* deviceItem = 0;
 
     // get the right devices which requested the search
     it = m_deviceList.find( device );
     if( it == m_deviceList.end() )
         return;
     deviceItem = it.data();
 
     // remove previous entries
     QList<QListViewItem> tempList;
     tempList.setAutoDelete( true );
     QListViewItem * child = deviceItem->firstChild();
     while( child ) {
 	tempList.append( child );
 	child = child->nextSibling();
     }
     tempList.clear();
 
     QValueList<OpieTooth::Services>::Iterator it2;
     BTServiceItem* serviceItem;
 
 
     if (!servicesList.isEmpty() ) {
         // add services
         QMap<int, QString> list;
         QMap<int, QString>::Iterator classIt;
         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() ) {
                 classId = classIt.key();
             }
 
             serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) );
         }
     } else {
         Services s1;
         s1.setServiceName( tr("no services found") );
         serviceItem = new BTServiceItem( deviceItem, s1 );
     }
     // now remove them from the  list
     m_deviceList.remove( it );
 }
 
 
+
+
+
+void BlueBase::addSignalStrength() {
+
+	QListViewItemIterator it( ListView4 );
+	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 ) {
+
+	QListViewItemIterator it( ListView4 );
+	for ( ; it.current(); ++it ) {
+		if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) {
+			((BTConnectionItem*)it.current() )->setSignalStrength( strength );
+		}
+	}
+}
+
 /**
  * Add the existing connections (pairs) to the connections tab.
  * This one triggers the search
  */
 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 ) {
 
     // clear the ListView first
     ListView4->clear();
 
     QValueList<OpieTooth::ConnectionState>::Iterator it;
     BTConnectionItem * connectionItem;
 
     if ( !connectionList.isEmpty() ) {
 
         for (it = connectionList.begin(); it != connectionList.end(); ++it) {
             connectionItem = new BTConnectionItem( ListView4 , (*it) );
+
+ 	    if( m_deviceList.find((*it).mac()).data() ) {
+
+	        connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
+             }
         }
     } else {
         ConnectionState con;
         con.setMac( tr("No connections found") );
         connectionItem = new BTConnectionItem( ListView4 , con );
     }
 
     //  recall connection search after some time
     QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
 }
 
 
 /**
  * Find out if a device can  currently be reached
  * @param 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() );
 }
 
 
 /**
  * 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  ) {
     qDebug("deviceActive slot");
 
     QMap<QString,BTDeviceItem*>::Iterator it;
 
     it = m_deviceList.find( device );
     if( it == m_deviceList.end() )
         return;
 
     BTDeviceItem* deviceItem = it.data();
 
 
     if ( connected ) {
         deviceItem->setPixmap( 1, m_onPix );
     } else {
         deviceItem->setPixmap( 1, m_offPix );
     }
     m_deviceList.remove( it );
 }
 
 
 /**
  * Open the "scan for devices"  dialog
  */
 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();
 }
 
 
 /**
  * Set the informations about the local device in information Tab
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 0326daf..743062c 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -1,92 +1,97 @@
 
 #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 "btserviceitem.h"
 #include "btdeviceitem.h"
+
 #include "popuphelper.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;
+class BTConnectionItem;
 
 
 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:
         bool find( const RemoteDevice& device );
 	void readConfig();
 	void writeConfig();
         void readSavedDevices();
         void writeSavedDevices();
         void writeToHciConfig();
 	QString status()const;
 	void initGui();
         void setInfo();
+
         PopupHelper m_popHelper;
         Manager *m_localDevice;
         QMap<QString,BTDeviceItem*> 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;
         QPixmap m_findPix;
 
         BTIconLoader *m_iconLoader;
 
 	private slots:
         void addSearchedDevices( const QValueList<RemoteDevice> &newDevices );
         void addServicesToDevice( BTDeviceItem *item );
         void addServicesToDevice( const QString& device, Services::ValueList );
         void addConnectedDevices();
         void addConnectedDevices( ConnectionState::ValueList );
         void startServiceActionClicked( QListViewItem *item );
         void startServiceActionHold( QListViewItem *, const QPoint &, int );
         void deviceActive( const QString& mac, bool connected  );
         void applyConfigChanges();
+	void addSignalStrength();
+	void addSignalStrength( const QString& mac, const QString& strengh );
 
     };
 
 }
 
 #endif
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 869a9cb..b51c8c6 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -137,128 +137,142 @@
                     <cstring>PushButton2</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
                         <x>40</x>
                         <y>231</y>
                         <width>154</width>
                         <height>30</height>
                     </rect>
                 </property>
                 <property stdset="1">
                     <name>sizePolicy</name>
                     <sizepolicy>
                         <hsizetype>0</hsizetype>
                         <vsizetype>0</vsizetype>
                     </sizepolicy>
                 </property>
                 <property stdset="1">
                     <name>text</name>
                     <string>Scan for Devices</string>
                 </property>
             </widget>
         </widget>
         <widget>
             <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
                 <string>Connections</string>
             </attribute>
             <widget>
                 <class>QListView</class>
                 <column>
                     <property>
                         <name>text</name>
                         <string>Device Name</string>
                     </property>
                     <property>
                         <name>clickable</name>
                         <bool>true</bool>
                     </property>
                     <property>
                         <name>resizeable</name>
                         <bool>true</bool>
                     </property>
                 </column>
                 <column>
                     <property>
                         <name>text</name>
                         <string>Connection type</string>
                     </property>
                     <property>
                         <name>clickable</name>
                         <bool>true</bool>
                     </property>
                     <property>
                         <name>resizeable</name>
                         <bool>true</bool>
                     </property>
                 </column>
+                <column>
+                    <property>
+                        <name>text</name>
+                        <string>Signal</string>
+                    </property>
+                    <property>
+                        <name>clickable</name>
+                        <bool>true</bool>
+                    </property>
+                    <property>
+                        <name>resizeable</name>
+                        <bool>true</bool>
+                    </property>
+                </column>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>ListView4</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
                         <x>0</x>
                         <y>0</y>
                         <width>240</width>
                         <height>240</height>
                     </rect>
                 </property>
             </widget>
         </widget>
         <widget>
             <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
                 <string>Config</string>
             </attribute>
             <widget>
                 <class>QLabel</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>deviceNameLabel</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
                         <x>10</x>
                         <y>10</y>
                         <width>70</width>
                         <height>20</height>
                     </rect>
                 </property>
                 <property stdset="1">
                     <name>text</name>
                     <string>Device Name</string>
                 </property>
             </widget>
             <widget>
                 <class>QLabel</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>passkeyLabel</cstring>
                 </property>
                 <property stdset="1">
                     <name>geometry</name>
                     <rect>
                         <x>10</x>
                         <y>50</y>
                         <width>80</width>
                         <height>20</height>
                     </rect>
                 </property>
                 <property stdset="1">
                     <name>text</name>
                     <string>Default Passkey</string>
                 </property>
diff --git a/noncore/net/opietooth/manager/btconnectionitem.cpp b/noncore/net/opietooth/manager/btconnectionitem.cpp
index b57d1b3..c565c47 100644
--- a/noncore/net/opietooth/manager/btconnectionitem.cpp
+++ b/noncore/net/opietooth/manager/btconnectionitem.cpp
@@ -1,24 +1,42 @@
 #include <connection.h>
 #include "btconnectionitem.h"
 
 using namespace OpieTooth;
 
 BTConnectionItem::BTConnectionItem( QListView* parent, const ConnectionState& con )
     : BTListItem( parent ){
     m_con = con;
     setText(0, m_con.mac() );
     setText(1, m_con.connectionMode() );
 }
 BTConnectionItem::~BTConnectionItem() {
 
 }
 QString BTConnectionItem::type() const {
     return QString::fromLatin1("connection");
 }
 int BTConnectionItem::typeId() const {
     return Connection;
 }
 ConnectionState BTConnectionItem::connection() const {
     return m_con;
 }
 
+void BTConnectionItem::setName( QString name ) {
+	m_name = name;
+	setText( 0, m_name );
+}
+
+QString BTConnectionItem::name() {
+	return m_name;
+}
+
+
+void BTConnectionItem::setSignalStrength( QString strength ) {
+	m_signalStrength = strength;
+	setText( 2, m_signalStrength );
+}
+
+QString BTConnectionItem::signalStrength()  {
+	return m_signalStrength;
+}
diff --git a/noncore/net/opietooth/manager/btconnectionitem.h b/noncore/net/opietooth/manager/btconnectionitem.h
index 3c0cd79..9ab745e 100644
--- a/noncore/net/opietooth/manager/btconnectionitem.h
+++ b/noncore/net/opietooth/manager/btconnectionitem.h
@@ -1,26 +1,32 @@
 
 #ifndef OPIE_TOOTH_BT_CONNECTION_ITEM_H
 #define OPIE_TOOTH_BT_CONNECTION_ITEM_H
 
 
 #include "btlistitem.h"
 
 namespace OpieTooth {
 
     class ConnectionState;
     class BTConnectionItem : public BTListItem {
     public:
         BTConnectionItem( QListView* parent, const ConnectionState& state );
         ~BTConnectionItem();
         QString type()const;
+	QString name();
+	QString signalStrength();
         int typeId() const;
         ConnectionState connection()const;
+	void setSignalStrength( QString );
+	void setName( QString );
+
     private:
         ConnectionState m_con;
-
+	QString m_name;
+	QString m_signalStrength;
     };
 
 };
 
 
 #endif