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
@@ -80,34 +80,36 @@ using namespace OpieTooth;
         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" );
 
@@ -286,63 +288,89 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
 
     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 );
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
@@ -2,27 +2,29 @@
 #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 );
 }