| -rw-r--r-- | noncore/net/networksetup/wlan/wlanimp.cpp | 3 | ||||
| -rw-r--r-- | noncore/settings/networksettings/wlan/wlanimp.cpp | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/noncore/net/networksetup/wlan/wlanimp.cpp b/noncore/net/networksetup/wlan/wlanimp.cpp index d4b4af9..e64a633 100644 --- a/noncore/net/networksetup/wlan/wlanimp.cpp +++ b/noncore/net/networksetup/wlan/wlanimp.cpp @@ -171,62 +171,65 @@ void WLANImp::changeAndSaveSettingFile(){ if(!wepEnabled->isChecked()) stream << "#"; stream << "\tKEY="; stream << keyLineEdit0->text() << " [1]"; stream << keyLineEdit1->text() << " [2]"; stream << keyLineEdit2->text() << " [3]"; stream << keyLineEdit3->text() << " [4]"; stream << " key ["; if(keyRadio0->isChecked()) stream << "1]"; if(keyRadio1->isChecked()) stream << "2]"; if(keyRadio2->isChecked()) stream << "3]"; if(keyRadio3->isChecked()) stream << "4]"; if(authOpen->isChecked()) stream << " open"; stream << "\n"; stream << "\tCHANNEL=" << networkChannel->value() << "\n"; stream << "\tRATE=auto\n"; if(line.contains("esac")) stream << line << "\n"; } if(line.contains(";;")) output = true; if(output) stream << (*it) << '\n'; } file.close(); } /** * Check to see if the current config is valid * Save wireless.opts, save interfaces */ void WLANImp::accept(){ + printf( "Accept pressed\n" ); if(wepEnabled->isChecked()){ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) + { QMessageBox::information(this, "", "Please enter a key for WEP.", 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 QString initpath; if( QDir("/etc/rc.d/init.d").exists() ) initpath = "/etc/rc.d/init.d"; else if( QDir("/etc/init.d").exists() ) initpath = "/etc/init.d"; if( initpath ) system(QString("%1/pcmcia stop").arg(initpath)); if( initpath ) system(QString("%1/pcmcia start").arg(initpath)); // Close out the dialog QDialog::accept(); } // wlanimp.cpp diff --git a/noncore/settings/networksettings/wlan/wlanimp.cpp b/noncore/settings/networksettings/wlan/wlanimp.cpp index d4b4af9..e64a633 100644 --- a/noncore/settings/networksettings/wlan/wlanimp.cpp +++ b/noncore/settings/networksettings/wlan/wlanimp.cpp @@ -171,62 +171,65 @@ void WLANImp::changeAndSaveSettingFile(){ if(!wepEnabled->isChecked()) stream << "#"; stream << "\tKEY="; stream << keyLineEdit0->text() << " [1]"; stream << keyLineEdit1->text() << " [2]"; stream << keyLineEdit2->text() << " [3]"; stream << keyLineEdit3->text() << " [4]"; stream << " key ["; if(keyRadio0->isChecked()) stream << "1]"; if(keyRadio1->isChecked()) stream << "2]"; if(keyRadio2->isChecked()) stream << "3]"; if(keyRadio3->isChecked()) stream << "4]"; if(authOpen->isChecked()) stream << " open"; stream << "\n"; stream << "\tCHANNEL=" << networkChannel->value() << "\n"; stream << "\tRATE=auto\n"; if(line.contains("esac")) stream << line << "\n"; } if(line.contains(";;")) output = true; if(output) stream << (*it) << '\n'; } file.close(); } /** * Check to see if the current config is valid * Save wireless.opts, save interfaces */ void WLANImp::accept(){ + printf( "Accept pressed\n" ); if(wepEnabled->isChecked()){ if(keyLineEdit0->text().isEmpty() && keyLineEdit1->text().isEmpty() && keyLineEdit2->text().isEmpty() && keyLineEdit3->text().isEmpty() ) + { QMessageBox::information(this, "", "Please enter a key for WEP.", 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 QString initpath; if( QDir("/etc/rc.d/init.d").exists() ) initpath = "/etc/rc.d/init.d"; else if( QDir("/etc/init.d").exists() ) initpath = "/etc/init.d"; if( initpath ) system(QString("%1/pcmcia stop").arg(initpath)); if( initpath ) system(QString("%1/pcmcia start").arg(initpath)); // Close out the dialog QDialog::accept(); } // wlanimp.cpp |