| -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 @@ -43,5 +43,4 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); - } @@ -91,7 +90,11 @@ void WLANImp::parseSettingFile(){ 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); } } @@ -224,5 +227,5 @@ void WLANImp::accept(){ if(!interfaceSetup->saveChanges()) return; - + // Restart the device now that the settings have changed QString initpath; 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 @@ -43,5 +43,4 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1()); connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); - } @@ -91,7 +90,11 @@ void WLANImp::parseSettingFile(){ 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); } } @@ -224,5 +227,5 @@ void WLANImp::accept(){ if(!interfaceSetup->saveChanges()) return; - + // Restart the device now that the settings have changed QString initpath; |