author | benmeyer <benmeyer> | 2002-12-11 22:21:08 (UTC) |
---|---|---|
committer | benmeyer <benmeyer> | 2002-12-11 22:21:08 (UTC) |
commit | ee3251a889aed8ef0346743589e5166b7d4f673b (patch) (unidiff) | |
tree | b6ba3331360bbd8c4d18d8291995d8bc2bf6a748 | |
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 | 7 | ||||
-rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 7 |
2 files changed, 10 insertions, 4 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 | |||
42 | else | 42 | else |
43 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); | 43 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); |
44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); | 44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); |
45 | |||
46 | } | 45 | } |
47 | 46 | ||
48 | void WLANImp::typeChanged(int mod){ | 47 | void WLANImp::typeChanged(int mod){ |
@@ -90,9 +89,13 @@ void WLANImp::parseSettingFile(){ | |||
90 | QString mode = line.mid(line.find("MODE=")+5, line.length()); | 89 | QString mode = line.mid(line.find("MODE=")+5, line.length()); |
91 | if(mode == "Managed"){ | 90 | if(mode == "Managed"){ |
92 | networkType->setCurrentItem(0); | 91 | networkType->setCurrentItem(0); |
92 | channelLabel->setEnabled(false); | ||
93 | networkChannel->setEnabled(false); | ||
93 | } | 94 | } |
94 | else{ | 95 | else{ |
95 | networkType->setCurrentItem(0); | 96 | networkType->setCurrentItem(1); |
97 | networkChannel->setEnabled(true); | ||
98 | channelLabel->setEnabled(true); | ||
96 | } | 99 | } |
97 | } | 100 | } |
98 | if(line.contains("KEY0=")) | 101 | if(line.contains("KEY0=")) |
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 | |||
42 | else | 42 | else |
43 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); | 43 | qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); |
44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); | 44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); |
45 | |||
46 | } | 45 | } |
47 | 46 | ||
48 | void WLANImp::typeChanged(int mod){ | 47 | void WLANImp::typeChanged(int mod){ |
@@ -90,9 +89,13 @@ void WLANImp::parseSettingFile(){ | |||
90 | QString mode = line.mid(line.find("MODE=")+5, line.length()); | 89 | QString mode = line.mid(line.find("MODE=")+5, line.length()); |
91 | if(mode == "Managed"){ | 90 | if(mode == "Managed"){ |
92 | networkType->setCurrentItem(0); | 91 | networkType->setCurrentItem(0); |
92 | channelLabel->setEnabled(false); | ||
93 | networkChannel->setEnabled(false); | ||
93 | } | 94 | } |
94 | else{ | 95 | else{ |
95 | networkType->setCurrentItem(0); | 96 | networkType->setCurrentItem(1); |
97 | networkChannel->setEnabled(true); | ||
98 | channelLabel->setEnabled(true); | ||
96 | } | 99 | } |
97 | } | 100 | } |
98 | if(line.contains("KEY0=")) | 101 | if(line.contains("KEY0=")) |