summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp76
-rw-r--r--noncore/net/opietooth/manager/bluebase.h5
2 files changed, 60 insertions, 21 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 22b16d2..c7e1fe4 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -35,41 +35,43 @@
#include <qlineedit.h>
#include <qlistview.h>
#include <qdir.h>
#include <qpe/resource.h>
#include <qpe/config.h>
#include <remotedevice.h>
namespace OpieTooth {
BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
: BluetoothBase( parent, name, fl ) {
+ localDevice = new Manager( "hci0" );
- QObject::connect( (QObject*)PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
- QObject::connect( (QObject*)configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
- QObject::connect( (QObject*)ListView2, SIGNAL( expanded( QListViewItem * item ) ),
+ QObject::connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
+ QObject::connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
+ QObject::connect( ListView2, SIGNAL( expanded( QListViewItem * item ) ),
this, SLOT( addServicesToDevice( QListViewItem * item ) ) );
- QObject::connect( (QObject*)ListView2, SIGNAL( clicked( QListViewItem * )),
+ QObject::connect( ListView2, SIGNAL( clicked( QListViewItem * )),
this, SLOT( startServiceActionClicked( QListViewItem * item ) ) );
+ connect( localDevice, SIGNAL( foundServices( const QString& device, Services::ValueList ) ),
+ this, SLOT( addServicesToDevice( const QString& device, Services::ValueList ) ) );
- //
// QObject::connect( (QObject*) Manager, SIGNAL (foundServices( const QString& device, Services::ValueList ), this () ) );
//Load all icons needed
QPixmap offPix = Resource::loadPixmap( "editdelete" );
QPixmap onPix = Resource::loadPixmap( "installed" );
QPalette pal = this->palette();
QColor col = pal.color(QPalette::Active, QColorGroup::Background);
pal.setColor(QPalette::Active, QColorGroup::Button, col);
pal.setColor(QPalette::Inactive, QColorGroup::Button, col);
pal.setColor(QPalette::Normal, QColorGroup::Button, col);
pal.setColor(QPalette::Disabled, QColorGroup::Button, col);
this->setPalette(pal);
@@ -127,61 +129,54 @@ namespace OpieTooth {
cfg.writeEntryCrypt("passkey", defaultPasskey);
cfg.writeEntry("useEncryption", useEncryption);
cfg.writeEntry("enableAuthentification", enableAuthentification);
cfg.writeEntry("enablePagescan",enablePagescan);
cfg.writeEntry("enableInquiryscan", enableInquiryscan);
}
/*
* Read the list of allready known devices
*
*/
void BlueBase::readSavedDevices() {
QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>;
- Config deviceList( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
+ Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
// RemoteDevice *currentDevice = RemoteDevice( , );
//loadedDevices->append( currentDevice );
addSearchedDevices( *loadedDevices );
}
/*
* Write the list of allready known devices
*
*/
void BlueBase::writeSavedDevices() {
QListViewItemIterator it( ListView2 );
- // one top conf file with all decices (by mac adress)
- Config deviceList( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
-
for ( ; it.current(); ++it ) {
- // MAC adress as group
- deviceList.setGroup( it.current()->text(1) );
- deviceList.writeEntry("inList", 1);
-
// seperate config file for each device, to store more information in future.
- Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(1)) + ".conf", Config::File );
+ Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(3)) + ".conf", Config::File );
conf.setGroup("Info");
conf.writeEntry("name", it.current()->text(0) );
}
}
/**
* Set up the gui
*/
void BlueBase::initGui() {
StatusLabel->setText(getStatus()); // maybe move it to getStatus()
cryptCheckBox->setChecked(useEncryption);
authCheckBox->setChecked(enableAuthentification);
pagescanCheckBox->setChecked(enablePagescan);
@@ -234,79 +229,118 @@ namespace OpieTooth {
* Add fresh found devices from scan dialog to the listing
*
*/
void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
QListViewItem * deviceItem;
QListIterator<RemoteDevice> it(newDevices);
for( ; it.current(); ++it ) {
RemoteDevice *dev = it.current();
deviceItem = new QListViewItem( ListView2, dev->name() );
if (deviceActive( dev ) ) {
- deviceItem->setPixmap(0, onPix);
+ deviceItem->setPixmap( 1 , onPix );
} else {
- deviceItem->setPixmap(0, offPix);
+ deviceItem->setPixmap( 1, offPix );
}
- deviceItem->setText(1, dev->mac() );
+ deviceItem->setText( 3, dev->mac() );
}
}
/*
* 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) {
}
/*
* Search and display avail. services for a device (on expand from device listing)
*
*/
void BlueBase::addServicesToDevice( QListViewItem * item ) {
+
// row of mac adress
- RemoteDevice *device = new RemoteDevice(item->text(1), item->text(0));
- //dann nen manager und darauf dann searchServises, das liefert nen signal, das wieder connected
- // werden muss.
+ RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0));
+
+ deviceList.insert( item->text(3) , item );
+
+// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
+ localDevice->searchServices( *device );
// delete
}
+
+ /**
+ * Overloaded. This one it the one that is connected to the foundServices signal
+ * @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,QListViewItem*>::Iterator it;
+
+ QListViewItem* deviceItem;
+
+ for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
+ if (it.key() == device ) {
+ deviceItem = it.data();
+ }
+ }
+
+ QValueList<OpieTooth::Services>::Iterator it2;
+
+
+
+ QListViewItem * serviceItem;
+
+ for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
+ it2.serviceName()
+ serviceItem = new QListViewItem( deviceItem , it2.serviceName() );
+ }
+
+ }
+
+
/*
* Find out if a device can currently be reached
*/
bool BlueBase::deviceActive( RemoteDevice *device ) {
-
return true;
}
+
/**
* 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>& ) ));
scan->showMaximized();
}
void BlueBase::setInfo() {
StatusLabel->setText(getStatus());
}
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index 7b03f82..dcb7681 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -1,30 +1,32 @@
#ifndef BLUEBASE_H
#define BLUEBASE_H
#include <qvariant.h>
#include <qwidget.h>
#include <qscrollview.h>
#include <qsplitter.h>
#include <qlist.h>
#include <qpixmap.h>
#include "bluetoothbase.h"
+
#include <remotedevice.h>
+#include <manager.h>
class QVBox;
class QHBoxLayout;
class QGridLayout;
class QFrame;
class QLabel;
class QPushButton;
class QTabWidget;
class QCheckBox;
namespace OpieTooth {
class BlueBase : public BluetoothBase {
@@ -35,41 +37,44 @@ namespace OpieTooth {
~BlueBase();
protected:
private slots:
void startScan();
private:
void readConfig();
void writeConfig();
void readSavedDevices();
void writeSavedDevices();
QString getStatus();
void initGui();
void setInfo();
+ Manager *localDevice;
+ QMap<QString,QListViewItem*> deviceList;
bool deviceActive( RemoteDevice *device );
QString deviceName;
QString defaultPasskey;
int useEncryption;
int enableAuthentification;
int enablePagescan;
int enableInquiryscan;
QPixmap offPix;
QPixmap onPix;
private slots:
void addSearchedDevices( QList<RemoteDevice> &newDevices );
void addServicesToDevice( QListViewItem * item );
+ void addServicesToDevice( const QString& device, Services::ValueList );
void startServiceActionClicked( QListViewItem * item );
void startServiceActionHold( QListViewItem * item, const QPoint & point, int column);
void applyConfigChanges();
};
}
#endif