summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/networksetup/wlan/wlanimp.cpp9
-rw-r--r--noncore/settings/networksettings/wlan/wlanimp.cpp9
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
@@ -33,25 +33,24 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
QString line = "";
while ( !stream.eof() ) {
line += stream.readLine();
line += "\n";
}
file.close();
settingsFileText = QStringList::split("\n", line, true);
parseSettingFile();
}
else
qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
-
}
void WLANImp::typeChanged(int mod){
networkChannel->setEnabled(mod);
channelLabel->setEnabled(mod);
}
/**
* Change the profile for both wireless settings and network settings.
*/
void WLANImp::setProfile(const QString &profile){
interfaceSetup->setProfile(profile);
@@ -81,27 +80,31 @@ void WLANImp::parseSettingFile(){
QString id = line.mid(line.find("ESSID=")+6, line.length());
if(id == "any"){
essAny->setChecked(false);
}else{
essAny->setChecked(true);
essSpecificLineEdit->setText(id);
}
}
if(line.contains("MODE=")){
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(0);
+ networkType->setCurrentItem(1);
+ networkChannel->setEnabled(true);
+ channelLabel->setEnabled(true);
}
}
if(line.contains("KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
if(line.contains("KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
if(line.contains("KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
if(line.contains("KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
if(line.contains("KEY=")){
@@ -214,25 +217,25 @@ void WLANImp::accept(){
if(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
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
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
@@ -33,25 +33,24 @@ WLANImp::WLANImp( QWidget* parent, const char* name, Interface *i, bool modal, W
QString line = "";
while ( !stream.eof() ) {
line += stream.readLine();
line += "\n";
}
file.close();
settingsFileText = QStringList::split("\n", line, true);
parseSettingFile();
}
else
qDebug(QString("WLANImp: Can't open file: %1 for reading.").arg(wlanFile).latin1());
connect(networkType, SIGNAL(activated(int)), this, SLOT(typeChanged(int)));
-
}
void WLANImp::typeChanged(int mod){
networkChannel->setEnabled(mod);
channelLabel->setEnabled(mod);
}
/**
* Change the profile for both wireless settings and network settings.
*/
void WLANImp::setProfile(const QString &profile){
interfaceSetup->setProfile(profile);
@@ -81,27 +80,31 @@ void WLANImp::parseSettingFile(){
QString id = line.mid(line.find("ESSID=")+6, line.length());
if(id == "any"){
essAny->setChecked(false);
}else{
essAny->setChecked(true);
essSpecificLineEdit->setText(id);
}
}
if(line.contains("MODE=")){
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(0);
+ networkType->setCurrentItem(1);
+ networkChannel->setEnabled(true);
+ channelLabel->setEnabled(true);
}
}
if(line.contains("KEY0="))
keyLineEdit0->setText(line.mid(5, line.length()));
if(line.contains("KEY1="))
keyLineEdit1->setText(line.mid(5, line.length()));
if(line.contains("KEY2="))
keyLineEdit2->setText(line.mid(5, line.length()));
if(line.contains("KEY3="))
keyLineEdit3->setText(line.mid(5, line.length()));
if(line.contains("KEY=")){
@@ -214,25 +217,25 @@ void WLANImp::accept(){
if(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
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