From 3cb4e1dfee2a496685d781dce9aaa4664e7a8364 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sat, 22 Feb 2014 13:35:05 +0400 Subject: [PATCH] starting work on setSettings() functions --- sources/gui/src/bridgewidget.cpp | 4 +++- sources/gui/src/ethernetwidget.cpp | 17 ++++++++++++++++- sources/gui/src/generalwidget.cpp | 24 ++++++++++++++++++++++-- 3 files changed, 41 insertions(+), 4 deletions(-) diff --git a/sources/gui/src/bridgewidget.cpp b/sources/gui/src/bridgewidget.cpp index 90ccb3b..e73af6a 100644 --- a/sources/gui/src/bridgewidget.cpp +++ b/sources/gui/src/bridgewidget.cpp @@ -63,5 +63,7 @@ int BridgeWidget::isOk() void BridgeWidget::setSettings(QHash settings) { - + if (settings.contains(QString("SkipForwardingDelay"))) + if (settings[QString("SkipForwardingDelay")] == QString("yes")) + ui->checkBox_skip->setCheckState(Qt::Checked); } diff --git a/sources/gui/src/ethernetwidget.cpp b/sources/gui/src/ethernetwidget.cpp index c1922da..8e796d6 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -131,5 +131,20 @@ int EthernetWidget::isOk() void EthernetWidget::setSettings(QHash settings) { - + if (settings.contains(QString("SkipNoCarrier"))) + if (settings[QString("SkipNoCarrier")] == QString("yes")) + ui->checkBox_skip->setCheckState(Qt::Checked); + if (settings.contains(QString("Auth8021X"))) + if (settings[QString("Auth8021X")] == QString("yes")) + ui->checkBox_8021x->setCheckState(Qt::Checked); + if (settings.contains(QString("WPAConfigFile"))) + ui->lineEdit_wpaConfig->setText(settings[QString("WPAConfigFile")]); + if (settings.contains(QString("WPADriver"))) + for (int i=0; icomboBox_driver->count(); i++) + if (settings[QString("WPADriver")] == ui->comboBox_driver->itemText(i)) + ui->comboBox_driver->setCurrentIndex(i); + if (settings.contains(QString("TimeoutCarrier"))) + ui->spinBox_timeoutCarrier->setValue(settings[QString("TimeoutCarrier")].toInt()); + if (settings.contains(QString("TimeoutWPA"))) + ui->spinBox_timeoutWpa->setValue(settings[QString("TimeoutWPA")].toInt()); } diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index 56336e8..2896aab 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -115,7 +115,7 @@ QHash GeneralWidget::getSettings() QHash generalSettings; if (isOk() == 0) { - generalSettings[QString("Description")] = ui->lineEdit_description->text(); + generalSettings[QString("Description")] = QString("'") + ui->lineEdit_description->text() + QString("'"); generalSettings[QString("Connection")] = ui->comboBox_connection->currentText(); generalSettings[QString("Interface")] = ui->comboBox_interface->currentText(); if (ui->listWidget_bindto->count() != 0) { @@ -160,5 +160,25 @@ int GeneralWidget::isOk() void GeneralWidget::setSettings(QHash settings) { - + if (settings.contains(QString("Description"))) + 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)) + 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)) + 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")]); + if (settings.contains(QString("ExecDownPre"))) + ui->lineEdit_execDownPre->setText(settings[QString("ExecDownPre")]); + if (settings.contains(QString("ForceConnect"))) + if (settings[QString("ForceConnect")] == QString("yes")) + ui->checkBox_forceConnect->setCheckState(Qt::Checked); }