author | harlekin <harlekin> | 2002-06-28 21:53:42 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-28 21:53:42 (UTC) |
commit | 05a76394214a0066325c71f91eb44ed7412df67c (patch) (side-by-side diff) | |
tree | 2b8995a8670ab3bda9a93bd37792117a4a4fa603 /noncore/net/opietooth/manager | |
parent | 26be5facf38c25f2b22b18a19ea7fa710f5e2236 (diff) | |
download | opie-05a76394214a0066325c71f91eb44ed7412df67c.zip opie-05a76394214a0066325c71f91eb44ed7412df67c.tar.gz opie-05a76394214a0066325c71f91eb44ed7412df67c.tar.bz2 |
connection view started
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 40 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/hciconfwrapper.cpp | 4 |
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 @@ -38,2 +38,3 @@ #include <qpopupmenu.h> +#include <qtimer.h> @@ -67,2 +68,4 @@ namespace OpieTooth { this, SLOT( deviceActive( const QString& , bool ) ) ); + connect( localDevice, SIGNAL( connections( Connection::ValueList ) ), + this, SLOT( addConnectedDevices( Connection::ValueList ) ) ); @@ -94,2 +97,4 @@ namespace OpieTooth { writeToHciConfig(); + // search conncetions + addConnectedDevices(); } @@ -297,7 +302,2 @@ namespace OpieTooth { - // move into the c'tor - // deviceItem->setMac( dev->mac() ); - // what kind of entry is it. - //deviceItem->setType( "device"); - // ggf auch hier? @@ -412,12 +412,2 @@ namespace OpieTooth { - - // empty entries - // QListViewItem * myChild = deviceItem->firstChild(); - //QList<QListViewItem*> tmpList; - //while( myChild ) { - // tmpList.append(myChild); - // myChild = myChild->nextSibling(); - // } - - QValueList<OpieTooth::Services>::Iterator it2; @@ -441,9 +431,25 @@ namespace OpieTooth { * Add the existing connections (pairs) to the connections tab. - * + * This one triggers the search */ void BlueBase::addConnectedDevices() { + localDevice->searchConnections(); + } - //mac address + void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) { + + QValueList<OpieTooth::Connection>::Iterator it; + BTListItem * connectionItem; + + if ( !connectionList.isEmpty() ) { + + for (it = connectionList.begin(); it != connectionList.end(); ++it) { + connectionItem = new BTListItem( ListView4 , (*it).mac() , (*it).mac() , "connection" ); + } + } else { + connectionItem = new BTListItem( ListView4 , tr("No connections found"), "", "connection" ); + } + // recall connection search after some time + QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) ); } 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 @@ -71,2 +71,3 @@ namespace OpieTooth { void addConnectedDevices(); + void addConnectedDevices( Connection::ValueList ); void startServiceActionClicked( QListViewItem *item ); 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 @@ -101,6 +101,4 @@ namespace OpieTooth { } - qDebug( str ); } - outstream << str << endl; @@ -109,2 +107,3 @@ namespace OpieTooth { f.close(); + f2.flush(); @@ -112,3 +111,2 @@ namespace OpieTooth { } - } |