summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp56
-rw-r--r--noncore/net/opietooth/manager/popuphelper.cpp2
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
@@ -95,4 +95,6 @@ using namespace OpieTooth;
95 s1.setServiceName( "Serial" ); 95 s1.setServiceName( "Serial" );
96 s1.insertClassId(1, "BlueNic");
96 (void) new BTServiceItem( topLV2, s1 ); 97 (void) new BTServiceItem( topLV2, s1 );
97 s1.setServiceName( "BlueNic" ); 98 s1.setServiceName( "BlueNic" );
99 s1.insertClassId(2, "Obex");
98 (void) new BTServiceItem( topLV2, s1 ); 100 (void) new BTServiceItem( topLV2, s1 );
@@ -301,3 +303,4 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
301 switch(ret) { 303 switch(ret) {
302 case 0: 304 case -1:
305
303 break; 306 break;
@@ -315,19 +318,44 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
315 318
316 } else if ( ((BTListItem*)item)->type() == "service") { 319 }
320 /**
321 * We got service sensitive PopupMenus in our factory
322 * We will create one through the factory and will insert
323 * our Separator + ShowInfo into the menu or create a new
324 * one if the factory returns 0
325 * PopupMenu deletion is kind of weird.
326 * If escaped( -1 ) or any of our items were chosen we'll
327 * delete the PopupMenu otherwise it's the responsibility of
328 * the PopupMenu to delete itself
329 *
330 */
331 else if ( ((BTListItem*)item)->type() == "service") {
332 BTServiceItem* service = (BTServiceItem*)item;
333 QMap<int, QString> list = service->services().classIdList();
334 QMap<int, QString>::Iterator it = list.begin();
335 QPopupMenu *popup =0l;
336 if ( it != list.end() )
337 popup = m_popHelper.find( it.key(),
338 service->services(),
339 service->parent() );
340
341 if ( popup == 0l ) {
342 qWarning("factory returned 0l");
343 popup = new QPopupMenu();
344 }
317 345
318 menu->insertItem( tr("Test1:"), 0); 346 int test1 = popup->insertItem( tr("Test1:"), 0);
319 menu->insertItem( tr("connect"), 1); 347 int con = popup->insertItem( tr("connect"), 1);
320 menu->insertItem( tr("delete"), 2); 348 int del = popup->insertItem( tr("delete"), 2);
321 349
322 ret = menu->exec( point , 0); 350 ret = popup->exec( point );
323 351
324 switch(ret) { 352 if ( ret == -1 )
325 case 0: 353 delete popup;
326 break; 354 else if ( ret == test1 )
327 case 1: 355 delete popup;
328 break; 356 else if ( ret == con )
329 case 2: 357 delete popup;
330 // delete childs too 358 else if ( ret == del ) {
359 // take item first? -zecke
331 delete item; 360 delete item;
332 break;
333 } 361 }
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
@@ -17,4 +17,6 @@ void PopupHelper::insert( int id, popupFactory fact ) {
17QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { 17QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) {
18 qWarning("find");
18 FactoryMap::Iterator it = m_map.find(id ); 19 FactoryMap::Iterator it = m_map.find(id );
19 if ( it != m_map.end() ) { 20 if ( it != m_map.end() ) {
21 qWarning("found");
20 popupFactory fact = it.data(); 22 popupFactory fact = it.data();