| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 83 | ||||
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 3 |
2 files changed, 45 insertions, 41 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 7a92dc3..6caca70 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -64,39 +64,32 @@ namespace OpieTooth { offPix = Resource::loadPixmap( "editdelete" ); 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); + 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 ); setCaption( tr( "Bluetooth Manager" ) ); readConfig(); initGui(); //TESTING - ListView2->setRootIsDecorated(true); - QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes"); - topLV->setPixmap( 1, offPix ); - // (void) new QListViewItem( topLV, "on" ); - //(void) new QListViewItem( topLV, "off" ); - QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); topLV2->setPixmap( 1, onPix ); - (void) new QListViewItem( topLV2, "on" ); - (void) new QListViewItem( topLV2, "off" ); - + (void) new QListViewItem( topLV2, "Serial" ); + (void) new QListViewItem( topLV2, "BlueNiC" ); } /** * Reads all options from the config file */ @@ -130,13 +123,13 @@ namespace OpieTooth { 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>; @@ -147,13 +140,13 @@ namespace OpieTooth { // RemoteDevice *currentDevice = RemoteDevice( , ); //loadedDevices->append( currentDevice ); addSearchedDevices( *loadedDevices ); } - /* + /** * Write the list of allready known devices * */ void BlueBase::writeSavedDevices() { QListViewItemIterator it( ListView2 ); @@ -171,34 +164,34 @@ namespace OpieTooth { /** * Set up the gui */ void BlueBase::initGui() { - StatusLabel->setText(getStatus()); // maybe move it to getStatus() + StatusLabel->setText( getStatus() ); // maybe move it to getStatus() - cryptCheckBox->setChecked(useEncryption); - authCheckBox->setChecked(enableAuthentification); - pagescanCheckBox->setChecked(enablePagescan); - inquiryscanCheckBox->setChecked(enableInquiryscan); - deviceNameLine->setText(deviceName); - passkeyLine->setText(defaultPasskey); + cryptCheckBox->setChecked( useEncryption ); + authCheckBox->setChecked( enableAuthentification ); + pagescanCheckBox->setChecked( enablePagescan ); + inquiryscanCheckBox->setChecked( enableInquiryscan ); + deviceNameLine->setText( deviceName ); + passkeyLine->setText( defaultPasskey ); // set info tab setInfo(); } /** * Get the status informations and returns it * @return QString the status informations gathered */ QString BlueBase::getStatus(){ - QString infoString = tr("<b>Device name : </b> Ipaq" ); - infoString += QString("<br><b>" + tr("MAC adress: ") +"</b> No idea"); - infoString += QString("<br><b>" + tr("Class") + "</b> PDA"); + QString infoString = tr( "<b>Device name : </b> Ipaq" ); + infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); + infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); return (infoString); } @@ -218,16 +211,16 @@ namespace OpieTooth { QMessageBox* box = new QMessageBox( this, "Test" ); box->setText( tr( "Changes applied" ) ); box->show(); // falls nötig hcid killhupen - die funktionalität adden -} + } - /* + /** * Add fresh found devices from scan dialog to the listing * */ void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { QListViewItem * deviceItem; @@ -251,41 +244,41 @@ namespace OpieTooth { // ggf auch hier? addServicesToDevice( deviceItem ); } } - /* + /** * 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 ) { qDebug("addServicesToDevice"); // row of mac adress - RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0)); + 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 + // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back localDevice->searchServices( *device ); // delete } @@ -301,32 +294,39 @@ namespace OpieTooth { QMap<QString,QListViewItem*>::Iterator it; QListViewItem* deviceItem; for( it = deviceList.begin(); it != deviceList.end(); ++it ) { - if (it.key() == device ) { + 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() ); } - } - /* + /** + * Add the existing connections (pairs) to the connections tab. + * + */ + void BlueBase::addConnectedDevices() { + + + } + + /** * Find out if a device can currently be reached */ bool BlueBase::deviceActive( RemoteDevice *device ) { return true; } @@ -334,19 +334,22 @@ namespace OpieTooth { /** * 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>& ) )); + QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ), + this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) ); scan->showMaximized(); } + /** + * Set the informations about the local device in information Tab + */ void BlueBase::setInfo() { StatusLabel->setText( getStatus() ); } /** * Decontructor diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index d20d05c..99d2fa6 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h @@ -62,16 +62,17 @@ namespace OpieTooth { int enablePagescan; int enableInquiryscan; QPixmap offPix; QPixmap onPix; - public slots: + private slots: void addSearchedDevices( QList<RemoteDevice> &newDevices ); void addServicesToDevice( QListViewItem *item ); void addServicesToDevice( const QString& device, Services::ValueList ); + void addConnectedDevices(); void startServiceActionClicked( QListViewItem *item ); void startServiceActionHold( QListViewItem *item, const QPoint &point, int column); void applyConfigChanges(); }; |