summaryrefslogtreecommitdiff
path: root/noncore/settings/networksettings/interfaces
Unidiff
Diffstat (limited to 'noncore/settings/networksettings/interfaces') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp2
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetup.ui90
-rw-r--r--noncore/settings/networksettings/interfaces/interfacesetupimp.cpp11
3 files changed, 13 insertions, 90 deletions
diff --git a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
index cf3dba1..1fa5d38 100644
--- a/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
+++ b/noncore/settings/networksettings/interfaces/interfaceinformationimp.cpp
@@ -28,3 +28,3 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
28 */ 28 */
29void InterfaceInformationImp::updateInterface(Interface *i){ 29void InterfaceInformationImp::updateInterface(Interface *){
30 if(interface->getStatus()){ 30 if(interface->getStatus()){
diff --git a/noncore/settings/networksettings/interfaces/interfacesetup.ui b/noncore/settings/networksettings/interfaces/interfacesetup.ui
index df55d25..2b45d49 100644
--- a/noncore/settings/networksettings/interfaces/interfacesetup.ui
+++ b/noncore/settings/networksettings/interfaces/interfacesetup.ui
@@ -13,3 +13,3 @@
13 <y>0</y> 13 <y>0</y>
14 <width>290</width> 14 <width>286</width>
15 <height>280</height> 15 <height>280</height>
@@ -42,70 +42,15 @@
42 <widget> 42 <widget>
43 <class>QLayoutWidget</class> 43 <class>QCheckBox</class>
44 <property stdset="1"> 44 <property stdset="1">
45 <name>name</name> 45 <name>name</name>
46 <cstring>Layout9</cstring> 46 <cstring>dhcpCheckBox</cstring>
47 </property>
48 <property stdset="1">
49 <name>text</name>
50 <string>DHCP</string>
51 </property>
52 <property stdset="1">
53 <name>checked</name>
54 <bool>true</bool>
47 </property> 55 </property>
48 <hbox>
49 <property stdset="1">
50 <name>margin</name>
51 <number>0</number>
52 </property>
53 <property stdset="1">
54 <name>spacing</name>
55 <number>6</number>
56 </property>
57 <widget>
58 <class>QCheckBox</class>
59 <property stdset="1">
60 <name>name</name>
61 <cstring>dhcpCheckBox</cstring>
62 </property>
63 <property stdset="1">
64 <name>text</name>
65 <string>DHCP</string>
66 </property>
67 <property stdset="1">
68 <name>checked</name>
69 <bool>true</bool>
70 </property>
71 </widget>
72 <widget>
73 <class>QLabel</class>
74 <property stdset="1">
75 <name>name</name>
76 <cstring>leaseHoursLabel</cstring>
77 </property>
78 <property stdset="1">
79 <name>text</name>
80 <string>Requested Lease</string>
81 </property>
82 </widget>
83 <widget>
84 <class>QSpinBox</class>
85 <property stdset="1">
86 <name>name</name>
87 <cstring>leaseTime</cstring>
88 </property>
89 <property stdset="1">
90 <name>suffix</name>
91 <string> hours</string>
92 </property>
93 <property stdset="1">
94 <name>maxValue</name>
95 <number>87600</number>
96 </property>
97 <property stdset="1">
98 <name>minValue</name>
99 <number>1</number>
100 </property>
101 <property stdset="1">
102 <name>lineStep</name>
103 <number>24</number>
104 </property>
105 <property stdset="1">
106 <name>value</name>
107 <number>168</number>
108 </property>
109 </widget>
110 </hbox>
111 </widget> 56 </widget>
@@ -283,14 +228,2 @@
283 <signal>toggled(bool)</signal> 228 <signal>toggled(bool)</signal>
284 <receiver>leaseHoursLabel</receiver>
285 <slot>setEnabled(bool)</slot>
286 </connection>
287 <connection>
288 <sender>dhcpCheckBox</sender>
289 <signal>toggled(bool)</signal>
290 <receiver>leaseTime</receiver>
291 <slot>setEnabled(bool)</slot>
292 </connection>
293 <connection>
294 <sender>dhcpCheckBox</sender>
295 <signal>toggled(bool)</signal>
296 <receiver>staticGroupBox</receiver> 229 <receiver>staticGroupBox</receiver>
@@ -302,3 +235,2 @@
302 <tabstop>dhcpCheckBox</tabstop> 235 <tabstop>dhcpCheckBox</tabstop>
303 <tabstop>leaseTime</tabstop>
304 <tabstop>ipAddressEdit</tabstop> 236 <tabstop>ipAddressEdit</tabstop>
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
@@ -52,7 +52,4 @@ bool InterfaceSetupImp::saveSettings(){
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{
@@ -124,7 +121,2 @@ void InterfaceSetupImp::setProfile(const QString &profile){
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
@@ -140,3 +132,2 @@ void InterfaceSetupImp::setProfile(const QString &profile){
140 gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error)); 132 gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error));
141
142} 133}