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 /noncore/net/networksetup/wlan/wlanimp.cpp | |
parent | 2217f9ba852aa2ffd36e5398988d9b1c65b18705 (diff) | |
download | opie-ee3251a889aed8ef0346743589e5166b7d4f673b.zip opie-ee3251a889aed8ef0346743589e5166b7d4f673b.tar.gz opie-ee3251a889aed8ef0346743589e5166b7d4f673b.tar.bz2 |
Fixed ad-hco bug
Diffstat (limited to 'noncore/net/networksetup/wlan/wlanimp.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 9 |
1 files changed, 6 insertions, 3 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 | |||
@@ -33,25 +33,24 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W | |||
33 | QString line = ""; | 33 | QString line = ""; |
34 | while ( !stream.eof() ) { | 34 | while ( !stream.eof() ) { |
35 | line += stream.readLine(); | 35 | line += stream.readLine(); |
36 | line += "\n"; | 36 | line += "\n"; |
37 | } | 37 | } |
38 | file.close(); | 38 | file.close(); |
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 | } |
52 | 51 | ||
53 | /** | 52 | /** |
54 | * Change the profile for both wireless settings and network settings. | 53 | * Change the profile for both wireless settings and network settings. |
55 | */ | 54 | */ |
56 | void WLANImp::setProfile(const QString &profile){ | 55 | void WLANImp::setProfile(const QString &profile){ |
57 | interfaceSetup->setProfile(profile); | 56 | interfaceSetup->setProfile(profile); |
@@ -81,27 +80,31 @@ void WLANImp::parseSettingFile(){ | |||
81 | QString id = line.mid(line.find("ESSID=")+6, line.length()); | 80 | QString id = line.mid(line.find("ESSID=")+6, line.length()); |
82 | if(id == "any"){ | 81 | if(id == "any"){ |
83 | essAny->setChecked(false); | 82 | essAny->setChecked(false); |
84 | }else{ | 83 | }else{ |
85 | essAny->setChecked(true); | 84 | essAny->setChecked(true); |
86 | essSpecificLineEdit->setText(id); | 85 | essSpecificLineEdit->setText(id); |
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())); |
102 | if(line.contains("KEY2=")) | 105 | if(line.contains("KEY2=")) |
103 | keyLineEdit2->setText(line.mid(5, line.length())); | 106 | keyLineEdit2->setText(line.mid(5, line.length())); |
104 | if(line.contains("KEY3=")) | 107 | if(line.contains("KEY3=")) |
105 | keyLineEdit3->setText(line.mid(5, line.length())); | 108 | keyLineEdit3->setText(line.mid(5, line.length())); |
106 | 109 | ||
107 | if(line.contains("KEY=")){ | 110 | if(line.contains("KEY=")){ |
@@ -214,25 +217,25 @@ void WLANImp::accept(){ | |||
214 | 217 | ||
215 | if(essSpecificLineEdit->text().isEmpty()){ | 218 | if(essSpecificLineEdit->text().isEmpty()){ |
216 | QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); | 219 | QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok); |
217 | return; | 220 | return; |
218 | } | 221 | } |
219 | 222 | ||
220 | // Ok settings are good here, save | 223 | // Ok settings are good here, save |
221 | changeAndSaveSettingFile(); | 224 | changeAndSaveSettingFile(); |
222 | 225 | ||
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() ) |
230 | initpath = "/etc/rc.d/init.d"; | 233 | initpath = "/etc/rc.d/init.d"; |
231 | else if( QDir("/etc/init.d").exists() ) | 234 | else if( QDir("/etc/init.d").exists() ) |
232 | initpath = "/etc/init.d"; | 235 | initpath = "/etc/init.d"; |
233 | if( initpath ) | 236 | if( initpath ) |
234 | system(QString("%1/pcmcia stop").arg(initpath)); | 237 | system(QString("%1/pcmcia stop").arg(initpath)); |
235 | if( initpath ) | 238 | if( initpath ) |
236 | system(QString("%1/pcmcia start").arg(initpath)); | 239 | system(QString("%1/pcmcia start").arg(initpath)); |
237 | 240 | ||
238 | // Close out the dialog | 241 | // Close out the dialog |