summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp28
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp28
2 files changed, 26 insertions, 30 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp
index 84e0bae..cc18fba 100644
--- a/noncore/net/networksetup/wlan/wlanimp.cpp
+++ b/noncore/net/networksetup/wlan/wlanimp.cpp
@@ -89,31 +89,31 @@ void WLANImp::parseSettingFile(){
QString mode = line.mid(line.find("MODE=")+5, line.length());
if(mode == "Managed"){
networkType->setCurrentItem(0);
channelLabel->setEnabled(false);
networkChannel->setEnabled(false);
}
else{
networkType->setCurrentItem(1);
networkChannel->setEnabled(true);
channelLabel->setEnabled(true);
}
}
- if(line.contains("KEY0="))
+ if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
- if(line.contains("KEY1="))
+ if(line.contains("#KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
- if(line.contains("KEY2="))
+ if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
- if(line.contains("KEY3="))
+ if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
if(line.contains("KEY=")){
wepEnabled->setChecked(true);
QString key;
if(line.right(5) == (" open")){
key = line.mid(4, line.length()-5);
authOpen->setChecked(true);
authShared->setChecked(false);
}
else{
authOpen->setChecked(false);
@@ -156,36 +156,35 @@ void WLANImp::changeAndSaveSettingFile(){
// See if we found our scheme to write or the sceme couldn't be found
if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
if(!line.contains("esac"))
stream << line << "\n";
if(!essAny->isChecked() == true){
stream << "\tESSID=any\n";
stream << "\tMODE=Managed\n";
- stream << "\tCHANNEL=6\n";
}
else{
stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
stream << "\tMODE=" << ( networkType->currentItem() == 0 ? "Managed" : "ad-hoc") << '\n';
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
}
- stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
- stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
- stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
- stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
+ stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
+ stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
+ stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
+ stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
if(authOpen->isChecked())
stream << " open";
else
stream << " restricted";
stream << "\"\n";
@@ -199,32 +198,31 @@ void WLANImp::changeAndSaveSettingFile(){
if(output && (*it).length() )
stream << (*it) << '\n';
}
file.close();
}
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
if(wepEnabled->isChecked()){
- if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
- {
- QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
- return;
- }
+ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
+ QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
+ return;
+ }
}
- if(essSpecificLineEdit->text().isEmpty()){
+ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
return;
}
// Ok settings are good here, save
changeAndSaveSettingFile();
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
// 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 84e0bae..cc18fba 100644
--- a/noncore/settings/networksettings/wlan/wlanimp.cpp
+++ b/noncore/settings/networksettings/wlan/wlanimp.cpp
@@ -89,31 +89,31 @@ void WLANImp::parseSettingFile(){
QString mode = line.mid(line.find("MODE=")+5, line.length());
if(mode == "Managed"){
networkType->setCurrentItem(0);
channelLabel->setEnabled(false);
networkChannel->setEnabled(false);
}
else{
networkType->setCurrentItem(1);
networkChannel->setEnabled(true);
channelLabel->setEnabled(true);
}
}
- if(line.contains("KEY0="))
+ if(line.contains("#KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
- if(line.contains("KEY1="))
+ if(line.contains("#KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
- if(line.contains("KEY2="))
+ if(line.contains("#KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
- if(line.contains("KEY3="))
+ if(line.contains("#KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
if(line.contains("KEY=")){
wepEnabled->setChecked(true);
QString key;
if(line.right(5) == (" open")){
key = line.mid(4, line.length()-5);
authOpen->setChecked(true);
authShared->setChecked(false);
}
else{
authOpen->setChecked(false);
@@ -156,36 +156,35 @@ void WLANImp::changeAndSaveSettingFile(){
// See if we found our scheme to write or the sceme couldn't be found
if((foundCase && line.contains("esac") && !found) ||
(foundCase && line.left(currentProfile.length()+7) == currentProfile + ",*,*,*)" && line.at(0) != '#')){
// write out scheme
found = true;
output = false;
if(!line.contains("esac"))
stream << line << "\n";
if(!essAny->isChecked() == true){
stream << "\tESSID=any\n";
stream << "\tMODE=Managed\n";
- stream << "\tCHANNEL=6\n";
}
else{
stream << "\tESSID=" << essSpecificLineEdit->text() << '\n';
stream << "\tMODE=" << ( networkType->currentItem() == 0 ? "Managed" : "ad-hoc") << '\n';
stream << "\tCHANNEL=" << networkChannel->value() << "\n";
}
- stream << "\tKEY0=" << keyLineEdit0->text() << "\n";
- stream << "\tKEY1=" << keyLineEdit1->text() << "\n";
- stream << "\tKEY2=" << keyLineEdit2->text() << "\n";
- stream << "\tKEY3=" << keyLineEdit3->text() << "\n";
+ stream << "\t#KEY0=" << keyLineEdit0->text() << "\n";
+ stream << "\t#KEY1=" << keyLineEdit1->text() << "\n";
+ stream << "\t#KEY2=" << keyLineEdit2->text() << "\n";
+ stream << "\t#KEY3=" << keyLineEdit3->text() << "\n";
if(wepEnabled->isChecked()){
stream << "\tKEY=\"";
if(keyRadio0->isChecked()) stream << keyLineEdit0->text();
if(keyRadio1->isChecked()) stream << keyLineEdit1->text();
if(keyRadio2->isChecked()) stream << keyLineEdit2->text();
if(keyRadio3->isChecked()) stream << keyLineEdit3->text();
if(authOpen->isChecked())
stream << " open";
else
stream << " restricted";
stream << "\"\n";
@@ -199,32 +198,31 @@ void WLANImp::changeAndSaveSettingFile(){
if(output && (*it).length() )
stream << (*it) << '\n';
}
file.close();
}
/**
* Check to see if the current config is valid
* Save wireless.opts, save interfaces
*/
void WLANImp::accept(){
if(wepEnabled->isChecked()){
- if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() )
- {
- QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
- return;
- }
+ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ){
+ QMessageBox::information(this, "Error", "Please enter a key for WEP.", QMessageBox::Ok);
+ return;
+ }
}
- if(essSpecificLineEdit->text().isEmpty()){
+ if(essAny->isChecked() && essSpecificLineEdit->text().isEmpty()){
QMessageBox::information(this, "Error", "Please enter a ESS-ID.", QMessageBox::Ok);
return;
}
// Ok settings are good here, save
changeAndSaveSettingFile();
// Try to save the interfaces settings.
if(!interfaceSetup->saveChanges())
return;
// Restart the device now that the settings have changed