Diffstat (limited to 'noncore/settings/networksettings/mainwindowimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/settings/networksettings/mainwindowimp.cpp | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 7b93554..9a17743 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp | |||
@@ -311,67 +311,63 @@ void MainWindowImp::removeClicked(){ | |||
311 | void MainWindowImp::configureClicked(){ | 311 | void MainWindowImp::configureClicked(){ |
312 | QListViewItem *item = connectionList->currentItem(); | 312 | QListViewItem *item = connectionList->currentItem(); |
313 | if(!item){ | 313 | if(!item){ |
314 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); | 314 | QMessageBox::information(this, "Sorry","Please select an interface first.", QMessageBox::Ok); |
315 | return; | 315 | return; |
316 | } | 316 | } |
317 | 317 | ||
318 | Interface *i = interfaceItems[item]; | 318 | Interface *i = interfaceItems[item]; |
319 | if(i->getModuleOwner()){ | 319 | if(i->getModuleOwner()){ |
320 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); | 320 | QWidget *moduleConfigure = i->getModuleOwner()->configure(i); |
321 | if(moduleConfigure != NULL){ | 321 | if(moduleConfigure != NULL){ |
322 | moduleConfigure->showMaximized(); | 322 | moduleConfigure->showMaximized(); |
323 | moduleConfigure->show(); | ||
324 | return; | 323 | return; |
325 | } | 324 | } |
326 | } | 325 | } |
327 | 326 | ||
328 | InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose); | 327 | InterfaceSetupImpDialog *configure = new InterfaceSetupImpDialog(0, "InterfaceSetupImp", i, true, Qt::WDestructiveClose); |
329 | QString currentProfileText = currentProfileLabel->text(); | 328 | QString currentProfileText = currentProfileLabel->text(); |
330 | if(currentProfileText.upper() == "ALL"); | 329 | if(currentProfileText.upper() == "ALL"); |
331 | currentProfileText = ""; | 330 | currentProfileText = ""; |
332 | configure->setProfile(currentProfileText); | 331 | configure->setProfile(currentProfileText); |
333 | configure->showMaximized(); | 332 | configure->showMaximized(); |
334 | configure->show(); | ||
335 | } | 333 | } |
336 | 334 | ||
337 | /** | 335 | /** |
338 | * Pull up the information about the currently selected interface. | 336 | * Pull up the information about the currently selected interface. |
339 | * Report an error if no interface is selected. | 337 | * Report an error if no interface is selected. |
340 | * If the interface has a module owner then request its configure. | 338 | * If the interface has a module owner then request its configure. |
341 | */ | 339 | */ |
342 | void MainWindowImp::informationClicked(){ | 340 | void MainWindowImp::informationClicked(){ |
343 | QListViewItem *item = connectionList->currentItem(); | 341 | QListViewItem *item = connectionList->currentItem(); |
344 | if(!item){ | 342 | if(!item){ |
345 | QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); | 343 | QMessageBox::information(this, "Sorry","Please select an interface First.", QMessageBox::Ok); |
346 | return; | 344 | return; |
347 | } | 345 | } |
348 | 346 | ||
349 | Interface *i = interfaceItems[item]; | 347 | Interface *i = interfaceItems[item]; |
350 | if(!i->isAttached()){ | 348 | if(!i->isAttached()){ |
351 | QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); | 349 | QMessageBox::information(this, "Sorry","No information about\na disconnected interface.", QMessageBox::Ok); |
352 | return; | 350 | return; |
353 | } | 351 | } |
354 | 352 | ||
355 | if(i->getModuleOwner()){ | 353 | if(i->getModuleOwner()){ |
356 | QWidget *moduleInformation = i->getModuleOwner()->information(i); | 354 | QWidget *moduleInformation = i->getModuleOwner()->information(i); |
357 | if(moduleInformation != NULL){ | 355 | if(moduleInformation != NULL){ |
358 | moduleInformation->showMaximized(); | 356 | moduleInformation->showMaximized(); |
359 | moduleInformation->show(); | ||
360 | return; | 357 | return; |
361 | } | 358 | } |
362 | } | 359 | } |
363 | InterfaceInformationImp *information = new InterfaceInformationImp(0, "InterfaceSetupImp", i, true); | 360 | InterfaceInformationImp information(0, "InterfaceSetupImp", i); |
364 | information->showMaximized(); | 361 | information.showMaximized(); |
365 | information->show(); | ||
366 | } | 362 | } |
367 | 363 | ||
368 | /** | 364 | /** |
369 | * Update this interface. If no QListViewItem exists create one. | 365 | * Update this interface. If no QListViewItem exists create one. |
370 | * @param Interface* pointer to the interface that needs to be updated. | 366 | * @param Interface* pointer to the interface that needs to be updated. |
371 | */ | 367 | */ |
372 | void MainWindowImp::updateInterface(Interface *i){ | 368 | void MainWindowImp::updateInterface(Interface *i){ |
373 | if(!advancedUserMode){ | 369 | if(!advancedUserMode){ |
374 | if(i->getInterfaceName() == "lo") | 370 | if(i->getInterfaceName() == "lo") |
375 | return; | 371 | return; |
376 | } | 372 | } |
377 | 373 | ||
@@ -402,25 +398,25 @@ void MainWindowImp::updateInterface(Interface *i){ | |||
402 | typeName = "irda"; | 398 | typeName = "irda"; |
403 | if(i->getInterfaceName().contains("wlan")) | 399 | if(i->getInterfaceName().contains("wlan")) |
404 | typeName = "wlan"; | 400 | typeName = "wlan"; |
405 | if(i->getInterfaceName().contains("usb")) | 401 | if(i->getInterfaceName().contains("usb")) |
406 | typeName = "usb"; | 402 | typeName = "usb"; |
407 | 403 | ||
408 | if(!i->isAttached()) | 404 | if(!i->isAttached()) |
409 | typeName = "connect_no"; | 405 | typeName = "connect_no"; |
410 | // Actually try to use the Module | 406 | // Actually try to use the Module |
411 | if(i->getModuleOwner() != NULL) | 407 | if(i->getModuleOwner() != NULL) |
412 | typeName = i->getModuleOwner()->getPixmapName(i); | 408 | typeName = i->getModuleOwner()->getPixmapName(i); |
413 | 409 | ||
414 | item->setPixmap(1, (Resource::loadPixmap(typeName))); | 410 | item->setPixmap(1, (Resource::loadPixmap(QString("networksetup/") + typeName))); |
415 | item->setText(2, i->getHardwareName()); | 411 | item->setText(2, i->getHardwareName()); |
416 | item->setText(3, QString("(%1)").arg(i->getInterfaceName())); | 412 | item->setText(3, QString("(%1)").arg(i->getInterfaceName())); |
417 | item->setText(4, (i->getStatus()) ? i->getIp() : QString("")); | 413 | item->setText(4, (i->getStatus()) ? i->getIp() : QString("")); |
418 | } | 414 | } |
419 | 415 | ||
420 | void MainWindowImp::newProfileChanged(const QString& newText){ | 416 | void MainWindowImp::newProfileChanged(const QString& newText){ |
421 | if(newText.length() > 0) | 417 | if(newText.length() > 0) |
422 | newProfileButton->setEnabled(true); | 418 | newProfileButton->setEnabled(true); |
423 | else | 419 | else |
424 | newProfileButton->setEnabled(false); | 420 | newProfileButton->setEnabled(false); |
425 | } | 421 | } |
426 | 422 | ||