6 files changed, 135 insertions, 56 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index d023302..2001db1 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -33,106 +33,101 @@
 #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>
-
+#include <services.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();
-    }
-
+        iconLoader = new BTIconLoader();
+      }
 
     /**
      * 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 );
         cfg.writeEntry( "useEncryption" , useEncryption );
         cfg.writeEntry( "enableAuthentification" , enableAuthentification );
         cfg.writeEntry( "enablePagescan" , enablePagescan );
         cfg.writeEntry( "enableInquiryscan" , enableInquiryscan );
 
         writeToHciConfig();
     }
@@ -201,323 +196,290 @@ namespace OpieTooth {
             qDebug("NAME: " + name);
             RemoteDevice currentDevice = RemoteDevice( 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.
-// TO FIX: BTLISTITEM!!!
             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( getStatus() ); // maybe move it to getStatus()
-
         cryptCheckBox->setChecked( useEncryption );
         authCheckBox->setChecked( enableAuthentification );
         pagescanCheckBox->setChecked( enablePagescan );
         inquiryscanCheckBox->setChecked( enableInquiryscan );
         deviceNameLine->setText( deviceName );
         passkeyLine->setText( defaultPasskey );
         // set info tab
         setInfo();
     }
 
 
     /**
      * Get the status informations and returns it
      * @return QString the status informations gathered
      */
     QString BlueBase::getStatus(){
-
         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() {
-
         deviceName =  deviceNameLine->text();
         defaultPasskey = passkeyLine->text();
         useEncryption = cryptCheckBox->isChecked();
         enableAuthentification = authCheckBox->isChecked();
         enablePagescan = pagescanCheckBox->isChecked();
         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 );
 
             // 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);
-              menu->insertItem( tr("delete"),  2);
-
+              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 = 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
+        delete 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;
+        BTListItem* deviceItem = 0;
 
         // get the right devices which requested the search
         for( it = deviceList.begin(); it != 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->setText(4, "service");
+                serviceItem->setPixmap( 0, iconLoader->serviceIcon( (*it2).classIdList() ) );
             }
         } 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();
     }
 
 
     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;
+        BTListItem* deviceItem = 0;
 
         // 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 ) {
             deviceItem->setPixmap( 1, onPix );
         } else {
             deviceItem->setPixmap( 1, offPix );
         }
-
     }
 
-
-
     /**
      * Open the "scan for devices"  dialog
      */
     void BlueBase::startScan() {
-
         ScanDialog *scan = new ScanDialog( this, "", true);
         QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ),
                          this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) );
 
         scan->showMaximized();
     }
 
 
     /**
      * Set the informations about the local device in information Tab
      */
     void BlueBase::setInfo() {
         StatusLabel->setText( getStatus() );
     }
 
     /**
      * Decontructor
      */
     BlueBase::~BlueBase() {
         writeSavedDevices();
+        delete iconLoader;
     }
 }
 
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 0516c16..ce0483f 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -2,24 +2,25 @@
 #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;
@@ -55,24 +56,26 @@ namespace OpieTooth {
         void deviceActive( RemoteDevice *device );
 
         QString deviceName;
         QString defaultPasskey;
         int useEncryption;
         int enableAuthentification;
         int enablePagescan;
         int enableInquiryscan;
 
         QPixmap offPix;
         QPixmap onPix;
 
+        BTIconLoader *iconLoader;
+
         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();
 
     };
