Diffstat (limited to 'noncore/net/opietooth/manager/bluebase.cpp') (more/less context) (ignore whitespace changes)
| -rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 68 |
1 files changed, 15 insertions, 53 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index d023302..2001db1 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp @@ -44,3 +44,3 @@ #include <remotedevice.h> - +#include <services.h> @@ -48,3 +48,2 @@ namespace OpieTooth { - BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) @@ -61,3 +60,2 @@ namespace OpieTooth { this, SLOT( startServiceActionClicked( QListViewItem* ) ) ); - // hehe, cast right later connect( ListView2, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int ) ), @@ -72,3 +70,2 @@ namespace OpieTooth { //Load all icons needed - offPix = Resource::loadPixmap( "editdelete" ); @@ -96,2 +93,3 @@ namespace OpieTooth { (void) new BTListItem( topLV2, "BlueNiC" , "", "service" ); + writeToHciConfig(); @@ -99,4 +97,4 @@ namespace OpieTooth { addConnectedDevices(); - } - + iconLoader = new BTIconLoader(); + } @@ -110,3 +108,2 @@ namespace OpieTooth { - deviceName = cfg.readEntry( "name" , "No name" ); // name the device should identify with @@ -117,3 +114,2 @@ namespace OpieTooth { enableInquiryscan = cfg.readNumEntry( "enableInquiryscan" , 1 ); - } @@ -125,3 +121,2 @@ namespace OpieTooth { - Config cfg( "bluetoothmanager" ); @@ -212,3 +207,2 @@ namespace OpieTooth { void BlueBase::writeSavedDevices() { - QListViewItemIterator it( ListView2 ); @@ -216,8 +210,5 @@ namespace OpieTooth { for ( ; it.current(); ++it ) { - // seperate config file for each device, to store more information in future. -// TO FIX: BTLISTITEM!!! qDebug( "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf"); Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf", Config::File ); - conf.setGroup( "Info" ); @@ -232,5 +223,3 @@ namespace OpieTooth { void BlueBase::initGui() { - StatusLabel->setText( getStatus() ); // maybe move it to getStatus() - cryptCheckBox->setChecked( useEncryption ); @@ -251,3 +240,2 @@ namespace OpieTooth { QString BlueBase::getStatus(){ - QString infoString = tr( "<b>Device name : </b> Ipaq" ); @@ -264,3 +252,2 @@ namespace OpieTooth { void BlueBase::applyConfigChanges() { - deviceName = deviceNameLine->text(); @@ -274,3 +261,2 @@ namespace OpieTooth { - QMessageBox* box = new QMessageBox( this, "Test" ); @@ -278,5 +264,3 @@ namespace OpieTooth { box->show(); - // falls nötig hcid killhupen - die funktionalität adden - } - + } @@ -287,5 +271,3 @@ namespace OpieTooth { void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { - BTListItem * deviceItem; - QListIterator<RemoteDevice> it( newDevices ); @@ -294,3 +276,2 @@ namespace OpieTooth { - RemoteDevice *dev = it.current(); @@ -312,4 +293,2 @@ namespace OpieTooth { void BlueBase::startServiceActionClicked( QListViewItem *item ) { - - } @@ -322,8 +301,4 @@ namespace OpieTooth { QPopupMenu *menu = new QPopupMenu(); - int ret=0; - - //QSize s = menu->sizeHint ( ); - if ( ((BTListItem*)item)->type() == "device") { @@ -334,4 +309,4 @@ namespace OpieTooth { menu->insertItem( tr("to group"), groups , 1); - menu->insertItem( tr("delete"), 2); - + menu->insertItem( tr("bound device"), 2); + menu->insertItem( tr("delete"), 3); @@ -345,2 +320,5 @@ namespace OpieTooth { case 2: + // make connection + break; + case 3: // delete childs too @@ -369,3 +347,2 @@ namespace OpieTooth { } - delete menu; @@ -378,3 +355,2 @@ namespace OpieTooth { void BlueBase::addServicesToDevice( BTListItem * item ) { - qDebug("addServicesToDevice"); @@ -382,9 +358,6 @@ namespace OpieTooth { RemoteDevice *device = new RemoteDevice( item->mac(), item->name() ); - deviceList.insert( item->mac() , item ); - // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back localDevice->searchServices( *device ); - - // delete + delete device; } @@ -398,3 +371,2 @@ namespace OpieTooth { void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { - qDebug("fill services list"); @@ -402,4 +374,3 @@ namespace OpieTooth { QMap<QString,BTListItem*>::Iterator it; - - BTListItem* deviceItem; + BTListItem* deviceItem = 0; @@ -413,3 +384,2 @@ namespace OpieTooth { QValueList<OpieTooth::Services>::Iterator it2; - BTListItem * serviceItem; @@ -420,3 +390,3 @@ namespace OpieTooth { serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" ); - //serviceItem->setText(4, "service"); + serviceItem->setPixmap( 0, iconLoader->serviceIcon( (*it2).classIdList() ) ); } @@ -424,3 +394,2 @@ namespace OpieTooth { serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" ); - //serviceItem->setText(4, "service"); } @@ -439,3 +408,2 @@ namespace OpieTooth { void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) { - QValueList<OpieTooth::Connection>::Iterator it; @@ -460,3 +428,2 @@ namespace OpieTooth { void BlueBase::deviceActive( RemoteDevice *device ) { - // search by mac, async, gets a signal back @@ -471,3 +438,2 @@ namespace OpieTooth { void BlueBase::deviceActive( const QString& device, bool connected ) { - qDebug("deviceActive slot"); @@ -475,4 +441,3 @@ namespace OpieTooth { QMap<QString,BTListItem*>::Iterator it; - - BTListItem* deviceItem; + BTListItem* deviceItem = 0; @@ -490,7 +455,4 @@ namespace OpieTooth { } - } - - /** @@ -499,3 +461,2 @@ namespace OpieTooth { void BlueBase::startScan() { - ScanDialog *scan = new ScanDialog( this, "", true); @@ -520,2 +481,3 @@ namespace OpieTooth { writeSavedDevices(); + delete iconLoader; } |