summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp32
-rw-r--r--noncore/net/opietooth/manager/bluetoothbase.ui6
-rw-r--r--noncore/net/opietooth/manager/devicedialog.ui12
-rw-r--r--noncore/net/opietooth/manager/scandialog.cpp18
-rw-r--r--noncore/net/opietooth/manager/scandialog.h2
5 files changed, 35 insertions, 35 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 90e44cb..7954cc3 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -58,63 +58,63 @@ using namespace OpieTooth;
58 58
59BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl ) 59BlueBase::BlueBase( QWidget* parent, const char* name, WFlags fl )
60 : BluetoothBase( parent, name, fl ) 60 : BluetoothBase( parent, name, fl )
61{ 61{
62 62
63 m_localDevice = new Manager( "hci0" ); 63 m_localDevice = new Manager( "hci0" );
64 64
65 connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) ); 65 connect( PushButton2, SIGNAL( clicked() ), this, SLOT(startScan() ) );
66 connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) ); 66 connect( configApplyButton, SIGNAL(clicked() ), this, SLOT(applyConfigChanges() ) );
67 67
68 connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) ); 68 connect( rfcommBindButton, SIGNAL( clicked() ), this, SLOT( rfcommDialog() ) );
69 // not good since lib is async 69 // not good since lib is async
70 // connect( ListView2, SIGNAL( expanded(QListViewItem*) ), 70 // connect( devicesView, SIGNAL( expanded(QListViewItem*) ),
71 // this, SLOT( addServicesToDevice(QListViewItem*) ) ); 71 // this, SLOT( addServicesToDevice(QListViewItem*) ) );
72 connect( ListView2, SIGNAL( clicked(QListViewItem*)), 72 connect( devicesView, SIGNAL( clicked(QListViewItem*)),
73 this, SLOT( startServiceActionClicked(QListViewItem*) ) ); 73 this, SLOT( startServiceActionClicked(QListViewItem*) ) );
74 connect( ListView2, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ), 74 connect( devicesView, SIGNAL( rightButtonClicked(QListViewItem*,const QPoint&,int) ),
75 this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) ); 75 this, SLOT(startServiceActionHold(QListViewItem*,const QPoint&,int) ) );
76 connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ), 76 connect( m_localDevice , SIGNAL( foundServices(const QString&,Services::ValueList) ),
77 this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) ); 77 this, SLOT( addServicesToDevice(const QString&,Services::ValueList) ) );
78 connect( m_localDevice, SIGNAL( available(const QString&,bool) ), 78 connect( m_localDevice, SIGNAL( available(const QString&,bool) ),
79 this, SLOT( deviceActive(const QString&,bool) ) ); 79 this, SLOT( deviceActive(const QString&,bool) ) );
80 connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ), 80 connect( m_localDevice, SIGNAL( connections(ConnectionState::ValueList) ),
81 this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) ); 81 this, SLOT( addConnectedDevices(ConnectionState::ValueList) ) );
82 connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ), 82 connect( m_localDevice, SIGNAL( signalStrength(const QString&,const QString&) ),
83 this, SLOT( addSignalStrength(const QString&,const QString&) ) ); 83 this, SLOT( addSignalStrength(const QString&,const QString&) ) );
84 84
85 85
86 // let hold be rightButtonClicked() 86 // let hold be rightButtonClicked()
87 QPEApplication::setStylusOperation( ListView2->viewport(), QPEApplication::RightOnHold); 87 QPEApplication::setStylusOperation( devicesView->viewport(), QPEApplication::RightOnHold);
88 QPEApplication::setStylusOperation( ListView4->viewport(), QPEApplication::RightOnHold); 88 QPEApplication::setStylusOperation( connectionsView->viewport(), QPEApplication::RightOnHold);
89 89
90 //Load all icons needed 90 //Load all icons needed
91 m_offPix = Resource::loadPixmap( "opietooth/notconnected" ); 91 m_offPix = Resource::loadPixmap( "opietooth/notconnected" );
92 m_onPix = Resource::loadPixmap( "opietooth/connected" ); 92 m_onPix = Resource::loadPixmap( "opietooth/connected" );
93 m_findPix = Resource::loadPixmap( "opietooth/find" ); 93 m_findPix = Resource::loadPixmap( "opietooth/find" );
94 94
95 QPalette pal = this->palette(); 95 QPalette pal = this->palette();
96 QColor col = pal.color( QPalette::Active, QColorGroup::Background ); 96 QColor col = pal.color( QPalette::Active, QColorGroup::Background );
97 pal.setColor( QPalette::Active, QColorGroup::Button, col ); 97 pal.setColor( QPalette::Active, QColorGroup::Button, col );
98 pal.setColor( QPalette::Inactive, QColorGroup::Button, col ); 98 pal.setColor( QPalette::Inactive, QColorGroup::Button, col );
99 pal.setColor( QPalette::Normal, QColorGroup::Button, col ); 99 pal.setColor( QPalette::Normal, QColorGroup::Button, col );
100 pal.setColor( QPalette::Disabled, QColorGroup::Button, col ); 100 pal.setColor( QPalette::Disabled, QColorGroup::Button, col );
101 this->setPalette( pal ); 101 this->setPalette( pal );
102 102
103 setCaption( tr( "Bluetooth Manager" ) ); 103 setCaption( tr( "Bluetooth Manager" ) );
104 104
105 readConfig(); 105 readConfig();
106 initGui(); 106 initGui();
107 107
108 ListView2->setRootIsDecorated(true); 108 devicesView->setRootIsDecorated(true);
109 109
110 110
111 writeToHciConfig(); 111 writeToHciConfig();
112 // search conncetions 112 // search conncetions
113 addConnectedDevices(); 113 addConnectedDevices();
114 addSignalStrength(); 114 addSignalStrength();
115 m_iconLoader = new BTIconLoader(); 115 m_iconLoader = new BTIconLoader();
116 readSavedDevices(); 116 readSavedDevices();
117} 117}
118 118
119/** 119/**
120 * Reads all options from the config file 120 * Reads all options from the config file
@@ -180,25 +180,25 @@ void BlueBase::readSavedDevices()
180 DeviceHandler handler; 180 DeviceHandler handler;
181 loadedDevices = handler.load(); 181 loadedDevices = handler.load();
182 182
183 addSearchedDevices( loadedDevices ); 183 addSearchedDevices( loadedDevices );
184} 184}
185 185
186 186
187/** 187/**
188 * Write the list of allready known devices 188 * Write the list of allready known devices
189 */ 189 */
190void BlueBase::writeSavedDevices() 190void BlueBase::writeSavedDevices()
191{ 191{
192 QListViewItemIterator it( ListView2 ); 192 QListViewItemIterator it( devicesView );
193 BTListItem* item; 193 BTListItem* item;
194 BTDeviceItem* device; 194 BTDeviceItem* device;
195 RemoteDevice::ValueList list; 195 RemoteDevice::ValueList list;
196 for ( ; it.current(); ++it ) 196 for ( ; it.current(); ++it )
197 { 197 {
198 item = (BTListItem*)it.current(); 198 item = (BTListItem*)it.current();
199 if(item->typeId() != BTListItem::Device ) 199 if(item->typeId() != BTListItem::Device )
200 continue; 200 continue;
201 device = (BTDeviceItem*)item; 201 device = (BTDeviceItem*)item;
202 202
203 list.append( device->remoteDevice() ); 203 list.append( device->remoteDevice() );
204 } 204 }
@@ -280,25 +280,25 @@ void BlueBase::rfcommDialog()
280 */ 280 */
281void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) 281void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices )
282{ 282{
283 BTDeviceItem * deviceItem; 283 BTDeviceItem * deviceItem;
284 QValueList<RemoteDevice>::ConstIterator it; 284 QValueList<RemoteDevice>::ConstIterator it;
285 285
286 for( it = newDevices.begin(); it != newDevices.end() ; ++it ) 286 for( it = newDevices.begin(); it != newDevices.end() ; ++it )
287 { 287 {
288 288
289 if (find( (*it) )) // is already inserted 289 if (find( (*it) )) // is already inserted
290 continue; 290 continue;
291 291
292 deviceItem = new BTDeviceItem( ListView2 , (*it) ); 292 deviceItem = new BTDeviceItem( devicesView , (*it) );
293 deviceItem->setPixmap( 1, m_findPix ); 293 deviceItem->setPixmap( 1, m_findPix );
294 deviceItem->setExpandable ( true ); 294 deviceItem->setExpandable ( true );
295 295
296 // look if device is avail. atm, async 296 // look if device is avail. atm, async
297 deviceActive( (*it) ); 297 deviceActive( (*it) );
298 298
299 // ggf auch hier? 299 // ggf auch hier?
300 addServicesToDevice( deviceItem ); 300 addServicesToDevice( deviceItem );
301 } 301 }
302} 302}
303 303
304 304
@@ -478,37 +478,37 @@ void BlueBase::addServicesToDevice( const QString& device, Services::ValueList s
478 } 478 }
479 // now remove them from the list 479 // now remove them from the list
480 m_deviceList.remove( it ); 480 m_deviceList.remove( it );
481} 481}
482 482
483 483
484 484
485 485
486 486
487void BlueBase::addSignalStrength() 487void BlueBase::addSignalStrength()
488{ 488{
489 489
490 QListViewItemIterator it( ListView4 ); 490 QListViewItemIterator it( connectionsView );
491 for ( ; it.current(); ++it ) 491 for ( ; it.current(); ++it )
492 { 492 {
493 m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() ); 493 m_localDevice->signalStrength( ((BTConnectionItem*)it.current() )->connection().mac() );
494 } 494 }
495 495
496 QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) ); 496 QTimer::singleShot( 5000, this, SLOT( addSignalStrength() ) );
497} 497}
498 498
499void BlueBase::addSignalStrength( const QString& mac, const QString& strength ) 499void BlueBase::addSignalStrength( const QString& mac, const QString& strength )
500{ 500{
501 501
502 QListViewItemIterator it( ListView4 ); 502 QListViewItemIterator it( connectionsView );
503 for ( ; it.current(); ++it ) 503 for ( ; it.current(); ++it )
504 { 504 {
505 if( ((BTConnectionItem*)it.current())->connection().mac() == mac ) 505 if( ((BTConnectionItem*)it.current())->connection().mac() == mac )
506 { 506 {
507 ((BTConnectionItem*)it.current() )->setSignalStrength( strength ); 507 ((BTConnectionItem*)it.current() )->setSignalStrength( strength );
508 } 508 }
509 } 509 }
510} 510}
511 511
512/** 512/**
513 * Add the existing connections (pairs) to the connections tab. 513 * Add the existing connections (pairs) to the connections tab.
514 * This one triggers the search 514 * This one triggers the search
@@ -525,73 +525,73 @@ void BlueBase::addConnectedDevices()
525void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList ) 525void BlueBase::addConnectedDevices( ConnectionState::ValueList connectionList )
526{ 526{
527 527
528 QValueList<OpieTooth::ConnectionState>::Iterator it; 528 QValueList<OpieTooth::ConnectionState>::Iterator it;
529 BTConnectionItem * connectionItem; 529 BTConnectionItem * connectionItem;
530 530
531 if ( !connectionList.isEmpty() ) 531 if ( !connectionList.isEmpty() )
532 { 532 {
533 533
534 for (it = connectionList.begin(); it != connectionList.end(); ++it) 534 for (it = connectionList.begin(); it != connectionList.end(); ++it)
535 { 535 {
536 536
537 QListViewItemIterator it2( ListView4 ); 537 QListViewItemIterator it2( connectionsView );
538 bool found = false; 538 bool found = false;
539 for ( ; it2.current(); ++it2 ) 539 for ( ; it2.current(); ++it2 )
540 { 540 {
541 if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() ) 541 if( ( (BTConnectionItem*)it2.current())->connection().mac() == (*it).mac() )
542 { 542 {
543 found = true; 543 found = true;
544 } 544 }
545 } 545 }
546 546
547 if ( found == false ) 547 if ( found == false )
548 { 548 {
549 connectionItem = new BTConnectionItem( ListView4, (*it) ); 549 connectionItem = new BTConnectionItem( connectionsView, (*it) );
550 550
551 if( m_deviceList.find((*it).mac()).data() ) 551 if( m_deviceList.find((*it).mac()).data() )
552 { 552 {
553 connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() ); 553 connectionItem->setName( m_deviceList.find( (*it).mac()).data()->name() );
554 } 554 }
555 } 555 }
556 556
557 } 557 }
558 558
559 QListViewItemIterator it2( ListView4 ); 559 QListViewItemIterator it2( connectionsView );
560 for ( ; it2.current(); ++it2 ) 560 for ( ; it2.current(); ++it2 )
561 { 561 {
562 bool found = false; 562 bool found = false;
563 for (it = connectionList.begin(); it != connectionList.end(); ++it) 563 for (it = connectionList.begin(); it != connectionList.end(); ++it)
564 { 564 {
565 if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() ) 565 if( ( ((BTConnectionItem*)it2.current())->connection().mac() ) == (*it).mac() )
566 { 566 {
567 found = true; 567 found = true;
568 } 568 }
569 } 569 }
570 570
571 if ( !found ) 571 if ( !found )
572 { 572 {
573 delete it2.current(); 573 delete it2.current();
574 } 574 }
575 575
576 } 576 }
577 577
578 578
579 } 579 }
580 else 580 else
581 { 581 {
582 ListView4->clear(); 582 connectionsView->clear();
583 ConnectionState con; 583 ConnectionState con;
584 con.setMac( tr("No connections found") ); 584 con.setMac( tr("No connections found") );
585 connectionItem = new BTConnectionItem( ListView4 , con ); 585 connectionItem = new BTConnectionItem( connectionsView , con );
586 } 586 }
587 587
588 // recall connection search after some time 588 // recall connection search after some time
589 QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) ); 589 QTimer::singleShot( 15000, this, SLOT( addConnectedDevices() ) );
590} 590}
591 591
592 592
593/** 593/**
594 * Find out if a device can currently be reached 594 * Find out if a device can currently be reached
595 * @param device 595 * @param device
596 */ 596 */
597void BlueBase::deviceActive( const RemoteDevice &device ) 597void BlueBase::deviceActive( const RemoteDevice &device )
@@ -664,25 +664,25 @@ BlueBase::~BlueBase()
664 delete m_iconLoader; 664 delete m_iconLoader;
665} 665}
666 666
667 667
668/** 668/**
669 * find searches the ListView for a BTDeviceItem containig 669 * find searches the ListView for a BTDeviceItem containig
670 * the same Device if found return true else false 670 * the same Device if found return true else false
671 * @param dev RemoteDevice to find 671 * @param dev RemoteDevice to find
672 * @return returns true if found 672 * @return returns true if found
673 */ 673 */
674bool BlueBase::find( const RemoteDevice& rem ) 674bool BlueBase::find( const RemoteDevice& rem )
675{ 675{
676 QListViewItemIterator it( ListView2 ); 676 QListViewItemIterator it( devicesView );
677 BTListItem* item; 677 BTListItem* item;
678 BTDeviceItem* device; 678 BTDeviceItem* device;
679 for (; it.current(); ++it ) 679 for (; it.current(); ++it )
680 { 680 {
681 item = (BTListItem*) it.current(); 681 item = (BTListItem*) it.current();
682 if ( item->typeId() != BTListItem::Device ) 682 if ( item->typeId() != BTListItem::Device )
683 continue; 683 continue;
684 684
685 device = (BTDeviceItem*)item; 685 device = (BTDeviceItem*)item;
686 if ( rem.equals( device->remoteDevice() ) ) 686 if ( rem.equals( device->remoteDevice() ) )
687 return true; 687 return true;
688 } 688 }
diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index 2d14b8f..cbde3c6 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -2,25 +2,25 @@
2<class>BluetoothBase</class> 2<class>BluetoothBase</class>
3<widget> 3<widget>
4 <class>QWidget</class> 4 <class>QWidget</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>BluetoothBase</cstring> 7 <cstring>BluetoothBase</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>297</width> 14 <width>293</width>
15 <height>382</height> 15 <height>382</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form1</string> 20 <string>Form1</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
@@ -88,25 +88,25 @@
88 </property> 88 </property>
89 <property> 89 <property>
90 <name>clickable</name> 90 <name>clickable</name>
91 <bool>true</bool> 91 <bool>true</bool>
92 </property> 92 </property>
93 <property> 93 <property>
94 <name>resizeable</name> 94 <name>resizeable</name>
95 <bool>true</bool> 95 <bool>true</bool>
96 </property> 96 </property>
97 </column> 97 </column>
98 <property stdset="1"> 98 <property stdset="1">
99 <name>name</name> 99 <name>name</name>
100 <cstring>ListView2</cstring> 100 <cstring>devicesView</cstring>
101 </property> 101 </property>
102 </widget> 102 </widget>
103 <widget> 103 <widget>
104 <class>QPushButton</class> 104 <class>QPushButton</class>
105 <property stdset="1"> 105 <property stdset="1">
106 <name>name</name> 106 <name>name</name>
107 <cstring>PushButton2</cstring> 107 <cstring>PushButton2</cstring>
108 </property> 108 </property>
109 <property stdset="1"> 109 <property stdset="1">
110 <name>sizePolicy</name> 110 <name>sizePolicy</name>
111 <sizepolicy> 111 <sizepolicy>
112 <hsizetype>0</hsizetype> 112 <hsizetype>0</hsizetype>
@@ -176,25 +176,25 @@
176 </property> 176 </property>
177 <property> 177 <property>
178 <name>clickable</name> 178 <name>clickable</name>
179 <bool>true</bool> 179 <bool>true</bool>
180 </property> 180 </property>
181 <property> 181 <property>
182 <name>resizeable</name> 182 <name>resizeable</name>
183 <bool>true</bool> 183 <bool>true</bool>
184 </property> 184 </property>
185 </column> 185 </column>
186 <property stdset="1"> 186 <property stdset="1">
187 <name>name</name> 187 <name>name</name>
188 <cstring>ListView4</cstring> 188 <cstring>connectionsView</cstring>
189 </property> 189 </property>
190 </widget> 190 </widget>
191 </vbox> 191 </vbox>
192 </widget> 192 </widget>
193 <widget> 193 <widget>
194 <class>QWidget</class> 194 <class>QWidget</class>
195 <property stdset="1"> 195 <property stdset="1">
196 <name>name</name> 196 <name>name</name>
197 <cstring>tab</cstring> 197 <cstring>tab</cstring>
198 </property> 198 </property>
199 <attribute> 199 <attribute>
200 <name>title</name> 200 <name>title</name>
diff --git a/noncore/net/opietooth/manager/devicedialog.ui b/noncore/net/opietooth/manager/devicedialog.ui
index 2ecfd4c..f5cd9ab 100644
--- a/noncore/net/opietooth/manager/devicedialog.ui
+++ b/noncore/net/opietooth/manager/devicedialog.ui
@@ -2,25 +2,25 @@
2<class>DeviceDialog</class> 2<class>DeviceDialog</class>
3<widget> 3<widget>
4 <class>QDialog</class> 4 <class>QDialog</class>
5 <property stdset="1"> 5 <property stdset="1">
6 <name>name</name> 6 <name>name</name>
7 <cstring>DeviceDialog</cstring> 7 <cstring>DeviceDialog</cstring>
8 </property> 8 </property>
9 <property stdset="1"> 9 <property stdset="1">
10 <name>geometry</name> 10 <name>geometry</name>
11 <rect> 11 <rect>
12 <x>0</x> 12 <x>0</x>
13 <y>0</y> 13 <y>0</y>
14 <width>275</width> 14 <width>267</width>
15 <height>323</height> 15 <height>323</height>
16 </rect> 16 </rect>
17 </property> 17 </property>
18 <property stdset="1"> 18 <property stdset="1">
19 <name>caption</name> 19 <name>caption</name>
20 <string>Form2</string> 20 <string>Form2</string>
21 </property> 21 </property>
22 <property> 22 <property>
23 <name>layoutMargin</name> 23 <name>layoutMargin</name>
24 </property> 24 </property>
25 <property> 25 <property>
26 <name>layoutSpacing</name> 26 <name>layoutSpacing</name>
@@ -60,25 +60,25 @@
60 <property stdset="1"> 60 <property stdset="1">
61 <name>margin</name> 61 <name>margin</name>
62 <number>4</number> 62 <number>4</number>
63 </property> 63 </property>
64 <property stdset="1"> 64 <property stdset="1">
65 <name>spacing</name> 65 <name>spacing</name>
66 <number>3</number> 66 <number>3</number>
67 </property> 67 </property>
68 <widget row="1" column="0" > 68 <widget row="1" column="0" >
69 <class>QPushButton</class> 69 <class>QPushButton</class>
70 <property stdset="1"> 70 <property stdset="1">
71 <name>name</name> 71 <name>name</name>
72 <cstring>PushButton5</cstring> 72 <cstring>applyChanges</cstring>
73 </property> 73 </property>
74 <property stdset="1"> 74 <property stdset="1">
75 <name>text</name> 75 <name>text</name>
76 <string>&amp;Apply Changes</string> 76 <string>&amp;Apply Changes</string>
77 </property> 77 </property>
78 </widget> 78 </widget>
79 <widget row="0" column="0" > 79 <widget row="0" column="0" >
80 <class>QListView</class> 80 <class>QListView</class>
81 <column> 81 <column>
82 <property> 82 <property>
83 <name>text</name> 83 <name>text</name>
84 <string>active</string> 84 <string>active</string>
@@ -99,25 +99,25 @@
99 </property> 99 </property>
100 <property> 100 <property>
101 <name>clickable</name> 101 <name>clickable</name>
102 <bool>true</bool> 102 <bool>true</bool>
103 </property> 103 </property>
104 <property> 104 <property>
105 <name>resizeable</name> 105 <name>resizeable</name>
106 <bool>true</bool> 106 <bool>true</bool>
107 </property> 107 </property>
108 </column> 108 </column>
109 <property stdset="1"> 109 <property stdset="1">
110 <name>name</name> 110 <name>name</name>
111 <cstring>ListView1</cstring> 111 <cstring>serviceView</cstring>
112 </property> 112 </property>
113 </widget> 113 </widget>
114 </grid> 114 </grid>
115 </widget> 115 </widget>
116 <widget> 116 <widget>
117 <class>QWidget</class> 117 <class>QWidget</class>
118 <property stdset="1"> 118 <property stdset="1">
119 <name>name</name> 119 <name>name</name>
120 <cstring>tab</cstring> 120 <cstring>tab</cstring>
121 </property> 121 </property>
122 <attribute> 122 <attribute>
123 <name>title</name> 123 <name>title</name>
@@ -138,32 +138,32 @@
138 <name>name</name> 138 <name>name</name>
139 <cstring>TextLabel8</cstring> 139 <cstring>TextLabel8</cstring>
140 </property> 140 </property>
141 <property stdset="1"> 141 <property stdset="1">
142 <name>text</name> 142 <name>text</name>
143 <string>Default PIN Code</string> 143 <string>Default PIN Code</string>
144 </property> 144 </property>
145 </widget> 145 </widget>
146 <widget row="1" column="1" > 146 <widget row="1" column="1" >
147 <class>QLineEdit</class> 147 <class>QLineEdit</class>
148 <property stdset="1"> 148 <property stdset="1">
149 <name>name</name> 149 <name>name</name>
150 <cstring>LineEdit6</cstring> 150 <cstring>defaultPinCode</cstring>
151 </property> 151 </property>
152 </widget> 152 </widget>
153 <widget row="0" column="1" > 153 <widget row="0" column="1" >
154 <class>QLineEdit</class> 154 <class>QLineEdit</class>
155 <property stdset="1"> 155 <property stdset="1">
156 <name>name</name> 156 <name>name</name>
157 <cstring>LineEdit1</cstring> 157 <cstring>deviceName</cstring>
158 </property> 158 </property>
159 </widget> 159 </widget>
160 <widget row="0" column="0" > 160 <widget row="0" column="0" >
161 <class>QLabel</class> 161 <class>QLabel</class>
162 <property stdset="1"> 162 <property stdset="1">
163 <name>name</name> 163 <name>name</name>
164 <cstring>TextLabel5</cstring> 164 <cstring>TextLabel5</cstring>
165 </property> 165 </property>
166 <property stdset="1"> 166 <property stdset="1">
167 <name>text</name> 167 <name>text</name>
168 <string>Change device name</string> 168 <string>Change device name</string>
169 </property> 169 </property>
@@ -205,25 +205,25 @@
205 <property stdset="1"> 205 <property stdset="1">
206 <name>margin</name> 206 <name>margin</name>
207 <number>4</number> 207 <number>4</number>
208 </property> 208 </property>
209 <property stdset="1"> 209 <property stdset="1">
210 <name>spacing</name> 210 <name>spacing</name>
211 <number>2</number> 211 <number>2</number>
212 </property> 212 </property>
213 <widget row="0" column="0" > 213 <widget row="0" column="0" >
214 <class>QLabel</class> 214 <class>QLabel</class>
215 <property stdset="1"> 215 <property stdset="1">
216 <name>name</name> 216 <name>name</name>
217 <cstring>DeviceInfoLabel</cstring> 217 <cstring>deviceInfoLabel</cstring>
218 </property> 218 </property>
219 <property stdset="1"> 219 <property stdset="1">
220 <name>text</name> 220 <name>text</name>
221 <string>TextLabel9</string> 221 <string>TextLabel9</string>
222 </property> 222 </property>
223 </widget> 223 </widget>
224 </grid> 224 </grid>
225 </widget> 225 </widget>
226 </widget> 226 </widget>
227 </grid> 227 </grid>
228</widget> 228</widget>
229</UI> 229</UI>
diff --git a/noncore/net/opietooth/manager/scandialog.cpp b/noncore/net/opietooth/manager/scandialog.cpp
index bccc6c2..160e8dd 100644
--- a/noncore/net/opietooth/manager/scandialog.cpp
+++ b/noncore/net/opietooth/manager/scandialog.cpp
@@ -47,31 +47,31 @@ namespace OpieTooth {
47 setCaption( tr( "Scan for devices" ) ); 47 setCaption( tr( "Scan for devices" ) );
48 48
49 Layout11 = new QVBoxLayout( this ); 49 Layout11 = new QVBoxLayout( this );
50 Layout11->setSpacing( 6 ); 50 Layout11->setSpacing( 6 );
51 Layout11->setMargin( 0 ); 51 Layout11->setMargin( 0 );
52 52
53 progress = new QProgressBar( this, "progbar"); 53 progress = new QProgressBar( this, "progbar");
54 progress->setTotalSteps(20); 54 progress->setTotalSteps(20);
55 55
56 StartStopButton = new QPushButton( this, "StartButton" ); 56 StartStopButton = new QPushButton( this, "StartButton" );
57 StartStopButton->setText( tr( "Start scan" ) ); 57 StartStopButton->setText( tr( "Start scan" ) );
58 58
59 ListView1 = new QListView( this, "ListView1" ); 59 serviceView = new QListView( this, "serviceView" );
60 60
61 //ListView1->addColumn( tr( "Add" ) ); 61 //serviceView->addColumn( tr( "Add" ) );
62 ListView1->addColumn( tr( "Add Device" ) ); 62 serviceView->addColumn( tr( "Add Device" ) );
63 //ListView1->addColumn( tr( "Type" ) ); 63 //serviceView->addColumn( tr( "Type" ) );
64 64
65 Layout11->addWidget( ListView1 ); 65 Layout11->addWidget( serviceView );
66 Layout11->addWidget( progress ); 66 Layout11->addWidget( progress );
67 Layout11->addWidget( StartStopButton ); 67 Layout11->addWidget( StartStopButton );
68 68
69 localDevice = new Manager( "hci0" ); 69 localDevice = new Manager( "hci0" );
70 70
71 connect( StartStopButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) ); 71 connect( StartStopButton, SIGNAL( clicked() ), this, SLOT( startSearch() ) );
72 connect( localDevice, SIGNAL( foundDevices(const QString&,RemoteDevice::ValueList) ), 72 connect( localDevice, SIGNAL( foundDevices(const QString&,RemoteDevice::ValueList) ),
73 this, SLOT( fillList(const QString&,RemoteDevice::ValueList) ) ) ; 73 this, SLOT( fillList(const QString&,RemoteDevice::ValueList) ) ) ;
74 74
75 progressStat = 0; 75 progressStat = 0;
76 m_search = false; 76 m_search = false;
77 } 77 }
@@ -93,67 +93,67 @@ namespace OpieTooth {
93 93
94 94
95 void ScanDialog::startSearch() { 95 void ScanDialog::startSearch() {
96 if ( m_search ) { 96 if ( m_search ) {
97 stopSearch(); 97 stopSearch();
98 return; 98 return;
99 } 99 }
100 m_search = true; 100 m_search = true;
101 progress->setProgress(0); 101 progress->setProgress(0);
102 progressStat = 0; 102 progressStat = 0;
103 103
104 // empty list before a new scan 104 // empty list before a new scan
105 ListView1->clear(); 105 serviceView->clear();
106 106
107 progressTimer(); 107 progressTimer();
108 // when finished, it emmite foundDevices() 108 // when finished, it emmite foundDevices()
109 // checken ob initialisiert , qcop ans applet. 109 // checken ob initialisiert , qcop ans applet.
110 StartStopButton->setText( tr( "Stop scan" ) ); 110 StartStopButton->setText( tr( "Stop scan" ) );
111 111
112 localDevice->searchDevices(); 112 localDevice->searchDevices();
113 113
114 } 114 }
115 115
116 void ScanDialog::stopSearch() { 116 void ScanDialog::stopSearch() {
117 m_search = true; 117 m_search = true;
118 } 118 }
119 119
120 void ScanDialog::fillList(const QString&, RemoteDevice::ValueList deviceList) { 120 void ScanDialog::fillList(const QString&, RemoteDevice::ValueList deviceList) {
121 progress->setProgress(0); 121 progress->setProgress(0);
122 progressStat = 0; 122 progressStat = 0;
123 QCheckListItem * deviceItem; 123 QCheckListItem * deviceItem;
124 124
125 RemoteDevice::ValueList::Iterator it; 125 RemoteDevice::ValueList::Iterator it;
126 for( it = deviceList.begin(); it != deviceList.end(); ++it ) { 126 for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
127 127
128 deviceItem = new QCheckListItem( ListView1, (*it).name(), QCheckListItem::CheckBox ); 128 deviceItem = new QCheckListItem( serviceView, (*it).name(), QCheckListItem::CheckBox );
129 deviceItem->setText( 1, (*it).mac() ); 129 deviceItem->setText( 1, (*it).mac() );
130 } 130 }
131 m_search = false; 131 m_search = false;
132 StartStopButton->setText( tr( "Start scan" ) ); 132 StartStopButton->setText( tr( "Start scan" ) );
133 } 133 }
134 134
135/** 135/**
136 * Iterates trough the items, and collects the checked items. 136 * Iterates trough the items, and collects the checked items.
137 * Then it emits it, so the manager can connect to the signal to fill the listing. 137 * Then it emits it, so the manager can connect to the signal to fill the listing.
138 */ 138 */
139 void ScanDialog::emitToManager() { 139 void ScanDialog::emitToManager() {
140 140
141 if (!ListView1) { 141 if (!serviceView) {
142 return; 142 return;
143 } 143 }
144 144
145 QValueList<RemoteDevice> deviceList; 145 QValueList<RemoteDevice> deviceList;
146 146
147 QListViewItemIterator it( ListView1 ); 147 QListViewItemIterator it( serviceView );
148 for ( ; it.current(); ++it ) { 148 for ( ; it.current(); ++it ) {
149 if ( ( (QCheckListItem*)it.current() )->isOn() ) { 149 if ( ( (QCheckListItem*)it.current() )->isOn() ) {
150 RemoteDevice device( it.current()->text(1), it.current()->text(0) ); 150 RemoteDevice device( it.current()->text(1), it.current()->text(0) );
151 deviceList.append( device ); 151 deviceList.append( device );
152 } 152 }
153 } 153 }
154 emit selectedDevices( deviceList ); 154 emit selectedDevices( deviceList );
155 } 155 }
156 156
157/** 157/**
158 * Cleanup 158 * Cleanup
159 */ 159 */
diff --git a/noncore/net/opietooth/manager/scandialog.h b/noncore/net/opietooth/manager/scandialog.h
index a644e96..2b04964 100644
--- a/noncore/net/opietooth/manager/scandialog.h
+++ b/noncore/net/opietooth/manager/scandialog.h
@@ -37,25 +37,25 @@ class Manager;
37class Device; 37class Device;
38 38
39 class ScanDialog : public QDialog { 39 class ScanDialog : public QDialog {
40 Q_OBJECT 40 Q_OBJECT
41 41
42 public: 42 public:
43 ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); 43 ScanDialog( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 );
44 ~ScanDialog(); 44 ~ScanDialog();
45 45
46 private: 46 private:
47 QProgressBar* progress; 47 QProgressBar* progress;
48 QPushButton* StartStopButton; 48 QPushButton* StartStopButton;
49 QListView* ListView1; 49 QListView* serviceView;
50 50
51 public slots: 51 public slots:
52 void accept(); 52 void accept();
53 53
54 protected: 54 protected:
55 QVBoxLayout* Layout11; 55 QVBoxLayout* Layout11;
56 56
57 private slots: 57 private slots:
58 void stopSearch(); 58 void stopSearch();
59 void startSearch(); 59 void startSearch();
60 void progressTimer(); 60 void progressTimer();
61 void fillList( const QString& device, RemoteDevice::ValueList list ); 61 void fillList( const QString& device, RemoteDevice::ValueList list );