-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index f400ce6..433bd3a 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -171,192 +171,193 @@ void BlueBase::writeToHciConfig() { | |||
171 | */ | 171 | */ |
172 | void BlueBase::readSavedDevices() { | 172 | void BlueBase::readSavedDevices() { |
173 | 173 | ||
174 | QValueList<RemoteDevice> loadedDevices; | 174 | QValueList<RemoteDevice> loadedDevices; |
175 | DeviceHandler handler; | 175 | DeviceHandler handler; |
176 | loadedDevices = handler.load(); | 176 | loadedDevices = handler.load(); |
177 | 177 | ||
178 | addSearchedDevices( loadedDevices ); | 178 | addSearchedDevices( loadedDevices ); |
179 | } | 179 | } |
180 | 180 | ||
181 | 181 | ||
182 | /** | 182 | /** |
183 | * Write the list of allready known devices | 183 | * Write the list of allready known devices |
184 | */ | 184 | */ |
185 | void BlueBase::writeSavedDevices() { | 185 | void BlueBase::writeSavedDevices() { |
186 | QListViewItemIterator it( ListView2 ); | 186 | QListViewItemIterator it( ListView2 ); |
187 | BTListItem* item; | 187 | BTListItem* item; |
188 | BTDeviceItem* device; | 188 | BTDeviceItem* device; |
189 | RemoteDevice::ValueList list; | 189 | RemoteDevice::ValueList list; |
190 | for ( ; it.current(); ++it ) { | 190 | for ( ; it.current(); ++it ) { |
191 | item = (BTListItem*)it.current(); | 191 | item = (BTListItem*)it.current(); |
192 | if(item->typeId() != BTListItem::Device ) | 192 | if(item->typeId() != BTListItem::Device ) |
193 | continue; | 193 | continue; |
194 | device = (BTDeviceItem*)item; | 194 | device = (BTDeviceItem*)item; |
195 | 195 | ||
196 | list.append( device->remoteDevice() ); | 196 | list.append( device->remoteDevice() ); |
197 | } | 197 | } |
198 | /* | 198 | /* |
199 | * if not empty save the List through DeviceHandler | 199 | * if not empty save the List through DeviceHandler |
200 | */ | 200 | */ |
201 | if ( list.isEmpty() ) | 201 | if ( list.isEmpty() ) |
202 | return; | 202 | return; |
203 | DeviceHandler handler; | 203 | DeviceHandler handler; |
204 | handler.save( list ); | 204 | handler.save( list ); |
205 | } | 205 | } |
206 | 206 | ||
207 | 207 | ||
208 | /** | 208 | /** |
209 | * Set up the gui | 209 | * Set up the gui |
210 | */ | 210 | */ |
211 | void BlueBase::initGui() { | 211 | void BlueBase::initGui() { |
212 | StatusLabel->setText( status() ); // maybe move it to getStatus() | 212 | StatusLabel->setText( status() ); // maybe move it to getStatus() |
213 | cryptCheckBox->setChecked( m_useEncryption ); | 213 | cryptCheckBox->setChecked( m_useEncryption ); |
214 | authCheckBox->setChecked( m_enableAuthentification ); | 214 | authCheckBox->setChecked( m_enableAuthentification ); |
215 | pagescanCheckBox->setChecked( m_enablePagescan ); | 215 | pagescanCheckBox->setChecked( m_enablePagescan ); |
216 | inquiryscanCheckBox->setChecked( m_enableInquiryscan ); | 216 | inquiryscanCheckBox->setChecked( m_enableInquiryscan ); |
217 | deviceNameLine->setText( m_deviceName ); | 217 | deviceNameLine->setText( m_deviceName ); |
218 | passkeyLine->setText( m_defaultPasskey ); | 218 | passkeyLine->setText( m_defaultPasskey ); |
219 | // set info tab | 219 | // set info tab |
220 | setInfo(); | 220 | setInfo(); |
221 | } | 221 | } |
222 | 222 | ||
223 | 223 | ||
224 | /** | 224 | /** |
225 | * Get the status informations and returns it | 225 | * Get the status informations and returns it |
226 | * @return QString the status informations gathered | 226 | * @return QString the status informations gathered |
227 | */ | 227 | */ |
228 | QString BlueBase::status()const{ | 228 | QString BlueBase::status()const{ |
229 | QString infoString = tr( "<b>Device name : </b> Ipaq" ); | 229 | QString infoString = tr( "<b>Device name : </b> Ipaq" ); |
230 | infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); | 230 | infoString += QString( "<br><b>" + tr( "MAC adress: " ) +"</b> No idea" ); |
231 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); | 231 | infoString += QString( "<br><b>" + tr( "Class" ) + "</b> PDA" ); |
232 | 232 | ||
233 | return (infoString); | 233 | return (infoString); |
234 | } | 234 | } |
235 | 235 | ||
236 | 236 | ||
237 | /** | 237 | /** |
238 | * Read the current values from the gui and invoke writeConfig() | 238 | * Read the current values from the gui and invoke writeConfig() |
239 | */ | 239 | */ |
240 | void BlueBase::applyConfigChanges() { | 240 | void BlueBase::applyConfigChanges() { |
241 | m_deviceName = deviceNameLine->text(); | 241 | m_deviceName = deviceNameLine->text(); |
242 | m_defaultPasskey = passkeyLine->text(); | 242 | m_defaultPasskey = passkeyLine->text(); |
243 | m_useEncryption = cryptCheckBox->isChecked(); | 243 | m_useEncryption = cryptCheckBox->isChecked(); |
244 | m_enableAuthentification = authCheckBox->isChecked(); | 244 | m_enableAuthentification = authCheckBox->isChecked(); |
245 | m_enablePagescan = pagescanCheckBox->isChecked(); | 245 | m_enablePagescan = pagescanCheckBox->isChecked(); |
246 | m_enableInquiryscan = inquiryscanCheckBox->isChecked(); | 246 | m_enableInquiryscan = inquiryscanCheckBox->isChecked(); |
247 | 247 | ||
248 | writeConfig(); | 248 | writeConfig(); |
249 | 249 | ||
250 | QMessageBox::information( this, tr("Test") , tr("Changes were applied.") ); | 250 | QMessageBox::information( this, tr("Test") , tr("Changes were applied.") ); |
251 | } | 251 | } |
252 | 252 | ||
253 | /** | 253 | /** |
254 | * Add fresh found devices from scan dialog to the listing | 254 | * Add fresh found devices from scan dialog to the listing |
255 | * | 255 | * |
256 | */ | 256 | */ |
257 | void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { | 257 | void BlueBase::addSearchedDevices( const QValueList<RemoteDevice> &newDevices ) { |
258 | BTDeviceItem * deviceItem; | 258 | BTDeviceItem * deviceItem; |
259 | QValueList<RemoteDevice>::ConstIterator it; | 259 | QValueList<RemoteDevice>::ConstIterator it; |
260 | 260 | ||
261 | for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { | 261 | for( it = newDevices.begin(); it != newDevices.end() ; ++it ) { |
262 | 262 | ||
263 | if (find( (*it) )) // is already inserted | 263 | if (find( (*it) )) // is already inserted |
264 | continue; | 264 | continue; |
265 | 265 | ||
266 | deviceItem = new BTDeviceItem( ListView2 , (*it) ); | 266 | deviceItem = new BTDeviceItem( ListView2 , (*it) ); |
267 | deviceItem->setPixmap( 1, m_findPix ); | ||
267 | deviceItem->setExpandable ( true ); | 268 | deviceItem->setExpandable ( true ); |
268 | 269 | ||
269 | // look if device is avail. atm, async | 270 | // look if device is avail. atm, async |
270 | deviceActive( (*it) ); | 271 | deviceActive( (*it) ); |
271 | 272 | ||
272 | // ggf auch hier? | 273 | // ggf auch hier? |
273 | addServicesToDevice( deviceItem ); | 274 | addServicesToDevice( deviceItem ); |
274 | } | 275 | } |
275 | } | 276 | } |
276 | 277 | ||
277 | 278 | ||
278 | /** | 279 | /** |
279 | * Action that is toggled on entrys on click | 280 | * Action that is toggled on entrys on click |
280 | */ | 281 | */ |
281 | void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { | 282 | void BlueBase::startServiceActionClicked( QListViewItem */*item*/ ) { |
282 | } | 283 | } |
283 | 284 | ||
284 | 285 | ||
285 | /** | 286 | /** |
286 | * Action that are toggled on hold (mostly QPopups i guess) | 287 | * Action that are toggled on hold (mostly QPopups i guess) |
287 | */ | 288 | */ |
288 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { | 289 | void BlueBase::startServiceActionHold( QListViewItem * item, const QPoint & point, int /*column*/ ) { |
289 | if (!item ) | 290 | if (!item ) |
290 | return; | 291 | return; |
291 | 292 | ||
292 | QPopupMenu *menu = new QPopupMenu(); | 293 | QPopupMenu *menu = new QPopupMenu(); |
293 | int ret=0; | 294 | int ret=0; |
294 | 295 | ||
295 | if ( ((BTListItem*)item)->type() == "device") { | 296 | if ( ((BTListItem*)item)->type() == "device") { |
296 | 297 | ||
297 | QPopupMenu *groups = new QPopupMenu(); | 298 | QPopupMenu *groups = new QPopupMenu(); |
298 | 299 | ||
299 | menu->insertItem( tr("rescan sevices:"), 0); | 300 | menu->insertItem( tr("rescan sevices:"), 0); |
300 | menu->insertItem( tr("to group"), groups , 1); | 301 | menu->insertItem( tr("to group"), groups , 1); |
301 | // menu->insertItem( tr("bound device"), 2); | 302 | // menu->insertItem( tr("bound device"), 2); |
302 | menu->insertItem( tr("delete"), 3); | 303 | menu->insertItem( tr("delete"), 3); |
303 | 304 | ||
304 | ret = menu->exec( point , 0); | 305 | ret = menu->exec( point , 0); |
305 | 306 | ||
306 | switch(ret) { | 307 | switch(ret) { |
307 | case -1: | 308 | case -1: |
308 | break; | 309 | break; |
309 | case 0: | 310 | case 0: |
310 | addServicesToDevice( (BTDeviceItem*)item ); | 311 | addServicesToDevice( (BTDeviceItem*)item ); |
311 | break; | 312 | break; |
312 | case 1: | 313 | case 1: |
313 | 314 | ||
314 | break; | 315 | break; |
315 | 316 | ||
316 | // NO need to, since hcid does that on the fly | 317 | // NO need to, since hcid does that on the fly |
317 | // case 2: | 318 | // case 2: |
318 | // make connection | 319 | // make connection |
319 | //m_localDevice->connectTo( ((BTDeviceItem*)item)->mac() ); | 320 | //m_localDevice->connectTo( ((BTDeviceItem*)item)->mac() ); |
320 | //break; | 321 | //break; |
321 | case 3: | 322 | case 3: |
322 | // deletes childs too | 323 | // deletes childs too |
323 | delete item; | 324 | delete item; |
324 | break; | 325 | break; |
325 | } | 326 | } |
326 | delete groups; | 327 | delete groups; |
327 | 328 | ||
328 | } | 329 | } |
329 | 330 | ||
330 | /* | 331 | /* |
331 | * We got service sensitive PopupMenus in our factory | 332 | * We got service sensitive PopupMenus in our factory |
332 | * We will create one through the factory and will insert | 333 | * We will create one through the factory and will insert |
333 | * our Separator + ShowInfo into the menu or create a new | 334 | * our Separator + ShowInfo into the menu or create a new |
334 | * one if the factory returns 0 | 335 | * one if the factory returns 0 |
335 | * PopupMenu deletion is kind of weird. | 336 | * PopupMenu deletion is kind of weird. |
336 | * If escaped( -1 ) or any of our items were chosen we'll | 337 | * If escaped( -1 ) or any of our items were chosen we'll |
337 | * delete the PopupMenu otherwise it's the responsibility of | 338 | * delete the PopupMenu otherwise it's the responsibility of |
338 | * the PopupMenu to delete itself | 339 | * the PopupMenu to delete itself |
339 | * | 340 | * |
340 | */ | 341 | */ |
341 | else if ( ((BTListItem*)item)->type() == "service") { | 342 | else if ( ((BTListItem*)item)->type() == "service") { |
342 | BTServiceItem* service = (BTServiceItem*)item; | 343 | BTServiceItem* service = (BTServiceItem*)item; |
343 | QMap<int, QString> list = service->services().classIdList(); | 344 | QMap<int, QString> list = service->services().classIdList(); |
344 | QMap<int, QString>::Iterator it = list.begin(); | 345 | QMap<int, QString>::Iterator it = list.begin(); |
345 | QPopupMenu *popup =0l; | 346 | QPopupMenu *popup =0l; |
346 | if ( it != list.end() ) { | 347 | if ( it != list.end() ) { |
347 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); | 348 | qWarning("Searching id %d %s", it.key(), it.data().latin1() ); |
348 | popup = m_popHelper.find( it.key() /*1*/, | 349 | popup = m_popHelper.find( it.key() /*1*/, |
349 | service->services(), | 350 | service->services(), |
350 | (BTDeviceItem*)service->parent() ); | 351 | (BTDeviceItem*)service->parent() ); |
351 | }else { | 352 | }else { |
352 | qWarning("Empty"); | 353 | qWarning("Empty"); |
353 | } | 354 | } |
354 | 355 | ||
355 | if ( popup == 0l ) { | 356 | if ( popup == 0l ) { |
356 | qWarning("factory returned 0l"); | 357 | qWarning("factory returned 0l"); |
357 | popup = new QPopupMenu(); | 358 | popup = new QPopupMenu(); |
358 | } | 359 | } |
359 | 360 | ||
360 | int test1 = popup->insertItem( tr("Test1:"), 0); | 361 | int test1 = popup->insertItem( tr("Test1:"), 0); |
361 | 362 | ||
362 | ret = popup->exec( point ); | 363 | ret = popup->exec( point ); |