summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/interfaces/interfaceinformationimp.cpp2
-rw-r--r--noncore/net/networksetup/interfaces/interfacesetup.ui90
-rw-r--r--noncore/net/networksetup/interfaces/interfacesetupimp.cpp11
-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
6 files changed, 26 insertions, 180 deletions
diff --git a/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp b/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp
index cf3dba1..1fa5d38 100644
--- a/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfaceinformationimp.cpp
@@ -27,5 +27,5 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
* know about).
*/
-void InterfaceInformationImp::updateInterface(Interface *i){
+void InterfaceInformationImp::updateInterface(Interface *){
if(interface->getStatus()){
startButton->setEnabled(false);
diff --git a/noncore/net/networksetup/interfaces/interfacesetup.ui b/noncore/net/networksetup/interfaces/interfacesetup.ui
index df55d25..2b45d49 100644
--- a/noncore/net/networksetup/interfaces/interfacesetup.ui
+++ b/noncore/net/networksetup/interfaces/interfacesetup.ui
@@ -12,5 +12,5 @@
<x>0</x>
<y>0</y>
- <width>290</width>
+ <width>286</width>
<height>280</height>
</rect>
@@ -41,72 +41,17 @@
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout9</cstring>
+ <cstring>dhcpCheckBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>DHCP</string>
+ </property>
+ <property stdset="1">
+ <name>checked</name>
+ <bool>true</bool>
</property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>dhcpCheckBox</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>DHCP</string>
- </property>
- <property stdset="1">
- <name>checked</name>
- <bool>true</bool>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>leaseHoursLabel</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Requested Lease</string>
- </property>
- </widget>
- <widget>
- <class>QSpinBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>leaseTime</cstring>
- </property>
- <property stdset="1">
- <name>suffix</name>
- <string> hours</string>
- </property>
- <property stdset="1">
- <name>maxValue</name>
- <number>87600</number>
- </property>
- <property stdset="1">
- <name>minValue</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>lineStep</name>
- <number>24</number>
- </property>
- <property stdset="1">
- <name>value</name>
- <number>168</number>
- </property>
- </widget>
- </hbox>
</widget>
<widget>
@@ -282,16 +227,4 @@
<sender>dhcpCheckBox</sender>
<signal>toggled(bool)</signal>
- <receiver>leaseHoursLabel</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>dhcpCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>leaseTime</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>dhcpCheckBox</sender>
- <signal>toggled(bool)</signal>
<receiver>staticGroupBox</receiver>
<slot>setDisabled(bool)</slot>
@@ -301,5 +234,4 @@
<tabstop>autoStart</tabstop>
<tabstop>dhcpCheckBox</tabstop>
- <tabstop>leaseTime</tabstop>
<tabstop>ipAddressEdit</tabstop>
<tabstop>subnetMaskEdit</tabstop>
diff --git a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
index 4818e37..56bbe93 100644
--- a/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
+++ b/noncore/net/networksetup/interfaces/interfacesetupimp.cpp
@@ -51,9 +51,6 @@ bool InterfaceSetupImp::saveSettings(){
// DHCP
- if(dhcpCheckBox->isChecked()){
+ if(dhcpCheckBox->isChecked())
interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP);
- interfaces.setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
- interfaces.setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
- }
else{
interfaces.setInterfaceMethod("static");
@@ -123,9 +120,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){
else
dhcpCheckBox->setChecked(false);
- leaseTime->setValue(interfaces.getInterfaceOption("leasehours", error).toInt());
- if(error)
- leaseTime->setValue(interfaces.getInterfaceOption("leasetime", error).toInt()/60/60);
- if(error)
- leaseTime->setValue(24);
// IP Information
@@ -139,5 +131,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){
subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error));
gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error));
-
}
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
@@ -27,5 +27,5 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na
* know about).
*/
-void InterfaceInformationImp::updateInterface(Interface *i){
+void InterfaceInformationImp::updateInterface(Interface *){
if(interface->getStatus()){
startButton->setEnabled(false);
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
@@ -12,5 +12,5 @@
<x>0</x>
<y>0</y>
- <width>290</width>
+ <width>286</width>
<height>280</height>
</rect>
@@ -41,72 +41,17 @@
</widget>
<widget>
- <class>QLayoutWidget</class>
+ <class>QCheckBox</class>
<property stdset="1">
<name>name</name>
- <cstring>Layout9</cstring>
+ <cstring>dhcpCheckBox</cstring>
+ </property>
+ <property stdset="1">
+ <name>text</name>
+ <string>DHCP</string>
+ </property>
+ <property stdset="1">
+ <name>checked</name>
+ <bool>true</bool>
</property>
- <hbox>
- <property stdset="1">
- <name>margin</name>
- <number>0</number>
- </property>
- <property stdset="1">
- <name>spacing</name>
- <number>6</number>
- </property>
- <widget>
- <class>QCheckBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>dhcpCheckBox</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>DHCP</string>
- </property>
- <property stdset="1">
- <name>checked</name>
- <bool>true</bool>
- </property>
- </widget>
- <widget>
- <class>QLabel</class>
- <property stdset="1">
- <name>name</name>
- <cstring>leaseHoursLabel</cstring>
- </property>
- <property stdset="1">
- <name>text</name>
- <string>Requested Lease</string>
- </property>
- </widget>
- <widget>
- <class>QSpinBox</class>
- <property stdset="1">
- <name>name</name>
- <cstring>leaseTime</cstring>
- </property>
- <property stdset="1">
- <name>suffix</name>
- <string> hours</string>
- </property>
- <property stdset="1">
- <name>maxValue</name>
- <number>87600</number>
- </property>
- <property stdset="1">
- <name>minValue</name>
- <number>1</number>
- </property>
- <property stdset="1">
- <name>lineStep</name>
- <number>24</number>
- </property>
- <property stdset="1">
- <name>value</name>
- <number>168</number>
- </property>
- </widget>
- </hbox>
</widget>
<widget>
@@ -282,16 +227,4 @@
<sender>dhcpCheckBox</sender>
<signal>toggled(bool)</signal>
- <receiver>leaseHoursLabel</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>dhcpCheckBox</sender>
- <signal>toggled(bool)</signal>
- <receiver>leaseTime</receiver>
- <slot>setEnabled(bool)</slot>
- </connection>
- <connection>
- <sender>dhcpCheckBox</sender>
- <signal>toggled(bool)</signal>
<receiver>staticGroupBox</receiver>
<slot>setDisabled(bool)</slot>
@@ -301,5 +234,4 @@
<tabstop>autoStart</tabstop>
<tabstop>dhcpCheckBox</tabstop>
- <tabstop>leaseTime</tabstop>
<tabstop>ipAddressEdit</tabstop>
<tabstop>subnetMaskEdit</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
@@ -51,9 +51,6 @@ bool InterfaceSetupImp::saveSettings(){
// DHCP
- if(dhcpCheckBox->isChecked()){
+ if(dhcpCheckBox->isChecked())
interfaces.setInterfaceMethod(INTERFACES_METHOD_DHCP);
- interfaces.setInterfaceOption("leasehours", QString("%1").arg(leaseTime->value()));
- interfaces.setInterfaceOption("leasetime", QString("%1").arg(leaseTime->value()*60*60));
- }
else{
interfaces.setInterfaceMethod("static");
@@ -123,9 +120,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){
else
dhcpCheckBox->setChecked(false);
- leaseTime->setValue(interfaces.getInterfaceOption("leasehours", error).toInt());
- if(error)
- leaseTime->setValue(interfaces.getInterfaceOption("leasetime", error).toInt()/60/60);
- if(error)
- leaseTime->setValue(24);
// IP Information
@@ -139,5 +131,4 @@ void InterfaceSetupImp::setProfile(const QString &profile){
subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error));
gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error));
-
}