summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-06-23 09:10:55 (UTC)
committer harlekin <harlekin>2002-06-23 09:10:55 (UTC)
commit1d773d5df7038410c498d38a68a9569c1350975a (patch) (side-by-side diff)
treea14334997864cf5b01302e9aa05c0c09c72a86b3
parente9f053439c8409ea2e1e57de9bf6f764f994b222 (diff)
downloadopie-1d773d5df7038410c498d38a68a9569c1350975a.zip
opie-1d773d5df7038410c498d38a68a9569c1350975a.tar.gz
opie-1d773d5df7038410c498d38a68a9569c1350975a.tar.bz2
small load save update
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp27
1 files changed, 16 insertions, 11 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 5d742b7..cc51405 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -76,13 +76,12 @@ namespace OpieTooth {
setCaption( tr( "Bluetooth Manager" ) );
readConfig();
initGui();
-
//TESTING
ListView2->setRootIsDecorated(true);
QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
topLV2->setPixmap( 1, onPix );
(void) new QListViewItem( topLV2, "Serial" );
@@ -131,18 +130,31 @@ namespace OpieTooth {
*
*/
void BlueBase::readSavedDevices() {
QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>;
- Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File );
+ QDir deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/");
+ // list of .conf files
+ QStringList devicesFileList = deviceListSave.entryList();
+ // cut .conf of to get the mac and also read the name entry in it.
- // RemoteDevice *currentDevice = RemoteDevice( , );
- //loadedDevices->append( currentDevice );
+ for ( QStringList::Iterator it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) {
+ QString name;
+ QString mac;
+ qDebug((*it).latin1() );
+ Config conf((*it));
+ conf.setGroup("Info");
+ name = conf.readEntry("name", "Error");
+ qDebug("MAC: " + mac);
+ qDebug("NAME: " + name);
+ RemoteDevice currentDevice = RemoteDevice( mac , name );
+ loadedDevices->append( &currentDevice );
+ }
addSearchedDevices( *loadedDevices );
}
/**
* Write the list of allready known devices
*
@@ -188,13 +200,12 @@ namespace OpieTooth {
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);
-
}
/**
* Read the current values from the gui and invoke writeConfig()
*/
@@ -209,13 +220,12 @@ namespace OpieTooth {
writeConfig();
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
@@ -258,13 +268,12 @@ namespace OpieTooth {
/**
* 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)
*
*/
@@ -302,14 +311,12 @@ namespace OpieTooth {
deviceItem = it.data();
}
}
QValueList<OpieTooth::Services>::Iterator it2;
-
-
QListViewItem * serviceItem;
for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() );
}
}
@@ -329,13 +336,12 @@ namespace OpieTooth {
/**
* Find out if a device can currently be reached
*/
bool BlueBase::deviceActive( RemoteDevice *device ) {
// search by mac
- //
localDevice->isAvailable( device->mac() );
return true;
}
@@ -362,9 +368,8 @@ namespace OpieTooth {
/**
* Decontructor
*/
BlueBase::~BlueBase() {
writeSavedDevices();
}
-
}