summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp68
-rw-r--r--noncore/net/opietooth/manager/bluebase.h3
-rw-r--r--noncore/net/opietooth/manager/bticonloader.cpp77
-rw-r--r--noncore/net/opietooth/manager/bticonloader.h37
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp2
-rw-r--r--noncore/net/opietooth/manager/manager.pro4
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
@@ -43,9 +43,8 @@
#include <remotedevice.h>
-
+#include <services.h>
namespace OpieTooth {
-
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
: BluetoothBase( parent, name, fl ) {
@@ -60,5 +59,4 @@ namespace OpieTooth {
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) ) );
@@ -71,5 +69,4 @@ namespace OpieTooth {
//Load all icons needed
-
offPix = Resource::loadPixmap( "editdelete" );
onPix = Resource::loadPixmap( "installed" );
@@ -95,9 +92,10 @@ namespace OpieTooth {
(void) new BTListItem( topLV2, "Serial" ,"", "service" );
(void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
+
writeToHciConfig();
// search conncetions
addConnectedDevices();
- }
-
+ iconLoader = new BTIconLoader();
+ }
/**
@@ -109,5 +107,4 @@ namespace OpieTooth {
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
@@ -116,5 +113,4 @@ namespace OpieTooth {
enablePagescan = cfg.readNumEntry( "enablePagescan" , 1 );
enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 );
-
}
@@ -124,5 +120,4 @@ namespace OpieTooth {
void BlueBase::writeConfig() {
-
Config cfg( "bluetoothmanager" );
cfg.setGroup( "bluezsettings" );
@@ -211,14 +206,10 @@ namespace OpieTooth {
*/
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() );
@@ -231,7 +222,5 @@ namespace OpieTooth {
*/
void BlueBase::initGui() {
-
StatusLabel->setText( getStatus() ); // maybe move it to getStatus()
-
cryptCheckBox->setChecked( useEncryption );
authCheckBox->setChecked( enableAuthentification );
@@ -250,5 +239,4 @@ namespace OpieTooth {
*/
QString BlueBase::getStatus(){
-
QString infoString = tr( "<b>Device name : </b> Ipaq" );
infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
@@ -263,5 +251,4 @@ namespace OpieTooth {
*/
void BlueBase::applyConfigChanges() {
-
deviceName = deviceNameLine->text();
defaultPasskey = passkeyLine->text();
@@ -273,11 +260,8 @@ namespace OpieTooth {
writeConfig();
-
QMessageBox* box = new QMessageBox( this, "Test" );
box->setText( tr( "Changes applied" ) );
box->show();
- // falls nötig hcid killhupen - die funktionalität adden
- }
-
+ }
/**
@@ -286,12 +270,9 @@ namespace OpieTooth {
*/
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" );
@@ -311,6 +292,4 @@ namespace OpieTooth {
*/
void BlueBase::startServiceActionClicked( QListViewItem *item ) {
-
-
}
@@ -321,10 +300,6 @@ namespace OpieTooth {
QPopupMenu *menu = new QPopupMenu();
-
int ret=0;
-
- //QSize s = menu->sizeHint ( );
-
if ( ((BTListItem*)item)->type() == "device") {
@@ -333,6 +308,6 @@ namespace OpieTooth {
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);
@@ -344,4 +319,7 @@ namespace OpieTooth {
break;
case 2:
+ // make connection
+ break;
+ case 3:
// delete childs too
delete item;
@@ -368,5 +346,4 @@ namespace OpieTooth {
}
}
-
delete menu;
}
@@ -377,15 +354,11 @@ namespace OpieTooth {
*/
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;
}
@@ -397,10 +370,8 @@ namespace OpieTooth {
*/
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
@@ -412,5 +383,4 @@ namespace OpieTooth {
QValueList<OpieTooth::Services>::Iterator it2;
-
BTListItem * serviceItem;
@@ -419,9 +389,8 @@ namespace OpieTooth {
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");
}
}
@@ -438,5 +407,4 @@ namespace OpieTooth {
void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) {
-
QValueList<OpieTooth::Connection>::Iterator it;
BTListItem * connectionItem;
@@ -459,5 +427,4 @@ namespace OpieTooth {
*/
void BlueBase::deviceActive( RemoteDevice *device ) {
-
// search by mac, async, gets a signal back
localDevice->isAvailable( device->mac() );
@@ -470,10 +437,8 @@ namespace OpieTooth {
*/
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
@@ -489,14 +454,10 @@ namespace OpieTooth {
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>& ) ),
@@ -519,4 +480,5 @@ namespace OpieTooth {
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
@@ -12,4 +12,5 @@
#include "bluetoothbase.h"
#include "btlistitem.h"
+#include "bticonloader.h"
#include <remotedevice.h>
@@ -65,4 +66,6 @@ namespace OpieTooth {
QPixmap onPix;
+ BTIconLoader *iconLoader;
+
private slots:
void addSearchedDevices( QList<RemoteDevice> &newDevices );
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,3 +1,3 @@
- #include "hciconfwrapper.h"
+#include "hciconfwrapper.h"
#include <qfile.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
@@ -2,6 +2,6 @@ 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