3 files changed, 25 insertions, 20 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 3e7e2ab..d023302 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -7,120 +7,125 @@
  *
  */
 /***************************************************************************
  *                                                                         *
  *   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 <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qlayout.h>
 #include <qvariant.h>
 #include <qwhatsthis.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 <qpe/resource.h>
 #include <qpe/config.h>
 
 #include <remotedevice.h>
 
 
 namespace OpieTooth {
 
 
     BlueBase::BlueBase( QWidget* parent,  const char* name, WFlags fl )
         : BluetoothBase( parent, name, fl ) {
 
         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* ) ) );
         // hehe, cast right later
         connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
                  this,  SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
         connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
                  this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
         connect( localDevice, SIGNAL( available( const QString&, bool ) ),
                  this, SLOT( deviceActive( const QString& , bool ) ) );
+        connect( localDevice, SIGNAL( connections( Connection::ValueList ) ),
+                 this, SLOT( addConnectedDevices( Connection::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);
 
         BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" );
         topLV2->setPixmap( 1, onPix );
         (void) new BTListItem( topLV2, "Serial" ,"", "service" );
         (void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
         writeToHciConfig();
+        // search conncetions
+        addConnectedDevices();
     }
 
 
     /**
      * 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 );
         enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 );
 
     }
 
     /**
      * Writes all options to the config file
      */
     void BlueBase::writeConfig() {
 
 
         Config cfg( "bluetoothmanager" );
         cfg.setGroup( "bluezsettings" );
 
         cfg.writeEntry( "name" , deviceName );
         cfg.writeEntryCrypt( "passkey" , defaultPasskey );
@@ -266,69 +271,64 @@ namespace OpieTooth {
         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 ) {
 
         BTListItem * deviceItem;
 
         QListIterator<RemoteDevice> it( newDevices );
 
         for( ; it.current() ; ++it ) {
 
 
             RemoteDevice *dev = it.current();
             deviceItem = new BTListItem( ListView2 , dev->name(), dev->mac(), "device" );
             deviceItem->setExpandable ( true );
 
             // look if device is avail. atm, async
             deviceActive( dev );
 
-            // move into the c'tor
-            // deviceItem->setMac( dev->mac() );
-            // what kind of entry is it.
-            //deviceItem->setType( "device");
-
             // 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;
 
 
           //QSize s = menu->sizeHint ( );
 
           if ( ((BTListItem*)item)->type() == "device") {
 
               QPopupMenu *groups = new QPopupMenu();
 
               menu->insertItem( tr("rescan sevices:"),  0);
               menu->insertItem( tr("to group"), groups ,  1);
@@ -381,100 +381,106 @@ namespace OpieTooth {
         // row of mac adress text(3)
         RemoteDevice *device = new RemoteDevice( item->mac(),  item->name() );
 
         deviceList.insert( item->mac() ,  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,BTListItem*>::Iterator it;
 
         BTListItem* deviceItem;
 
         // get the right devices which requested the search
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
             if ( it.key() == device ) {
                 deviceItem = it.data();
             }
         }
 
-
-        // empty entries
-        //  QListViewItem * myChild = deviceItem->firstChild();
-        //QList<QListViewItem*> tmpList;
-        //while( myChild ) {
-        //    tmpList.append(myChild);
-        //    myChild = myChild->nextSibling();
-        // }
-
-
         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->setText(4, "service");
             }
         } else {
             serviceItem = new BTListItem( deviceItem  , tr("no services found"), "" , "service"  );
             //serviceItem->setText(4, "service");
         }
     }
 
 
     /**
      * Add the existing connections (pairs) to the connections tab.
-     *
+     * This one triggers the search
      */
     void BlueBase::addConnectedDevices() {
+        localDevice->searchConnections();
+    }
 
 
-        //mac address
+    void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) {
+
+        QValueList<OpieTooth::Connection>::Iterator it;
+        BTListItem * connectionItem;
+
+        if ( !connectionList.isEmpty() ) {
+
+            for (it = connectionList.begin(); it != connectionList.end(); ++it) {
+                connectionItem = new BTListItem( ListView4 , (*it).mac() , (*it).mac() , "connection" );
+            }
+        } else {
+            connectionItem = new BTListItem( ListView4 , tr("No connections found"), "", "connection" );
+        }
 
+        //  recall connection search after some time
+        QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) );
     }
 
     /**
      * Find out if a device can  currently be reached
      */
     void BlueBase::deviceActive( RemoteDevice *device ) {
 
         // search by mac, async, gets a signal back
         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,BTListItem*>::Iterator it;
 
         BTListItem* deviceItem;
 
         // get the right devices which requested the search
         for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
             if ( it.key() == device ) {
                 deviceItem = it.data();
             }
         }
 
         if ( connected ) {
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index ef67aa2..0516c16 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -40,42 +40,43 @@ namespace OpieTooth {
             private slots:
         void startScan();
 
     private:
         void readConfig();
         void writeConfig();
         void readSavedDevices();
         void writeSavedDevices();
         void writeToHciConfig();
         QString getStatus();
         void initGui();
         void setInfo();
         Manager *localDevice;
         QMap<QString,BTListItem*> deviceList;
 
         void deviceActive( RemoteDevice *device );
 
         QString deviceName;
         QString defaultPasskey;
         int useEncryption;
         int enableAuthentification;
         int enablePagescan;
         int enableInquiryscan;
 
         QPixmap offPix;
         QPixmap onPix;
 
         private slots:
         void addSearchedDevices( QList<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
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 7b2497a..2d6d7da 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -70,45 +70,43 @@ namespace OpieTooth {
         QFile f2( m_fileName );
 
         if ( !f.open( IO_ReadOnly) ) {
             qDebug("Could not open readonly");
             return;
         }
 
         if ( !f2.open( IO_ReadWrite ) ) {
             qDebug("Just readonly - not enough");
             return;
         }
 
         QStringList list;
         qDebug(m_fileName);
         QTextStream stream ( &f);
         QTextStream outstream (&f2);
 
         QString str;
         while ( !(str=stream.readLine()).isNull() ) {
 
 
             //qDebug(str);
             if( (str.contains(key)) > 0 ) {
                 qDebug("Found");
                 // still need to look if its commented out!!!
                 str.simplifyWhiteSpace();
                 qDebug( key );
                 if (str.startsWith("#")) {
                     str = (key + " " + value + ";");
                 } else {
                     str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ),  key + " " + value + ";");
                 }
-
                 qDebug( str );
             }
-
             outstream << str << endl;
         }
 
         f.close();
+
         f2.flush();
         f2.close();
     }
-
 }