author | zecke <zecke> | 2002-07-12 17:14:58 (UTC) |
---|---|---|
committer | zecke <zecke> | 2002-07-12 17:14:58 (UTC) |
commit | 89dce758480cc90502ad14b6c4cf80774e6c1845 (patch) (unidiff) | |
tree | 2ff4e635c8aa86385dfd896084f5cd419efd0840 /noncore/net/opietooth/manager | |
parent | 716211b5e06bb25145cfbcf62a11a7c52c79dde5 (diff) | |
download | opie-89dce758480cc90502ad14b6c4cf80774e6c1845.zip opie-89dce758480cc90502ad14b6c4cf80774e6c1845.tar.gz opie-89dce758480cc90502ad14b6c4cf80774e6c1845.tar.bz2 |
- Connection -> ConnectionState
- Factory adjustments
- Factory function
- Refactoring the QListViewItem derived class
BTListItem
|
- BTDeviceItem for RemoteDevices
|
- BTServiceItem for Services
|
- BTConnectionItem for ConnectionState
- misc bug fixes
Diffstat (limited to 'noncore/net/opietooth/manager') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 84 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.h | 11 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btlistitem.cpp | 60 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/btlistitem.h | 21 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/manager.pro | 4 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.cpp | 9 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/popuphelper.h | 6 |
7 files changed, 78 insertions, 117 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 85c6717..9cfeaa2 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -35,24 +35,26 @@ | |||
35 | #include <qlineedit.h> | 35 | #include <qlineedit.h> |
36 | #include <qlistview.h> | 36 | #include <qlistview.h> |
37 | #include <qdir.h> | 37 | #include <qdir.h> |
38 | #include <qpopupmenu.h> | 38 | #include <qpopupmenu.h> |
39 | #include <qtimer.h> | 39 | #include <qtimer.h> |
40 | 40 | ||
41 | #include <qpe/resource.h> | 41 | #include <qpe/resource.h> |
42 | #include <qpe/config.h> | 42 | #include <qpe/config.h> |
43 | 43 | ||
44 | #include <remotedevice.h> | 44 | #include <remotedevice.h> |
45 | #include <services.h> | 45 | #include <services.h> |
46 | 46 | ||
47 | #include "btconnectionitem.h" | ||
48 | |||
47 | using namespace OpieTooth; | 49 | using namespace OpieTooth; |
48 | 50 | ||
49 | BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) | 51 | BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) |
50 | : BluetoothBase( parent, name, fl ) { | 52 | : BluetoothBase( parent, name, fl ) { |
51 | 53 | ||
52 | m_localDevice = new Manager( "hci0" ); | 54 | m_localDevice = new Manager( "hci0" ); |
53 | 55 | ||
54 | connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); | 56 | connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); |
55 | connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); | 57 | connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); |
56 | // not good since lib is async | 58 | // not good since lib is async |
57 | // connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ), | 59 | // connect( ListView2, SIGNAL( expanded ( QListViewItem* ) ), |
58 | // this, SLOT( addServicesToDevice( QListViewItem * ) ) ); | 60 | // this, SLOT( addServicesToDevice( QListViewItem * ) ) ); |
@@ -78,28 +80,31 @@ using namespace OpieTooth; | |||
78 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); | 80 | pal.setColor( QPalette::Normal, QColorGroup::Button, col ); |
79 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); | 81 | pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); |
80 | this->setPalette( pal ); | 82 | this->setPalette( pal ); |
81 | 83 | ||
82 | setCaption( tr( "Bluetooth Manager" ) ); | 84 | setCaption( tr( "Bluetooth Manager" ) ); |
83 | 85 | ||
84 | readConfig(); | 86 | readConfig(); |
85 | initGui(); | 87 | initGui(); |
86 | 88 | ||
87 | //TESTING | 89 | //TESTING |
88 | ListView2->setRootIsDecorated(true); | 90 | ListView2->setRootIsDecorated(true); |
89 | 91 | ||
90 | BTListItem *topLV2 = new BTListItem( ListView2, "Siemens S45", "", "device" ); | 92 | BTDeviceItem *topLV2 = new BTDeviceItem( ListView2, RemoteDevice("xx:", "Siemens S45" ) ); |
91 | topLV2->setPixmap( 1, m_onPix ); | 93 | topLV2->setPixmap( 1, m_onPix ); |
92 | (void) new BTListItem( topLV2, "Serial" ,"", "service" ); | 94 | Services s1; |
93 | (void) new BTListItem( topLV2, "BlueNiC" , "", "service" ); | 95 | s1.setServiceName( "Serial" ); |
96 | (void) new BTServiceItem( topLV2, s1 ); | ||
97 | s1.setServiceName( "BlueNic" ); | ||
98 | (void) new BTServiceItem( topLV2, s1 ); | ||
94 | 99 | ||
95 | writeToHciConfig(); | 100 | writeToHciConfig(); |
96 | // search conncetions | 101 | // search conncetions |
97 | addConnectedDevices(); | 102 | addConnectedDevices(); |
98 | m_iconLoader = new BTIconLoader(); | 103 | m_iconLoader = new BTIconLoader(); |
99 | } | 104 | } |
100 | 105 | ||
101 | /** | 106 | /** |
102 | * Reads all options from the config file | 107 | * Reads all options from the config file |
103 | */ | 108 | */ |
104 | void BlueBase::readConfig() { | 109 | void BlueBase::readConfig() { |
105 | 110 | ||
@@ -175,31 +180,37 @@ using namespace OpieTooth; | |||
175 | RemoteDevice currentDevice( mac , name ); | 180 | RemoteDevice currentDevice( mac , name ); |
176 | loadedDevices.append( currentDevice ); | 181 | loadedDevices.append( currentDevice ); |
177 | } | 182 | } |
178 | addSearchedDevices( loadedDevices ); | 183 | addSearchedDevices( loadedDevices ); |
179 | } | 184 | } |
180 | 185 | ||
181 | /** | 186 | /** |
182 | * Write the list of allready known devices | 187 | * Write the list of allready known devices |
183 | * | 188 | * |
184 | */ | 189 | */ |
185 | void BlueBase::writeSavedDevices() { | 190 | void BlueBase::writeSavedDevices() { |
186 | QListViewItemIterator it( ListView2 ); | 191 | QListViewItemIterator it( ListView2 ); |
192 | BTListItem* item; | ||
193 | BTDeviceItem* device; | ||
187 | 194 | ||
188 | for ( ; it.current(); ++it ) { | 195 | for ( ; it.current(); ++it ) { |
196 | item = (BTListItem*)it.current(); | ||
197 | if(item->typeId() != BTListItem::Device ) | ||
198 | continue; | ||
199 | device = (BTDeviceItem*)item; | ||
189 | // seperate config file for each device, to store more information in future. | 200 | // seperate config file for each device, to store more information in future. |
190 | qDebug( "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf"); | 201 | qDebug( "/Settings/bluetooth/" + device->mac() + ".conf"); |
191 | Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + (((BTListItem*)it.current())->mac()) + ".conf", Config::File ); | 202 | Config conf( QDir::homeDirPath() + "/Settings/bluetooth/" + device->mac() + ".conf", Config::File ); |
192 | conf.setGroup( "Info" ); | 203 | conf.setGroup( "Info" ); |
193 | conf.writeEntry( "name", ((BTListItem*)it.current())->name() ); | 204 | conf.writeEntry( "name", device->name() ); |
194 | } | 205 | } |
195 | } | 206 | } |
196 | 207 | ||
197 | 208 | ||
198 | /** | 209 | /** |
199 | * Set up the gui | 210 | * Set up the gui |
200 | */ | 211 | */ |
201 | void BlueBase::initGui() { | 212 | void BlueBase::initGui() { |
202 | StatusLabel->setText( status() ); // maybe move it to getStatus() | 213 | StatusLabel->setText( status() ); // maybe move it to getStatus() |
203 | cryptCheckBox->setChecked( m_useEncryption ); | 214 | cryptCheckBox->setChecked( m_useEncryption ); |
204 | authCheckBox->setChecked( m_enableAuthentification ); | 215 | authCheckBox->setChecked( m_enableAuthentification ); |
205 | pagescanCheckBox->setChecked( m_enablePagescan ); | 216 | pagescanCheckBox->setChecked( m_enablePagescan ); |
@@ -236,29 +247,30 @@ using namespace OpieTooth; | |||
236 | m_enableInquiryscan = inquiryscanCheckBox->isChecked(); | 247 | m_enableInquiryscan = inquiryscanCheckBox->isChecked(); |
237 | 248 | ||
238 | writeConfig(); | 249 | writeConfig(); |
239 | 250 | ||
240 | QMessageBox::information( this, tr("Test") , tr("Changes were applied.") ); | 251 | QMessageBox::information( this, tr("Test") , tr("Changes were applied.") ); |
241 | } | 252 | } |
242 | 253 | ||
243 | /** | 254 | /** |
244 | * Add fresh found devices from scan dialog to the listing | 255 | * Add fresh found devices from scan dialog to the listing |
245 | * | 256 | * |
246 | */ | 257 | */ |
247 | void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { | 258 | void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { |
248 | BTListItem * deviceItem; | 259 | BTDeviceItem * deviceItem; |
249 | QValueList<RemoteDevice>::ConstIterator it; | 260 | QValueList<RemoteDevice>::ConstIterator it; |
250 | 261 | ||
251 | for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { | 262 | for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { |
252 | deviceItem = new BTListItem( ListView2 , (*it).name(), (*it).mac(), "device" ); | 263 | |
264 | deviceItem = new BTDeviceItem( ListView2 , (*it) ); | ||
253 | deviceItem->setExpandable ( true ); | 265 | deviceItem->setExpandable ( true ); |
254 | 266 | ||
255 | // look if device is avail. atm, async | 267 | // look if device is avail. atm, async |
256 | deviceActive( (*it) ); | 268 | deviceActive( (*it) ); |
257 | 269 | ||
258 | // ggf auch hier? | 270 | // ggf auch hier? |
259 | addServicesToDevice( deviceItem ); | 271 | addServicesToDevice( deviceItem ); |
260 | } | 272 | } |
261 | } | 273 | } |
262 | 274 | ||
263 | 275 | ||
264 | /** | 276 | /** |
@@ -317,124 +329,130 @@ void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & poin | |||
317 | // delete childs too | 329 | // delete childs too |
318 | delete item; | 330 | delete item; |
319 | break; | 331 | break; |
320 | } | 332 | } |
321 | } | 333 | } |
322 | delete menu; | 334 | delete menu; |
323 | } | 335 | } |
324 | 336 | ||
325 | /** | 337 | /** |
326 | * Search and display avail. services for a device (on expand from device listing) | 338 | * Search and display avail. services for a device (on expand from device listing) |
327 | * | 339 | * |
328 | */ | 340 | */ |
329 | void BlueBase::addServicesToDevice( BTListItem * item ) { | 341 | void BlueBase::addServicesToDevice( BTDeviceItem * item ) { |
330 | qDebug("addServicesToDevice"); | 342 | qDebug("addServicesToDevice"); |
331 | // row of mac adress text(3) | 343 | // row of mac adress text(3) |
332 | RemoteDevice device( item->mac(), item->name() ); | 344 | RemoteDevice device = item->remoteDevice(); |
333 | m_deviceList.insert( item->mac() , item ); | 345 | m_deviceList.insert( item->mac() , item ); |
334 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back | 346 | // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back |
335 | m_localDevice->searchServices( device ); | 347 | m_localDevice->searchServices( device ); |
336 | } | 348 | } |
337 | 349 | ||
338 | 350 | ||
339 | /** | 351 | /** |
340 | * Overloaded. This one it the one that is connected to the foundServices signal | 352 | * Overloaded. This one it the one that is connected to the foundServices signal |
341 | * @param device the mac address of the remote device | 353 | * @param device the mac address of the remote device |
342 | * @param servicesList the list with the service the device has. | 354 | * @param servicesList the list with the service the device has. |
343 | */ | 355 | */ |
344 | void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { | 356 | void BlueBase::addServicesToDevice( const QString& device, Services::ValueList servicesList ) { |
345 | qDebug("fill services list"); | 357 | qDebug("fill services list"); |
346 | 358 | ||
347 | QMap<QString,BTListItem*>::Iterator it; | 359 | QMap<QString,BTDeviceItem*>::Iterator it; |
348 | BTListItem* deviceItem = 0; | 360 | BTDeviceItem* deviceItem = 0; |
349 | 361 | ||
350 | // get the right devices which requested the search | 362 | // get the right devices which requested the search |
351 | for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) { | 363 | it = m_deviceList.find( device ); |
352 | if ( it.key() == device ) { | 364 | if( it == m_deviceList.end() ) |
353 | deviceItem = it.data(); | 365 | return; |
354 | } | 366 | deviceItem = it.data(); |
355 | } | ||
356 | 367 | ||
357 | QValueList<OpieTooth::Services>::Iterator it2; | 368 | QValueList<OpieTooth::Services>::Iterator it2; |
358 | BTListItem * serviceItem; | 369 | BTServiceItem * serviceItem; |
359 | 370 | ||
360 | if (!servicesList.isEmpty() ) { | 371 | if (!servicesList.isEmpty() ) { |
361 | // add services | 372 | // add services |
362 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { | 373 | for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { |
363 | serviceItem = new BTListItem( deviceItem , (*it2).serviceName() , "" , "service" ); | 374 | serviceItem = new BTServiceItem( deviceItem , (*it2) ); |
364 | serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) ); | 375 | serviceItem->setPixmap( 0, m_iconLoader->serviceIcon( (*it2).classIdList() ) ); |
365 | } | 376 | } |
366 | } else { | 377 | } else { |
367 | serviceItem = new BTListItem( deviceItem , tr("no services found"), "" , "service" ); | 378 | Services s1; |
379 | s1.setServiceName( tr("no serives found") ); | ||
380 | serviceItem = new BTServiceItem( deviceItem, s1 ); | ||
368 | } | 381 | } |
382 | // now remove them from the list | ||
383 | m_deviceList.remove( it ); | ||
369 | } | 384 | } |
370 | 385 | ||
371 | 386 | ||
372 | /** | 387 | /** |
373 | * Add the existing connections (pairs) to the connections tab. | 388 | * Add the existing connections (pairs) to the connections tab. |
374 | * This one triggers the search | 389 | * This one triggers the search |
375 | */ | 390 | */ |
376 | void BlueBase::addConnectedDevices() { | 391 | void BlueBase::addConnectedDevices() { |
377 | m_localDevice->searchConnections(); | 392 | m_localDevice->searchConnections(); |
378 | } | 393 | } |
379 | 394 | ||
380 | 395 | ||
381 | void BlueBase::addConnectedDevices( Connection::ValueList connectionList ) { | 396 | void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) { |
382 | QValueList<OpieTooth::Connection>::Iterator it; | 397 | QValueList<OpieTooth::ConnectionState>::Iterator it; |
383 | BTListItem * connectionItem; | 398 | BTConnectionItem * connectionItem; |
384 | 399 | ||
385 | if ( !connectionList.isEmpty() ) { | 400 | if ( !connectionList.isEmpty() ) { |
386 | 401 | ||
387 | for (it = connectionList.begin(); it != connectionList.end(); ++it) { | 402 | for (it = connectionList.begin(); it != connectionList.end(); ++it) { |
388 | connectionItem = new BTListItem( ListView4 , (*it).mac() , (*it).mac() , "connection" ); | 403 | connectionItem = new BTConnectionItem( ListView4 , (*it) ); |
389 | } | 404 | } |
390 | } else { | 405 | } else { |
391 | connectionItem = new BTListItem( ListView4 , tr("No connections found"), "", "connection" ); | 406 | ConnectionState con; |
407 | con.setMac( tr("No connections found") ); | ||
408 | connectionItem = new BTConnectionItem( ListView4 , con ); | ||
392 | } | 409 | } |
393 | 410 | ||
394 | // recall connection search after some time | 411 | // recall connection search after some time |
395 | QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) ); | 412 | QTimer::singleShot( 20000, this, SLOT( addConnectedDevices() ) ); |
396 | } | 413 | } |
397 | 414 | ||
398 | /** | 415 | /** |
399 | * Find out if a device can currently be reached | 416 | * Find out if a device can currently be reached |
400 | */ | 417 | */ |
401 | void BlueBase::deviceActive( const RemoteDevice &device ) { | 418 | void BlueBase::deviceActive( const RemoteDevice &device ) { |
402 | // search by mac, async, gets a signal back | 419 | // search by mac, async, gets a signal back |
420 | // We should have a BTDeviceItem there or where does it get added to the map -zecke | ||
403 | m_localDevice->isAvailable( device.mac() ); | 421 | m_localDevice->isAvailable( device.mac() ); |
404 | } | 422 | } |
405 | 423 | ||
406 | /** | 424 | /** |
407 | * The signal catcher. Set the avail. status on device. | 425 | * The signal catcher. Set the avail. status on device. |
408 | * @param device - the mac address | 426 | * @param device - the mac address |
409 | * @param connected - if it is avail. or not | 427 | * @param connected - if it is avail. or not |
410 | */ | 428 | */ |
411 | void BlueBase::deviceActive( const QString& device, bool connected ) { | 429 | void BlueBase::deviceActive( const QString& device, bool connected ) { |
412 | qDebug("deviceActive slot"); | 430 | qDebug("deviceActive slot"); |
413 | 431 | ||
414 | QMap<QString,BTListItem*>::Iterator it; | 432 | QMap<QString,BTDeviceItem*>::Iterator it; |
415 | BTListItem* deviceItem = 0; | 433 | |
434 | it = m_deviceList.find( device ); | ||
435 | if( it == m_deviceList.end() ) | ||
436 | return; | ||
437 | |||
438 | BTDeviceItem* deviceItem = it.data(); | ||
416 | 439 | ||
417 | // get the right devices which requested the search | ||
418 | for( it = m_deviceList.begin(); it != m_deviceList.end(); ++it ) { | ||
419 | if ( it.key() == device ) { | ||
420 | deviceItem = it.data(); | ||
421 | } | ||
422 | } | ||
423 | 440 | ||
424 | if ( connected ) { | 441 | if ( connected ) { |
425 | deviceItem->setPixmap( 1, m_onPix ); | 442 | deviceItem->setPixmap( 1, m_onPix ); |
426 | } else { | 443 | } else { |
427 | deviceItem->setPixmap( 1, m_offPix ); | 444 | deviceItem->setPixmap( 1, m_offPix ); |
428 | } | 445 | } |
446 | m_deviceList.remove( it ); | ||
429 | } | 447 | } |
430 | 448 | ||
431 | /** | 449 | /** |
432 | * Open the "scan for devices" dialog | 450 | * Open the "scan for devices" dialog |
433 | */ | 451 | */ |
434 | void BlueBase::startScan() { | 452 | void BlueBase::startScan() { |
435 | ScanDialog *scan = new ScanDialog( this, "ScanDialog", | 453 | ScanDialog *scan = new ScanDialog( this, "ScanDialog", |
436 | true, WDestructiveClose ); | 454 | true, WDestructiveClose ); |
437 | QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ), | 455 | QObject::connect( scan, SIGNAL( selectedDevices( const QValueList<RemoteDevice>& ) ), |
438 | this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) ); | 456 | this, SLOT( addSearchedDevices( const QValueList<RemoteDevice>& ) ) ); |
439 | 457 | ||
440 | scan->showMaximized(); | 458 | scan->showMaximized(); |
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h index 73fac97..a8f4fe4 100644 --- a/noncore/net/opietooth/manager/bluebase.h +++ b/noncore/net/opietooth/manager/bluebase.h | |||
@@ -1,25 +1,28 @@ | |||
1 | 1 | ||
2 | #ifndef BLUEBASE_H | 2 | #ifndef BLUEBASE_H |
3 | #define BLUEBASE_H | 3 | #define BLUEBASE_H |
4 | 4 | ||
5 | #include <qvariant.h> | 5 | #include <qvariant.h> |
6 | #include <qwidget.h> | 6 | #include <qwidget.h> |
7 | #include <qscrollview.h> | 7 | #include <qscrollview.h> |
8 | #include <qsplitter.h> | 8 | #include <qsplitter.h> |
9 | #include <qlist.h> | 9 | #include <qlist.h> |
10 | #include <qpixmap.h> | 10 | #include <qpixmap.h> |
11 | 11 | ||
12 | #include "bluetoothbase.h" | 12 | #include "bluetoothbase.h" |
13 | #include "btlistitem.h" | 13 | |
14 | #include "btserviceitem.h" | ||
15 | #include "btdeviceitem.h" | ||
16 | |||
14 | #include "bticonloader.h" | 17 | #include "bticonloader.h" |
15 | 18 | ||
16 | #include <remotedevice.h> | 19 | #include <remotedevice.h> |
17 | #include <manager.h> | 20 | #include <manager.h> |
18 | 21 | ||
19 | class QVBox; | 22 | class QVBox; |
20 | class QHBoxLayout; | 23 | class QHBoxLayout; |
21 | class QGridLayout; | 24 | class QGridLayout; |
22 | class QFrame; | 25 | class QFrame; |
23 | class QLabel; | 26 | class QLabel; |
24 | class QPushButton; | 27 | class QPushButton; |
25 | class QTabWidget; | 28 | class QTabWidget; |
@@ -42,44 +45,44 @@ namespace OpieTooth { | |||
42 | void startScan(); | 45 | void startScan(); |
43 | 46 | ||
44 | private: | 47 | private: |
45 | void readConfig(); | 48 | void readConfig(); |
46 | void writeConfig(); | 49 | void writeConfig(); |
47 | void readSavedDevices(); | 50 | void readSavedDevices(); |
48 | void writeSavedDevices(); | 51 | void writeSavedDevices(); |
49 | void writeToHciConfig(); | 52 | void writeToHciConfig(); |
50 | QString status()const; | 53 | QString status()const; |
51 | void initGui(); | 54 | void initGui(); |
52 | void setInfo(); | 55 | void setInfo(); |
53 | Manager *m_localDevice; | 56 | Manager *m_localDevice; |
54 | QMap<QString,BTListItem*> m_deviceList; | 57 | QMap<QString,BTDeviceItem*> m_deviceList; |
55 | 58 | ||
56 | void deviceActive( const RemoteDevice &device ); | 59 | void deviceActive( const RemoteDevice &device ); |
57 | 60 | ||
58 | QString m_deviceName; | 61 | QString m_deviceName; |
59 | QString m_defaultPasskey; | 62 | QString m_defaultPasskey; |
60 | bool m_useEncryption; | 63 | bool m_useEncryption; |
61 | bool m_enableAuthentification; | 64 | bool m_enableAuthentification; |
62 | bool m_enablePagescan; | 65 | bool m_enablePagescan; |
63 | bool m_enableInquiryscan; | 66 | bool m_enableInquiryscan; |
64 | 67 | ||
65 | QPixmap m_offPix; | 68 | QPixmap m_offPix; |
66 | QPixmap m_onPix; | 69 | QPixmap m_onPix; |
67 | 70 | ||
68 | BTIconLoader *m_iconLoader; | 71 | BTIconLoader *m_iconLoader; |
69 | 72 | ||
70 | private slots: | 73 | private slots: |
71 | void addSearchedDevices( const QValueList<RemoteDevice> &newDevices ); | 74 | void addSearchedDevices( const QValueList<RemoteDevice> &newDevices ); |
72 | void addServicesToDevice( BTListItem *item ); | 75 | void addServicesToDevice( BTDeviceItem *item ); |
73 | void addServicesToDevice( const QString& device, Services::ValueList ); | 76 | void addServicesToDevice( const QString& device, Services::ValueList ); |
74 | void addConnectedDevices(); | 77 | void addConnectedDevices(); |
75 | void addConnectedDevices( Connection::ValueList ); | 78 | void addConnectedDevices( ConnectionState::ValueList ); |
76 | void startServiceActionClicked( QListViewItem *item ); | 79 | void startServiceActionClicked( QListViewItem *item ); |
77 | void startServiceActionHold( QListViewItem *, const QPoint &, int ); | 80 | void startServiceActionHold( QListViewItem *, const QPoint &, int ); |
78 | void deviceActive( const QString& mac, bool connected ); | 81 | void deviceActive( const QString& mac, bool connected ); |
79 | void applyConfigChanges(); | 82 | void applyConfigChanges(); |
80 | 83 | ||
81 | }; | 84 | }; |
82 | 85 | ||
83 | } | 86 | } |
84 | 87 | ||
85 | #endif | 88 | #endif |
diff --git a/noncore/net/opietooth/manager/btlistitem.cpp b/noncore/net/opietooth/manager/btlistitem.cpp index 82e7c00..36816f8 100644 --- a/noncore/net/opietooth/manager/btlistitem.cpp +++ b/noncore/net/opietooth/manager/btlistitem.cpp | |||
@@ -1,61 +1,11 @@ | |||
1 | 1 | ||
2 | #include "btlistitem.h" | 2 | #include "btlistitem.h" |
3 | 3 | ||
4 | namespace OpieTooth { | 4 | using namespace OpieTooth; |
5 | 5 | ||
6 | 6 | ||
7 | BTListItem::BTListItem( QListView * parent ) : QListViewItem( parent ) { | 7 | BTListItem::BTListItem( QListView * parent ) : QListViewItem( parent ) { |
8 | } | 8 | } |
9 | 9 | ||
10 | BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) { | 10 | BTListItem::BTListItem( QListViewItem * parent ) : QListViewItem( parent ) { |
11 | } | 11 | } |
12 | |||
13 | |||
14 | // name, and then mac and then servicetype | ||
15 | BTListItem::BTListItem( QListView * parent, const QString &name , const QString& mac, const QString& type ) | ||
16 | : QListViewItem( parent, name ){ | ||
17 | |||
18 | m_name = name; | ||
19 | m_mac = mac; | ||
20 | m_type = type; | ||
21 | |||
22 | } | ||
23 | |||
24 | BTListItem::BTListItem( QListViewItem * parent , const QString& name, const QString& mac, const QString& type ) | ||
25 | : QListViewItem( parent, name ){ | ||
26 | |||
27 | m_name = name; | ||
28 | m_mac = mac; | ||
29 | m_type = type; | ||
30 | } | ||
31 | |||
32 | |||
33 | void BTListItem::setMac( const QString& mac ) { | ||
34 | m_mac = mac; | ||
35 | } | ||
36 | |||
37 | QString BTListItem::mac() const { | ||
38 | return m_mac; | ||
39 | } | ||
40 | |||
41 | void BTListItem::setName( const QString& name ) { | ||
42 | m_name = name; | ||
43 | } | ||
44 | |||
45 | QString BTListItem::name() const { | ||
46 | return m_name; | ||
47 | } | ||
48 | |||
49 | void BTListItem::setType( const QString& type ) { | ||
50 | m_type = type; | ||
51 | } | ||
52 | |||
53 | QString BTListItem::type() const { | ||
54 | return m_type; | ||
55 | } | ||
56 | |||
57 | |||
58 | BTListItem::~BTListItem() { | ||
59 | } | ||
60 | |||
61 | }; | ||
diff --git a/noncore/net/opietooth/manager/btlistitem.h b/noncore/net/opietooth/manager/btlistitem.h index d7ce03b..6b529d1 100644 --- a/noncore/net/opietooth/manager/btlistitem.h +++ b/noncore/net/opietooth/manager/btlistitem.h | |||
@@ -1,33 +1,18 @@ | |||
1 | #ifndef BTLISTITEM_H | 1 | #ifndef BTLISTITEM_H |
2 | #define BTLISTITEM_H | 2 | #define BTLISTITEM_H |
3 | 3 | ||
4 | #include <qlistview.h> | 4 | #include <qlistview.h> |
5 | 5 | ||
6 | namespace OpieTooth { | 6 | namespace OpieTooth { |
7 | 7 | ||
8 | class BTListItem : public QListViewItem { | 8 | class BTListItem : public QListViewItem { |
9 | |||
10 | public: | 9 | public: |
10 | enum Types { Device =0, Service, Connection }; | ||
11 | BTListItem( QListView * parent ); | 11 | BTListItem( QListView * parent ); |
12 | BTListItem( QListViewItem * parent ); | 12 | BTListItem( QListViewItem * parent ); |
13 | 13 | virtual QString type() const = 0; | |
14 | // name, and then mac and then servicetype | 14 | virtual int typeId() const = 0; |
15 | BTListItem( QListView * , const QString&, const QString&, const QString& ); | ||
16 | BTListItem( QListViewItem * parent , const QString&, const QString& , const QString& ); | ||
17 | ~BTListItem(); | ||
18 | |||
19 | void setMac( const QString& ); | ||
20 | QString mac()const; | ||
21 | void setName( const QString& ); | ||
22 | QString name()const; | ||
23 | void setType( const QString& ); | ||
24 | QString type()const; | ||
25 | private: | ||
26 | QString m_name; | ||
27 | QString m_mac; | ||
28 | QString m_type; | ||
29 | |||
30 | }; | 15 | }; |
31 | }; | 16 | }; |
32 | 17 | ||
33 | #endif | 18 | #endif |
diff --git a/noncore/net/opietooth/manager/manager.pro b/noncore/net/opietooth/manager/manager.pro index 4f0ea60..d36b8df2 100644 --- a/noncore/net/opietooth/manager/manager.pro +++ b/noncore/net/opietooth/manager/manager.pro | |||
@@ -1,17 +1,17 @@ | |||
1 | TEMPLATE = app | 1 | TEMPLATE = app |
2 | CONFIG = qt warn_on debug | 2 | CONFIG = qt warn_on debug |
3 | #CONFIG = qt warn_on release | 3 | #CONFIG = qt warn_on release |
4 | HEADERS = popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h | 4 | HEADERS = btconnectionitem.h btdeviceitem.h btserviceitem.h stdpopups.h popuphelper.h bluebase.h scandialog.h btlistitem.h hciconfwrapper.h bticonloader.h |
5 | SOURCES = popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp | 5 | SOURCES = btconnectionitem.cpp btdeviceitem.cpp btserviceitem.h stdpopups.cpp popuphelper.cpp main.cpp bluebase.cpp scandialog.cpp btlistitem.cpp hciconfwrapper.cpp bticonloader.cpp |
6 | INCLUDEPATH += $(OPIEDIR)/include | 6 | INCLUDEPATH += $(OPIEDIR)/include |
7 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib | 7 | INCLUDEPATH += $(OPIEDIR)/noncore/net/opietooth/lib |
8 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopietooth -lopie | 9 | LIBS += -lqpe -lopietooth -lopie |
10 | INTERFACES = bluetoothbase.ui devicedialog.ui | 10 | INTERFACES = bluetoothbase.ui devicedialog.ui |
11 | DESTDIR = $(OPIEDIR)/bin | 11 | DESTDIR = $(OPIEDIR)/bin |
12 | TARGET = bluetooth-manager | 12 | TARGET = bluetooth-manager |
13 | 13 | ||
14 | TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \ | 14 | TRANSLATIONS = ../../../../i18n/de/bluetooth-manager.ts \ |
15 | ../../../../i18n/en/bluetooth-manager.ts \ | 15 | ../../../../i18n/en/bluetooth-manager.ts \ |
16 | ../../../../i18n/es/bluetooth-manager.ts \ | 16 | ../../../../i18n/es/bluetooth-manager.ts \ |
17 | ../../../../i18n/fr/bluetooth-manager.ts \ | 17 | ../../../../i18n/fr/bluetooth-manager.ts \ |
diff --git a/noncore/net/opietooth/manager/popuphelper.cpp b/noncore/net/opietooth/manager/popuphelper.cpp index 2a6dad0..d8404d6 100644 --- a/noncore/net/opietooth/manager/popuphelper.cpp +++ b/noncore/net/opietooth/manager/popuphelper.cpp | |||
@@ -1,25 +1,28 @@ | |||
1 | 1 | ||
2 | #include "stdpopups.h" | ||
3 | |||
2 | #include "popuphelper.h" | 4 | #include "popuphelper.h" |
3 | 5 | ||
4 | using namespace OpieTooth; | 6 | using namespace OpieTooth; |
5 | 7 | ||
6 | PopupHelper::PopupHelper() { | 8 | PopupHelper::PopupHelper() { |
7 | init(); | 9 | init(); |
8 | } | 10 | } |
9 | PopupHelper::~PopupHelper() { | 11 | PopupHelper::~PopupHelper() { |
10 | 12 | ||
11 | } | 13 | } |
12 | void PopupHelper::insert( int id, popupFactory fact ) { | 14 | void PopupHelper::insert( int id, popupFactory fact ) { |
13 | m_map.insert(id, fact ); | 15 | m_map.insert(id, fact ); |
14 | } | 16 | } |
15 | QPopupMenu* PopupHelper::find( int id ) { | 17 | QPopupMenu* PopupHelper::find( int id, const Services& ser, QListViewItem* item ) { |
16 | FactoryMap::Iterator it = m_map.find(id ); | 18 | FactoryMap::Iterator it = m_map.find(id ); |
17 | if ( it != m_map.end() ) { | 19 | if ( it != m_map.end() ) { |
18 | popupFactory fact = it.data(); | 20 | popupFactory fact = it.data(); |
19 | return (*fact)(); | 21 | return (*fact)(ser, item); |
20 | } | 22 | } |
21 | return 0l; | 23 | return 0l; |
22 | } | 24 | } |
23 | void PopupHelper::init() { | 25 | void PopupHelper::init() { |
24 | 26 | insert( 1, newRfcComPopup ); | |
27 | insert(2, newObexPushPopup ); | ||
25 | } | 28 | } |
diff --git a/noncore/net/opietooth/manager/popuphelper.h b/noncore/net/opietooth/manager/popuphelper.h index 7485f71..7541ac5 100644 --- a/noncore/net/opietooth/manager/popuphelper.h +++ b/noncore/net/opietooth/manager/popuphelper.h | |||
@@ -1,25 +1,27 @@ | |||
1 | 1 | ||
2 | #ifndef OPIE_TOOTH_POPUP_HELPER | 2 | #ifndef OPIE_TOOTH_POPUP_HELPER |
3 | #define OPIE_TOOTH_POPUP_HELPER | 3 | #define OPIE_TOOTH_POPUP_HELPER |
4 | 4 | ||
5 | #include <qlistview.h> | ||
5 | #include <qpopupmenu.h> | 6 | #include <qpopupmenu.h> |
6 | #include <qmap.h> | 7 | #include <qmap.h> |
7 | 8 | ||
9 | #include <services.h> | ||
8 | 10 | ||
9 | namespace OpieTooth { | 11 | namespace OpieTooth { |
10 | typedef QPopupMenu* (*popupFactory)(void); | 12 | typedef QPopupMenu* (*popupFactory)(const Services&, QListViewItem*); |
11 | typedef QMap<int, popupFactory> FactoryMap; | 13 | typedef QMap<int, popupFactory> FactoryMap; |
12 | class PopupHelper { | 14 | class PopupHelper { |
13 | public: | 15 | public: |
14 | PopupHelper(); | 16 | PopupHelper(); |
15 | ~PopupHelper(); | 17 | ~PopupHelper(); |
16 | void insert( int id, popupFactory fact ); | 18 | void insert( int id, popupFactory fact ); |
17 | QPopupMenu* find( int id ); | 19 | QPopupMenu* find( int id, const Services&, QListViewItem* ); |
18 | private: | 20 | private: |
19 | void init(); | 21 | void init(); |
20 | FactoryMap m_map; | 22 | FactoryMap m_map; |
21 | 23 | ||
22 | }; | 24 | }; |
23 | }; | 25 | }; |
24 | 26 | ||
25 | #endif | 27 | #endif |