summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opietooth/manager/bluebase.cpp83
-rw-r--r--noncore/net/opietooth/manager/bluebase.h3
2 files changed, 45 insertions, 41 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp
index 7a92dc3..6caca70 100644
--- a/noncore/net/opietooth/manager/bluebase.cpp
+++ b/noncore/net/opietooth/manager/bluebase.cpp
@@ -67,12 +67,12 @@ namespace OpieTooth {
67 onPix = Resource::loadPixmap( "installed" ); 67 onPix = Resource::loadPixmap( "installed" );
68 68
69 QPalette pal = this->palette(); 69 QPalette pal = this->palette();
70 QColor col = pal.color(QPalette::Active, QColorGroup::Background); 70 QColor col = pal.color( QPalette::Active, QColorGroup::Background );
71 pal.setColor(QPalette::Active, QColorGroup::Button, col); 71 pal.setColor( QPalette::Active, QColorGroup::Button, col );
72 pal.setColor(QPalette::Inactive, QColorGroup::Button, col); 72 pal.setColor( QPalette::Inactive, QColorGroup::Button, col );
73 pal.setColor(QPalette::Normal, QColorGroup::Button, col); 73 pal.setColor( QPalette::Normal, QColorGroup::Button, col );
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
@@ -81,19 +81,12 @@ namespace OpieTooth {
81 81
82 82
83 //TESTING 83 //TESTING
84
85 ListView2->setRootIsDecorated(true); 84 ListView2->setRootIsDecorated(true);
86 85
87 QListViewItem *topLV = new QListViewItem( ListView2, "Harlekins Dongle" , "yes");
88 topLV->setPixmap( 1, offPix );
89 // (void) new QListViewItem( topLV, "on" );
90 //(void) new QListViewItem( topLV, "off" );
91
92 QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" ); 86 QListViewItem *topLV2 = new QListViewItem( ListView2, "Siemens S45" , "no" );
93 topLV2->setPixmap( 1, onPix ); 87 topLV2->setPixmap( 1, onPix );
94 (void) new QListViewItem( topLV2, "on" ); 88 (void) new QListViewItem( topLV2, "Serial" );
95 (void) new QListViewItem( topLV2, "off" ); 89 (void) new QListViewItem( topLV2, "BlueNiC" );
96
97 } 90 }
98 91
99 92
@@ -133,7 +126,7 @@ namespace OpieTooth {
133} 126}
134 127
135 128
136 /* 129 /**
137 * Read the list of allready known devices 130 * Read the list of allready known devices
138 * 131 *
139 */ 132 */
@@ -150,7 +143,7 @@ namespace OpieTooth {
150 addSearchedDevices( *loadedDevices ); 143 addSearchedDevices( *loadedDevices );
151 } 144 }
152 145
153 /* 146 /**
154 * Write the list of allready known devices 147 * Write the list of allready known devices
155 * 148 *
156 */ 149 */
@@ -174,14 +167,14 @@ namespace OpieTooth {
174 */ 167 */
175 void BlueBase::initGui() { 168 void BlueBase::initGui() {
176 169
177 StatusLabel->setText(getStatus()); // maybe move it to getStatus() 170 StatusLabel->setText( getStatus() ); // maybe move it to getStatus()
178 171
179 cryptCheckBox->setChecked(useEncryption); 172 cryptCheckBox->setChecked( useEncryption );
180 authCheckBox->setChecked(enableAuthentification); 173 authCheckBox->setChecked( enableAuthentification );
181 pagescanCheckBox->setChecked(enablePagescan); 174 pagescanCheckBox->setChecked( enablePagescan );
182 inquiryscanCheckBox->setChecked(enableInquiryscan); 175 inquiryscanCheckBox->setChecked( enableInquiryscan );
183 deviceNameLine->setText(deviceName); 176 deviceNameLine->setText( deviceName );
184 passkeyLine->setText(defaultPasskey); 177 passkeyLine->setText( defaultPasskey );
185 // set info tab 178 // set info tab
186 setInfo(); 179 setInfo();
187 } 180 }
@@ -193,9 +186,9 @@ namespace OpieTooth {
193 */ 186 */
194 QString BlueBase::getStatus(){ 187 QString BlueBase::getStatus(){
195 188
196 QString infoString = tr("<b>Device name : </b> Ipaq" ); 189 QString infoString = tr( "<b>Device name : </b> Ipaq" );
197 infoString += QString("<br><b>" + tr("MAC adress: ") +"</b> No idea"); 190 infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" );
198 infoString += QString("<br><b>" + tr("Class") + "</b> PDA"); 191 infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" );
199 192
200 return (infoString); 193 return (infoString);
201 194
@@ -221,10 +214,10 @@ namespace OpieTooth {
221 box->show(); 214 box->show();
222 215
223 // falls nötig hcid killhupen - die funktionalität adden 216 // falls nötig hcid killhupen - die funktionalität adden
224} 217 }
225 218
226 219
227 /* 220 /**
228 * Add fresh found devices from scan dialog to the listing 221 * Add fresh found devices from scan dialog to the listing
229 * 222 *
230 */ 223 */
@@ -254,7 +247,7 @@ namespace OpieTooth {
254 } 247 }
255 248
256 249
257 /* 250 /**
258 * Action that is toggled on entrys on click 251 * Action that is toggled on entrys on click
259 */ 252 */
260 void BlueBase::startServiceActionClicked( QListViewItem *item ) { 253 void BlueBase::startServiceActionClicked( QListViewItem *item ) {
@@ -262,7 +255,7 @@ namespace OpieTooth {
262 255
263 } 256 }
264 257
265 /* 258 /**
266 * Action that are toggled on hold (mostly QPopups i guess) 259 * Action that are toggled on hold (mostly QPopups i guess)
267 */ 260 */
268 void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) { 261 void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int column ) {
@@ -270,7 +263,7 @@ namespace OpieTooth {
270 263
271 } 264 }
272 265
273 /* 266 /**
274 * Search and display avail. services for a device (on expand from device listing) 267 * Search and display avail. services for a device (on expand from device listing)
275 * 268 *
276 */ 269 */
@@ -278,11 +271,11 @@ namespace OpieTooth {
278 271
279 qDebug("addServicesToDevice"); 272 qDebug("addServicesToDevice");
280 // row of mac adress 273 // row of mac adress
281 RemoteDevice *device = new RemoteDevice(item->text(3), item->text(0)); 274 RemoteDevice *device = new RemoteDevice( item->text(3), item->text(0) );
282 275
283 deviceList.insert( item->text(3) , item ); 276 deviceList.insert( item->text(3) , item );
284 277
285// and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back 278 // and some time later I get a signal foundServices( const QString& device, Services::ValueList ); back
286 localDevice->searchServices( *device ); 279 localDevice->searchServices( *device );
287 280
288 // delete 281 // delete
@@ -304,7 +297,7 @@ namespace OpieTooth {
304 QListViewItem* deviceItem; 297 QListViewItem* deviceItem;
305 298
306 for( it = deviceList.begin(); it != deviceList.end(); ++it ) { 299 for( it = deviceList.begin(); it != deviceList.end(); ++it ) {
307 if (it.key() == device ) { 300 if ( it.key() == device ) {
308 deviceItem = it.data(); 301 deviceItem = it.data();
309 } 302 }
310 } 303 }
@@ -316,14 +309,21 @@ namespace OpieTooth {
316 QListViewItem * serviceItem; 309 QListViewItem * serviceItem;
317 310
318 for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) { 311 for( it2 = servicesList.begin(); it2 != servicesList.end(); ++it2 ) {
319// it2.serviceName()
320 serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() ); 312 serviceItem = new QListViewItem( deviceItem , (*it2).serviceName() );
321 } 313 }
322
323 } 314 }
324 315
325 316
326 /* 317 /**
318 * Add the existing connections (pairs) to the connections tab.
319 *
320 */
321 void BlueBase::addConnectedDevices() {
322
323
324 }
325
326 /**
327 * Find out if a device can currently be reached 327 * Find out if a device can currently be reached
328 */ 328 */
329 bool BlueBase::deviceActive( RemoteDevice *device ) { 329 bool BlueBase::deviceActive( RemoteDevice *device ) {
@@ -337,13 +337,16 @@ namespace OpieTooth {
337 void BlueBase::startScan() { 337 void BlueBase::startScan() {
338 338
339 ScanDialog *scan = new ScanDialog( this, "", true); 339 ScanDialog *scan = new ScanDialog( this, "", true);
340 QObject::connect( scan, SIGNAL( selectedDevices(QList<RemoteDevice>&) ), 340 QObject::connect( scan, SIGNAL( selectedDevices( QList<RemoteDevice>& ) ),
341 this, SLOT( addSearchedDevices(QList<RemoteDevice>& ) )); 341 this, SLOT( addSearchedDevices( QList<RemoteDevice>& ) ) );
342 342
343 scan->showMaximized(); 343 scan->showMaximized();
344 } 344 }
345 345
346 346
347 /**
348 * Set the informations about the local device in information Tab
349 */
347 void BlueBase::setInfo() { 350 void BlueBase::setInfo() {
348 StatusLabel->setText( getStatus() ); 351 StatusLabel->setText( getStatus() );
349 } 352 }
diff --git a/noncore/net/opietooth/manager/bluebase.h b/noncore/net/opietooth/manager/bluebase.h
index d20d05c..99d2fa6 100644
--- a/noncore/net/opietooth/manager/bluebase.h
+++ b/noncore/net/opietooth/manager/bluebase.h
@@ -65,10 +65,11 @@ namespace OpieTooth {
65 QPixmap offPix; 65 QPixmap offPix;
66 QPixmap onPix; 66 QPixmap onPix;
67 67
68 public slots: 68 private slots:
69 void addSearchedDevices( QList<RemoteDevice> &newDevices ); 69 void addSearchedDevices( QList<RemoteDevice> &newDevices );
70 void addServicesToDevice( QListViewItem *item ); 70 void addServicesToDevice( QListViewItem *item );
71 void addServicesToDevice( const QString& device, Services::ValueList ); 71 void addServicesToDevice( const QString& device, Services::ValueList );
72 void addConnectedDevices();
72 void startServiceActionClicked( QListViewItem *item ); 73 void startServiceActionClicked( QListViewItem *item );
73 void startServiceActionHold( QListViewItem *item, const QPoint &point, int column); 74 void startServiceActionHold( QListViewItem *item, const QPoint &point, int column);
74 void applyConfigChanges(); 75 void applyConfigChanges();