summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-20 19:41:55 (UTC)
committer harlekin <harlekin>2002-07-20 19:41:55 (UTC)
commit62e980bfddd33cbd66cccd4c013780ec6e964523 (patch) (unidiff)
tree442a4f3c45505b0cdd159e705e8200a4cf5a0cfc
parent2ba2f7293e6b7b7b54e733ff84e0b57f0dbc3dfc (diff)
downloadopie-62e980bfddd33cbd66cccd4c013780ec6e964523.zip
opie-62e980bfddd33cbd66cccd4c013780ec6e964523.tar.gz
opie-62e980bfddd33cbd66cccd4c013780ec6e964523.tar.bz2
clear Connection tab before adding each search and documentation updates
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp35
1 files changed, 26 insertions, 9 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 598ce16..d2854a1 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -143,15 +143,14 @@ void BlueBase::writeConfig() {
143 writeToHciConfig(); 143 writeToHciConfig();
144} 144}
145 145
146/**
147 * Modify the hcid.conf file to our needs
148 */
146void BlueBase::writeToHciConfig() { 149void BlueBase::writeToHciConfig() {
147 qWarning("writeToHciConfig"); 150 qWarning("writeToHciConfig");
148 HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" ); 151 HciConfWrapper hciconf ( "/etc/bluetooth/hcid.conf" );
149 hciconf.load(); 152 hciconf.load();
150 hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" ); 153 hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
151
152
153 // hciconf->setPinHelper( "/bin/QtPalmtop/bin/blue-pin" );
154
155 hciconf.setName( m_deviceName ); 154 hciconf.setName( m_deviceName );
156 hciconf.setEncrypt( m_useEncryption ); 155 hciconf.setEncrypt( m_useEncryption );
157 hciconf.setAuth( m_enableAuthentification ); 156 hciconf.setAuth( m_enableAuthentification );
@@ -174,6 +173,7 @@ void BlueBase::readSavedDevices() {
174 addSearchedDevices( loadedDevices ); 173 addSearchedDevices( loadedDevices );
175} 174}
176 175
176
177/** 177/**
178 * Write the list of allready known devices 178 * Write the list of allready known devices
179 * 179 *
@@ -277,6 +277,7 @@ void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
277void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { 277void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) {
278} 278}
279 279
280
280/** 281/**
281 * Action that are toggled on hold (mostly QPopups i guess) 282 * Action that are toggled on hold (mostly QPopups i guess)
282 */ 283 */
@@ -313,7 +314,8 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
313 delete groups; 314 delete groups;
314 315
315 } 316 }
316 /** 317
318 /*
317 * We got service sensitive PopupMenus in our factory 319 * We got service sensitive PopupMenus in our factory
318 * We will create one through the factory and will insert 320 * We will create one through the factory and will insert
319 * our Separator + ShowInfo into the menu or create a new 321 * our Separator + ShowInfo into the menu or create a new
@@ -363,10 +365,11 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin
363 delete menu; 365 delete menu;
364} 366}
365 367
366 /** 368
367 * Search and display avail. services for a device (on expand from device listing) 369/**
368 * 370 * Search and display avail. services for a device (on expand from device listing)
369 */ 371 * @param item the service item returned
372 */
370void BlueBase::addServicesToDevice( BTDeviceItem * item ) { 373void BlueBase::addServicesToDevice( BTDeviceItem * item ) {
371 qDebug("addServicesToDevice"); 374 qDebug("addServicesToDevice");
372 // row of mac adress text(3) 375 // row of mac adress text(3)
@@ -430,7 +433,15 @@ void BlueBase::addConnectedDevices() {
430} 433}
431 434
432 435
436/**
437 * This adds the found connections to the connection tab.
438 * @param connectionList the ValueList with all current connections
439 */
433void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) { 440void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) {
441
442 // clear the ListView first
443 ListView4->clear();
444
434 QValueList<OpieTooth::ConnectionState>::Iterator it; 445 QValueList<OpieTooth::ConnectionState>::Iterator it;
435 BTConnectionItem * connectionItem; 446 BTConnectionItem * connectionItem;
436 447
@@ -449,8 +460,10 @@ void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
449 QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) ); 460 QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) );
450} 461}
451 462
463
452/** 464/**
453 * Find out if a device can currently be reached 465 * Find out if a device can currently be reached
466 * @param device
454 */ 467 */
455void BlueBase::deviceActive( const RemoteDevice &device ) { 468void BlueBase::deviceActive( const RemoteDevice &device ) {
456 // search by mac, async, gets a signal back 469 // search by mac, async, gets a signal back
@@ -458,6 +471,7 @@ void BlueBase::deviceActive( const RemoteDevice &device ) {
458 m_localDevice->isAvailable( device.mac() ); 471 m_localDevice->isAvailable( device.mac() );
459} 472}
460 473
474
461/** 475/**
462 * The signal catcher. Set the avail. status on device. 476 * The signal catcher. Set the avail. status on device.
463 * @param device - the mac address 477 * @param device - the mac address
@@ -483,6 +497,7 @@ void BlueBase::deviceActive( const QString& device, bool connected ) {
483 m_deviceList.remove( it ); 497 m_deviceList.remove( it );
484} 498}
485 499
500
486/** 501/**
487 * Open the "scan for devices" dialog 502 * Open the "scan for devices" dialog
488 */ 503 */
@@ -503,6 +518,7 @@ void BlueBase::setInfo() {
503 StatusLabel->setText( status() ); 518 StatusLabel->setText( status() );
504} 519}
505 520
521
506/** 522/**
507 * Decontructor 523 * Decontructor
508 */ 524 */
@@ -511,6 +527,7 @@ BlueBase::~BlueBase() {
511 delete m_iconLoader; 527 delete m_iconLoader;
512} 528}
513 529
530
514/** 531/**
515 * find searches the ListView for a BTDeviceItem containig 532 * find searches the ListView for a BTDeviceItem containig
516 * the same Device if found return true else false 533 * the same Device if found return true else false