From d98b3694a43739e5617718228c000c0bb7473cbb Mon Sep 17 00:00:00 2001 From: arcan1s Date: Mon, 24 Feb 2014 19:55:04 +0400 Subject: [PATCH] small edit of added setSettings() to wireless --- sources/gui/src/bridgewidget.cpp | 2 +- sources/gui/src/ethernetwidget.cpp | 10 ++++---- sources/gui/src/generalwidget.cpp | 14 +++++------ sources/gui/src/mobilewidget.cpp | 10 ++++---- sources/gui/src/pppoewidget.cpp | 10 ++++---- sources/gui/src/wirelesswidget.cpp | 40 ++++++++++++++++++++++++++++-- 6 files changed, 61 insertions(+), 25 deletions(-) diff --git a/sources/gui/src/bridgewidget.cpp b/sources/gui/src/bridgewidget.cpp index e73af6a..3848e2a 100644 --- a/sources/gui/src/bridgewidget.cpp +++ b/sources/gui/src/bridgewidget.cpp @@ -64,6 +64,6 @@ int BridgeWidget::isOk() void BridgeWidget::setSettings(QHash settings) { if (settings.contains(QString("SkipForwardingDelay"))) - if (settings[QString("SkipForwardingDelay")] == QString("yes")) + if (settings[QString("SkipForwardingDelay")].remove(QString("'")) == QString("yes")) ui->checkBox_skip->setCheckState(Qt::Checked); } diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp index 8e796d6..fecbd8c 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -104,7 +104,7 @@ QHash EthernetWidget::getSettings() ethernetSettings[QString("SkipNoCarrier")] = QString("yes"); if (ui->checkBox_8021x->checkState() == Qt::Checked) { ethernetSettings[QString("Auth8021X")] = QString("yes"); - ethernetSettings[QString("WPAConfigFile")] = ui->lineEdit_wpaConfig->text(); + ethernetSettings[QString("WPAConfigFile")] = QString("'") + ui->lineEdit_wpaConfig->text() + QString("'"); ethernetSettings[QString("WPADriver")] = ui->comboBox_driver->currentText(); } if (ui->spinBox_timeoutCarrier->value() != 5) @@ -132,16 +132,16 @@ int EthernetWidget::isOk() void EthernetWidget::setSettings(QHash settings) { if (settings.contains(QString("SkipNoCarrier"))) - if (settings[QString("SkipNoCarrier")] == QString("yes")) + if (settings[QString("SkipNoCarrier")].remove(QString("'")) == QString("yes")) ui->checkBox_skip->setCheckState(Qt::Checked); if (settings.contains(QString("Auth8021X"))) - if (settings[QString("Auth8021X")] == QString("yes")) + if (settings[QString("Auth8021X")].remove(QString("'")) == QString("yes")) ui->checkBox_8021x->setCheckState(Qt::Checked); if (settings.contains(QString("WPAConfigFile"))) - ui->lineEdit_wpaConfig->setText(settings[QString("WPAConfigFile")]); + ui->lineEdit_wpaConfig->setText(settings[QString("WPAConfigFile")].remove(QString("'"))); if (settings.contains(QString("WPADriver"))) for (int i=0; icomboBox_driver->count(); i++) - if (settings[QString("WPADriver")] == ui->comboBox_driver->itemText(i)) + if (settings[QString("WPADriver")].remove(QString("'")) == ui->comboBox_driver->itemText(i)) ui->comboBox_driver->setCurrentIndex(i); if (settings.contains(QString("TimeoutCarrier"))) ui->spinBox_timeoutCarrier->setValue(settings[QString("TimeoutCarrier")].toInt()); diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index 2896aab..045290b 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -131,9 +131,9 @@ QHash GeneralWidget::getSettings() generalSettings[QString("After")] = profiles.join(QString(" ")); } if (!ui->lineEdit_execUpPost->text().isEmpty()) - generalSettings[QString("ExecUpPost")] = ui->lineEdit_execUpPost->text(); + generalSettings[QString("ExecUpPost")] = QString("'") + ui->lineEdit_execUpPost->text() + QString("'"); if (!ui->lineEdit_execDownPre->text().isEmpty()) - generalSettings[QString("ExecDownPre")] = ui->lineEdit_execDownPre->text(); + generalSettings[QString("ExecDownPre")] = QString("'") + ui->lineEdit_execDownPre->text() + QString("'"); if (ui->checkBox_forceConnect->checkState() == Qt::Checked) generalSettings[QString("ForceConnect")] = QString("yes"); clear(); @@ -164,21 +164,21 @@ void GeneralWidget::setSettings(QHash settings) ui->lineEdit_description->setText(settings[QString("Description")].remove(QString("'"))); if (settings.contains(QString("Connection"))) for (int i=0; icomboBox_connection->count(); i++) - if (settings[QString("Connection")] == ui->comboBox_connection->itemText(i)) + if (settings[QString("Connection")].remove(QString("'")) == ui->comboBox_connection->itemText(i)) ui->comboBox_connection->setCurrentIndex(i); if (settings.contains(QString("Interface"))) for (int i=0; icomboBox_interface->count(); i++) - if (settings[QString("Interface")] == ui->comboBox_interface->itemText(i)) + if (settings[QString("Interface")].remove(QString("'")) == ui->comboBox_interface->itemText(i)) ui->comboBox_interface->setCurrentIndex(i); if (settings.contains(QString("BindsToInterfaces"))) ui->listWidget_bindto->addItems(settings[QString("BindsToInterfaces")].split(QString(" "))); if (settings.contains(QString("After"))) ui->listWidget_after->addItems(settings[QString("After")].split(QString(" "))); if (settings.contains(QString("ExecUpPost"))) - ui->lineEdit_execUpPost->setText(settings[QString("ExecUpPost")]); + ui->lineEdit_execUpPost->setText(settings[QString("ExecUpPost")].remove(QString("'"))); if (settings.contains(QString("ExecDownPre"))) - ui->lineEdit_execDownPre->setText(settings[QString("ExecDownPre")]); + ui->lineEdit_execDownPre->setText(settings[QString("ExecDownPre")].remove(QString("'"))); if (settings.contains(QString("ForceConnect"))) - if (settings[QString("ForceConnect")] == QString("yes")) + if (settings[QString("ForceConnect")].remove(QString("'")) == QString("yes")) ui->checkBox_forceConnect->setCheckState(Qt::Checked); } diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp index 30cc94b..3409062 100644 --- a/sources/gui/src/mobilewidget.cpp +++ b/sources/gui/src/mobilewidget.cpp @@ -110,7 +110,7 @@ QHash MobileWidget::getSettings() if (ui->checkBox_dns->checkState() == Qt::Unchecked) mobileSettings[QString("UsePeerDNS")] = QString("false"); if (!ui->lineEdit_options->text().isEmpty()) - mobileSettings[QString("OptionsFile")] = ui->lineEdit_options->text(); + mobileSettings[QString("OptionsFile")] = QString("'") + ui->lineEdit_options->text() + QString("'"); clear(); } @@ -144,16 +144,16 @@ void MobileWidget::setSettings(QHash settings) ui->lineEdit_pin->setText(settings[QString("PIN")].remove(QString("'"))); if (settings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) - if (settings[QString("Mode")] == ui->comboBox_mode->itemText(i)) + if (settings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i)) ui->comboBox_mode->setCurrentIndex(i); if (settings.contains(QString("MaxFail"))) ui->spinBox_fail->setValue(settings[QString("MaxFail")].toInt()); if (settings.contains(QString("DefaultRoute"))) - if (settings[QString("DefaultRoute")] == QString("false")) + if (settings[QString("DefaultRoute")].remove(QString("'")) == QString("false")) ui->checkBox_route->setCheckState(Qt::Unchecked); if (settings.contains(QString("UsePeerDNS"))) - if (settings[QString("UsePeerDNS")] == QString("false")) + if (settings[QString("UsePeerDNS")].remove(QString("'")) == QString("false")) ui->checkBox_dns->setCheckState(Qt::Unchecked); if (settings.contains(QString("OptionsFile"))) - ui->lineEdit_options->setText(settings[QString("OptionsFile")]); + ui->lineEdit_options->setText(settings[QString("OptionsFile")].remove(QString("'"))); } diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp index cf79457..2427da7 100644 --- a/sources/gui/src/pppoewidget.cpp +++ b/sources/gui/src/pppoewidget.cpp @@ -141,7 +141,7 @@ QHash PppoeWidget::getSettings() if (ui->spinBox_lcpFailure->value() != 4) pppoeSettings[QString("LCPEchoFailure")] = QString(ui->spinBox_lcpFailure->value()); if (!ui->lineEdit_options->text().isEmpty()) - pppoeSettings[QString("OptionsFile")] = ui->lineEdit_options->text(); + pppoeSettings[QString("OptionsFile")] = QString("'") + ui->lineEdit_options->text() + QString("'"); if (!ui->lineEdit_service->text().isEmpty()) pppoeSettings[QString("PPPoEService")] = QString("'") + ui->lineEdit_service->text() + QString("'"); if (!ui->lineEdit_ac->text().isEmpty()) @@ -193,17 +193,17 @@ void PppoeWidget::setSettings(QHash settings) ui->lineEdit_password->setText(settings[QString("Password")].remove(QString("'"))); if (settings.contains(QString("ConnectionMode"))) for (int i=0; icomboBox_connection->count(); i++) - if (settings[QString("ConnectionMode")] == ui->comboBox_connection->itemText(i)) + if (settings[QString("ConnectionMode")].remove(QString("'")) == ui->comboBox_connection->itemText(i)) ui->comboBox_connection->setCurrentIndex(i); if (settings.contains(QString("IdleTimeout"))) ui->spinBox_timeout->setValue(settings[QString("IdleTimeout")].toInt()); if (settings.contains(QString("MaxFail"))) ui->spinBox_fail->setValue(settings[QString("MaxFail")].toInt()); if (settings.contains(QString("DefaultRoute"))) - if (settings[QString("DefaultRoute")] == QString("false")) + if (settings[QString("DefaultRoute")].remove(QString("'")) == QString("false")) ui->checkBox_route->setCheckState(Qt::Unchecked); if (settings.contains(QString("UsePeerDNS"))) - if (settings[QString("UsePeerDNS")] == QString("false")) + if (settings[QString("UsePeerDNS")].remove(QString("'")) == QString("false")) ui->checkBox_dns->setCheckState(Qt::Unchecked); if (settings.contains(QString("PPPUnit"))) ui->lineEdit_unit->setText(settings[QString("PPPUnit")]); @@ -212,7 +212,7 @@ void PppoeWidget::setSettings(QHash settings) if (settings.contains(QString("LCPEchoFailure"))) ui->spinBox_lcpFailure->setValue(settings[QString("LCPEchoFailure")].toInt()); if (settings.contains(QString("OptionsFile"))) - ui->lineEdit_options->setText(settings[QString("OptionsFile")]); + ui->lineEdit_options->setText(settings[QString("OptionsFile")].remove(QString("'"))); if (settings.contains(QString("PPPoEService"))) ui->lineEdit_service->setText(settings[QString("PPPoEService")].remove(QString("'"))); if (settings.contains(QString("PPPoEAC"))) diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index c0405e0..8333627 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -211,7 +211,7 @@ QHash WirelessWidget::getSettings() wirelessSettings[QString("WPAConfigFile")] = QString("'") + ui->lineEdit_wpaConfig->text() + QString("'"); if (ui->checkBox_hidden->checkState() == Qt::Checked) wirelessSettings[QString("Hidden")] = QString("yes"); - if (ui->checkBox_hidden->checkState() == Qt::Checked) + if (ui->checkBox_adhoc->checkState() == Qt::Checked) wirelessSettings[QString("AdHoc")] = QString("yes"); if (ui->listWidget_freq->count() != 0) { QStringList freqs; @@ -273,5 +273,41 @@ int WirelessWidget::isOk() void WirelessWidget::setSettings(QHash settings) { - + if (settings.contains(QString("Security"))) + for (int i=0; icomboBox_security->count(); i++) + if (settings[QString("Security")].remove(QString("'")) == ui->comboBox_security->itemText(i)) + ui->comboBox_security->setCurrentIndex(i); + if (settings.contains(QString("ESSID"))) + ui->lineEdit_essid->setText(settings[QString("ESSID")].remove(QString("'"))); + if (settings.contains(QString("Key"))) + ui->lineEdit_key->setText(settings[QString("Key")].remove(QString("'"))); + if (settings.contains(QString("WPAConfigSection"))) + ui->listWidget_wpaConfigSection->addItems(settings[QString("WPAConfigSection")].split(QString("\n"))); + if (settings.contains(QString("WPAConfigFile"))) + ui->lineEdit_wpaConfig->setText(settings[QString("WPAConfigFile")].remove(QString("'"))); + if (settings.contains(QString("Hidden"))) + if (settings[QString("Hidden")].remove(QString("'")) == QString("yes")) + ui->checkBox_hidden->setCheckState(Qt::Checked); + if (settings.contains(QString("AdHoc"))) + if (settings[QString("AdHoc")].remove(QString("'")) == QString("yes")) + ui->checkBox_adhoc->setCheckState(Qt::Checked); + if (settings.contains(QString("ScanFrequencies"))) + ui->listWidget_freq->addItems(settings[QString("ScanFrequencies")].split(QString("\n"))); + if (settings.contains(QString("Priority"))) + ui->spinBox_priority->setValue(settings[QString("Priority")].toInt()); + if (settings.contains(QString("Country"))) + ui->lineEdit_country->setText(settings[QString("Country")].remove(QString("'"))); + if (settings.contains(QString("WPAGroup"))) + ui->lineEdit_wpaGroup->setText(settings[QString("WPAGroup")].remove(QString("'"))); + if (settings.contains(QString("WPADriver"))) + ui->listWidget_drivers->addItems(settings[QString("WPADriver")].split(QString(","))); + if (settings.contains(QString("RFKill"))) + for (int i=0; icomboBox_rfkill->count(); i++) + if (settings[QString("RFKill")].remove(QString("'")) == ui->comboBox_rfkill->itemText(i)) + ui->comboBox_rfkill->setCurrentIndex(i); + if (settings.contains(QString("TimeoutWPA"))) + ui->spinBox_timeoutWpa->setValue(settings[QString("TimeoutWPA")].toInt()); + if (settings.contains(QString("ExcludeAuto"))) + if (settings[QString("ExcludeAuto")].remove(QString("'")) == QString("yes")) + ui->checkBox_exclude->setCheckState(Qt::Checked); }