summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp9
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp9
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
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
48void WLANImp::typeChanged(int mod){ 47void 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="))
@@ -223,7 +226,7 @@ void WLANImp::accept(){
223 // Try to save the interfaces settings. 226 // Try to save the interfaces settings.
224 if(!interfaceSetup->saveChanges()) 227 if(!interfaceSetup->saveChanges())
225 return; 228 return;
226 229
227 // Restart the device now that the settings have changed 230 // Restart the device now that the settings have changed
228 QString initpath; 231 QString initpath;
229 if( QDir("/etc/rc.d/init.d").exists() ) 232 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
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
48void WLANImp::typeChanged(int mod){ 47void 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="))
@@ -223,7 +226,7 @@ void WLANImp::accept(){
223 // Try to save the interfaces settings. 226 // Try to save the interfaces settings.
224 if(!interfaceSetup->saveChanges()) 227 if(!interfaceSetup->saveChanges())
225 return; 228 return;
226 229
227 // Restart the device now that the settings have changed 230 // Restart the device now that the settings have changed
228 QString initpath; 231 QString initpath;
229 if( QDir("/etc/rc.d/init.d").exists() ) 232 if( QDir("/etc/rc.d/init.d").exists() )