summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaces/interfacesetupimp.cpp4
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
index 6587d6f..550e909 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
@@ -56,13 +56,13 @@ bool InterfaceSetupImp::saveSettings(){
56 if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ 56 if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
57 interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); 57 interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
58 return true; 58 return true;
59 } 59 }
60 60
61 if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ 61 if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
62 QMessageBox::information(this, "Empy Fields.", "Please fill in address, subnet,\n and gateway entries.", "Ok"); 62 QMessageBox::information(this, "Not Saved.", "Please fill in address, subnet,\n and gateway entries.", "Ok");
63 return false; 63 return false;
64 } 64 }
65 interfaces->removeAllInterfaceOptions(); 65 interfaces->removeAllInterfaceOptions();
66 66
67 // DHCP 67 // DHCP
68 if(dhcpCheckBox->isChecked()){ 68 if(dhcpCheckBox->isChecked()){
@@ -133,13 +133,13 @@ void InterfaceSetupImp::setProfile(const QString &profile){
133 leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60); 133 leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60);
134 if(error) 134 if(error)
135 leaseTime->setValue(24); 135 leaseTime->setValue(24);
136 136
137 // IP Information 137 // IP Information
138 autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); 138 autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
139 QString dns = interfaces->getInterfaceOption("up interfacednsscript -a", error); 139 QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
140 if(dns.contains(" ")){ 140 if(dns.contains(" ")){
141 firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); 141 firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
142 secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 142 secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));
143 } 143 }
144 ipAddressEdit->setText(interfaces->getInterfaceOption("address", error)); 144 ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
145 subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); 145 subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 6587d6f..550e909 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -56,13 +56,13 @@ bool InterfaceSetupImp::saveSettings(){
56 if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){ 56 if(interfaces->getInterfaceMethod(error) == INTERFACES_LOOPBACK){
57 interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked()); 57 interfaces->setAuto(interface->getInterfaceName(), autoStart->isChecked());
58 return true; 58 return true;
59 } 59 }
60 60
61 if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){ 61 if(!dhcpCheckBox->isChecked() && (ipAddressEdit->text().isEmpty() || subnetMaskEdit->text().isEmpty())){
62 QMessageBox::information(this, "Empy Fields.", "Please fill in address, subnet,\n and gateway entries.", "Ok"); 62 QMessageBox::information(this, "Not Saved.", "Please fill in address, subnet,\n and gateway entries.", "Ok");
63 return false; 63 return false;
64 } 64 }
65 interfaces->removeAllInterfaceOptions(); 65 interfaces->removeAllInterfaceOptions();
66 66
67 // DHCP 67 // DHCP
68 if(dhcpCheckBox->isChecked()){ 68 if(dhcpCheckBox->isChecked()){
@@ -133,13 +133,13 @@ void InterfaceSetupImp::setProfile(const QString &profile){
133 leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60); 133 leaseTime->setValue(interfaces->getInterfaceOption("leasetime", error).toInt()/60/60);
134 if(error) 134 if(error)
135 leaseTime->setValue(24); 135 leaseTime->setValue(24);
136 136
137 // IP Information 137 // IP Information
138 autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName())); 138 autoStart->setChecked(interfaces->isAuto(interface->getInterfaceName()));
139 QString dns = interfaces->getInterfaceOption("up interfacednsscript -a", error); 139 QString dns = interfaces->getInterfaceOption("up "DNSSCRIPT" -a", error);
140 if(dns.contains(" ")){ 140 if(dns.contains(" ")){
141 firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); 141 firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
142 secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 142 secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));
143 } 143 }
144 ipAddressEdit->setText(interfaces->getInterfaceOption("address", error)); 144 ipAddressEdit->setText(interfaces->getInterfaceOption("address", error));
145 subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error)); 145 subnetMaskEdit->setText(interfaces->getInterfaceOption("netmask", error));