author | benmeyer <benmeyer> | 2002-12-16 21:48:37 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-12-16 21:48:37 (UTC) |
commit | 9cb9007f211c22349e3183ba20bb7f817d811005 (patch) (side-by-side diff) | |
tree | 71d929282b4edfff101ef208d6ab4d1512b20960 /noncore/settings/networksettings | |
parent | 05ee76167ad314aea710966e7c93b124da252a95 (diff) | |
download | opie-9cb9007f211c22349e3183ba20bb7f817d811005.zip opie-9cb9007f211c22349e3183ba20bb7f817d811005.tar.gz opie-9cb9007f211c22349e3183ba20bb7f817d811005.tar.bz2 |
Remove the lease time requst. Wasn't realy needed and was uneccessary
Diffstat (limited to 'noncore/settings/networksettings') (more/less context) (show whitespace changes)
3 files changed, 3 insertions, 80 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 @@ -26,7 +26,7 @@ InterfaceInformationImp::InterfaceInformationImp(QWidget *parent, const char *na * @param Intarface *i the interface to update (should be the one we already * know about). */ -void InterfaceInformationImp::updateInterface(Interface *i){ +void InterfaceInformationImp::updateInterface(Interface *){ if(interface->getStatus()){ startButton->setEnabled(false); stopButton->setEnabled(true); 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 @@ -11,7 +11,7 @@ <rect> <x>0</x> <y>0</y> - <width>290</width> + <width>286</width> <height>280</height> </rect> </property> @@ -40,21 +40,6 @@ </property> </widget> <widget> - <class>QLayoutWidget</class> - <property stdset="1"> - <name>name</name> - <cstring>Layout9</cstring> - </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> @@ -70,46 +55,6 @@ </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> <class>QGroupBox</class> <property stdset="1"> <name>name</name> @@ -281,18 +226,6 @@ <connection> <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> </connection> @@ -300,7 +233,6 @@ <tabstops> <tabstop>autoStart</tabstop> <tabstop>dhcpCheckBox</tabstop> - <tabstop>leaseTime</tabstop> <tabstop>ipAddressEdit</tabstop> <tabstop>subnetMaskEdit</tabstop> <tabstop>gatewayEdit</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 @@ -50,11 +50,8 @@ bool InterfaceSetupImp::saveSettings(){ interfaces.removeAllInterfaceOptions(); // 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"); interfaces.setInterfaceOption("address", ipAddressEdit->text()); @@ -122,11 +119,6 @@ void InterfaceSetupImp::setProfile(const QString &profile){ dhcpCheckBox->setChecked(true); 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 autoStart->setChecked(interfaces.isAuto(interface->getInterfaceName())); @@ -138,7 +130,6 @@ void InterfaceSetupImp::setProfile(const QString &profile){ ipAddressEdit->setText(interfaces.getInterfaceOption("address", error)); subnetMaskEdit->setText(interfaces.getInterfaceOption("netmask", error)); gatewayEdit->setText(interfaces.getInterfaceOption("gateway", error)); - } // interfacesetup.cpp |