arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-10-15 01:19:56 +00:00
Code Issues Projects Releases Wiki Activity

more refactoring

Browse Source
This commit is contained in:
arcan1s
2014-02-28 20:07:04 +04:00
parent 2cade97786
commit 3f02c047c2
27 changed files with 475 additions and 449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
sources/gui/src/tunnelwidget.cpp
View File

@ -87,13 +87,14 @@ QMap<QString, QString> TunnelWidget::getSettings()
{
QMap<QString, QString> tunnelSettings;
if (isOk() == 0) {
tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'");
if (!ui->lineEdit_local->text().split(QString(".")).join(QString("")).remove(QString(" ")).isEmpty())
tunnelSettings[QString("Local")] = QString("'") + getIp(ui->lineEdit_local->text().remove(QString(" "))) + QString("'");
if (!ui->lineEdit_remote->text().split(QString(".")).join(QString("")).remove(QString(" ")).isEmpty())
tunnelSettings[QString("Remote")] = QString("'") + getIp(ui->lineEdit_remote->text().remove(QString(" "))) + QString("'");
}
if (isOk() != 0)
return tunnelSettings;
tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'");
if (!ui->lineEdit_local->text().split(QString(".")).join(QString("")).remove(QString(" ")).isEmpty())
tunnelSettings[QString("Local")] = QString("'") + getIp(ui->lineEdit_local->text().remove(QString(" "))) + QString("'");
if (!ui->lineEdit_remote->text().split(QString(".")).join(QString("")).remove(QString(" ")).isEmpty())
tunnelSettings[QString("Remote")] = QString("'") + getIp(ui->lineEdit_remote->text().remove(QString(" "))) + QString("'");
return tunnelSettings;
}
@ -106,14 +107,16 @@ int TunnelWidget::isOk()
}
void TunnelWidget::setSettings(QMap<QString, QString> settings)
void TunnelWidget::setSettings(const QMap<QString, QString> settings)
{
if (settings.contains(QString("Mode")))
QMap<QString, QString> tunnelSettings = settings;
if (tunnelSettings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++)
if (settings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i))
if (tunnelSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i))
ui->comboBox_mode->setCurrentIndex(i);
if (settings.contains(QString("Local")))
ui->lineEdit_local->setText(settings[QString("Local")].remove(QString("'")));
if (settings.contains(QString("Remote")))
ui->lineEdit_remote->setText(settings[QString("Remote")].remove(QString("'")));
if (tunnelSettings.contains(QString("Local")))
ui->lineEdit_local->setText(tunnelSettings[QString("Local")].remove(QString("'")));
if (tunnelSettings.contains(QString("Remote")))
ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")].remove(QString("'")));
}