summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 6caca70..5d742b7 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -211,48 +211,49 @@ namespace OpieTooth {
211 211
212 QMessageBox* box = new QMessageBox( this, "Test" ); 212 QMessageBox* box = new QMessageBox( this, "Test" );
213 box->setText( tr( "Changes applied" ) ); 213 box->setText( tr( "Changes applied" ) );
214 box->show(); 214 box->show();
215 215
216 // falls nötig hcid killhupen - die funktionalität adden 216 // falls nötig hcid killhupen - die funktionalität adden
217 } 217 }
218 218
219 219
220 /** 220 /**
221 * Add fresh found devices from scan dialog to the listing 221 * Add fresh found devices from scan dialog to the listing
222 * 222 *
223 */ 223 */
224 void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) { 224 void BlueBase::addSearchedDevices( QList<RemoteDevice> &newDevices ) {
225 225
226 QListViewItem * deviceItem; 226 QListViewItem * deviceItem;
227 227
228 QListIterator<RemoteDevice> it( newDevices ); 228 QListIterator<RemoteDevice> it( newDevices );
229 229
230 for( ; it.current() ; ++it ) { 230 for( ; it.current() ; ++it ) {
231 231
232 232
233 RemoteDevice *dev = it.current(); 233 RemoteDevice *dev = it.current();
234 deviceItem = new QListViewItem( ListView2 , dev->name() ); 234 deviceItem = new QListViewItem( ListView2 , dev->name() );
235 deviceItem->setExpandable ( true );
235 236
236 if ( deviceActive( dev ) ) { 237 if ( deviceActive( dev ) ) {
237 deviceItem->setPixmap( 1 , onPix ); 238 deviceItem->setPixmap( 1 , onPix );
238 } else { 239 } else {
239 deviceItem->setPixmap( 1, offPix ); 240 deviceItem->setPixmap( 1, offPix );
240 } 241 }
241 242
242 deviceItem->setText( 3, dev->mac() ); 243 deviceItem->setText( 3, dev->mac() );
243 244
244 // ggf auch hier? 245 // ggf auch hier?
245 addServicesToDevice( deviceItem ); 246 addServicesToDevice( deviceItem );
246 } 247 }
247 } 248 }
248 249
249 250
250 /** 251 /**
251 * Action that is toggled on entrys on click 252 * Action that is toggled on entrys on click
252 */ 253 */
253 void BlueBase::startServiceActionClicked( QListViewItem *item ) { 254 void BlueBase::startServiceActionClicked( QListViewItem *item ) {
254 255
255 256
256 } 257 }
257 258
258 /** 259 /**
@@ -300,54 +301,61 @@ namespace OpieTooth {
300 if ( it.key() == device ) { 301 if ( it.key() == device ) {
301 deviceItem = it.data(); 302 deviceItem = it.data();
302 } 303 }
303 } 304 }
304 305
305 QValueList<OpieTooth::Services>::Iterator it2; 306 QValueList<OpieTooth::Services>::Iterator it2;
306 307
307 308
308 309
309 QListViewItem * serviceItem; 310 QListViewItem * serviceItem;
310 311
311 for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { 312 for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
312 serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); 313 serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() );
313 } 314 }
314 } 315 }
315 316
316 317
317 /** 318 /**
318 * Add the existing connections (pairs) to the connections tab. 319 * Add the existing connections (pairs) to the connections tab.
319 * 320 *
320 */ 321 */
321 void BlueBase::addConnectedDevices() { 322 void BlueBase::addConnectedDevices() {
322 323
323 324
325 //mac address
326
324 } 327 }
325 328
326 /** 329 /**
327 * Find out if a device can currently be reached 330 * Find out if a device can currently be reached
328 */ 331 */
329 bool BlueBase::deviceActive( RemoteDevice *device ) { 332 bool BlueBase::deviceActive( RemoteDevice *device ) {
333
334 // search by mac
335 //
336 localDevice->isAvailable( device->mac() );
337
330 return true; 338 return true;
331 } 339 }
332 340
333 341
334 /** 342 /**
335 * Open the "scan for devices" dialog 343 * Open the "scan for devices" dialog
336 */ 344 */
337 void BlueBase::startScan() { 345 void BlueBase::startScan() {
338 346
339 ScanDialog *scan = new ScanDialog( this, "", true); 347 ScanDialog *scan = new ScanDialog( this, "", true);
340 QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ), 348 QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ),
341 this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) ); 349 this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) );
342 350
343 scan->showMaximized(); 351 scan->showMaximized();
344 } 352 }
345 353
346 354
347 /** 355 /**
348 * Set the informations about the local device in information Tab 356 * Set the informations about the local device in information Tab
349 */ 357 */
350 void BlueBase::setInfo() { 358 void BlueBase::setInfo() {
351 StatusLabel->setText( getStatus() ); 359 StatusLabel->setText( getStatus() );
352 } 360 }
353 361