| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 68 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 3 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bticonloader.cpp | 77 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bticonloader.h | 37 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/hciconfwrapper.cpp | 2 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 |
6 files changed, 135 insertions, 56 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index d023302..2001db1 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -41,13 +41,12 @@ #include <qpe/resource.h> #include <qpe/config.h> #include <remotedevice.h> - +#include <services.h> namespace OpieTooth { - BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) : BluetoothBase( parent, name, fl ) { localDevice = new Manager( "hci0" ); @@ -58,9 +57,8 @@ namespace OpieTooth { // connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ), // this, SLOT( addServicesToDevice( QListViewItem * ) ) ); connect( ListView2, SIGNAL( clicked( QListViewItem* )), this, SLOT( startServiceActionClicked( QListViewItem* ) ) ); - // hehe, cast right later connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ), this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) ); connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ), this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); @@ -69,9 +67,8 @@ namespace OpieTooth { connect( localDevice, SIGNAL( connections( Connection::ValueList ) ), this, SLOT( addConnectedDevices( Connection::ValueList ) ) ); //Load all icons needed - offPix = Resource::loadPixmap( "editdelete" ); onPix = Resource::loadPixmap( "installed" ); QPalette pal = this->palette(); @@ -93,13 +90,14 @@ namespace OpieTooth { BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" ); topLV2->setPixmap( 1, onPix ); (void) new BTListItem( topLV2, "Serial" ,"", "service" ); (void) new BTListItem( topLV2, "BlueNiC" , "", "service" ); + writeToHciConfig(); // search conncetions addConnectedDevices(); - } - + iconLoader = new BTIconLoader(); + } /** * Reads all options from the config file */ @@ -107,24 +105,21 @@ namespace OpieTooth { Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); - deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with defaultPasskey = cfg.readEntryCrypt( "passkey" , "" ); // <- hmm, look up how good the trolls did that, maybe too weak useEncryption = cfg.readNumEntry( "useEncryption" , 1 ); enableAuthentification = cfg.readNumEntry( "enableAuthentification" , 1 ); enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 ); enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 ); - } /** * Writes all options to the config file */ void BlueBase::writeConfig() { - Config cfg( "bluetoothmanager" ); cfg.setGroup( "bluezsettings" ); cfg.writeEntry( "name" , deviceName ); @@ -209,18 +204,14 @@ namespace OpieTooth { * Write the list of allready known devices * */ void BlueBase::writeSavedDevices() { - QListViewItemIterator it( ListView2 ); for ( ; it.current(); ++it ) { - // seperate config file for each device, to store more information in future. -// TO FIX: BTLISTITEM!!! qDebug( "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf"); Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf", Config::File ); - conf.setGroup( "Info" ); conf.writeEntry( "name", ((BTListItem*)it.current())->name() ); } } @@ -229,11 +220,9 @@ namespace OpieTooth { /** * Set up the gui */ void BlueBase::initGui() { - StatusLabel->setText( getStatus() ); // maybe move it to getStatus() - cryptCheckBox->setChecked( useEncryption ); authCheckBox->setChecked( enableAuthentification ); pagescanCheckBox->setChecked( enablePagescan ); inquiryscanCheckBox->setChecked( enableInquiryscan ); @@ -248,9 +237,8 @@ namespace OpieTooth { * Get the status informations and returns it * @return QString the status informations gathered */ QString BlueBase::getStatus(){ - QString infoString = tr( "<b>Device name : </b> Ipaq" ); infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); @@ -261,9 +249,8 @@ namespace OpieTooth { /** * Read the current values from the gui and invoke writeConfig() */ void BlueBase::applyConfigChanges() { - deviceName = deviceNameLine->text(); defaultPasskey = passkeyLine->text(); useEncryption = cryptCheckBox->isChecked(); enableAuthentification = authCheckBox->isChecked(); @@ -271,29 +258,23 @@ namespace OpieTooth { enableInquiryscan = inquiryscanCheckBox->isChecked(); writeConfig(); - QMessageBox* box = new QMessageBox( this, "Test" ); box->setText( tr( "Changes applied" ) ); box->show(); - // falls nötig hcid killhupen - die funktionalität adden - } - + } /** * Add fresh found devices from scan dialog to the listing * */ void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { - BTListItem * deviceItem; - QListIterator<RemoteDevice> it( newDevices ); for( ; it.current() ; ++it ) { - RemoteDevice *dev = it.current(); deviceItem = new BTListItem( ListView2 , dev->name(), dev->mac(), "device" ); deviceItem->setExpandable ( true ); @@ -309,32 +290,26 @@ namespace OpieTooth { /** * 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; - - //QSize s = menu->sizeHint ( ); - 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("delete"), 2); - + menu->insertItem( tr("bound device"), 2); + menu->insertItem( tr("delete"), 3); ret = menu->exec( point , 0); switch(ret) { @@ -342,8 +317,11 @@ namespace OpieTooth { break; case 1: break; case 2: + // make connection + break; + case 3: // delete childs too delete item; break; } @@ -366,28 +344,23 @@ namespace OpieTooth { delete item; break; } } - delete menu; } /** * Search and display avail. services for a device (on expand from device listing) * */ void BlueBase::addServicesToDevice( BTListItem * item ) { - qDebug("addServicesToDevice"); // row of mac adress text(3) RemoteDevice *device = new RemoteDevice( item->mac(), item->name() ); - deviceList.insert( item->mac() , item ); - // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back localDevice->searchServices( *device ); - - // delete + delete device; } /** @@ -395,14 +368,12 @@ namespace OpieTooth { * @param device the mac address of the remote device * @param servicesList the list with the service the device has. */ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { - qDebug("fill services list"); QMap<QString,BTListItem*>::Iterator it; - - BTListItem* deviceItem; + BTListItem* deviceItem = 0; // get the right devices which requested the search for( it = deviceList.begin(); it != deviceList.end(); ++it ) { if ( it.key() == device ) { @@ -410,20 +381,18 @@ namespace OpieTooth { } } QValueList<OpieTooth::Services>::Iterator it2; - BTListItem * serviceItem; if (!servicesList.isEmpty() ) { // add services for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" ); - //serviceItem->setText(4, "service"); + serviceItem->setPixmap( 0, iconLoader->serviceIcon( (*it2).classIdList() ) ); } } else { serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" ); - //serviceItem->setText(4, "service"); } } @@ -436,9 +405,8 @@ namespace OpieTooth { } void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) { - QValueList<OpieTooth::Connection>::Iterator it; BTListItem * connectionItem; if ( !connectionList.isEmpty() ) { @@ -457,9 +425,8 @@ namespace OpieTooth { /** * Find out if a device can currently be reached */ void BlueBase::deviceActive( RemoteDevice *device ) { - // search by mac, async, gets a signal back localDevice->isAvailable( device->mac() ); } @@ -468,14 +435,12 @@ namespace OpieTooth { * @param device - the mac address * @param connected - if it is avail. or not */ void BlueBase::deviceActive( const QString& device, bool connected ) { - qDebug("deviceActive slot"); QMap<QString,BTListItem*>::Iterator it; - - BTListItem* deviceItem; + BTListItem* deviceItem = 0; // get the right devices which requested the search for( it = deviceList.begin(); it != deviceList.end(); ++it ) { if ( it.key() == device ) { @@ -487,18 +452,14 @@ namespace OpieTooth { deviceItem->setPixmap( 1, onPix ); } else { deviceItem->setPixmap( 1, offPix ); } - } - - /** * Open the "scan for devices" dialog */ void BlueBase::startScan() { - ScanDialog *scan = new ScanDialog( this, "", true); QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ), this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) ); @@ -517,7 +478,8 @@ namespace OpieTooth { * Decontructor */ BlueBase::~BlueBase() { writeSavedDevices(); + delete iconLoader; } } diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index 0516c16..ce0483f 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -10,8 +10,9 @@ #include <qpixmap.h> #include "bluetoothbase.h" #include "btlistitem.h" +#include "bticonloader.h" #include <remotedevice.h> #include <manager.h> @@ -63,8 +64,10 @@ namespace OpieTooth { QPixmap offPix; QPixmap onPix; + BTIconLoader *iconLoader; + private slots: void addSearchedDevices( QList<RemoteDevice> &newDevices ); void addServicesToDevice( BTListItem *item ); void addServicesToDevice( const QString& device, Services::ValueList ); diff --git a/noncore/net/opietooth/manager/bticonloader.cpp b/noncore/net/opietooth/manager/bticonloader.cpp new file mode 100644 index 0000000..3fb0edd --- a/dev/null +++ b/noncore/net/opietooth/manager/bticonloader.cpp @@ -0,0 +1,77 @@ + +#include "bticonloader.h" + +#include <qpixmap.h> +#include <qpe/resource.h> + +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 + + //serviceIcons.insert( "106" , "link_16" ); + //serviceIcons.insert( "107" , "misc_16" ); + } + + BTIconLoader::~BTIconLoader() { + } + + QPixmap BTIconLoader::deviceIcon( const QString &deviceClass ) { + + QString iconName; + + QMap<QString, QString>::Iterator it; + + it = deviceIcons.find( deviceClass ); + iconName = it.data(); + + if ( iconName.isEmpty() ) { + iconName = "unknown_16"; + } + return( Resource::loadPixmap( "opietooth/icons/" + iconName ) ); + } + + QPixmap BTIconLoader::serviceIcon( const QString &serviceClass ) { + + QString iconName; + + QMap<QString, QString>::Iterator it; + + it = deviceIcons.find( serviceClass ); + iconName = it.data(); + + if ( iconName.isEmpty() ) { + iconName = "unknown_16"; + } + return( Resource::loadPixmap( "opietooth/icons/" + iconName ) ); + } + +} diff --git a/noncore/net/opietooth/manager/bticonloader.h b/noncore/net/opietooth/manager/bticonloader.h new file mode 100644 index 0000000..1b48009 --- a/dev/null +++ b/noncore/net/opietooth/manager/bticonloader.h @@ -0,0 +1,37 @@ +#ifndef BTICONLOADER_H +#define BTICONLOADER_H + +#include <qpixmap.h> +#include <qmap.h> + +namespace OpieTooth { + + class BTIconLoader { + + public: + + BTIconLoader(); + ~BTIconLoader(); + + /** + * Returns an icon depending on device class + * @param deviceClass the device class id + * @return the pixmap + */ + QPixmap deviceIcon( const QString &deviceClass ); + + /** + * Returns an icon depending on service id + * @param serviceClass the service id + * @return the pixmap + */ + QPixmap serviceIcon( const QString &serviceClass ); + + private: + // first ist id, second is icon name + QMap<QString,QString> deviceIcons; + QMap<QString,QString> serviceIcons; + }; +} + +#endif diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp index 2d6d7da..0b90e87 100644 --- a/noncore/net/opietooth/manager/hciconfwrapper.cpp +++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp @@ -1,5 +1,5 @@ - #include "hciconfwrapper.h" +#include "hciconfwrapper.h" #include <qfile.h> #include <qtextstream.h> #include <qstringlist.h> diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 4fcf010..55f2fd2 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro @@ -1,9 +1,9 @@ TEMPLATE = app CONFIG = qt warn_on debug #CONFIG = qt warn_on release -HEADERS = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h -SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp +HEADERS = bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h +SOURCES = main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp INCLUDEPATH += $(OPIEDIR)/include INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopietooth -lopie |