arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-24 15:37:23 +00:00
Code Issues Projects Releases Wiki Activity

small edit of

Browse Source 
added setSettings() to wireless
This commit is contained in:
arcan1s 2014-02-24 19:55:04 +04:00
parent ac1a135844
commit d98b3694a4
6 changed files with 61 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sources/gui/src/bridgewidget.cpp
View File

@ -64,6 +64,6 @@ int BridgeWidget::isOk()
void BridgeWidget::setSettings(QHash<QString, QString> 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);
}

10
sources/gui/src/ethernetwidget.cpp
View File

@ -104,7 +104,7 @@ QHash<QString, QString> 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<QString, QString> 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; i<ui->comboBox_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());

14
sources/gui/src/generalwidget.cpp
View File

@ -131,9 +131,9 @@ QHash<QString, QString> 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<QString, QString> settings)
ui->lineEdit_description->setText(settings[QString("Description")].remove(QString("'")));
if (settings.contains(QString("Connection")))
for (int i=0; i<ui->comboBox_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; i<ui->comboBox_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);
}

10
sources/gui/src/mobilewidget.cpp
View File

@ -110,7 +110,7 @@ QHash<QString, QString> 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<QString, QString> settings)
ui->lineEdit_pin->setText(settings[QString("PIN")].remove(QString("'")));
if (settings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_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("'")));
}

10
sources/gui/src/pppoewidget.cpp
View File

@ -141,7 +141,7 @@ QHash<QString, QString> 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<QString, QString> settings)
ui->lineEdit_password->setText(settings[QString("Password")].remove(QString("'")));
if (settings.contains(QString("ConnectionMode")))
for (int i=0; i<ui->comboBox_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<QString, QString> 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")))

40
sources/gui/src/wirelesswidget.cpp
View File

@ -211,7 +211,7 @@ QHash<QString, QString> 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<QString, QString> settings)
{
if (settings.contains(QString("Security")))
for (int i=0; i<ui->comboBox_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; i<ui->comboBox_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);
}