summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
Unidiff
Diffstat (limited to 'noncore/settings/networksettings/interfaces/interfacesetupimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp11
1 files changed, 1 insertions, 10 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
index 4818e37..56bbe93 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfacesetupimp.cpp
@@ -47,17 +47,14 @@ bool InterfaceSetupImp::saveSettings(){
47 QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok); 47 QMessageBox::information(this, "Not Saved.", "Please fill in the IP address and\n subnet entries.", QMessageBox::Ok);
48 return false; 48 return false;
49 } 49 }
50 interfaces.removeAllInterfaceOptions(); 50 interfaces.removeAllInterfaceOptions();
51 51
52 // DHCP 52 // DHCP
53 if(dhcpCheckBox->isChecked()){ 53 if(dhcpCheckBox->isChecked())
54 interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP); 54 interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP);
55 interfaces.setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
56 interfaces.setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
57 }
58 else{ 55 else{
59 interfaces.setInterfaceMethod("static"); 56 interfaces.setInterfaceMethod("static");
60 interfaces.setInterfaceOption("address", ipAddressEdit->text()); 57 interfaces.setInterfaceOption("address", ipAddressEdit->text());
61 interfaces.setInterfaceOption("netmask", subnetMaskEdit->text()); 58 interfaces.setInterfaceOption("netmask", subnetMaskEdit->text());
62 interfaces.setInterfaceOption("gateway", gatewayEdit->text()); 59 interfaces.setInterfaceOption("gateway", gatewayEdit->text());
63 if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){ 60 if(!firstDNSLineEdit->text().isEmpty() || !secondDNSLineEdit->text().isEmpty()){
@@ -119,27 +116,21 @@ void InterfaceSetupImp::setProfile(const QString &profile){
119 // DHCP 116 // DHCP
120 bool error = false; 117 bool error = false;
121 if(interfaces.getInterfaceMethod(error) == INTERFACES_METHOD_DHCP) 118 if(interfaces.getInterfaceMethod(error) == INTERFACES_METHOD_DHCP)
122 dhcpCheckBox->setChecked(true); 119 dhcpCheckBox->setChecked(true);
123 else 120 else
124 dhcpCheckBox->setChecked(false); 121 dhcpCheckBox->setChecked(false);
125 leaseTime->setValue(interfaces.getInterfaceOption("leasehours", error).toInt());
126 if(error)
127 leaseTime->setValue(interfaces.getInterfaceOption("leasetime", error).toInt()/60/60);
128 if(error)
129 leaseTime->setValue(24);
130 122
131 // IP Information 123 // IP Information
132 autoStart->setChecked(interfaces.isAuto(interface->getInterfaceName())); 124 autoStart->setChecked(interfaces.isAuto(interface->getInterfaceName()));
133 QString dns = interfaces.getInterfaceOption("up "DNSSCRIPT" -a", error); 125 QString dns = interfaces.getInterfaceOption("up "DNSSCRIPT" -a", error);
134 if(dns.contains(" ")){ 126 if(dns.contains(" ")){
135 firstDNSLineEdit->setText(dns.mid(0, dns.find(" "))); 127 firstDNSLineEdit->setText(dns.mid(0, dns.find(" ")));
136 secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length())); 128 secondDNSLineEdit->setText(dns.mid(dns.find(" ")+1, dns.length()));
137 } 129 }
138 ipAddressEdit->setText(interfaces.getInterfaceOption("address", error)); 130 ipAddressEdit->setText(interfaces.getInterfaceOption("address", error));
139 subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error)); 131 subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error));
140 gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error)); 132 gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error));
141
142} 133}
143 134
144// interfacesetup.cpp 135// interfacesetup.cpp
145 136