-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 | |||
@@ -44,3 +44,2 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); | 44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); |
45 | |||
46 | } | 45 | } |
@@ -92,5 +91,9 @@ void WLANImp::parseSettingFile(){ | |||
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 | } |
@@ -225,3 +228,3 @@ void WLANImp::accept(){ | |||
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 |
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 | |||
@@ -44,3 +44,2 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); | 44 | connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int))); |
45 | |||
46 | } | 45 | } |
@@ -92,5 +91,9 @@ void WLANImp::parseSettingFile(){ | |||
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 | } |
@@ -225,3 +228,3 @@ void WLANImp::accept(){ | |||
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 |