Diffstat (limited to 'noncore/net/networksetup/mainwindowimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 3c0af6a..9f07f0d 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -219,42 +219,42 @@ void MainWindowImp::configureClicked(){ | |||
219 | if(!item){ | 219 | if(!item){ |
220 | QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok); | 220 | QMessageBox::information(this, "Error","Please select an interface.", QMessageBox::Ok); |
221 | return; | 221 | return; |
222 | } | 222 | } |
223 | 223 | ||
224 | QString currentProfile = currentProfileLabel->text(); | 224 | QString currentProfile = currentProfileLabel->text(); |
225 | if(profilesList->count() <= 1 || currentProfile == "All"){ | 225 | if(profilesList->count() <= 1 || currentProfile == "All"){ |
226 | currentProfile = ""; | 226 | currentProfile = ""; |
227 | } | 227 | } |
228 | 228 | ||
229 | Interface *i = interfaceItems[item]; | 229 | Interface *i = interfaceItems[item]; |
230 | if(i->getModuleOwner()){ | 230 | if(i->getModuleOwner()){ |
231 | i->getModuleOwner()->setProfile(currentProfileLabel->text()); | 231 | i->getModuleOwner()->setProfile(currentProfile); |
232 | QTabWidget *tabWidget = NULL; | 232 | QTabWidget *tabWidget = NULL; |
233 | QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget); | 233 | QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget); |
234 | if(moduleConfigure != NULL){ | 234 | if(moduleConfigure != NULL){ |
235 | if(tabWidget != NULL){ | 235 | if(tabWidget != NULL){ |
236 | InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true); | 236 | InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true); |
237 | configure->setProfile(currentProfileLabel->text()); | 237 | configure->setProfile(currentProfile); |
238 | tabWidget->insertTab(configure, "TCP/IP"); | 238 | tabWidget->insertTab(configure, "TCP/IP"); |
239 | 239 | ||
240 | } | 240 | } |
241 | moduleConfigure->showMaximized(); | 241 | moduleConfigure->showMaximized(); |
242 | moduleConfigure->show(); | 242 | moduleConfigure->show(); |
243 | return; | 243 | return; |
244 | } | 244 | } |
245 | } | 245 | } |
246 | 246 | ||
247 | InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true); | 247 | InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true); |
248 | configure->setProfile(currentProfileLabel->text()); | 248 | configure->setProfile(currentProfile); |
249 | configure->showMaximized(); | 249 | configure->showMaximized(); |
250 | configure->show(); | 250 | configure->show(); |
251 | } | 251 | } |
252 | 252 | ||
253 | /** | 253 | /** |
254 | * Pull up the information about the currently selected interface. | 254 | * Pull up the information about the currently selected interface. |
255 | * Report an error if no interface is selected. | 255 | * Report an error if no interface is selected. |
256 | * If the interface has a module owner then request its configure with a empty | 256 | * If the interface has a module owner then request its configure with a empty |
257 | * tab. If tab is !NULL then append the interfaces setup widget to it. | 257 | * tab. If tab is !NULL then append the interfaces setup widget to it. |
258 | */ | 258 | */ |
259 | void MainWindowImp::informationClicked(){ | 259 | void MainWindowImp::informationClicked(){ |
260 | QListViewItem *item = connectionList->currentItem(); | 260 | QListViewItem *item = connectionList->currentItem(); |
@@ -368,30 +368,32 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
368 | 368 | ||
369 | if(threads.count() == 0){ | 369 | if(threads.count() == 0){ |
370 | Interfaces i; | 370 | Interfaces i; |
371 | QStringList list = i.getInterfaceList(); | 371 | QStringList list = i.getInterfaceList(); |
372 | QMap<QString, Interface*>::Iterator it; | 372 | QMap<QString, Interface*>::Iterator it; |
373 | for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { | 373 | for ( QStringList::Iterator ni = list.begin(); ni != list.end(); ++ni ) { |
374 | bool found = false; | 374 | bool found = false; |
375 | for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ | 375 | for( it = interfaceNames.begin(); it != interfaceNames.end(); ++it ){ |
376 | if(it.key() == (*ni)) | 376 | if(it.key() == (*ni)) |
377 | found = true; | 377 | found = true; |
378 | } | 378 | } |
379 | if(!found){ | 379 | if(!found){ |
380 | Interface *i = new Interface(this, *ni, false); | 380 | if(!(*ni).contains("_")){ |
381 | i->setAttached(false); | 381 | Interface *i = new Interface(this, *ni, false); |
382 | i->setHardwareName("Disconnected"); | 382 | i->setAttached(false); |
383 | interfaceNames.insert(i->getInterfaceName(), i); | 383 | i->setHardwareName("Disconnected"); |
384 | updateInterface(i); | 384 | interfaceNames.insert(i->getInterfaceName(), i); |
385 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | 385 | updateInterface(i); |
386 | connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); | ||
387 | } | ||
386 | } | 388 | } |
387 | } | 389 | } |
388 | } | 390 | } |
389 | } | 391 | } |
390 | 392 | ||
391 | /** | 393 | /** |
392 | * Update this interface. If no QListViewItem exists create one. | 394 | * Update this interface. If no QListViewItem exists create one. |
393 | * @param Interface* pointer to the interface that needs to be updated. | 395 | * @param Interface* pointer to the interface that needs to be updated. |
394 | */ | 396 | */ |
395 | void MainWindowImp::updateInterface(Interface *i){ | 397 | void MainWindowImp::updateInterface(Interface *i){ |
396 | if(!advancedUserMode){ | 398 | if(!advancedUserMode){ |
397 | if(i->getInterfaceName() == "lo") | 399 | if(i->getInterfaceName() == "lo") |
@@ -480,38 +482,42 @@ void MainWindowImp::removeProfile(){ | |||
480 | if(profileToRemove == currentProfileLabel->text()){ | 482 | if(profileToRemove == currentProfileLabel->text()){ |
481 | QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), "Ok"); | 483 | QMessageBox::information(this, "Can't remove.",QString("%1 is the current profile.").arg(profileToRemove), "Ok"); |
482 | return; | 484 | return; |
483 | 485 | ||
484 | } | 486 | } |
485 | 487 | ||
486 | if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){ | 488 | if(QMessageBox::information(this, "Question",QString("Remove profile: %1").arg(profileToRemove), QMessageBox::Ok, QMessageBox::Cancel) == QMessageBox::Ok){ |
487 | profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), "")); | 489 | profiles = QStringList::split(" ", profiles.join(" ").replace(QRegExp(profileToRemove), "")); |
488 | profilesList->clear(); | 490 | profilesList->clear(); |
489 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) | 491 | for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) |
490 | profilesList->insertItem((*it)); | 492 | profilesList->insertItem((*it)); |
491 | } | 493 | } |
494 | |||
495 | // Remove any interface settings and mappings. | ||
496 | //TODO | ||
492 | } | 497 | } |
493 | 498 | ||
494 | /** | 499 | /** |
495 | * A new profile has been selected, change. | 500 | * A new profile has been selected, change. |
496 | * @param newProfile the new profile. | 501 | * @param newProfile the new profile. |
497 | */ | 502 | */ |
498 | void MainWindowImp::changeProfile(){ | 503 | void MainWindowImp::changeProfile(){ |
499 | if(profilesList->currentItem() == -1){ | 504 | if(profilesList->currentItem() == -1){ |
500 | QMessageBox::information(this, "Can't Change.","Please select a profile.", "Ok"); | 505 | QMessageBox::information(this, "Can't Change.","Please select a profile.", "Ok"); |
501 | return; | 506 | return; |
502 | } | 507 | } |
503 | QString newProfile = profilesList->text(profilesList->currentItem()); | 508 | QString newProfile = profilesList->text(profilesList->currentItem()); |
504 | if(newProfile != currentProfileLabel->text()){ | 509 | if(newProfile != currentProfileLabel->text()){ |
505 | currentProfileLabel->setText(newProfile); | 510 | currentProfileLabel->setText(newProfile); |
511 | QFile::remove(SCHEME); | ||
506 | QFile file(SCHEME); | 512 | QFile file(SCHEME); |
507 | if ( file.open(IO_ReadWrite) ) { | 513 | if ( file.open(IO_ReadWrite) ) { |
508 | QTextStream stream( &file ); | 514 | QTextStream stream( &file ); |
509 | stream << QString("SCHEME=%1").arg(newProfile); | 515 | stream << QString("SCHEME=%1").arg(newProfile); |
510 | file.close(); | 516 | file.close(); |
511 | } | 517 | } |
512 | // restart all up devices? | 518 | // restart all up devices? |
513 | if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ | 519 | if(QMessageBox::information(this, "Question","Restart all running interfaces?", QMessageBox::Ok, QMessageBox::No) == QMessageBox::Ok){ |
514 | // Go through them one by one | 520 | // Go through them one by one |
515 | QMap<Interface*, QListViewItem*>::Iterator it; | 521 | QMap<Interface*, QListViewItem*>::Iterator it; |
516 | for( it = items.begin(); it != items.end(); ++it ){ | 522 | for( it = items.begin(); it != items.end(); ++it ){ |
517 | if(it.key()->getStatus() == true) | 523 | if(it.key()->getStatus() == true) |