From c16dcab3fe45ae7193cbdfb2f62bf7e5482d449b Mon Sep 17 00:00:00 2001 From: benmeyer Date: Fri, 18 Oct 2002 15:40:50 +0000 Subject: Profiles copy --- 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 @@ -167,6 +167,32 @@ bool Interfaces::addInterface(QString interface, QString family, QString method) } /** + * Copies interface with name interface to name newInterface + * @param newInterface name of the new interface. + * @return bool true if successfull + */ +bool Interfaces::copyInterface(QString interface, QString newInterface){ + if(!setInterface(interface)) return false; + + QStringList::Iterator it = currentIface; + it++; + + bool error; + addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error)); + if(!setInterface(newInterface)) return false; + QStringList::Iterator newIface = currentIface; + newIface++; + + for ( it; it != interfaces.end(); ++it ){ + if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))) + break; + newIface = interfaces.insert(newIface, *it); + } + + return true; +} + +/** * Remove the currently selected interface and all of its options. * @return bool if successfull or not. */ @@ -401,12 +427,26 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { QString line = (*it).simplifyWhiteSpace(); if(line.contains(stanza) && line.contains(option)){ - if(found == true){ - qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); + uint point = line.find(option); + bool valid = true; + if(point > 0){ + // There are more chars in the line. check +1 + if(line.at(point-1) != ' ') + valid = false; + } + point += option.length(); + if(point < line.length()-1){ + // There are more chars in the line. check -1 + if(line.at(point) != ' ') + valid = false; + } + if(valid){ + if(found == true){ + qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); + } + found = true; + iterator = it; } - qDebug("Found"); - found = true; - iterator = it; } } return found; 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 @@ -30,6 +30,7 @@ public: bool removeInterface(); bool addInterface(QString interface, QString family, QString method); + bool copyInterface(QString oldInterface, QString newInterface); bool setInterface(QString interface); bool isInterfaceSet(); QString getInterfaceName(bool &error); 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 @@ -89,17 +89,15 @@ bool InterfaceSetupImp::saveSettings(){ * @profile the new profile. */ void InterfaceSetupImp::setProfile(const QString &profile){ - QString newInterfaceName = interface->getInterfaceName() + profile; - + QString newInterfaceName = interface->getInterfaceName(); + if(profile.length() > 0) + newInterfaceName += "_" + profile; + qDebug( newInterfaceName.latin1()); // See if we have to make a interface. if(!interfaces->setInterface(newInterfaceName)){ - interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); - if(!interfaces->setInterface(newInterfaceName)){ - qDebug("InterfaceSetupImp: Added interface, but still can't set."); - return; - } // Add making for this new interface if need too if(profile != ""){ + interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); if(!interfaces->setMapping(interface->getInterfaceName())){ interfaces->addMapping(interface->getInterfaceName()); if(!interfaces->setMapping(interface->getInterfaceName())){ @@ -107,8 +105,15 @@ void InterfaceSetupImp::setProfile(const QString &profile){ return; } } - interfaces->setScript("getprofile.sh"); interfaces->setMap("map", newInterfaceName); + interfaces->setScript("getprofile.sh"); + } + else{ + interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); + if(!interfaces->setInterface(newInterfaceName)){ + qDebug("InterfaceSetupImp: Added interface, but still can't set."); + return; + } } } 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 @@ -228,13 +228,13 @@ void MainWindowImp::configureClicked(){ Interface *i = interfaceItems[item]; if(i->getModuleOwner()){ - i->getModuleOwner()->setProfile(currentProfileLabel->text()); + i->getModuleOwner()->setProfile(currentProfile); QTabWidget *tabWidget = NULL; QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget); if(moduleConfigure != NULL){ if(tabWidget != NULL){ InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true); - configure->setProfile(currentProfileLabel->text()); + configure->setProfile(currentProfile); tabWidget->insertTab(configure, "TCP/IP"); } @@ -245,7 +245,7 @@ void MainWindowImp::configureClicked(){ } InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true); - configure->setProfile(currentProfileLabel->text()); + configure->setProfile(currentProfile); configure->showMaximized(); configure->show(); } @@ -377,12 +377,14 @@ void MainWindowImp::jobDone(KProcess *process){ found = true; } if(!found){ - Interface *i = new Interface(this, *ni, false); - i->setAttached(false); - i->setHardwareName("Disconnected"); - interfaceNames.insert(i->getInterfaceName(), i); - updateInterface(i); - connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); + if(!(*ni).contains("_")){ + Interface *i = new Interface(this, *ni, false); + i->setAttached(false); + i->setHardwareName("Disconnected"); + interfaceNames.insert(i->getInterfaceName(), i); + updateInterface(i); + connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); + } } } } @@ -489,6 +491,9 @@ void MainWindowImp::removeProfile(){ for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) profilesList->insertItem((*it)); } + + // Remove any interface settings and mappings. + //TODO } /** @@ -503,6 +508,7 @@ void MainWindowImp::changeProfile(){ QString newProfile = profilesList->text(profilesList->currentItem()); if(newProfile != currentProfileLabel->text()){ currentProfileLabel->setText(newProfile); + QFile::remove(SCHEME); QFile file(SCHEME); if ( file.open(IO_ReadWrite) ) { QTextStream stream( &file ); diff --git a/noncore/settings/networksettings/interfaces.cpp b/noncore/settings/networksettings/interfaces.cpp index eef42df..0927258 100644 --- a/noncore/settings/networksettings/interfaces.cpp +++ b/noncore/settings/networksettings/interfaces.cpp @@ -167,6 +167,32 @@ bool Interfaces::addInterface(QString interface, QString family, QString method) } /** + * Copies interface with name interface to name newInterface + * @param newInterface name of the new interface. + * @return bool true if successfull + */ +bool Interfaces::copyInterface(QString interface, QString newInterface){ + if(!setInterface(interface)) return false; + + QStringList::Iterator it = currentIface; + it++; + + bool error; + addInterface(newInterface, getInterfaceFamily(error), getInterfaceMethod(error)); + if(!setInterface(newInterface)) return false; + QStringList::Iterator newIface = currentIface; + newIface++; + + for ( it; it != interfaces.end(); ++it ){ + if(((*it).contains(IFACE) || (*it).contains(MAPPING) || (*it).contains(AUTO))) + break; + newIface = interfaces.insert(newIface, *it); + } + + return true; +} + +/** * Remove the currently selected interface and all of its options. * @return bool if successfull or not. */ @@ -401,12 +427,26 @@ bool Interfaces::setStanza(QString stanza, QString option, QStringList::Iterator for ( QStringList::Iterator it = interfaces.begin(); it != interfaces.end(); ++it ) { QString line = (*it).simplifyWhiteSpace(); if(line.contains(stanza) && line.contains(option)){ - if(found == true){ - qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); + uint point = line.find(option); + bool valid = true; + if(point > 0){ + // There are more chars in the line. check +1 + if(line.at(point-1) != ' ') + valid = false; + } + point += option.length(); + if(point < line.length()-1){ + // There are more chars in the line. check -1 + if(line.at(point) != ' ') + valid = false; + } + if(valid){ + if(found == true){ + qDebug(QString("Interfaces: Found multiple stanza's for search: %1 %2").arg(stanza).arg(option).latin1()); + } + found = true; + iterator = it; } - qDebug("Found"); - found = true; - iterator = it; } } return found; diff --git a/noncore/settings/networksettings/interfaces.h b/noncore/settings/networksettings/interfaces.h index e617c17..7cf04f0 100644 --- a/noncore/settings/networksettings/interfaces.h +++ b/noncore/settings/networksettings/interfaces.h @@ -30,6 +30,7 @@ public: bool removeInterface(); bool addInterface(QString interface, QString family, QString method); + bool copyInterface(QString oldInterface, QString newInterface); bool setInterface(QString interface); bool isInterfaceSet(); QString getInterfaceName(bool &error); diff --git a/noncore/settings/networksettings/interfacesetupimp.cpp b/noncore/settings/networksettings/interfacesetupimp.cpp index c16d821..bdbdfde 100644 --- a/noncore/settings/networksettings/interfacesetupimp.cpp +++ b/noncore/settings/networksettings/interfacesetupimp.cpp @@ -89,17 +89,15 @@ bool InterfaceSetupImp::saveSettings(){ * @profile the new profile. */ void InterfaceSetupImp::setProfile(const QString &profile){ - QString newInterfaceName = interface->getInterfaceName() + profile; - + QString newInterfaceName = interface->getInterfaceName(); + if(profile.length() > 0) + newInterfaceName += "_" + profile; + qDebug( newInterfaceName.latin1()); // See if we have to make a interface. if(!interfaces->setInterface(newInterfaceName)){ - interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); - if(!interfaces->setInterface(newInterfaceName)){ - qDebug("InterfaceSetupImp: Added interface, but still can't set."); - return; - } // Add making for this new interface if need too if(profile != ""){ + interfaces->copyInterface(interface->getInterfaceName(), newInterfaceName); if(!interfaces->setMapping(interface->getInterfaceName())){ interfaces->addMapping(interface->getInterfaceName()); if(!interfaces->setMapping(interface->getInterfaceName())){ @@ -107,8 +105,15 @@ void InterfaceSetupImp::setProfile(const QString &profile){ return; } } - interfaces->setScript("getprofile.sh"); interfaces->setMap("map", newInterfaceName); + interfaces->setScript("getprofile.sh"); + } + else{ + interfaces->addInterface(newInterfaceName, INTERFACES_FAMILY_INET, INTERFACES_METHOD_DHCP); + if(!interfaces->setInterface(newInterfaceName)){ + qDebug("InterfaceSetupImp: Added interface, but still can't set."); + return; + } } } diff --git a/noncore/settings/networksettings/mainwindowimp.cpp b/noncore/settings/networksettings/mainwindowimp.cpp index 3c0af6a..9f07f0d 100644 --- a/noncore/settings/networksettings/mainwindowimp.cpp +++ b/noncore/settings/networksettings/mainwindowimp.cpp @@ -228,13 +228,13 @@ void MainWindowImp::configureClicked(){ Interface *i = interfaceItems[item]; if(i->getModuleOwner()){ - i->getModuleOwner()->setProfile(currentProfileLabel->text()); + i->getModuleOwner()->setProfile(currentProfile); QTabWidget *tabWidget = NULL; QWidget *moduleConfigure = i->getModuleOwner()->configure(&tabWidget); if(moduleConfigure != NULL){ if(tabWidget != NULL){ InterfaceSetupImp *configure = new InterfaceSetupImp(tabWidget, "InterfaceSetupImp", i, true); - configure->setProfile(currentProfileLabel->text()); + configure->setProfile(currentProfile); tabWidget->insertTab(configure, "TCP/IP"); } @@ -245,7 +245,7 @@ void MainWindowImp::configureClicked(){ } InterfaceSetupImp *configure = new InterfaceSetupImp(0, "InterfaceSetupImp", i, true); - configure->setProfile(currentProfileLabel->text()); + configure->setProfile(currentProfile); configure->showMaximized(); configure->show(); } @@ -377,12 +377,14 @@ void MainWindowImp::jobDone(KProcess *process){ found = true; } if(!found){ - Interface *i = new Interface(this, *ni, false); - i->setAttached(false); - i->setHardwareName("Disconnected"); - interfaceNames.insert(i->getInterfaceName(), i); - updateInterface(i); - connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); + if(!(*ni).contains("_")){ + Interface *i = new Interface(this, *ni, false); + i->setAttached(false); + i->setHardwareName("Disconnected"); + interfaceNames.insert(i->getInterfaceName(), i); + updateInterface(i); + connect(i, SIGNAL(updateInterface(Interface *)), this, SLOT(updateInterface(Interface *))); + } } } } @@ -489,6 +491,9 @@ void MainWindowImp::removeProfile(){ for ( QStringList::Iterator it = profiles.begin(); it != profiles.end(); ++it) profilesList->insertItem((*it)); } + + // Remove any interface settings and mappings. + //TODO } /** @@ -503,6 +508,7 @@ void MainWindowImp::changeProfile(){ QString newProfile = profilesList->text(profilesList->currentItem()); if(newProfile != currentProfileLabel->text()){ currentProfileLabel->setText(newProfile); + QFile::remove(SCHEME); QFile file(SCHEME); if ( file.open(IO_ReadWrite) ) { QTextStream stream( &file ); -- cgit v0.9.0.2