update

2 files changed, 60 insertions, 21 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 22b16d2..c7e1fe4 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -45,21 +45,23 @@
 namespace OpieTooth {
 
 
     BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl ) {
 
+        localDevice = new Manager( "hci0" );
 
-        QObject::connect( (QObject*)PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
-        QObject::connect( (QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
-        QObject::connect( (QObject*)ListView2, SIGNAL(  expanded( QListViewItem * item ) ),
+        QObject::connect( PushButton2,  SIGNAL( clicked() ), this, SLOT(startScan() ) );
+        QObject::connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
+        QObject::connect( ListView2, SIGNAL(  expanded( QListViewItem * item ) ),
                           this, SLOT( addServicesToDevice( QListViewItem * item ) ) );
-        QObject::connect( (QObject*)ListView2, SIGNAL( clicked( QListViewItem * )),
+        QObject::connect( ListView2, SIGNAL( clicked( QListViewItem * )),
                           this, SLOT( startServiceActionClicked( QListViewItem * item ) ) );
+       connect( localDevice,  SIGNAL( foundServices( const QString& device, Services::ValueList ) ),
+                this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) );
 
-        //
         //      QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) );
 
         //Load all icons needed
 
 
         QPixmap offPix = Resource::loadPixmap( "editdelete" );
@@ -137,13 +139,13 @@ namespace OpieTooth {
      *
      */
     void BlueBase::readSavedDevices() {
 
         QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>;
 
-        Config deviceList( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
+        Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
 
 
         //   RemoteDevice *currentDevice = RemoteDevice( ,  );
         //loadedDevices->append( currentDevice );
 
         addSearchedDevices( *loadedDevices );
@@ -154,24 +156,17 @@ namespace OpieTooth {
      *
      */
     void BlueBase::writeSavedDevices() {
 
         QListViewItemIterator it( ListView2 );
 
-        // one top conf file with all decices (by mac adress)
-        Config deviceList( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
-
         for ( ; it.current(); ++it ) {
 
-            // MAC adress as group
-            deviceList.setGroup( it.current()->text(1) );
-            deviceList.writeEntry("inList",  1);
-
             // seperate config file for each device, to store more information in future.
 
-            Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(1)) + ".conf", Config::File );
+            Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(3)) + ".conf", Config::File );
             conf.setGroup("Info");
             conf.writeEntry("name", it.current()->text(0) );
         }
     }
 
 
@@ -244,18 +239,18 @@ namespace OpieTooth {
 
 
             RemoteDevice *dev = it.current();
             deviceItem = new QListViewItem( ListView2, dev->name() );
 
             if (deviceActive( dev ) ) {
-                deviceItem->setPixmap(0, onPix);
+                deviceItem->setPixmap( 1 , onPix );
             } else {
-                deviceItem->setPixmap(0, offPix);
+                deviceItem->setPixmap( 1, offPix );
             }
 
-            deviceItem->setText(1, dev->mac() );
+            deviceItem->setText( 3, dev->mac() );
         }
     }
 
 
     /*
      * Action that is toggled on entrys on click
@@ -275,28 +270,67 @@ namespace OpieTooth {
 
     /*
      * Search and display avail. services for a device (on expand from device listing)
      *
      */
     void BlueBase::addServicesToDevice( QListViewItem * item ) {
+
         // row of mac adress
-        RemoteDevice *device = new RemoteDevice(item->text(1),  item->text(0));
-        //dann nen manager und darauf dann searchServises, das liefert nen signal, das wieder connected
-        // werden  muss.
+        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 ) {
+ it2.serviceName()
+            serviceItem = new QListViewItem( deviceItem  ,    it2.serviceName()       );
+        }
+
+    }
+
+
     /*
      * Find out if a device can  currently be reached
      */
     bool BlueBase::deviceActive( RemoteDevice *device ) {
-
         return true;
     }
 
+
     /**
      * Open the "scan for devices"  dialog
      */
     void BlueBase::startScan() {
 
         ScanDialog *scan = new ScanDialog( this, "", true);
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 7b03f82..dcb7681 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -8,13 +8,15 @@
 #include <qsplitter.h>
 #include <qlist.h>
 #include <qpixmap.h>
 
 #include "bluetoothbase.h"
 
+
 #include <remotedevice.h>
+#include <manager.h>
 
 class QVBox;
 class QHBoxLayout;
 class QGridLayout;
 class QFrame;
 class QLabel;
@@ -45,12 +47,14 @@ namespace OpieTooth {
 	void writeConfig();
         void readSavedDevices();
         void writeSavedDevices();
 	QString getStatus();
 	void initGui();
         void setInfo();
+        Manager *localDevice;
+        QMap<QString,QListViewItem*> deviceList;
 
         bool deviceActive( RemoteDevice *device );
 
 	QString deviceName;
 	QString defaultPasskey;
 	int useEncryption;
@@ -61,12 +65,13 @@ namespace OpieTooth {
         QPixmap offPix;
         QPixmap onPix;
 
 	private slots:
         void addSearchedDevices( QList<RemoteDevice> &newDevices );
         void addServicesToDevice( QListViewItem * item );
+        void addServicesToDevice( const QString& device, Services::ValueList );
         void startServiceActionClicked( QListViewItem * item );
         void startServiceActionHold( QListViewItem * item, const QPoint & point, int column);
       	void applyConfigChanges();
 
     };