summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp143
-rw-r--r--noncore/net/opietooth/manager/bluebase.h11
-rw-r--r--noncore/net/opietooth/manager/btlistitem.cpp46
-rw-r--r--noncore/net/opietooth/manager/btlistitem.h11
4 files changed, 148 insertions, 63 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 77eb62b..910bb8c 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -61,7 +61,7 @@ namespace OpieTooth {
connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ),
- this, SLOT(startServiceActionHold( QListViewItem *, const QPoint &, int) ) );
+ this, SLOT(startServiceActionHold( BTListItem *, const QPoint &, int) ) );
connect( localDevice , SIGNAL( foundServices( const QString& , Services::ValueList ) ),
this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
- // connect( localDevice, SIGNAL( available( const QString& device, bool connected ) ),
- // this, SLOT() );
+ connect( localDevice, SIGNAL( available( const QString& device, bool connected ) ),
+ this, SLOT( deviceActive( const QString& mac, bool connected ) ) );
@@ -88,7 +88,6 @@ namespace OpieTooth {
- QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
+ BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" );
topLV2->setPixmap( 1, onPix );
- topLV2->setText(4, "device" );
- (void) new QListViewItem( topLV2, "Serial" );
- (void) new QListViewItem( topLV2, "BlueNiC" );
+ (void) new BTListItem( topLV2, "Serial" ,"", "service" );
+ (void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
}
@@ -173,6 +172,7 @@ namespace OpieTooth {
// seperate config file for each device, to store more information in future.
+// TO FIX: BTLISTITEM!!!
- Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (it.current()->text(3)) + ".conf", Config::File );
- conf.setGroup( "Info" );
- conf.writeEntry( "name", it.current()->text(0) );
+ // Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem)it.current())->mac()) + ".conf", Config::File );
+ // conf.setGroup( "Info" );
+ // conf.writeEntry( "name", it.current()->name() );
}
@@ -240,3 +240,3 @@ namespace OpieTooth {
- QListViewItem * deviceItem;
+ BTListItem * deviceItem;
@@ -248,14 +248,12 @@ namespace OpieTooth {
RemoteDevice *dev = it.current();
- deviceItem = new QListViewItem( ListView2 , dev->name() );
+ deviceItem = new BTListItem( ListView2 , dev->name(), dev->mac(), "device" );
deviceItem->setExpandable ( true );
- if ( deviceActive( dev ) ) {
- deviceItem->setPixmap( 1 , onPix );
- } else {
- deviceItem->setPixmap( 1, offPix );
- }
+ // look if device is avail. atm, async
+ deviceActive( dev );
- deviceItem->setText( 3, dev->mac() );
+ // move into the c'tor
+ // deviceItem->setMac( dev->mac() );
// what kind of entry is it.
- deviceItem->setText( 4, "device");
+ //deviceItem->setType( "device");
@@ -278,6 +276,6 @@ namespace OpieTooth {
*/
- void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) {
+ void BlueBase::startServiceActionHold( BTListItem * item, const QPoint & point, int column ) {
QPopupMenu *menu = new QPopupMenu();
- QPopupMenu *groups = new QPopupMenu();
+
int ret=0;
@@ -286,3 +284,6 @@ namespace OpieTooth {
- if ( item->text(4) == "device") {
+ if ( item->type() == "device") {
+
+ QPopupMenu *groups = new QPopupMenu();
+
menu->insertItem( tr("rescan sevices:"), 0);
@@ -290,3 +291,19 @@ namespace OpieTooth {
menu->insertItem( tr("delete"), 2);
- } else if ( item->text(4) == "service") {
+
+
+ ret = menu->exec( point , 0);
+
+ switch(ret) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ // delete childs too
+ delete item;
+ break;
+ }
+ delete groups;
+
+ } else if ( item->type() == "service") {
menu->insertItem( tr("Test1:"), 0);
@@ -294,16 +311,15 @@ namespace OpieTooth {
menu->insertItem( tr("delete"), 2);
- }
- ret = menu->exec( point , 0);
-
-// noch differenzieren
- switch(ret) {
- case 0:
- break;
- case 1:
- break;
- case 2:
- // delete childs too
- delete item;
- break;
+ ret = menu->exec( point , 0);
+
+ switch(ret) {
+ case 0:
+ break;
+ case 1:
+ break;
+ case 2:
+ // delete childs too
+ delete item;
+ break;
+ }
}
@@ -311,3 +327,2 @@ namespace OpieTooth {
delete menu;
- delete groups;
}
@@ -318,3 +333,3 @@ namespace OpieTooth {
*/
- void BlueBase::addServicesToDevice( QListViewItem * item ) {
+ void BlueBase::addServicesToDevice( BTListItem * item ) {
@@ -322,5 +337,5 @@ namespace OpieTooth {
// row of mac adress text(3)
- RemoteDevice *device = new RemoteDevice( item->text(3), item->text(0) );
+ RemoteDevice *device = new RemoteDevice( item->mac(), item->name() );
- deviceList.insert( item->text(3) , item );
+ deviceList.insert( item->mac() , item );
@@ -342,5 +357,5 @@ namespace OpieTooth {
- QMap<QString,QListViewItem*>::Iterator it;
+ QMap<QString,BTListItem*>::Iterator it;
- QListViewItem* deviceItem;
+ BTListItem* deviceItem;
@@ -365,3 +380,3 @@ namespace OpieTooth {
- QListViewItem * serviceItem;
+ BTListItem * serviceItem;
@@ -370,8 +385,8 @@ namespace OpieTooth {
for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
- serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() );
- serviceItem->setText(4, "service");
+ serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" );
+ //serviceItem->setText(4, "service");
}
} else {
- serviceItem = new QListViewItem( deviceItem , tr("no services found") );
- serviceItem->setText(4, "service");
+ serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" );
+ //serviceItem->setText(4, "service");
}
@@ -394,11 +409,35 @@ namespace OpieTooth {
*/
- bool BlueBase::deviceActive( RemoteDevice *device ) {
-
- // search by mac
- localDevice->isAvailable( device->mac() );
+ void BlueBase::deviceActive( RemoteDevice *device ) {
- return true;
+ // search by mac, async, gets a signal back
+ localDevice->isAvailable( device->mac() );
}
+ /**
+ * The signal catcher. Set the avail. status on device.
+ * @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;
+
+ // get the right devices which requested the search
+ for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
+ if ( it.key() == device ) {
+ deviceItem = it.data();
+ }
+ }
+
+ if ( connected ) {
+ deviceItem->setPixmap( 1, onPix );
+ } else {
+ deviceItem->setPixmap( 1, offPix );
+ }
+
+ }
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index dee721d..481f0c9 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -12,3 +12,3 @@
#include "bluetoothbase.h"
-
+#include "btlistitem.h"
@@ -51,5 +51,5 @@ namespace OpieTooth {
Manager *localDevice;
- QMap<QString,QListViewItem*> deviceList;
+ QMap<QString,BTListItem*> deviceList;
- bool deviceActive( RemoteDevice *device );
+ void deviceActive( RemoteDevice *device );
@@ -67,3 +67,3 @@ namespace OpieTooth {
void addSearchedDevices( QList<RemoteDevice> &newDevices );
- void addServicesToDevice( QListViewItem *item );
+ void addServicesToDevice( BTListItem *item );
void addServicesToDevice( const QString& device, Services::ValueList );
@@ -71,3 +71,4 @@ namespace OpieTooth {
void startServiceActionClicked( QListViewItem *item );
- void startServiceActionHold( QListViewItem *, const QPoint &, int );
+ void startServiceActionHold( BTListItem *, const QPoint &, int );
+ void deviceActive( const QString& mac, bool connected );
void applyConfigChanges();
diff --git a/noncore/net/opietooth/manager/btlistitem.cpp b/noncore/net/opietooth/manager/btlistitem.cpp
index 19d1057..ce5b141 100644
--- a/noncore/net/opietooth/manager/btlistitem.cpp
+++ b/noncore/net/opietooth/manager/btlistitem.cpp
@@ -7,3 +7,5 @@ namespace OpieTooth {
BTListItem::BTListItem( QListView * parent ) : QListViewItem( parent ) {
-
+ m_name = "";
+ m_mac ="";
+ m_type ="";
}
@@ -11,3 +13,5 @@ namespace OpieTooth {
BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) {
-
+ m_name = "";
+ m_mac ="";
+ m_type ="";
}
@@ -18,4 +22,6 @@ namespace OpieTooth {
: QListViewItem( parent, name ){
- setText(4, mac);
- setText(5, type);
+
+ m_name = name;
+ m_mac = mac;
+ m_type = type;
@@ -25,6 +31,34 @@ namespace OpieTooth {
: QListViewItem( parent, name ){
- setText(4, mac);
- setText(5, type);
+
+ m_name = name;
+ m_mac = mac;
+ m_type = type;
+ }
+
+
+ void BTListItem::setMac( QString mac ) {
+ m_mac = mac;
+ }
+
+ QString BTListItem::mac() {
+ return m_mac;
}
+ void BTListItem::setName( QString name ) {
+ m_name = name;
+ }
+
+ QString BTListItem::name() {
+ return m_name;
+ }
+
+ void BTListItem::setType( QString type ) {
+ m_type = type;
+ }
+
+ QString BTListItem::type() {
+ return m_type;
+ }
+
+
BTListItem::~BTListItem() {
diff --git a/noncore/net/opietooth/manager/btlistitem.h b/noncore/net/opietooth/manager/btlistitem.h
index 92b3803..8963caa 100644
--- a/noncore/net/opietooth/manager/btlistitem.h
+++ b/noncore/net/opietooth/manager/btlistitem.h
@@ -18,2 +18,13 @@ namespace OpieTooth {
+ void setMac( QString );
+ QString mac();
+ void setName( QString );
+ QString name();
+ void setType( QString );
+ QString type();
+ private:
+ QString m_name;
+ QString m_mac;
+ QString m_type;
+
};