summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp40
-rw-r--r--noncore/net/opietooth/manager/bluebase.h1
-rw-r--r--noncore/net/opietooth/manager/hciconfwrapper.cpp4
3 files changed, 25 insertions, 20 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 3e7e2ab..d023302 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -36,6 +36,7 @@
36#include <qlistview.h> 36#include <qlistview.h>
37#include <qdir.h> 37#include <qdir.h>
38#include <qpopupmenu.h> 38#include <qpopupmenu.h>
39#include <qtimer.h>
39 40
40#include <qpe/resource.h> 41#include <qpe/resource.h>
41#include <qpe/config.h> 42#include <qpe/config.h>
@@ -65,6 +66,8 @@ namespace OpieTooth {
65 this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) ); 66 this, SLOT( addServicesToDevice( const QString& , Services::ValueList ) ) );
66 connect( localDevice, SIGNAL( available( const QString&, bool ) ), 67 connect( localDevice, SIGNAL( available( const QString&, bool ) ),
67 this, SLOT( deviceActive( const QString& , bool ) ) ); 68 this, SLOT( deviceActive( const QString& , bool ) ) );
69 connect( localDevice, SIGNAL( connections( Connection::ValueList ) ),
70 this, SLOT( addConnectedDevices( Connection::ValueList ) ) );
68 71
69 //Load all icons needed 72 //Load all icons needed
70 73
@@ -92,6 +95,8 @@ namespace OpieTooth {
92 (void) new BTListItem( topLV2, "Serial" ,"", "service" ); 95 (void) new BTListItem( topLV2, "Serial" ,"", "service" );
93 (void) new BTListItem( topLV2, "BlueNiC" , "", "service" ); 96 (void) new BTListItem( topLV2, "BlueNiC" , "", "service" );
94 writeToHciConfig(); 97 writeToHciConfig();
98 // search conncetions
99 addConnectedDevices();
95 } 100 }
96 101
97 102
@@ -295,11 +300,6 @@ namespace OpieTooth {
295 // look if device is avail. atm, async 300 // look if device is avail. atm, async
296 deviceActive( dev ); 301 deviceActive( dev );
297 302
298 // move into the c'tor
299 // deviceItem->setMac( dev->mac() );
300 // what kind of entry is it.
301 //deviceItem->setType( "device");
302
303 // ggf auch hier? 303 // ggf auch hier?
304 addServicesToDevice( deviceItem ); 304 addServicesToDevice( deviceItem );
305 } 305 }
@@ -410,16 +410,6 @@ namespace OpieTooth {
410 } 410 }
411 } 411 }
412 412
413
414 // empty entries
415 // QListViewItem * myChild = deviceItem->firstChild();
416 //QList<QListViewItem*> tmpList;
417 //while( myChild ) {
418 // tmpList.append(myChild);
419 // myChild = myChild->nextSibling();
420 // }
421
422
423 QValueList<OpieTooth::Services>::Iterator it2; 413 QValueList<OpieTooth::Services>::Iterator it2;
424 414
425 BTListItem * serviceItem; 415 BTListItem * serviceItem;
@@ -439,13 +429,29 @@ namespace OpieTooth {
439 429
440 /** 430 /**
441 * Add the existing connections (pairs) to the connections tab. 431 * Add the existing connections (pairs) to the connections tab.
442 * 432 * This one triggers the search
443 */ 433 */
444 void BlueBase::addConnectedDevices() { 434 void BlueBase::addConnectedDevices() {
435 localDevice->searchConnections();
436 }
445 437
446 438
447 //mac address 439 void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) {
440
441 QValueList<OpieTooth::Connection>::Iterator it;
442 BTListItem * connectionItem;
443
444 if ( !connectionList.isEmpty() ) {
445
446 for (it = connectionList.begin(); it != connectionList.end(); ++it) {
447 connectionItem = new BTListItem( ListView4 , (*it).mac() , (*it).mac() , "connection" );
448 }
449 } else {
450 connectionItem = new BTListItem( ListView4 , tr("No connections found"), "", "connection" );
451 }
448 452
453 // recall connection search after some time
454 QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) );
449 } 455 }
450 456
451 /** 457 /**
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index ef67aa2..0516c16 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -69,6 +69,7 @@ namespace OpieTooth {
69 void addServicesToDevice( BTListItem *item ); 69 void addServicesToDevice( BTListItem *item );
70 void addServicesToDevice( const QString& device, Services::ValueList ); 70 void addServicesToDevice( const QString& device, Services::ValueList );
71 void addConnectedDevices(); 71 void addConnectedDevices();
72 void addConnectedDevices( Connection::ValueList );
72 void startServiceActionClicked( QListViewItem *item ); 73 void startServiceActionClicked( QListViewItem *item );
73 void startServiceActionHold( QListViewItem *, const QPoint &, int ); 74 void startServiceActionHold( QListViewItem *, const QPoint &, int );
74 void deviceActive( const QString& mac, bool connected ); 75 void deviceActive( const QString& mac, bool connected );
diff --git a/noncore/net/opietooth/manager/hciconfwrapper.cpp b/noncore/net/opietooth/manager/hciconfwrapper.cpp
index 7b2497a..2d6d7da 100644
--- a/noncore/net/opietooth/manager/hciconfwrapper.cpp
+++ b/noncore/net/opietooth/manager/hciconfwrapper.cpp
@@ -99,16 +99,14 @@ namespace OpieTooth {
99 } else { 99 } else {
100 str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";"); 100 str = str.replace( QRegExp( "\\s*"+key+"\\s+[^\\s][^;]*;" ), key + " " + value + ";");
101 } 101 }
102
103 qDebug( str ); 102 qDebug( str );
104 } 103 }
105
106 outstream << str << endl; 104 outstream << str << endl;
107 } 105 }
108 106
109 f.close(); 107 f.close();
108
110 f2.flush(); 109 f2.flush();
111 f2.close(); 110 f2.close();
112 } 111 }
113
114} 112}