diff --git a/noncore/net/opietooth/manager/bticonloader.cpp b/noncore/net/opietooth/manager/bticonloader.cpp
new file mode 100644
index 0000000..3fb0edd
--- a/dev/null
+++ b/noncore/net/opietooth/manager/bticonloader.cpp
@@ -0,0 +1,77 @@
+
+#include "bticonloader.h"
+
+#include <qpixmap.h>
+#include <qpe/resource.h>
+
+namespace OpieTooth {
+
+
+    BTIconLoader::BTIconLoader() {
+
+        // still need to find out real ids
+        deviceIcons.insert( "100" , "computer_16" );
+        deviceIcons.insert( "101" , "phone_16" );
+        deviceIcons.insert( "102" , "brain_16" );
+        deviceIcons.insert( "103" , "conduit_16" );
+
+
+        serviceIcons.insert( "0x1105" , "obex_16" ); //OBEXObjectPush
+        serviceIcons.insert( "0x1106" , "obex_16" ); //OBEXFileTransfer
+        serviceIcons.insert( "0x1111" , "print_16" ); //Fax
+        serviceIcons.insert( "0x1101" , "serial_16" ); //SerialPort
+        serviceIcons.insert( "0x1104" , "sync_16" ); //IrMCSync
+        serviceIcons.insert( "0x1107" , "sync_16" ); //IrMCSyncCommand
+        serviceIcons.insert( "0x1102" , "network_16" ); //LANAccessUsingPPP
+        serviceIcons.insert( "0x1103" , "network_16"); //DialupNetworking
+        serviceIcons.insert( "0x1108" , "phone_16"); // Headset
+        serviceIcons.insert( "0x1112" , "audio_16");  //HeadsetAudioGateway
+        serviceIcons.insert( "0x1109" , "phone_16"); // CordlessTelephony
+        serviceIcons.insert( "0x110A" , "audio_16"); // AudioSource
+        serviceIcons.insert( "0x110B" , "audio_16"); // AudioSink
+        serviceIcons.insert( "0x1126" , "print_16" ); //HCR_Print
+        serviceIcons.insert( "0x1128" , "phone_16" ); //Common_ISDN_Access
+
+        serviceIcons.insert( "0x1201" , "network_16" );  //GenericNetworking
+        serviceIcons.insert( "0x1202" , "folder_16" ); //GenericFileTransfer
+        serviceIcons.insert( "0x1128" , "audio_16" ); //GenericAudio
+        serviceIcons.insert( "0x1128" , "phone_16" ); //GenericTelephony
+
+        //serviceIcons.insert( "106" , "link_16" );
+        //serviceIcons.insert( "107" , "misc_16" );
+    }
+
+    BTIconLoader::~BTIconLoader() {
+    }
+
+    QPixmap BTIconLoader::deviceIcon( const QString &deviceClass ) {
+
+        QString iconName;
+
+        QMap<QString, QString>::Iterator it;
+
+        it = deviceIcons.find( deviceClass );
+        iconName = it.data();
+
+        if ( iconName.isEmpty() ) {
+            iconName = "unknown_16";
+        }
+        return( Resource::loadPixmap( "opietooth/icons/" + iconName ) );
+    }
+
+    QPixmap BTIconLoader::serviceIcon( const QString &serviceClass ) {
+
+        QString iconName;
+
+        QMap<QString, QString>::Iterator it;
+
+        it = deviceIcons.find( serviceClass );
+        iconName = it.data();
+
+        if ( iconName.isEmpty() ) {
+            iconName = "unknown_16";
+        }
+        return( Resource::loadPixmap( "opietooth/icons/" + iconName ) );
+    }
+
+}
diff --git a/noncore/net/opietooth/manager/bticonloader.h b/noncore/net/opietooth/manager/bticonloader.h
new file mode 100644
index 0000000..1b48009
--- a/dev/null
+++ b/noncore/net/opietooth/manager/bticonloader.h
@@ -0,0 +1,37 @@
+#ifndef BTICONLOADER_H
+#define BTICONLOADER_H
+
+#include <qpixmap.h>
+#include <qmap.h>
+
+namespace OpieTooth {
+
+    class BTIconLoader {
+
+    public:
+
+        BTIconLoader();
+        ~BTIconLoader();
+
+        /**
+         * Returns an icon depending on device class
+         * @param deviceClass the device class id
+         * @return the pixmap
+         */
+        QPixmap deviceIcon( const QString &deviceClass );
+
+        /**
+         * Returns an icon depending on service id
+         * @param serviceClass the service id
+         * @return the pixmap
+         */
+        QPixmap serviceIcon( const QString &serviceClass );
+
+    private:
+        // first ist id, second is icon name
+        QMap<QString,QString> deviceIcons;
+        QMap<QString,QString> serviceIcons;
+    };
+}
+
+#endif
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 2d6d7da..0b90e87 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -1,13 +1,13 @@
- #include "hciconfwrapper.h"
+#include "hciconfwrapper.h"
 
 #include <qfile.h>
 #include <qtextstream.h>
 #include <qstringlist.h>
 #include <qregexp.h>
 
 namespace OpieTooth {
 
 
     HciConfWrapper::HciConfWrapper( const QString &fileName) {
         m_fileName = fileName;
     }
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro
index 4fcf010..55f2fd2 100644
--- a/noncore/net/opietooth/manager/manager.pro
+++ b/noncore/net/opietooth/manager/manager.pro
@@ -1,17 +1,17 @@
 TEMPLATE        = app
 CONFIG          = qt warn_on debug
 #CONFIG          = qt warn_on release
-HEADERS         = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h 
-SOURCES         = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp
+HEADERS         = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h
+SOURCES         = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp
 INCLUDEPATH     += $(OPIEDIR)/include
 INCLUDEPATH     += $(OPIEDIR)/noncore/net/opietooth/lib
 DEPENDPATH      += $(OPIEDIR)/include
 LIBS            += -lqpe -lopietooth -lopie
 INTERFACES      = bluetoothbase.ui  devicedialog.ui  
 DESTDIR         = $(OPIEDIR)/bin
 TARGET          = bluetooth-manager
 
 TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \
          ../../../../i18n/en/bluetooth-manager.ts \
          ../../../../i18n/es/bluetooth-manager.ts \
          ../../../../i18n/fr/bluetooth-manager.ts \