-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index d2854a1..af64663 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -287,32 +287,38 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
287 | int ret=0; | 287 | int ret=0; |
288 | 288 | ||
289 | if ( ((BTListItem*)item)->type() == "device") { | 289 | if ( ((BTListItem*)item)->type() == "device") { |
290 | 290 | ||
291 | QPopupMenu *groups = new QPopupMenu(); | 291 | QPopupMenu *groups = new QPopupMenu(); |
292 | 292 | ||
293 | menu->insertItem( tr("rescan sevices:"), 0); | 293 | menu->insertItem( tr("rescan sevices:"), 0); |
294 | menu->insertItem( tr("to group"), groups , 1); | 294 | menu->insertItem( tr("to group"), groups , 1); |
295 | menu->insertItem( tr("bound device"), 2); | 295 | // menu->insertItem( tr("bound device"), 2); |
296 | menu->insertItem( tr("delete"), 3); | 296 | menu->insertItem( tr("delete"), 3); |
297 | 297 | ||
298 | ret = menu->exec( point , 0); | 298 | ret = menu->exec( point , 0); |
299 | 299 | ||
300 | switch(ret) { | 300 | switch(ret) { |
301 | case -1: | 301 | case -1: |
302 | 302 | break; | |
303 | case 0: | ||
304 | addServicesToDevice( (BTDeviceItem*)item ); | ||
303 | break; | 305 | break; |
304 | case 1: | 306 | case 1: |
307 | |||
305 | break; | 308 | break; |
306 | case 2: | 309 | |
310 | // NO need to, since hcid does that on the fly | ||
311 | // case 2: | ||
307 | // make connection | 312 | // make connection |
308 | break; | 313 | //m_localDevice->connectTo( ((BTDeviceItem*)item)->mac() ); |
314 | //break; | ||
309 | case 3: | 315 | case 3: |
310 | // delete childs too | 316 | // deletes childs too |
311 | delete item; | 317 | delete item; |
312 | break; | 318 | break; |
313 | } | 319 | } |
314 | delete groups; | 320 | delete groups; |
315 | 321 | ||
316 | } | 322 | } |
317 | 323 | ||
318 | /* | 324 | /* |
@@ -404,18 +410,19 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s | |||
404 | // add services | 410 | // add services |
405 | QMap<int, QString> list; | 411 | QMap<int, QString> list; |
406 | QMap<int, QString>::Iterator classIt; | 412 | QMap<int, QString>::Iterator classIt; |
407 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { | 413 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { |
408 | serviceItem = new BTServiceItem( deviceItem , (*it2) ); | 414 | serviceItem = new BTServiceItem( deviceItem , (*it2) ); |
409 | list = (*it2).classIdList(); | 415 | list = (*it2).classIdList(); |
410 | classIt = list.begin(); | 416 | classIt = list.begin(); |
411 | int classId=0; | 417 | int classId=0; |
412 | if ( classIt != list.end() ) | 418 | if ( classIt != list.end() ) { |
413 | classId = classIt.key(); | 419 | classId = classIt.key(); |
420 | } | ||
414 | 421 | ||
415 | serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) ); | 422 | serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( classId ) ); |
416 | } | 423 | } |
417 | } else { | 424 | } else { |
418 | Services s1; | 425 | Services s1; |
419 | s1.setServiceName( tr("no serives found") ); | 426 | s1.setServiceName( tr("no serives found") ); |
420 | serviceItem = new BTServiceItem( deviceItem, s1 ); | 427 | serviceItem = new BTServiceItem( deviceItem, s1 ); |
421 | } | 428 | } |