From 8be0a8e108eaf8ff99301aa175298ddeb48eae67 Mon Sep 17 00:00:00 2001 From: zecke Date: Sat, 13 Jul 2002 12:53:59 +0000 Subject: Icon loader updates and LIB updates --- (limited to 'noncore/net/opietooth') diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 9cfeaa2..189001d 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -314,6 +314,7 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin delete groups; } else if ( ((BTListItem*)item)->type() == "service") { + menu->insertItem( tr("Test1:"), 0); menu->insertItem( tr("connect"), 1); menu->insertItem( tr("delete"), 2); @@ -370,9 +371,16 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin if (!servicesList.isEmpty() ) { // add services + QMap list; + QMap::Iterator classIt; for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { serviceItem = new BTServiceItem( deviceItem , (*it2) ); - serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) ); + 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; diff --git a/noncore/net/opietooth/manager/bticonloader.cpp b/noncore/net/opietooth/manager/bticonloader.cpp index 3fb0edd..f299117 100644 --- a/noncore/net/opietooth/manager/bticonloader.cpp +++ b/noncore/net/opietooth/manager/bticonloader.cpp @@ -10,32 +10,33 @@ namespace OpieTooth { BTIconLoader::BTIconLoader() { // still need to find out real ids - deviceIcons.insert( "100" , "computer_16" ); - deviceIcons.insert( "101" , "phone_16" ); - deviceIcons.insert( "102" , "brain_16" ); - deviceIcons.insert( "103" , "conduit_16" ); - - - serviceIcons.insert( "0x1105" , "obex_16" ); //OBEXObjectPush - serviceIcons.insert( "0x1106" , "obex_16" ); //OBEXFileTransfer - serviceIcons.insert( "0x1111" , "print_16" ); //Fax - serviceIcons.insert( "0x1101" , "serial_16" ); //SerialPort - serviceIcons.insert( "0x1104" , "sync_16" ); //IrMCSync - serviceIcons.insert( "0x1107" , "sync_16" ); //IrMCSyncCommand - serviceIcons.insert( "0x1102" , "network_16" ); //LANAccessUsingPPP - serviceIcons.insert( "0x1103" , "network_16"); //DialupNetworking - serviceIcons.insert( "0x1108" , "phone_16"); // Headset - serviceIcons.insert( "0x1112" , "audio_16"); //HeadsetAudioGateway - serviceIcons.insert( "0x1109" , "phone_16"); // CordlessTelephony - serviceIcons.insert( "0x110A" , "audio_16"); // AudioSource - serviceIcons.insert( "0x110B" , "audio_16"); // AudioSink - serviceIcons.insert( "0x1126" , "print_16" ); //HCR_Print - serviceIcons.insert( "0x1128" , "phone_16" ); //Common_ISDN_Access - - serviceIcons.insert( "0x1201" , "network_16" ); //GenericNetworking - serviceIcons.insert( "0x1202" , "folder_16" ); //GenericFileTransfer - serviceIcons.insert( "0x1128" , "audio_16" ); //GenericAudio - serviceIcons.insert( "0x1128" , "phone_16" ); //GenericTelephony + deviceIcons.insert( 100 , "computer_16" ); + deviceIcons.insert( 101 , "phone_16" ); + deviceIcons.insert( 102 , "brain_16" ); + deviceIcons.insert( 103 , "conduit_16" ); + + + serviceIcons.insert( 4357 , "obex_16" ); //OBEXObjectPush + serviceIcons.insert( 4358 , "obex_16" ); //OBEXFileTransfer + serviceIcons.insert( 4369 , "print_16" ); //Fax + serviceIcons.insert( 4353 , "serial_16" ); //SerialPort + serviceIcons.insert( 4356 , "sync_16" ); //IrMCSync + serviceIcons.insert( 4359 , "sync_16" ); //IrMCSyncCommand + serviceIcons.insert( 4354 , "network_16" ); //LANAccessUsingPPP + serviceIcons.insert( 4355 , "network_16"); //DialupNetworking + serviceIcons.insert( 4360 , "phone_16"); // Headset + serviceIcons.insert( 4370 , "audio_16"); //HeadsetAudioGateway + serviceIcons.insert( 4361 , "phone_16"); // CordlessTelephony + serviceIcons.insert( 4362 , "audio_16"); // AudioSource + serviceIcons.insert( 4363 , "audio_16"); // AudioSink + serviceIcons.insert( 4390 , "print_16" ); //HCR_Print + serviceIcons.insert( 4392 , "phone_16" ); //Common_ISDN_Access + + serviceIcons.insert( 4609 , "network_16" ); //GenericNetworking + serviceIcons.insert( 4610 , "folder_16" ); //GenericFileTransfer + serviceIcons.insert( 4392 , "audio_16" ); //GenericAudio + // serviceIcons.insert( 4392 , "phone_16" ); //GenericTelephony + // the above is duplicated? -zecke //serviceIcons.insert( "106" , "link_16" ); //serviceIcons.insert( "107" , "misc_16" ); @@ -44,11 +45,11 @@ namespace OpieTooth { BTIconLoader::~BTIconLoader() { } - QPixmap BTIconLoader::deviceIcon( const QString &deviceClass ) { + QPixmap BTIconLoader::deviceIcon( int deviceClass ) { QString iconName; - QMap::Iterator it; + QMap::Iterator it; it = deviceIcons.find( deviceClass ); iconName = it.data(); @@ -59,11 +60,11 @@ namespace OpieTooth { return( Resource::loadPixmap( "opietooth/icons/" + iconName ) ); } - QPixmap BTIconLoader::serviceIcon( const QString &serviceClass ) { + QPixmap BTIconLoader::serviceIcon( int serviceClass ) { QString iconName; - QMap::Iterator it; + QMap::Iterator it; it = deviceIcons.find( serviceClass ); iconName = it.data(); diff --git a/noncore/net/opietooth/manager/bticonloader.h b/noncore/net/opietooth/manager/bticonloader.h index 1b48009..9951c4c 100644 --- a/noncore/net/opietooth/manager/bticonloader.h +++ b/noncore/net/opietooth/manager/bticonloader.h @@ -18,19 +18,19 @@ namespace OpieTooth { * @param deviceClass the device class id * @return the pixmap */ - QPixmap deviceIcon( const QString &deviceClass ); + QPixmap deviceIcon( int ); /** * Returns an icon depending on service id * @param serviceClass the service id * @return the pixmap */ - QPixmap serviceIcon( const QString &serviceClass ); + QPixmap serviceIcon( int ); private: // first ist id, second is icon name - QMap deviceIcons; - QMap serviceIcons; + QMap deviceIcons; + QMap serviceIcons; }; } diff --git a/noncore/net/opietooth/manager/btserviceitem.cpp b/noncore/net/opietooth/manager/btserviceitem.cpp index 352e793..7db93c9 100644 --- a/noncore/net/opietooth/manager/btserviceitem.cpp +++ b/noncore/net/opietooth/manager/btserviceitem.cpp @@ -21,3 +21,6 @@ int BTServiceItem::typeId() const { Services BTServiceItem::services() const { return m_service; } +int BTServiceItem::serviceId() const { + return m_service.recHandle(); +}; diff --git a/noncore/net/opietooth/manager/btserviceitem.h b/noncore/net/opietooth/manager/btserviceitem.h index 6dbd8f1..625a5f7 100644 --- a/noncore/net/opietooth/manager/btserviceitem.h +++ b/noncore/net/opietooth/manager/btserviceitem.h @@ -16,6 +16,7 @@ namespace OpieTooth { QString type() const; int typeId() const; Services services() const; + int serviceId() const; private: Services m_service; diff --git a/noncore/net/opietooth/manager/stdpopups.cpp b/noncore/net/opietooth/manager/stdpopups.cpp index 43a0f62..f462368 100644 --- a/noncore/net/opietooth/manager/stdpopups.cpp +++ b/noncore/net/opietooth/manager/stdpopups.cpp @@ -1,8 +1,11 @@ +//#include "rfccompopup.h" + #include "stdpopups.h" -QPopupMenu* newRfcComPopup( const OpieTooth::Services&, QListViewItem* ) { +QPopupMenu* newRfcComPopup( const OpieTooth::Services& servive, QListViewItem* item ) { + // return OpieTooth::RfcComPopup( servive, item ); return 0l; } QPopupMenu* newObexPushPopup( const OpieTooth::Services&, QListViewItem* ) { -- cgit v0.9.0.2