-rw-r--r-- | noncore/net/networksetup/interfaces.cpp | 64 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces.h | 4 | ||||
-rw-r--r-- | noncore/net/networksetup/interfacesetupimp.cpp | 1 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 38 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.h | 1 |
5 files changed, 93 insertions, 15 deletions
diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp index 0927258..9155890 100644 --- a/noncore/net/networksetup/interfaces.cpp +++ b/noncore/net/networksetup/interfaces.cpp | |||
@@ -337,4 +337,3 @@ QString Interfaces::getInterfaceOption(QString option, bool &error){ | |||
337 | * Set a value for an option in the currently selected interface. If option | 337 | * Set a value for an option in the currently selected interface. If option |
338 | * doesn't exist then it is added along with the value. If value is set to an | 338 | * doesn't exist then it is added along with the value. |
339 | * empty string then option is removed. | ||
340 | * @param option the options to set the value. | 339 | * @param option the options to set the value. |
@@ -349,2 +348,13 @@ bool Interfaces::setInterfaceOption(QString option, QString value){ | |||
349 | /** | 348 | /** |
349 | * Removes a value for an option in the currently selected interface. | ||
350 | * @param option the options to set the value. | ||
351 | * @param value the value that option should be set to. | ||
352 | * @param error set to true if any error occurs, false otherwise. | ||
353 | * @return QString the options value. QString::null if error == true | ||
354 | */ | ||
355 | bool Interfaces::removeInterfaceOption(QString option, QString value){ | ||
356 | return removeOption(currentIface, option, value); | ||
357 | } | ||
358 | |||
359 | /** | ||
350 | * Removes all of the options from the currently selected interface. | 360 | * Removes all of the options from the currently selected interface. |
@@ -379,2 +389,13 @@ void Interfaces::addMapping(QString option){ | |||
379 | /** | 389 | /** |
390 | * Remove the currently selected map and all of its options. | ||
391 | * @return bool if successfull or not. | ||
392 | */ | ||
393 | bool Interfaces::removeMapping(){ | ||
394 | if(currentMapping == interfaces.end()) | ||
395 | return false; | ||
396 | (*currentMapping) = ""; | ||
397 | return removeAllOptions(currentMapping); | ||
398 | } | ||
399 | |||
400 | /** | ||
380 | * Set a map option within a mapping. | 401 | * Set a map option within a mapping. |
@@ -389,2 +410,12 @@ bool Interfaces::setMap(QString map, QString value){ | |||
389 | /** | 410 | /** |
411 | * Removes a map option within a mapping. | ||
412 | * @param map map to use | ||
413 | * @param value value to go with map | ||
414 | * @return bool true if it is successfull. | ||
415 | */ | ||
416 | bool Interfaces::removeMap(QString map, QString value){ | ||
417 | return removeOption(currentMapping, map, value); | ||
418 | } | ||
419 | |||
420 | /** | ||
390 | * Get a map value within a mapping. | 421 | * Get a map value within a mapping. |
@@ -479,5 +510,2 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
479 | found = true; | 510 | found = true; |
480 | if(value == "") | ||
481 | (*it) = ""; | ||
482 | else | ||
483 | (*it) = QString("\t%1 %2").arg(option).arg(value); | 511 | (*it) = QString("\t%1 %2").arg(option).arg(value); |
@@ -492,2 +520,28 @@ bool Interfaces::setOption(QStringList::Iterator start, QString option, QString | |||
492 | } | 520 | } |
521 | /** | ||
522 | * Removes a option in a stanza | ||
523 | * @param start the start of the stanza | ||
524 | * @param option the option to use when setting value. | ||
525 | * @return bool true if successfull, false otherwise. | ||
526 | */ | ||
527 | bool Interfaces::removeOption(QStringList::Iterator start, QString option, QString value){ | ||
528 | if(start == interfaces.end()) | ||
529 | return false; | ||
530 | |||
531 | bool found = false; | ||
532 | for ( QStringList::Iterator it = start; it != interfaces.end(); ++it ) { | ||
533 | if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO)) && it != start){ | ||
534 | // got to the end without finding it | ||
535 | break; | ||
536 | } | ||
537 | if((*it).contains(option) && (*it).contains(value) &&it != start){ | ||
538 | // Found it in stanza so replace it. | ||
539 | if(found) | ||
540 | qDebug(QString("Interfaces: Set Options found more then one value for option: %1 in stanza: %1").arg(option).arg((*start)).latin1()); | ||
541 | found = true; | ||
542 | (*it) = ""; | ||
543 | } | ||
544 | } | ||
545 | return found; | ||
546 | } | ||
493 | 547 | ||
diff --git a/noncore/net/networksetup/interfaces.h b/noncore/net/networksetup/interfaces.h index 7cf04f0..e09ea71 100644 --- a/noncore/net/networksetup/interfaces.h +++ b/noncore/net/networksetup/interfaces.h | |||
@@ -43,2 +43,3 @@ public: | |||
43 | bool setInterfaceOption(QString option, QString value); | 43 | bool setInterfaceOption(QString option, QString value); |
44 | bool removeInterfaceOption(QString option, QString value); | ||
44 | bool removeAllInterfaceOptions(); | 45 | bool removeAllInterfaceOptions(); |
@@ -46,4 +47,6 @@ public: | |||
46 | bool setMapping(QString interface); | 47 | bool setMapping(QString interface); |
48 | bool removeMapping(); | ||
47 | void addMapping(QString options); | 49 | void addMapping(QString options); |
48 | bool setMap(QString map, QString value); | 50 | bool setMap(QString map, QString value); |
51 | bool removeMap(QString map, QString value); | ||
49 | QString getMap(QString map, bool &error); | 52 | QString getMap(QString map, bool &error); |
@@ -57,2 +60,3 @@ private: | |||
57 | bool setOption(QStringList::Iterator start, QString option, QString value); | 60 | bool setOption(QStringList::Iterator start, QString option, QString value); |
61 | bool removeOption(QStringList::Iterator start, QString option, QString value); | ||
58 | QString getOption(QStringList::Iterator start, QString option, bool &error); | 62 | QString getOption(QStringList::Iterator start, QString option, bool &error); |
diff --git a/noncore/net/networksetup/interfacesetupimp.cpp b/noncore/net/networksetup/interfacesetupimp.cpp index bdbdfde..1327726 100644 --- a/noncore/net/networksetup/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfacesetupimp.cpp | |||
@@ -94,3 +94,2 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
94 | newInterfaceName += "_" + profile; | 94 | newInterfaceName += "_" + profile; |
95 | qDebug( newInterfaceName.latin1()); | ||
96 | // See if we have to make a interface. | 95 | // See if we have to make a interface. |
diff --git a/noncore/net/networksetup/mainwindowimp.cpp b/noncore/net/networksetup/mainwindowimp.cpp index 9f07f0d..01063c2 100644 --- a/noncore/net/networksetup/mainwindowimp.cpp +++ b/noncore/net/networksetup/mainwindowimp.cpp | |||
@@ -34,3 +34,4 @@ | |||
34 | 34 | ||
35 | #define SCHEME "/var/lib/pcmcia/scheme" | 35 | #define DEFAULT_SCHEME "/var/lib/pcmcia/scheme" |
36 | |||
36 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ | 37 | MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(parent, name, true), advancedUserMode(false){ |
@@ -58,4 +59,5 @@ MainWindowImp::MainWindowImp(QWidget *parent, const char *name) : MainWindow(par | |||
58 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); | 59 | advancedUserMode = cfg.readBoolEntry("AdvancedUserMode", false); |
60 | scheme = cfg.readEntry("SchemeFile", DEFAULT_SCHEME); | ||
59 | 61 | ||
60 | QFile file(SCHEME); | 62 | QFile file(scheme); |
61 | if ( file.open(IO_ReadOnly) ) { // file opened successfully | 63 | if ( file.open(IO_ReadOnly) ) { // file opened successfully |
@@ -97,3 +99,3 @@ MainWindowImp::~MainWindowImp(){ | |||
97 | void MainWindowImp::loadModules(QString path){ | 99 | void MainWindowImp::loadModules(QString path){ |
98 | qDebug(path.latin1()); | 100 | //qDebug(path.latin1()); |
99 | QDir d(path); | 101 | QDir d(path); |
@@ -122,3 +124,3 @@ void MainWindowImp::loadModules(QString path){ | |||
122 | Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ | 124 | Module* MainWindowImp::loadPlugin(QString pluginFileName, QString resolveString){ |
123 | qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1()); | 125 | //qDebug(QString("MainWindowImp::loadPlugin: %1").arg(pluginFileName).latin1()); |
124 | QLibrary *lib = new QLibrary(pluginFileName); | 126 | QLibrary *lib = new QLibrary(pluginFileName); |
@@ -492,6 +494,24 @@ void MainWindowImp::removeProfile(){ | |||
492 | profilesList->insertItem((*it)); | 494 | profilesList->insertItem((*it)); |
493 | } | ||
494 | 495 | ||
495 | // Remove any interface settings and mappings. | 496 | // Remove any interface settings and mappings. |
496 | //TODO | 497 | Interfaces interfaces; |
498 | // Go through them one by one | ||
499 | QMap<Interface*, QListViewItem*>::Iterator it; | ||
500 | for( it = items.begin(); it != items.end(); ++it ){ | ||
501 | QString interfaceName = it.key()->getInterfaceName(); | ||
502 | qDebug(interfaceName.latin1()); | ||
503 | if(interfaces.setInterface(interfaceName + "_" + profileToRemove)){ | ||
504 | interfaces.removeInterface(); | ||
505 | if(interfaces.setMapping(interfaceName)){ | ||
506 | if(profilesList->count() == 1) | ||
507 | interfaces.removeMapping(); | ||
508 | else{ | ||
509 | interfaces.removeMap("map", interfaceName + "_" + profileToRemove); | ||
510 | } | ||
511 | } | ||
512 | interfaces.write(); | ||
513 | break; | ||
514 | } | ||
515 | } | ||
516 | } | ||
497 | } | 517 | } |
@@ -510,4 +530,4 @@ void MainWindowImp::changeProfile(){ | |||
510 | currentProfileLabel->setText(newProfile); | 530 | currentProfileLabel->setText(newProfile); |
511 | QFile::remove(SCHEME); | 531 | QFile::remove(scheme); |
512 | QFile file(SCHEME); | 532 | QFile file(scheme); |
513 | if ( file.open(IO_ReadWrite) ) { | 533 | if ( file.open(IO_ReadWrite) ) { |
diff --git a/noncore/net/networksetup/mainwindowimp.h b/noncore/net/networksetup/mainwindowimp.h index c67c161..e5284b4 100644 --- a/noncore/net/networksetup/mainwindowimp.h +++ b/noncore/net/networksetup/mainwindowimp.h | |||
@@ -52,2 +52,3 @@ private: | |||
52 | bool advancedUserMode; | 52 | bool advancedUserMode; |
53 | QString scheme; | ||
53 | }; | 54 | }; |