-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 | |||
@@ -39,13 +39,12 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
39 | settingsFileText = QStringList::split("\n", line, true); | 39 | settingsFileText = QStringList::split("\n", line, true); |
40 | parseSettingFile(); | 40 | parseSettingFile(); |
41 | } | 41 | } |
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){ |
49 | networkChannel->setEnabled(mod); | 48 | networkChannel->setEnabled(mod); |
50 | channelLabel->setEnabled(mod); | 49 | channelLabel->setEnabled(mod); |
51 | } | 50 | } |
@@ -87,15 +86,19 @@ void WLANImp::parseSettingFile(){ | |||
87 | } | 86 | } |
88 | } | 87 | } |
89 | if(line.contains("MODE=")){ | 88 | if(line.contains("MODE=")){ |
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=")) |
99 | keyLineEdit0->setText(line.mid(5, line.length())); | 102 | keyLineEdit0->setText(line.mid(5, line.length())); |
100 | if(line.contains("KEY1=")) | 103 | if(line.contains("KEY1=")) |
101 | keyLineEdit1->setText(line.mid(5, line.length())); | 104 | keyLineEdit1->setText(line.mid(5, line.length())); |
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 | |||
@@ -39,13 +39,12 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
39 | settingsFileText = QStringList::split("\n", line, true); | 39 | settingsFileText = QStringList::split("\n", line, true); |
40 | parseSettingFile(); | 40 | parseSettingFile(); |
41 | } | 41 | } |
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){ |
49 | networkChannel->setEnabled(mod); | 48 | networkChannel->setEnabled(mod); |
50 | channelLabel->setEnabled(mod); | 49 | channelLabel->setEnabled(mod); |
51 | } | 50 | } |
@@ -87,15 +86,19 @@ void WLANImp::parseSettingFile(){ | |||
87 | } | 86 | } |
88 | } | 87 | } |
89 | if(line.contains("MODE=")){ | 88 | if(line.contains("MODE=")){ |
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=")) |
99 | keyLineEdit0->setText(line.mid(5, line.length())); | 102 | keyLineEdit0->setText(line.mid(5, line.length())); |
100 | if(line.contains("KEY1=")) | 103 | if(line.contains("KEY1=")) |
101 | keyLineEdit1->setText(line.mid(5, line.length())); | 104 | keyLineEdit1->setText(line.mid(5, line.length())); |