Factory code is in place... aye

Now we just need FactoryImpl of
OBEX,RfcCom,VoiceGateWay
There will be one small adjustment though
QListViewItem -> BTDeviceItem

2 files changed, 44 insertions, 14 deletions

diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 189001d..3f2f138 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -32,130 +32,132 @@
 #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>
 #include <services.h>
 
 #include "btconnectionitem.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( Connection::ValueList ) ),
                  this, SLOT( addConnectedDevices( Connection::ValueList ) ) );
 
         //Load all icons needed
         m_offPix = Resource::loadPixmap( "editdelete" );
         m_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);
 
         BTDeviceItem *topLV2 = new BTDeviceItem( ListView2, RemoteDevice("xx:", "Siemens S45" ) );
         topLV2->setPixmap( 1, m_onPix );
 	Services s1;
 	s1.setServiceName( "Serial" );
+        s1.insertClassId(1, "BlueNic");
         (void) new BTServiceItem( topLV2, s1 );
 	s1.setServiceName( "BlueNic" );
+        s1.insertClassId(2, "Obex");
         (void) new BTServiceItem( topLV2, s1 );
 
         writeToHciConfig();
         // search conncetions
         addConnectedDevices();
         m_iconLoader = new BTIconLoader();
       }
 
     /**
      * 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();
     }
 
     void BlueBase::writeToHciConfig() {
 
         HciConfWrapper hciconf ( "/tmp/hcid.conf" );
         hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
 
 
         //    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 );
     }
 
 
     /**
      * Read the list of allready known devices
      *
      */
     void BlueBase::readSavedDevices() {
 
@@ -238,159 +240,185 @@ using namespace OpieTooth;
     /**
      * Read the current values from the gui and invoke writeConfig()
      */
     void BlueBase::applyConfigChanges() {
         m_deviceName =  deviceNameLine->text();
         m_defaultPasskey = passkeyLine->text();
         m_useEncryption = cryptCheckBox->isChecked();
         m_enableAuthentification = authCheckBox->isChecked();
         m_enablePagescan = pagescanCheckBox->isChecked();
         m_enableInquiryscan = inquiryscanCheckBox->isChecked();
 
         writeConfig();
 
         QMessageBox::information( this, tr("Test") , tr("Changes were applied.") );
    }
 
     /**
      * Add fresh found devices from scan dialog to the listing
      *
      */
     void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) {
         BTDeviceItem * deviceItem;
         QValueList<RemoteDevice>::ConstIterator it;
 
         for( it = newDevices.begin(); it != newDevices.end() ; ++it ) {
 
             deviceItem = new BTDeviceItem( ListView2 , (*it) );
             deviceItem->setExpandable ( true );
 
             // look if device is avail. atm, async
             deviceActive( (*it) );
 
             // 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;
 
     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("bound device"), 2);
         menu->insertItem( tr("delete"),  3);
 
         ret = menu->exec( point  , 0);
 
         switch(ret) {
-        case 0:
+        case -1:
+
             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") {
+    }
+    /**
+     * 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() )
+            popup = m_popHelper.find( it.key(),
+                                      service->services(),
+                                      service->parent() );
+
+        if ( popup == 0l ) {
+            qWarning("factory returned 0l");
+            popup = new QPopupMenu();
+        }
 
-        menu->insertItem( tr("Test1:"),  0);
-        menu->insertItem( tr("connect"), 1);
-        menu->insertItem( tr("delete"),  2);
+        int test1 = popup->insertItem( tr("Test1:"),  0);
+        int con = popup->insertItem( tr("connect"), 1);
+        int del = popup->insertItem( tr("delete"),  2);
 
-        ret = menu->exec( point  , 0);
+        ret = popup->exec( point );
 
-        switch(ret) {
-        case 0:
-            break;
-        case 1:
-            break;
-        case 2:
-            // delete childs too
+        if ( ret == -1 )
+            delete popup;
+        else if ( ret == test1 )
+            delete popup;
+        else if ( ret == con )
+            delete popup;
+        else if ( ret == del ) {
+            // take item first? -zecke
             delete item;
-            break;
         }
     }
     delete menu;
 }
 
     /**
      * Search and display avail. services for a device (on expand from device listing)
      *
      */
     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
      * @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();
 
         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;
                 if ( classIt != list.end() )
                     classId = classIt.key();
                 serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) );
             }
         } else {
     	    Services s1;
 	    s1.setServiceName( tr("no serives found") );
             serviceItem = new BTServiceItem( deviceItem, s1 );
         }
 	// now remove them from the  list
 	m_deviceList.remove( it );
     }
 
 
     /**
      * Add the existing connections (pairs) to the connections tab.
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp
index d8404d6..26c4b02 100644
--- a/noncore/net/opietooth/manager/popuphelper.cpp
+++ b/noncore/net/opietooth/manager/popuphelper.cpp
@@ -1,28 +1,30 @@
 
 #include "stdpopups.h"
 
 #include "popuphelper.h"
 
 using namespace OpieTooth;
 
 PopupHelper::PopupHelper() {
     init();
 }
 PopupHelper::~PopupHelper() {
 
 }
 void PopupHelper::insert( int id, popupFactory fact ) {
     m_map.insert(id, fact );
 }
 QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
+    qWarning("find");
     FactoryMap::Iterator it = m_map.find(id );
     if ( it != m_map.end() ) {
+        qWarning("found");
         popupFactory fact = it.data();
         return (*fact)(ser,  item);
     }
     return 0l;
 }
 void PopupHelper::init() {
     insert( 1,  newRfcComPopup );
     insert(2, newObexPushPopup );
 }