| author | benmeyer <benmeyer> | 2002-12-11 22:21:08 (UTC) |
|---|---|---|
| committer | benmeyer <benmeyer> | 2002-12-11 22:21:08 (UTC) |
| commit | ee3251a889aed8ef0346743589e5166b7d4f673b (patch) (side-by-side diff) | |
| tree | b6ba3331360bbd8c4d18d8291995d8bc2bf6a748 /noncore | |
| parent | 2217f9ba852aa2ffd36e5398988d9b1c65b18705 (diff) | |
| download | opie-ee3251a889aed8ef0346743589e5166b7d4f673b.zip opie-ee3251a889aed8ef0346743589e5166b7d4f673b.tar.gz opie-ee3251a889aed8ef0346743589e5166b7d4f673b.tar.bz2 | |
Fixed ad-hco bug
| -rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 9 | ||||
| -rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 9 |
2 files changed, 12 insertions, 6 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index 120d4e5..84e0bae 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp @@ -42,7 +42,6 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W else qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); - } void WLANImp::typeChanged(int mod){ @@ -90,9 +89,13 @@ void WLANImp::parseSettingFile(){ QString mode = line.mid(line.find("MODE=")+5, line.length()); if(mode == "Managed"){ networkType->setCurrentItem(0); + channelLabel->setEnabled(false); + networkChannel->setEnabled(false); } else{ - networkType->setCurrentItem(0); + networkType->setCurrentItem(1); + networkChannel->setEnabled(true); + channelLabel->setEnabled(true); } } if(line.contains("KEY0=")) @@ -223,7 +226,7 @@ void WLANImp::accept(){ // Try to save the interfaces settings. if(!interfaceSetup->saveChanges()) return; - + // Restart the device now that the settings have changed QString initpath; if( QDir("/etc/rc.d/init.d").exists() ) diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index 120d4e5..84e0bae 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp @@ -42,7 +42,6 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W else qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); - } void WLANImp::typeChanged(int mod){ @@ -90,9 +89,13 @@ void WLANImp::parseSettingFile(){ QString mode = line.mid(line.find("MODE=")+5, line.length()); if(mode == "Managed"){ networkType->setCurrentItem(0); + channelLabel->setEnabled(false); + networkChannel->setEnabled(false); } else{ - networkType->setCurrentItem(0); + networkType->setCurrentItem(1); + networkChannel->setEnabled(true); + channelLabel->setEnabled(true); } } if(line.contains("KEY0=")) @@ -223,7 +226,7 @@ void WLANImp::accept(){ // Try to save the interfaces settings. if(!interfaceSetup->saveChanges()) return; - + // Restart the device now that the settings have changed QString initpath; if( QDir("/etc/rc.d/init.d").exists() ) |