-rw-r--r-- | noncore/net/networksetup/interfaces.cpp | 50 | ||||
-rw-r--r-- | noncore/net/networksetup/interfaces.h | 1 | ||||
-rw-r--r-- | noncore/net/networksetup/interfacesetupimp.cpp | 21 | ||||
-rw-r--r-- | noncore/net/networksetup/mainwindowimp.cpp | 24 |
4 files changed, 74 insertions, 22 deletions
diff --git a/noncore/net/networksetup/interfaces.cpp b/noncore/net/networksetup/interfaces.cpp index eef42df..0927258 100644 --- a/noncore/net/networksetup/interfaces.cpp +++ b/noncore/net/networksetup/interfaces.cpp | |||
@@ -168,4 +168,30 @@ bool Interfaces::addInterface(QString interface, QString family, QString method) | |||
168 | 168 | ||
169 | /** | 169 | /** |
170 | * Copies interface with name interface to name newInterface | ||
171 | * @param newInterface name of the new interface. | ||
172 | * @return bool true if successfull | ||
173 | */ | ||
174 | bool Interfaces::copyInterface(QString interface, QString newInterface){ | ||
175 | if(!setInterface(interface)) return false; | ||
176 | |||
177 | QStringList::Iterator it = currentIface; | ||
178 | it++; | ||
179 | |||
180 | bool error; | ||
181 | addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error)); | ||
182 | if(!setInterface(newInterface)) return false; | ||
183 | QStringList::Iterator newIface = currentIface; | ||
184 | newIface++; | ||
185 | |||
186 | for ( it; it != interfaces.end(); ++it ){ | ||
187 | if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))) | ||
188 | break; | ||
189 | newIface = interfaces.insert(newIface, *it); | ||
190 | } | ||
191 | |||
192 | return true; | ||
193 | } | ||
194 | |||
195 | /** | ||
170 | * Remove the currently selected interface and all of its options. | 196 | * Remove the currently selected interface and all of its options. |
171 | * @return bool if successfull or not. | 197 | * @return bool if successfull or not. |
@@ -402,10 +428,24 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator | |||
402 | QString line = (*it).simplifyWhiteSpace(); | 428 | QString line = (*it).simplifyWhiteSpace(); |
403 | if(line.contains(stanza) && line.contains(option)){ | 429 | if(line.contains(stanza) && line.contains(option)){ |
404 | if(found == true){ | 430 | uint point = line.find(option); |
405 | qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); | 431 | bool valid = true; |
432 | if(point > 0){ | ||
433 | // There are more chars in the line. check +1 | ||
434 | if(line.at(point-1) != ' ') | ||
435 | valid = false; | ||
436 | } | ||
437 | point += option.length(); | ||
438 | if(point < line.length()-1){ | ||
439 | // There are more chars in the line. check -1 | ||
440 | if(line.at(point) != ' ') | ||
441 | valid = false; | ||
442 | } | ||
443 | if(valid){ | ||
444 | if(found == true){ | ||
445 | qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); | ||
446 | } | ||
447 | found = true; | ||
448 | iterator = it; | ||
406 | } | 449 | } |
407 | qDebug("Found"); | ||
408 | found = true; | ||
409 | iterator = it; | ||
410 | } | 450 | } |
411 | } | 451 | } |
diff --git a/noncore/net/networksetup/interfaces.h b/noncore/net/networksetup/interfaces.h index e617c17..7cf04f0 100644 --- a/noncore/net/networksetup/interfaces.h +++ b/noncore/net/networksetup/interfaces.h | |||
@@ -31,4 +31,5 @@ public: | |||
31 | bool removeInterface(); | 31 | bool removeInterface(); |
32 | bool addInterface(QString interface, QString family, QString method); | 32 | bool addInterface(QString interface, QString family, QString method); |
33 | bool copyInterface(QString oldInterface, QString newInterface); | ||
33 | bool setInterface(QString interface); | 34 | bool setInterface(QString interface); |
34 | bool isInterfaceSet(); | 35 | bool isInterfaceSet(); |
diff --git a/noncore/net/networksetup/interfacesetupimp.cpp b/noncore/net/networksetup/interfacesetupimp.cpp index c16d821..bdbdfde 100644 --- a/noncore/net/networksetup/interfacesetupimp.cpp +++ b/noncore/net/networksetup/interfacesetupimp.cpp | |||
@@ -90,15 +90,13 @@ bool InterfaceSetupImp::saveSettings(){ | |||
90 | */ | 90 | */ |
91 | void InterfaceSetupImp::setProfile(const QString &profile){ | 91 | void InterfaceSetupImp::setProfile(const QString &profile){ |
92 | QString newInterfaceName = interface->getInterfaceName() + profile; | 92 | QString newInterfaceName = interface->getInterfaceName(); |
93 | 93 | if(profile.length() > 0) | |
94 | newInterfaceName += "_" + profile; | ||
95 | qDebug( newInterfaceName.latin1()); | ||
94 | // See if we have to make a interface. | 96 | // See if we have to make a interface. |
95 | if(!interfaces->setInterface(newInterfaceName)){ | 97 | if(!interfaces->setInterface(newInterfaceName)){ |
96 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); | ||
97 | if(!interfaces->setInterface(newInterfaceName)){ | ||
98 | qDebug("InterfaceSetupImp: Added interface, but still can't set."); | ||
99 | return; | ||
100 | } | ||
101 | // Add making for this new interface if need too | 98 | // Add making for this new interface if need too |
102 | if(profile != ""){ | 99 | if(profile != ""){ |
100 | interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); | ||
103 | if(!interfaces->setMapping(interface->getInterfaceName())){ | 101 | if(!interfaces->setMapping(interface->getInterfaceName())){ |
104 | interfaces->addMapping(interface->getInterfaceName()); | 102 | interfaces->addMapping(interface->getInterfaceName()); |
@@ -108,6 +106,13 @@ void InterfaceSetupImp::setProfile(const QString &profile){ | |||
108 | } | 106 | } |
109 | } | 107 | } |
110 | interfaces->setScript("getprofile.sh"); | ||
111 | interfaces->setMap("map", newInterfaceName); | 108 | interfaces->setMap("map", newInterfaceName); |
109 | interfaces->setScript("getprofile.sh"); | ||
110 | } | ||
111 | else{ | ||
112 | interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); | ||
113 | if(!interfaces->setInterface(newInterfaceName)){ | ||
114 | qDebug("InterfaceSetupImp: Added interface, but still can't set."); | ||
115 | return; | ||
116 | } | ||
112 | } | 117 | } |
113 | } | 118 | } |
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 | |||
@@ -229,5 +229,5 @@ void MainWindowImp::configureClicked(){ | |||
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); |
@@ -235,5 +235,5 @@ void MainWindowImp::configureClicked(){ | |||
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 | ||
@@ -246,5 +246,5 @@ void MainWindowImp::configureClicked(){ | |||
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(); |
@@ -378,10 +378,12 @@ void MainWindowImp::jobDone(KProcess *process){ | |||
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 | } |
@@ -490,4 +492,7 @@ void MainWindowImp::removeProfile(){ | |||
490 | profilesList->insertItem((*it)); | 492 | profilesList->insertItem((*it)); |
491 | } | 493 | } |
494 | |||
495 | // Remove any interface settings and mappings. | ||
496 | //TODO | ||
492 | } | 497 | } |
493 | 498 | ||
@@ -504,4 +509,5 @@ void MainWindowImp::changeProfile(){ | |||
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) ) { |