summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-20 20:45:08 (UTC)
committer harlekin <harlekin>2002-07-20 20:45:08 (UTC)
commit0f24c1fb86d3bb58d8696358b824c0e01752b10d (patch) (side-by-side diff)
tree646c57bf8f5b903cd951aac9287c7703d0af4d4d
parentf095be190be0bcacd7911c585d034fd031e16099 (diff)
downloadopie-0f24c1fb86d3bb58d8696358b824c0e01752b10d.zip
opie-0f24c1fb86d3bb58d8696358b824c0e01752b10d.tar.gz
opie-0f24c1fb86d3bb58d8696358b824c0e01752b10d.tar.bz2
little update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp19
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
@@ -271,64 +271,70 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
}
/**
* 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("bound device"), 2);
menu->insertItem( tr("delete"), 3);
ret = menu->exec( point , 0);
switch(ret) {
case -1:
-
+ break;
+ case 0:
+ addServicesToDevice( (BTDeviceItem*)item );
break;
case 1:
+
break;
- case 2:
+
+ // NO need to, since hcid does that on the fly
+ // case 2:
// make connection
- break;
+ //m_localDevice->connectTo( ((BTDeviceItem*)item)->mac() );
+ //break;
case 3:
- // delete childs too
+ // deletes childs too
delete item;
break;
}
delete groups;
}
/*
* 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() ) {
@@ -388,50 +394,51 @@ void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
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=0;
- if ( classIt != list.end() )
+ 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.
* This one triggers the search
*/
void BlueBase::addConnectedDevices() {
m_localDevice->searchConnections();
}
/**
* This adds the found connections to the connection tab.