author | harlekin <harlekin> | 2002-06-23 09:10:55 (UTC) |
---|---|---|
committer | harlekin <harlekin> | 2002-06-23 09:10:55 (UTC) |
commit | 1d773d5df7038410c498d38a68a9569c1350975a (patch) (unidiff) | |
tree | a14334997864cf5b01302e9aa05c0c09c72a86b3 | |
parent | e9f053439c8409ea2e1e57de9bf6f764f994b222 (diff) | |
download | opie-1d773d5df7038410c498d38a68a9569c1350975a.zip opie-1d773d5df7038410c498d38a68a9569c1350975a.tar.gz opie-1d773d5df7038410c498d38a68a9569c1350975a.tar.bz2 |
small load save update
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 27 |
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 | |||
@@ -74,17 +74,16 @@ namespace OpieTooth { | |||
74 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); | 74 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); |
75 | this->setPalette( pal ); | 75 | this->setPalette( pal ); |
76 | 76 | ||
77 | setCaption( tr( "Bluetooth Manager" ) ); | 77 | setCaption( tr( "Bluetooth Manager" ) ); |
78 | 78 | ||
79 | readConfig(); | 79 | readConfig(); |
80 | initGui(); | 80 | initGui(); |
81 | 81 | ||
82 | |||
83 | //TESTING | 82 | //TESTING |
84 | ListView2->setRootIsDecorated(true); | 83 | ListView2->setRootIsDecorated(true); |
85 | 84 | ||
86 | QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); | 85 | QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); |
87 | topLV2->setPixmap( 1, onPix ); | 86 | topLV2->setPixmap( 1, onPix ); |
88 | (void) new QListViewItem( topLV2, "Serial" ); | 87 | (void) new QListViewItem( topLV2, "Serial" ); |
89 | (void) new QListViewItem( topLV2, "BlueNiC" ); | 88 | (void) new QListViewItem( topLV2, "BlueNiC" ); |
90 | } | 89 | } |
@@ -129,22 +128,35 @@ namespace OpieTooth { | |||
129 | /** | 128 | /** |
130 | * Read the list of allready known devices | 129 | * Read the list of allready known devices |
131 | * | 130 | * |
132 | */ | 131 | */ |
133 | void BlueBase::readSavedDevices() { | 132 | void BlueBase::readSavedDevices() { |
134 | 133 | ||
135 | QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>; | 134 | QList<RemoteDevice> *loadedDevices = new QList<RemoteDevice>; |
136 | 135 | ||
137 | Config deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/devicelist.conf", Config::File ); | 136 | QDir deviceListSave( QDir::homeDirPath() + "/Settings/bluetooth/"); |
137 | // list of .conf files | ||
138 | QStringList devicesFileList = deviceListSave.entryList(); | ||
138 | 139 | ||
140 | // cut .conf of to get the mac and also read the name entry in it. | ||
139 | 141 | ||
140 | // RemoteDevice *currentDevice = RemoteDevice( , ); | 142 | for ( QStringList::Iterator it = devicesFileList.begin(); it != devicesFileList.end(); ++it ) { |
141 | //loadedDevices->append( currentDevice ); | ||
142 | 143 | ||
144 | QString name; | ||
145 | QString mac; | ||
146 | qDebug((*it).latin1() ); | ||
147 | Config conf((*it)); | ||
148 | conf.setGroup("Info"); | ||
149 | name = conf.readEntry("name", "Error"); | ||
150 | qDebug("MAC: " + mac); | ||
151 | qDebug("NAME: " + name); | ||
152 | RemoteDevice currentDevice = RemoteDevice( mac , name ); | ||
153 | loadedDevices->append( ¤tDevice ); | ||
154 | } | ||
143 | addSearchedDevices( *loadedDevices ); | 155 | addSearchedDevices( *loadedDevices ); |
144 | } | 156 | } |
145 | 157 | ||
146 | /** | 158 | /** |
147 | * Write the list of allready known devices | 159 | * Write the list of allready known devices |
148 | * | 160 | * |
149 | */ | 161 | */ |
150 | void BlueBase::writeSavedDevices() { | 162 | void BlueBase::writeSavedDevices() { |
@@ -186,17 +198,16 @@ namespace OpieTooth { | |||
186 | */ | 198 | */ |
187 | QString BlueBase::getStatus(){ | 199 | QString BlueBase::getStatus(){ |
188 | 200 | ||
189 | QString infoString = tr( "<b>Device name : </b> Ipaq" ); | 201 | QString infoString = tr( "<b>Device name : </b> Ipaq" ); |
190 | infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); | 202 | infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); |
191 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); | 203 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); |
192 | 204 | ||
193 | return (infoString); | 205 | return (infoString); |
194 | |||
195 | } | 206 | } |
196 | 207 | ||
197 | 208 | ||
198 | /** | 209 | /** |
199 | * Read the current values from the gui and invoke writeConfig() | 210 | * Read the current values from the gui and invoke writeConfig() |
200 | */ | 211 | */ |
201 | void BlueBase::applyConfigChanges() { | 212 | void BlueBase::applyConfigChanges() { |
202 | 213 | ||
@@ -207,17 +218,16 @@ namespace OpieTooth { | |||
207 | enablePagescan = pagescanCheckBox->isChecked(); | 218 | enablePagescan = pagescanCheckBox->isChecked(); |
208 | enableInquiryscan = inquiryscanCheckBox->isChecked(); | 219 | enableInquiryscan = inquiryscanCheckBox->isChecked(); |
209 | 220 | ||
210 | writeConfig(); | 221 | writeConfig(); |
211 | 222 | ||
212 | QMessageBox* box = new QMessageBox( this, "Test" ); | 223 | QMessageBox* box = new QMessageBox( this, "Test" ); |
213 | box->setText( tr( "Changes applied" ) ); | 224 | box->setText( tr( "Changes applied" ) ); |
214 | box->show(); | 225 | box->show(); |
215 | |||
216 | // falls nötig hcid killhupen - die funktionalität adden | 226 | // falls nötig hcid killhupen - die funktionalität adden |
217 | } | 227 | } |
218 | 228 | ||
219 | 229 | ||
220 | /** | 230 | /** |
221 | * Add fresh found devices from scan dialog to the listing | 231 | * Add fresh found devices from scan dialog to the listing |
222 | * | 232 | * |
223 | */ | 233 | */ |
@@ -256,17 +266,16 @@ namespace OpieTooth { | |||
256 | 266 | ||
257 | } | 267 | } |
258 | 268 | ||
259 | /** | 269 | /** |
260 | * Action that are toggled on hold (mostly QPopups i guess) | 270 | * Action that are toggled on hold (mostly QPopups i guess) |
261 | */ | 271 | */ |
262 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) { | 272 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) { |
263 | 273 | ||
264 | |||
265 | } | 274 | } |
266 | 275 | ||
267 | /** | 276 | /** |
268 | * Search and display avail. services for a device (on expand from device listing) | 277 | * Search and display avail. services for a device (on expand from device listing) |
269 | * | 278 | * |
270 | */ | 279 | */ |
271 | void BlueBase::addServicesToDevice( QListViewItem * item ) { | 280 | void BlueBase::addServicesToDevice( QListViewItem * item ) { |
272 | 281 | ||
@@ -300,18 +309,16 @@ namespace OpieTooth { | |||
300 | for( it = deviceList.begin(); it != deviceList.end(); ++it ) { | 309 | for( it = deviceList.begin(); it != deviceList.end(); ++it ) { |
301 | if ( it.key() == device ) { | 310 | if ( it.key() == device ) { |
302 | deviceItem = it.data(); | 311 | deviceItem = it.data(); |
303 | } | 312 | } |
304 | } | 313 | } |
305 | 314 | ||
306 | QValueList<OpieTooth::Services>::Iterator it2; | 315 | QValueList<OpieTooth::Services>::Iterator it2; |
307 | 316 | ||
308 | |||
309 | |||
310 | QListViewItem * serviceItem; | 317 | QListViewItem * serviceItem; |
311 | 318 | ||
312 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { | 319 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { |
313 | serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); | 320 | serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); |
314 | } | 321 | } |
315 | } | 322 | } |
316 | 323 | ||
317 | 324 | ||
@@ -327,17 +334,16 @@ namespace OpieTooth { | |||
327 | } | 334 | } |
328 | 335 | ||
329 | /** | 336 | /** |
330 | * Find out if a device can currently be reached | 337 | * Find out if a device can currently be reached |
331 | */ | 338 | */ |
332 | bool BlueBase::deviceActive( RemoteDevice *device ) { | 339 | bool BlueBase::deviceActive( RemoteDevice *device ) { |
333 | 340 | ||
334 | // search by mac | 341 | // search by mac |
335 | // | ||
336 | localDevice->isAvailable( device->mac() ); | 342 | localDevice->isAvailable( device->mac() ); |
337 | 343 | ||
338 | return true; | 344 | return true; |
339 | } | 345 | } |
340 | 346 | ||
341 | 347 | ||
342 | /** | 348 | /** |
343 | * Open the "scan for devices" dialog | 349 | * Open the "scan for devices" dialog |
@@ -360,11 +366,10 @@ namespace OpieTooth { | |||
360 | } | 366 | } |
361 | 367 | ||
362 | /** | 368 | /** |
363 | * Decontructor | 369 | * Decontructor |
364 | */ | 370 | */ |
365 | BlueBase::~BlueBase() { | 371 | BlueBase::~BlueBase() { |
366 | writeSavedDevices(); | 372 | writeSavedDevices(); |
367 | } | 373 | } |
368 | |||
369 | } | 374 | } |
370 | 375 | ||