arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-04-25 07:57:20 +00:00
Code Issues Projects Releases Wiki Activity

end of refactoring of the widgets

Browse Source 
refactoring of settingswindow
This commit is contained in:
arcan1s 2014-07-13 10:48:46 +04:00
parent ceb7f3bd0f
commit dbb9ba70c4
15 changed files with 222 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sources/dataengine/netctl.cpp
View File

@ -75,12 +75,11 @@ void Netctl::readConfiguration()
fileStr = QString(confFile.readLine()).trimmed(); fileStr = QString(confFile.readLine()).trimmed();
if (fileStr[0] == QChar('#')) continue; if (fileStr[0] == QChar('#')) continue;
if (fileStr[0] == QChar(';')) continue; if (fileStr[0] == QChar(';')) continue;
if (fileStr.contains(QChar('='))) { if (!fileStr.contains(QChar('='))) continue;
value.clear(); value.clear();
for (int i=1; i<fileStr.split(QChar('=')).count(); i++) for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
value.append(fileStr.split(QChar('='))[i]); value.append(fileStr.split(QChar('='))[i]);
rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('=')); rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
}
if (confFile.atEnd()) if (confFile.atEnd())
break; break;
} }

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

@ -76,6 +76,7 @@ void BridgeWidget::setSettings(const QMap<QString, QString> settings)
QMap<QString, QString> bridgeSettings = settings; QMap<QString, QString> bridgeSettings = settings;
if (bridgeSettings.contains(QString("SkipForwardingDelay"))) if (bridgeSettings.contains(QString("SkipForwardingDelay")))
if (bridgeSettings[QString("SkipForwardingDelay")].remove(QString("'")) == QString("yes")) if (bridgeSettings[QString("SkipForwardingDelay")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_skip->setCheckState(Qt::Checked); ui->checkBox_skip->setCheckState(Qt::Checked);
} }

1
sources/gui/src/errorwindow.cpp
View File

@ -42,6 +42,7 @@ ErrorWindow::~ErrorWindow()
void ErrorWindow::setMessage(const int mess) void ErrorWindow::setMessage(const int mess)
{ {
if (debug) qDebug() << "[ErrorWindow]" << "[setMessage]"; if (debug) qDebug() << "[ErrorWindow]" << "[setMessage]";
if (debug) qDebug() << "[ErrorWindow]" << "[setMessage]" << ":" << "Message" << mess;
QString message; QString message;
switch(mess) { switch(mess) {

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

@ -145,16 +145,20 @@ void EthernetWidget::setSettings(const QMap<QString, QString> settings)
QMap<QString, QString> ethernetSettings = settings; QMap<QString, QString> ethernetSettings = settings;
if (ethernetSettings.contains(QString("SkipNoCarrier"))) if (ethernetSettings.contains(QString("SkipNoCarrier")))
if (ethernetSettings[QString("SkipNoCarrier")].remove(QString("'")) == QString("yes")) if (ethernetSettings[QString("SkipNoCarrier")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_skip->setCheckState(Qt::Checked); ui->checkBox_skip->setCheckState(Qt::Checked);
if (ethernetSettings.contains(QString("Auth8021X"))) if (ethernetSettings.contains(QString("Auth8021X")))
if (ethernetSettings[QString("Auth8021X")].remove(QString("'")) == QString("yes")) if (ethernetSettings[QString("Auth8021X")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_8021x->setCheckState(Qt::Checked); ui->checkBox_8021x->setCheckState(Qt::Checked);
if (ethernetSettings.contains(QString("WPAConfigFile"))) if (ethernetSettings.contains(QString("WPAConfigFile")))
ui->lineEdit_wpaConfig->setText(ethernetSettings[QString("WPAConfigFile")].remove(QString("'"))); ui->lineEdit_wpaConfig->setText(ethernetSettings[QString("WPAConfigFile")]
.remove(QChar('\'')).remove(QChar('"')));
if (ethernetSettings.contains(QString("WPADriver"))) if (ethernetSettings.contains(QString("WPADriver")))
for (int i=0; i<ui->comboBox_driver->count(); i++) for (int i=0; i<ui->comboBox_driver->count(); i++)
if (ethernetSettings[QString("WPADriver")].remove(QString("'")) == ui->comboBox_driver->itemText(i)) if (ethernetSettings[QString("WPADriver")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_driver->itemText(i))
ui->comboBox_driver->setCurrentIndex(i); ui->comboBox_driver->setCurrentIndex(i);
if (ethernetSettings.contains(QString("TimeoutCarrier"))) if (ethernetSettings.contains(QString("TimeoutCarrier")))
ui->spinBox_timeoutCarrier->setValue(ethernetSettings[QString("TimeoutCarrier")].toInt()); ui->spinBox_timeoutCarrier->setValue(ethernetSettings[QString("TimeoutCarrier")].toInt());

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

@ -136,13 +136,13 @@ QMap<QString, QString> GeneralWidget::getSettings()
QStringList interfaces; QStringList interfaces;
for (int i=0; i<ui->listWidget_bindto->count(); i++) for (int i=0; i<ui->listWidget_bindto->count(); i++)
interfaces.append(ui->listWidget_bindto->item(i)->text()); interfaces.append(ui->listWidget_bindto->item(i)->text());
generalSettings[QString("BindsToInterfaces")] = interfaces.join(QString(" ")); generalSettings[QString("BindsToInterfaces")] = interfaces.join(QChar(' '));
} }
if (ui->listWidget_after->count() != 0) { if (ui->listWidget_after->count() != 0) {
QStringList profiles; QStringList profiles;
for (int i=0; i<ui->listWidget_after->count(); i++) for (int i=0; i<ui->listWidget_after->count(); i++)
profiles.append(ui->listWidget_after->item(i)->text()); profiles.append(ui->listWidget_after->item(i)->text());
generalSettings[QString("After")] = profiles.join(QString(" ")); generalSettings[QString("After")] = profiles.join(QChar(' '));
} }
if (!ui->lineEdit_execUpPost->text().isEmpty()) if (!ui->lineEdit_execUpPost->text().isEmpty())
generalSettings[QString("ExecUpPost")] = QString("'") + ui->lineEdit_execUpPost->text() + QString("'"); generalSettings[QString("ExecUpPost")] = QString("'") + ui->lineEdit_execUpPost->text() + QString("'");
@ -179,27 +179,34 @@ void GeneralWidget::setSettings(const QMap<QString, QString> settings)
QMap<QString, QString> generalSettings = settings; QMap<QString, QString> generalSettings = settings;
if (generalSettings.contains(QString("Description"))) if (generalSettings.contains(QString("Description")))
ui->lineEdit_description->setText(generalSettings[QString("Description")].remove(QString("'"))); ui->lineEdit_description->setText(generalSettings[QString("Description")]
.remove(QChar('\'')).remove(QChar('"')));
if (generalSettings.contains(QString("Connection"))) if (generalSettings.contains(QString("Connection")))
for (int i=0; i<ui->comboBox_connection->count(); i++) for (int i=0; i<ui->comboBox_connection->count(); i++)
if (generalSettings[QString("Connection")].remove(QString("'")) == ui->comboBox_connection->itemText(i)) if (generalSettings[QString("Connection")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i))
ui->comboBox_connection->setCurrentIndex(i); ui->comboBox_connection->setCurrentIndex(i);
if (generalSettings.contains(QString("Interface"))) if (generalSettings.contains(QString("Interface")))
for (int i=0; i<ui->comboBox_interface->count(); i++) for (int i=0; i<ui->comboBox_interface->count(); i++)
if (generalSettings[QString("Interface")].remove(QString("'")) == ui->comboBox_interface->itemText(i)) if (generalSettings[QString("Interface")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_interface->itemText(i))
ui->comboBox_interface->setCurrentIndex(i); ui->comboBox_interface->setCurrentIndex(i);
if (generalSettings.contains(QString("BindsToInterfaces"))) if (generalSettings.contains(QString("BindsToInterfaces")))
ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar(' '))); ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar(' ')));
if (generalSettings.contains(QString("After"))) if (generalSettings.contains(QString("After")))
ui->listWidget_after->addItems(generalSettings[QString("After")].split(QChar(' '))); ui->listWidget_after->addItems(generalSettings[QString("After")].split(QChar(' ')));
if (generalSettings.contains(QString("ExecUpPost"))) if (generalSettings.contains(QString("ExecUpPost")))
ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")].remove(QString("'"))); ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")]
.remove(QChar('\'')).remove(QChar('"')));
if (generalSettings.contains(QString("ExecDownPre"))) if (generalSettings.contains(QString("ExecDownPre")))
ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")].remove(QString("'"))); ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")]
.remove(QChar('\'')).remove(QChar('"')));
if (generalSettings.contains(QString("ForceConnect"))) if (generalSettings.contains(QString("ForceConnect")))
if (generalSettings[QString("ForceConnect")].remove(QString("'")) == QString("yes")) if (generalSettings[QString("ForceConnect")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_forceConnect->setCheckState(Qt::Checked); ui->checkBox_forceConnect->setCheckState(Qt::Checked);
if (generalSettings.contains(QString("NETCTL_DEBUG"))) if (generalSettings.contains(QString("NETCTL_DEBUG")))
if (generalSettings[QString("NETCTL_DEBUG")].remove(QString("'")) == QString("yes")) if (generalSettings[QString("NETCTL_DEBUG")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_debug->setCheckState(Qt::Checked); ui->checkBox_debug->setCheckState(Qt::Checked);
} }

106
sources/gui/src/ipwidget.cpp
View File

@ -186,7 +186,7 @@ QString IpWidget::getIp(const QString rawIp)
if (ip[i].toInt() > 255) if (ip[i].toInt() > 255)
ip[i] = QString("255"); ip[i] = QString("255");
return ip.join(QString(".")); return ip.join(QChar('.'));
} }
@ -233,8 +233,8 @@ QString IpWidget::getPrefix6(const QString rawPrefix)
void IpWidget::addIp() void IpWidget::addIp()
{ {
QString ip = getIp(ui->lineEdit_ipAddress->text().remove(" ").split(QChar('/'))[0]); QString ip = getIp(ui->lineEdit_ipAddress->text().remove(QChar(' ')).split(QChar('/'))[0]);
QString prefix = getPrefix(ui->lineEdit_ipAddress->text().remove(" ").split(QChar('/'))[1]); QString prefix = getPrefix(ui->lineEdit_ipAddress->text().remove(QChar(' ')).split(QChar('/'))[1]);
ui->listWidget_ipAddress->addItem(ip + QString("/") + prefix); ui->listWidget_ipAddress->addItem(ip + QString("/") + prefix);
ui->lineEdit_ipAddress->clear(); ui->lineEdit_ipAddress->clear();
@ -243,9 +243,9 @@ void IpWidget::addIp()
void IpWidget::addIpRoutes() void IpWidget::addIpRoutes()
{ {
QString ip = getIp(ui->lineEdit_ipRoutes->text().remove(" ").split(QChar('/'))[0]); QString ip = getIp(ui->lineEdit_ipRoutes->text().remove(QChar(' ')).split(QChar('/'))[0]);
QString prefix = getPrefix(ui->lineEdit_ipRoutes->text().remove(" ").split(QChar('/'))[1]); QString prefix = getPrefix(ui->lineEdit_ipRoutes->text().remove(QChar(' ')).split(QChar('/'))[1]);
QString ipVia = getIp(ui->lineEdit_ipRoutes2->text().remove(" ")); QString ipVia = getIp(ui->lineEdit_ipRoutes2->text().remove(QChar(' ')));
ui->listWidget_ipRoutes->addItem(ip + QString("/") + prefix + QString(" via ") + ipVia); ui->listWidget_ipRoutes->addItem(ip + QString("/") + prefix + QString(" via ") + ipVia);
ui->lineEdit_ipRoutes->clear(); ui->lineEdit_ipRoutes->clear();
@ -255,8 +255,8 @@ void IpWidget::addIpRoutes()
void IpWidget::addIp6() void IpWidget::addIp6()
{ {
QString ip = getIp6(ui->lineEdit_ipAddress6->text().remove(" ").split(QChar('/'))[0]); QString ip = getIp6(ui->lineEdit_ipAddress6->text().remove(QChar(' ')).split(QChar('/'))[0]);
QString prefix = getPrefix6(ui->lineEdit_ipAddress6->text().remove(" ").split(QChar('/'))[1]); QString prefix = getPrefix6(ui->lineEdit_ipAddress6->text().remove(QChar(' ')).split(QChar('/'))[1]);
ui->listWidget_ipAddress6->addItem(ip + QString("/") + prefix); ui->listWidget_ipAddress6->addItem(ip + QString("/") + prefix);
ui->lineEdit_ipAddress6->clear(); ui->lineEdit_ipAddress6->clear();
@ -265,9 +265,9 @@ void IpWidget::addIp6()
void IpWidget::addIpRoutes6() void IpWidget::addIpRoutes6()
{ {
QString ip = getIp6(ui->lineEdit_ipRoutes6->text().remove(" ").split(QChar('/'))[0]); QString ip = getIp6(ui->lineEdit_ipRoutes6->text().remove(QChar(' ')).split(QChar('/'))[0]);
QString prefix = getPrefix6(ui->lineEdit_ipRoutes6->text().remove(" ").split(QChar('/'))[1]); QString prefix = getPrefix6(ui->lineEdit_ipRoutes6->text().remove(QChar(' ')).split(QChar('/'))[1]);
QString ipVia = getIp6(ui->lineEdit_ipRoutes62->text().remove(" ")); QString ipVia = getIp6(ui->lineEdit_ipRoutes62->text().remove(QChar(' ')));
ui->listWidget_ipRoutes6->addItem(ip + QString("/") + prefix + QString(" via ") + ipVia); ui->listWidget_ipRoutes6->addItem(ip + QString("/") + prefix + QString(" via ") + ipVia);
ui->lineEdit_ipRoutes6->clear(); ui->lineEdit_ipRoutes6->clear();
@ -285,7 +285,7 @@ void IpWidget::addCustom()
void IpWidget::addDns() void IpWidget::addDns()
{ {
QString ip = getIp(ui->lineEdit_dns->text().remove(" ")); QString ip = getIp(ui->lineEdit_dns->text().remove(QChar(' ')));
ui->listWidget_dns->addItem(ip); ui->listWidget_dns->addItem(ip);
ui->lineEdit_dns->clear(); ui->lineEdit_dns->clear();
@ -389,14 +389,14 @@ QMap<QString, QString> IpWidget::getSettings()
QStringList addresses; QStringList addresses;
for (int i=0; i<ui->listWidget_ipAddress->count(); i++) for (int i=0; i<ui->listWidget_ipAddress->count(); i++)
addresses.append(QString("'") + ui->listWidget_ipAddress->item(i)->text() + QString("'")); addresses.append(QString("'") + ui->listWidget_ipAddress->item(i)->text() + QString("'"));
ipSettings[QString("Address")] = addresses.join(QString(" ")); ipSettings[QString("Address")] = addresses.join(QChar(' '));
ipSettings[QString("Gateway")] = QString("'") + ui->lineEdit_gateway->text() + QString("'"); ipSettings[QString("Gateway")] = QString("'") + ui->lineEdit_gateway->text() + QString("'");
} }
if (ui->listWidget_ipRoutes->count() > 0) { if (ui->listWidget_ipRoutes->count() > 0) {
QStringList routes; QStringList routes;
for (int i=0; i<ui->listWidget_ipRoutes->count(); i++) for (int i=0; i<ui->listWidget_ipRoutes->count(); i++)
routes.append(QString("'") + ui->listWidget_ipRoutes->item(i)->text() + QString("'")); routes.append(QString("'") + ui->listWidget_ipRoutes->item(i)->text() + QString("'"));
ipSettings[QString("Routes")] = routes.join(QString(" ")); ipSettings[QString("Routes")] = routes.join(QChar(' '));
} }
} }
else else
@ -408,14 +408,14 @@ QMap<QString, QString> IpWidget::getSettings()
QStringList addresses; QStringList addresses;
for (int i=0; i<ui->listWidget_ipAddress6->count(); i++) for (int i=0; i<ui->listWidget_ipAddress6->count(); i++)
addresses.append(QString("'") + ui->listWidget_ipAddress6->item(i)->text() + QString("'")); addresses.append(QString("'") + ui->listWidget_ipAddress6->item(i)->text() + QString("'"));
ipSettings[QString("Address6")] = addresses.join(QString(" ")); ipSettings[QString("Address6")] = addresses.join(QChar(' '));
ipSettings[QString("Gateway6")] = QString("'") + ui->lineEdit_gateway6->text() + QString("'"); ipSettings[QString("Gateway6")] = QString("'") + ui->lineEdit_gateway6->text() + QString("'");
} }
if (ui->listWidget_ipRoutes6->count() > 0) { if (ui->listWidget_ipRoutes6->count() > 0) {
QStringList routes; QStringList routes;
for (int i=0; i<ui->listWidget_ipRoutes6->count(); i++) for (int i=0; i<ui->listWidget_ipRoutes6->count(); i++)
routes.append(QString("'") + ui->listWidget_ipRoutes6->item(i)->text() + QString("'")); routes.append(QString("'") + ui->listWidget_ipRoutes6->item(i)->text() + QString("'"));
ipSettings[QString("Routes6")] = routes.join(QString(" ")); ipSettings[QString("Routes6")] = routes.join(QChar(' '));
} }
} }
else else
@ -424,7 +424,7 @@ QMap<QString, QString> IpWidget::getSettings()
QStringList custom; QStringList custom;
for (int i=0; i<ui->listWidget_custom->count(); i++) for (int i=0; i<ui->listWidget_custom->count(); i++)
custom.append(QString("'") + ui->listWidget_custom->item(i)->text() + QString("'")); custom.append(QString("'") + ui->listWidget_custom->item(i)->text() + QString("'"));
ipSettings[QString("IPCustom")] = custom.join(QString(" ")); ipSettings[QString("IPCustom")] = custom.join(QChar(' '));
} }
if (!ui->lineEdit_hostname->text().isEmpty()) if (!ui->lineEdit_hostname->text().isEmpty())
ipSettings[QString("Hostname")] = QString("'") + ui->lineEdit_hostname->text() + QString("'"); ipSettings[QString("Hostname")] = QString("'") + ui->lineEdit_hostname->text() + QString("'");
@ -449,7 +449,7 @@ QMap<QString, QString> IpWidget::getSettings()
QStringList dns; QStringList dns;
for (int i=0; i<ui->listWidget_dns->count(); i++) for (int i=0; i<ui->listWidget_dns->count(); i++)
dns.append(QString("'") + ui->listWidget_dns->item(i)->text() + QString("'")); dns.append(QString("'") + ui->listWidget_dns->item(i)->text() + QString("'"));
ipSettings[QString("DNS")] = dns.join(QString(" ")); ipSettings[QString("DNS")] = dns.join(QChar(' '));
} }
if (!ui->lineEdit_dnsDomain->text().isEmpty()) if (!ui->lineEdit_dnsDomain->text().isEmpty())
ipSettings[QString("DNSDomain")] = QString("'") + ui->lineEdit_dnsDomain->text() + QString("'"); ipSettings[QString("DNSDomain")] = QString("'") + ui->lineEdit_dnsDomain->text() + QString("'");
@ -459,7 +459,7 @@ QMap<QString, QString> IpWidget::getSettings()
QStringList dnsOpt; QStringList dnsOpt;
for (int i=0; i<ui->listWidget_dnsOptions->count(); i++) for (int i=0; i<ui->listWidget_dnsOptions->count(); i++)
dnsOpt.append(QString("'") + ui->listWidget_dnsOptions->item(i)->text() + QString("'")); dnsOpt.append(QString("'") + ui->listWidget_dnsOptions->item(i)->text() + QString("'"));
ipSettings[QString("DNSOptions")] = dnsOpt.join(QString(" ")); ipSettings[QString("DNSOptions")] = dnsOpt.join(QChar(' '));
} }
return ipSettings; return ipSettings;
@ -492,37 +492,50 @@ void IpWidget::setSettings(const QMap<QString, QString> settings)
QMap<QString, QString> ipSettings = settings; QMap<QString, QString> ipSettings = settings;
if (ipSettings.contains(QString("IP"))) { if (ipSettings.contains(QString("IP"))) {
if (ipSettings[QString("IP")].remove(QString("'")) == QString("no")) if (ipSettings[QString("IP")].remove(QChar('\'')).remove(QChar('"')) == QString("no"))
ui->checkBox_ip->setCheckState(Qt::Unchecked); ui->checkBox_ip->setCheckState(Qt::Unchecked);
else { else {
ui->checkBox_ip->setCheckState(Qt::Checked); ui->checkBox_ip->setCheckState(Qt::Checked);
for (int i=0; i<ui->comboBox_ip->count(); i++) for (int i=0; i<ui->comboBox_ip->count(); i++)
if (ipSettings[QString("IP")].remove(QString("'")) == ui->comboBox_ip->itemText(i)) if (ipSettings[QString("IP")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip->itemText(i))
ui->comboBox_ip->setCurrentIndex(i); ui->comboBox_ip->setCurrentIndex(i);
} }
} }
if (ipSettings.contains(QString("Address"))) if (ipSettings.contains(QString("Address")))
ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")].remove(QString("'")).split(QChar(' '))); ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")]
.remove(QChar('\'')).remove(QChar('"'))
.split(QChar(' ')));
if (ipSettings.contains(QString("Gateway"))) if (ipSettings.contains(QString("Gateway")))
ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")].remove(QString("'"))); ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("Routes"))) if (ipSettings.contains(QString("Routes")))
ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")].remove(QString("'")).split(QChar(' '))); ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")]
.remove(QChar('\'')).remove(QChar('"'))
.split(QChar(' ')));
if (ipSettings.contains(QString("IP6"))) { if (ipSettings.contains(QString("IP6"))) {
if (ipSettings[QString("IP6")].remove(QString("'")) == QString("no")) if (ipSettings[QString("IP6")].remove(QChar('\''))
.remove(QChar('\'')).remove(QChar('"')) == QString("no"))
ui->checkBox_ip6->setCheckState(Qt::Unchecked); ui->checkBox_ip6->setCheckState(Qt::Unchecked);
else { else {
ui->checkBox_ip6->setCheckState(Qt::Checked); ui->checkBox_ip6->setCheckState(Qt::Checked);
for (int i=0; i<ui->comboBox_ip6->count(); i++) for (int i=0; i<ui->comboBox_ip6->count(); i++)
if (ipSettings[QString("IP6")].remove(QString("'")) == ui->comboBox_ip6->itemText(i)) if (ipSettings[QString("IP6")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip6->itemText(i))
ui->comboBox_ip6->setCurrentIndex(i); ui->comboBox_ip6->setCurrentIndex(i);
} }
} }
if (ipSettings.contains(QString("Address6"))) if (ipSettings.contains(QString("Address6")))
ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")].remove(QString("'")).split(QChar(' '))); ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")]
.remove(QChar('\'')).remove(QChar('"'))
.split(QChar(' ')));
if (ipSettings.contains(QString("Gateway6"))) if (ipSettings.contains(QString("Gateway6")))
ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")].remove(QString("'"))); ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("Routes6"))) if (ipSettings.contains(QString("Routes6")))
ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")].remove(QString("'")).split(QChar(' '))); ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")]
.remove(QChar('\'')).remove(QChar('"'))
.split(QChar(' ')));
if (ipSettings.contains(QString("IPCustom"))) { if (ipSettings.contains(QString("IPCustom"))) {
QStringList custom; QStringList custom;
if (ipSettings[QString("IPCustom")].contains(QString("\n"))) if (ipSettings[QString("IPCustom")].contains(QString("\n")))
@ -530,35 +543,48 @@ void IpWidget::setSettings(const QMap<QString, QString> settings)
else else
custom = ipSettings[QString("IPCustom")].split(QString("' '")); custom = ipSettings[QString("IPCustom")].split(QString("' '"));
for (int i=0; i<custom.count(); i++) for (int i=0; i<custom.count(); i++)
ui->listWidget_custom->addItem(custom[i].remove(QString("'"))); ui->listWidget_custom->addItem(custom[i]
.remove(QChar('\'')).remove(QChar('"')));
} }
if (ipSettings.contains(QString("Hostname"))) if (ipSettings.contains(QString("Hostname")))
ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")].remove(QString("'"))); ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("TimeoutDAD"))) if (ipSettings.contains(QString("TimeoutDAD")))
ui->spinBox_timeoutDad->setValue(ipSettings[QString("TimeoutDAD")].toInt()); ui->spinBox_timeoutDad->setValue(ipSettings[QString("TimeoutDAD")].toInt());
if (ipSettings.contains(QString("DHCPClient"))) if (ipSettings.contains(QString("DHCPClient")))
for (int i=0; i<ui->comboBox_dhcp->count(); i++) for (int i=0; i<ui->comboBox_dhcp->count(); i++)
if (ipSettings[QString("DHCPClient")].remove(QString("'")) == ui->comboBox_dhcp->itemText(i)) if (ipSettings[QString("DHCPClient")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_dhcp->itemText(i))
ui->comboBox_dhcp->setCurrentIndex(i); ui->comboBox_dhcp->setCurrentIndex(i);
if (ipSettings.contains(QString("DhcpcdOptions"))) if (ipSettings.contains(QString("DhcpcdOptions")))
ui->lineEdit_dhcpcdOpt->setText(ipSettings[QString("DhcpcdOptions")].remove(QString("'"))); ui->lineEdit_dhcpcdOpt->setText(ipSettings[QString("DhcpcdOptions")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("DhclientOptions"))) if (ipSettings.contains(QString("DhclientOptions")))
ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")].remove(QString("'"))); ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("DhclientOptions6"))) if (ipSettings.contains(QString("DhclientOptions6")))
ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")].remove(QString("'"))); ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("TimeoutDHCP"))) if (ipSettings.contains(QString("TimeoutDHCP")))
ui->spinBox_timeoutDhcp->setValue(ipSettings[QString("TimeoutDHCP")].toInt()); ui->spinBox_timeoutDhcp->setValue(ipSettings[QString("TimeoutDHCP")].toInt());
if (ipSettings.contains(QString("DHCPReleaseOnStop"))) if (ipSettings.contains(QString("DHCPReleaseOnStop")))
if (ipSettings[QString("DHCPReleaseOnStop")].remove(QString("'")) == QString("yes")) if (ipSettings[QString("DHCPReleaseOnStop")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_dhcp->setCheckState(Qt::Checked); ui->checkBox_dhcp->setCheckState(Qt::Checked);
if (ipSettings.contains(QString("DNS"))) if (ipSettings.contains(QString("DNS")))
ui->listWidget_dns->addItems(ipSettings[QString("DNS")].remove(QString("'")).split(QChar(' '))); ui->listWidget_dns->addItems(ipSettings[QString("DNS")]
.remove(QChar('\'')).remove(QChar('"'))
.split(QChar(' ')));
if (ipSettings.contains(QString("DNSDomain"))) if (ipSettings.contains(QString("DNSDomain")))
ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")].remove(QString("'"))); ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("DNSSearch"))) if (ipSettings.contains(QString("DNSSearch")))
ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")].remove(QString("'"))); ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")]
.remove(QChar('\'')).remove(QChar('"')));
if (ipSettings.contains(QString("DNSOptions"))) if (ipSettings.contains(QString("DNSOptions")))
ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")].remove(QString("'")).split(QChar(' '))); ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")]
.remove(QChar('\'')).remove(QChar('"'))
.split(QChar(' ')));
ipEnable(ui->checkBox_ip->checkState()); ipEnable(ui->checkBox_ip->checkState());
changeIpMode(ui->comboBox_ip->currentText()); changeIpMode(ui->comboBox_ip->currentText());

28
sources/gui/src/language.cpp
View File

@ -36,6 +36,7 @@ QString Language::checkLanguage(const QString language, const QString defaultLan
for (int i=0; i<availableLanguages.count(); i++) for (int i=0; i<availableLanguages.count(); i++)
if (language.contains(availableLanguages[i] + QChar('_'))) if (language.contains(availableLanguages[i] + QChar('_')))
return availableLanguages[i]; return availableLanguages[i];
return defaultLanguage; return defaultLanguage;
} }
@ -47,6 +48,7 @@ QString Language::defineLanguage(const QString configPath)
if (language.isEmpty()) if (language.isEmpty())
language = defineLanguageFromLocale(); language = defineLanguageFromLocale();
language = checkLanguage(language, QString("en")); language = checkLanguage(language, QString("en"));
return language; return language;
} }
@ -58,19 +60,20 @@ QString Language::defineLanguageFromFile(const QString configPath)
return language; return language;
QFile configFile(configPath); QFile configFile(configPath);
QString fileStr; QString fileStr;
if (configFile.open(QIODevice::ReadOnly)) if (!configFile.open(QIODevice::ReadOnly))
while (true) { return language;
fileStr = QString(configFile.readLine()); while (true) {
if (fileStr[0] != '#') { fileStr = QString(configFile.readLine());
if (fileStr.contains(QString("LANGUAGE="))) if (fileStr[0] == QChar('#')) continue;
language = fileStr.split(QChar('='))[1] if (fileStr.contains(QString("LANGUAGE=")))
.remove(QString(" ")) language = fileStr.split(QChar('='))[1]
.trimmed(); .remove(QChar(' '))
} .trimmed();
if (configFile.atEnd()) if (configFile.atEnd())
break; break;
} }
configFile.close(); configFile.close();
return language; return language;
} }
@ -86,5 +89,6 @@ QStringList Language::getAvailableLanguages()
QStringList languages; QStringList languages;
languages.append(QString("en")); languages.append(QString("en"));
languages.append(QString("ru")); languages.append(QString("ru"));
return languages; return languages;
} }

5
sources/gui/src/macvlanwidget.cpp
View File

@ -66,7 +66,7 @@ QMap<QString, QString> MacvlanWidget::getSettings()
return macvlanSettings; return macvlanSettings;
macvlanSettings[QString("Mode")] = ui->comboBox_mode->currentText(); macvlanSettings[QString("Mode")] = ui->comboBox_mode->currentText();
if (!ui->lineEdit_mac->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) if (!ui->lineEdit_mac->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
macvlanSettings[QString("MACAddress")] = ui->lineEdit_mac->text(); macvlanSettings[QString("MACAddress")] = ui->lineEdit_mac->text();
return macvlanSettings; return macvlanSettings;
@ -87,7 +87,8 @@ void MacvlanWidget::setSettings(const QMap<QString, QString> settings)
if (macvlanSettings.contains(QString("Mode"))) if (macvlanSettings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++) for (int i=0; i<ui->comboBox_mode->count(); i++)
if (macvlanSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i)) if (macvlanSettings[QString("Mode")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
ui->comboBox_mode->setCurrentIndex(i); ui->comboBox_mode->setCurrentIndex(i);
if (macvlanSettings.contains(QString("MACAddress"))) if (macvlanSettings.contains(QString("MACAddress")))
ui->lineEdit_mac->setText(macvlanSettings[QString("MACAddress")]); ui->lineEdit_mac->setText(macvlanSettings[QString("MACAddress")]);

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

@ -147,25 +147,33 @@ void MobileWidget::setSettings(const QMap<QString, QString> settings)
QMap<QString, QString> mobileSettings = settings; QMap<QString, QString> mobileSettings = settings;
if (mobileSettings.contains(QString("User"))) if (mobileSettings.contains(QString("User")))
ui->lineEdit_username->setText(mobileSettings[QString("User")].remove(QString("'"))); ui->lineEdit_username->setText(mobileSettings[QString("User")]
.remove(QChar('\'')).remove(QChar('"')));
if (mobileSettings.contains(QString("Password"))) if (mobileSettings.contains(QString("Password")))
ui->lineEdit_password->setText(mobileSettings[QString("Password")].remove(QString("'"))); ui->lineEdit_password->setText(mobileSettings[QString("Password")]
.remove(QChar('\'')).remove(QChar('"')));
if (mobileSettings.contains(QString("AccessPointName"))) if (mobileSettings.contains(QString("AccessPointName")))
ui->lineEdit_apn->setText(mobileSettings[QString("AccessPointName")].remove(QString("'"))); ui->lineEdit_apn->setText(mobileSettings[QString("AccessPointName")]
.remove(QChar('\'')).remove(QChar('"')));
if (mobileSettings.contains(QString("PIN"))) if (mobileSettings.contains(QString("PIN")))
ui->lineEdit_pin->setText(mobileSettings[QString("PIN")].remove(QString("'"))); ui->lineEdit_pin->setText(mobileSettings[QString("PIN")]
.remove(QChar('\'')).remove(QChar('"')));
if (mobileSettings.contains(QString("Mode"))) if (mobileSettings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++) for (int i=0; i<ui->comboBox_mode->count(); i++)
if (mobileSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i)) if (mobileSettings[QString("Mode")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
ui->comboBox_mode->setCurrentIndex(i); ui->comboBox_mode->setCurrentIndex(i);
if (mobileSettings.contains(QString("MaxFail"))) if (mobileSettings.contains(QString("MaxFail")))
ui->spinBox_fail->setValue(mobileSettings[QString("MaxFail")].toInt()); ui->spinBox_fail->setValue(mobileSettings[QString("MaxFail")].toInt());
if (mobileSettings.contains(QString("DefaultRoute"))) if (mobileSettings.contains(QString("DefaultRoute")))
if (mobileSettings[QString("DefaultRoute")].remove(QString("'")) == QString("false")) if (mobileSettings[QString("DefaultRoute")]
.remove(QChar('\'')).remove(QChar('"')) == QString("false"))
ui->checkBox_route->setCheckState(Qt::Unchecked); ui->checkBox_route->setCheckState(Qt::Unchecked);
if (mobileSettings.contains(QString("UsePeerDNS"))) if (mobileSettings.contains(QString("UsePeerDNS")))
if (mobileSettings[QString("UsePeerDNS")].remove(QString("'")) == QString("false")) if (mobileSettings[QString("UsePeerDNS")]
.remove(QChar('\'')).remove(QChar('"'))== QString("false"))
ui->checkBox_dns->setCheckState(Qt::Unchecked); ui->checkBox_dns->setCheckState(Qt::Unchecked);
if (mobileSettings.contains(QString("OptionsFile"))) if (mobileSettings.contains(QString("OptionsFile")))
ui->lineEdit_options->setText(mobileSettings[QString("OptionsFile")].remove(QString("'"))); ui->lineEdit_options->setText(mobileSettings[QString("OptionsFile")]
.remove(QChar('\'')).remove(QChar('"')));
} }

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

@ -157,9 +157,10 @@ QMap<QString, QString> PppoeWidget::getSettings()
pppoeSettings[QString("PPPoEService")] = QString("'") + ui->lineEdit_service->text() + QString("'"); pppoeSettings[QString("PPPoEService")] = QString("'") + ui->lineEdit_service->text() + QString("'");
if (!ui->lineEdit_ac->text().isEmpty()) if (!ui->lineEdit_ac->text().isEmpty())
pppoeSettings[QString("PPPoEAC")] = QString("'") + ui->lineEdit_ac->text() + QString("'"); pppoeSettings[QString("PPPoEAC")] = QString("'") + ui->lineEdit_ac->text() + QString("'");
if (!ui->lineEdit_session->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) if (!ui->lineEdit_session->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
pppoeSettings[QString("PPPoESession")] = QString("'") + ui->lineEdit_session->text().remove(QString(" ")) + QString("'"); pppoeSettings[QString("PPPoESession")] = QString("'") + ui->lineEdit_session->text()
if (!ui->lineEdit_mac->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) .remove(QChar('\'')).remove(QChar('"')) + QString("'");
if (!ui->lineEdit_mac->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
pppoeSettings[QString("PPPoEMAC")] = QString("'") + ui->lineEdit_mac->text() + QString("'"); pppoeSettings[QString("PPPoEMAC")] = QString("'") + ui->lineEdit_mac->text() + QString("'");
if (ui->checkBox_ipv6->checkState() == Qt::Checked) if (ui->checkBox_ipv6->checkState() == Qt::Checked)
pppoeSettings[QString("PPPoEIP6")] = QString("yes"); pppoeSettings[QString("PPPoEIP6")] = QString("yes");
@ -175,18 +176,18 @@ int PppoeWidget::isOk()
if (!QFile(ui->lineEdit_options->text()).exists()) if (!QFile(ui->lineEdit_options->text()).exists())
return 1; return 1;
// mac address // mac address
if (!ui->lineEdit_mac->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) if (!ui->lineEdit_mac->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
if (ui->lineEdit_mac->text().contains(QString(" "))) if (ui->lineEdit_mac->text().contains(QChar(' ')))
return 2; return 2;
// session id is not set // session id is not set
if (!ui->lineEdit_session->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) if (!ui->lineEdit_session->text().remove(QChar(':')).remove(QChar(' ')).isEmpty())
if (ui->lineEdit_session->text().split(QChar(':'))[0].remove(QString(" ")).isEmpty()) if (ui->lineEdit_session->text().split(QChar(':'))[0].remove(QChar(' ')).isEmpty())
return 3; return 3;
// session mac address // session mac address
if (!ui->lineEdit_session->text().split(QChar(':')).join(QString("")).remove(QString(" ")).isEmpty()) { if (!ui->lineEdit_session->text().remove(QChar(':')).remove(QChar(' ')).isEmpty()) {
QStringList item = ui->lineEdit_session->text().split(QChar(':')); QStringList item = ui->lineEdit_session->text().split(QChar(':'));
for (int i=1; i<7; i++) for (int i=1; i<7; i++)
if (item[i].contains(QString(" "))) if (item[i].contains(QChar(' ')))
return 4; return 4;
} }
// all fine // all fine
@ -200,22 +201,27 @@ void PppoeWidget::setSettings(const QMap<QString, QString> settings)
QMap<QString, QString> pppoeSettings = settings; QMap<QString, QString> pppoeSettings = settings;
if (pppoeSettings.contains(QString("User"))) if (pppoeSettings.contains(QString("User")))
ui->lineEdit_username->setText(pppoeSettings[QString("User")].remove(QString("'"))); ui->lineEdit_username->setText(pppoeSettings[QString("User")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("Password"))) if (pppoeSettings.contains(QString("Password")))
ui->lineEdit_password->setText(pppoeSettings[QString("Password")].remove(QString("'"))); ui->lineEdit_password->setText(pppoeSettings[QString("Password")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("ConnectionMode"))) if (pppoeSettings.contains(QString("ConnectionMode")))
for (int i=0; i<ui->comboBox_connection->count(); i++) for (int i=0; i<ui->comboBox_connection->count(); i++)
if (pppoeSettings[QString("ConnectionMode")].remove(QString("'")) == ui->comboBox_connection->itemText(i)) if (pppoeSettings[QString("ConnectionMode")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i))
ui->comboBox_connection->setCurrentIndex(i); ui->comboBox_connection->setCurrentIndex(i);
if (pppoeSettings.contains(QString("IdleTimeout"))) if (pppoeSettings.contains(QString("IdleTimeout")))
ui->spinBox_timeout->setValue(pppoeSettings[QString("IdleTimeout")].toInt()); ui->spinBox_timeout->setValue(pppoeSettings[QString("IdleTimeout")].toInt());
if (pppoeSettings.contains(QString("MaxFail"))) if (pppoeSettings.contains(QString("MaxFail")))
ui->spinBox_fail->setValue(pppoeSettings[QString("MaxFail")].toInt()); ui->spinBox_fail->setValue(pppoeSettings[QString("MaxFail")].toInt());
if (pppoeSettings.contains(QString("DefaultRoute"))) if (pppoeSettings.contains(QString("DefaultRoute")))
if (pppoeSettings[QString("DefaultRoute")].remove(QString("'")) == QString("false")) if (pppoeSettings[QString("DefaultRoute")]
.remove(QChar('\'')).remove(QChar('"'))== QString("false"))
ui->checkBox_route->setCheckState(Qt::Unchecked); ui->checkBox_route->setCheckState(Qt::Unchecked);
if (pppoeSettings.contains(QString("UsePeerDNS"))) if (pppoeSettings.contains(QString("UsePeerDNS")))
if (pppoeSettings[QString("UsePeerDNS")].remove(QString("'")) == QString("false")) if (pppoeSettings[QString("UsePeerDNS")]
.remove(QChar('\'')).remove(QChar('"')) == QString("false"))
ui->checkBox_dns->setCheckState(Qt::Unchecked); ui->checkBox_dns->setCheckState(Qt::Unchecked);
if (pppoeSettings.contains(QString("PPPUnit"))) if (pppoeSettings.contains(QString("PPPUnit")))
ui->lineEdit_unit->setText(pppoeSettings[QString("PPPUnit")]); ui->lineEdit_unit->setText(pppoeSettings[QString("PPPUnit")]);
@ -224,15 +230,20 @@ void PppoeWidget::setSettings(const QMap<QString, QString> settings)
if (pppoeSettings.contains(QString("LCPEchoFailure"))) if (pppoeSettings.contains(QString("LCPEchoFailure")))
ui->spinBox_lcpFailure->setValue(pppoeSettings[QString("LCPEchoFailure")].toInt()); ui->spinBox_lcpFailure->setValue(pppoeSettings[QString("LCPEchoFailure")].toInt());
if (pppoeSettings.contains(QString("OptionsFile"))) if (pppoeSettings.contains(QString("OptionsFile")))
ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")].remove(QString("'"))); ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("PPPoEService"))) if (pppoeSettings.contains(QString("PPPoEService")))
ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")].remove(QString("'"))); ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("PPPoEAC"))) if (pppoeSettings.contains(QString("PPPoEAC")))
ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")].remove(QString("'"))); ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("PPPoESession"))) if (pppoeSettings.contains(QString("PPPoESession")))
ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")].remove(QString("'"))); ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("PPPoEMAC"))) if (pppoeSettings.contains(QString("PPPoEMAC")))
ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")].remove(QString("'"))); ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")]
.remove(QChar('\'')).remove(QChar('"')));
if (pppoeSettings.contains(QString("PPPoEIP6"))) if (pppoeSettings.contains(QString("PPPoEIP6")))
if (pppoeSettings[QString("PPPoEIP6")] == QString("yes")) if (pppoeSettings[QString("PPPoEIP6")] == QString("yes"))
ui->checkBox_dns->setCheckState(Qt::Checked); ui->checkBox_dns->setCheckState(Qt::Checked);

28
sources/gui/src/settingswindow.cpp
View File

@ -52,12 +52,13 @@ void SettingsWindow::createActions()
{ {
if (debug) qDebug() << "[SettingsWindow]" << "[createActions]"; if (debug) qDebug() << "[SettingsWindow]" << "[createActions]";
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)), this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem *)));
connect(ui->comboBox_language, SIGNAL(currentIndexChanged(int)), ui->label_info, SLOT(show()));
connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close())); connect(ui->buttonBox->button(QDialogButtonBox::Cancel), SIGNAL(clicked(bool)), this, SLOT(close()));
connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(setDefault())); connect(ui->buttonBox->button(QDialogButtonBox::Reset), SIGNAL(clicked(bool)), this, SLOT(setDefault()));
connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(saveSettings())); connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(saveSettings()));
connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(close())); connect(ui->buttonBox->button(QDialogButtonBox::Ok), SIGNAL(clicked(bool)), this, SLOT(close()));
connect(ui->comboBox_language, SIGNAL(currentIndexChanged(int)), ui->label_info, SLOT(show()));
connect(ui->treeWidget, SIGNAL(currentItemChanged(QTreeWidgetItem *, QTreeWidgetItem *)),
this, SLOT(changePage(QTreeWidgetItem *, QTreeWidgetItem *)));
// buttons // buttons
connect(ui->pushButton_interfaceDir, SIGNAL(clicked(bool)), SLOT(selectIfaceDir())); connect(ui->pushButton_interfaceDir, SIGNAL(clicked(bool)), SLOT(selectIfaceDir()));
connect(ui->pushButton_netctlPath, SIGNAL(clicked(bool)), SLOT(selectNetctlPath())); connect(ui->pushButton_netctlPath, SIGNAL(clicked(bool)), SLOT(selectNetctlPath()));
@ -110,12 +111,11 @@ void SettingsWindow::saveSettings()
QMap<QString, QString> settings = readSettings(); QMap<QString, QString> settings = readSettings();
QFile configFile(file); QFile configFile(file);
if (!configFile.open(QIODevice::WriteOnly | QIODevice::Text)) if (!configFile.open(QIODevice::WriteOnly | QIODevice::Text))
return; return;
QTextStream out(&configFile); QTextStream out(&configFile);
for (int i=0; i<settings.keys().count(); i++) for (int i=0; i<settings.keys().count(); i++)
out << settings.keys()[i] << QString("=") << settings[settings.keys()[i]] << QString("\n"); out << settings.keys()[i] << QString("=") << settings[settings.keys()[i]] << endl;
configFile.close(); configFile.close();
} }
@ -281,7 +281,6 @@ QMap<QString, QString> SettingsWindow::readSettings()
if (debug) qDebug() << "[SettingsWindow]" << "[readSettings]"; if (debug) qDebug() << "[SettingsWindow]" << "[readSettings]";
QMap<QString, QString> settings; QMap<QString, QString> settings;
settings[QString("CTRL_DIR")] = ui->lineEdit_wpaDir->text(); settings[QString("CTRL_DIR")] = ui->lineEdit_wpaDir->text();
settings[QString("CTRL_GROUP")] = ui->lineEdit_wpaGroup->text(); settings[QString("CTRL_GROUP")] = ui->lineEdit_wpaGroup->text();
settings[QString("IFACE_DIR")] = ui->lineEdit_interfacesDir->text(); settings[QString("IFACE_DIR")] = ui->lineEdit_interfacesDir->text();
@ -299,7 +298,6 @@ QMap<QString, QString> SettingsWindow::readSettings()
settings[QString("WPACLI_PATH")] = ui->lineEdit_wpaCliPath->text(); settings[QString("WPACLI_PATH")] = ui->lineEdit_wpaCliPath->text();
settings[QString("WPASUP_PATH")] = ui->lineEdit_wpaSupPath->text(); settings[QString("WPASUP_PATH")] = ui->lineEdit_wpaSupPath->text();
settings[QString("WPA_DRIVERS")] = ui->lineEdit_wpaSupDrivers->text(); settings[QString("WPA_DRIVERS")] = ui->lineEdit_wpaSupDrivers->text();
for (int i=0; i<settings.keys().count(); i++) for (int i=0; i<settings.keys().count(); i++)
if (debug) qDebug() << "[SettingsWindow]" << "[readSettings]" << ":" << if (debug) qDebug() << "[SettingsWindow]" << "[readSettings]" << ":" <<
settings.keys()[i] + QString("=") + settings[settings.keys()[i]]; settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
@ -332,7 +330,6 @@ void SettingsWindow::setSettings(const QMap<QString, QString> settings)
ui->lineEdit_wpaCliPath->setText(settings[QString("WPACLI_PATH")]); ui->lineEdit_wpaCliPath->setText(settings[QString("WPACLI_PATH")]);
ui->lineEdit_wpaSupPath->setText(settings[QString("WPASUP_PATH")]); ui->lineEdit_wpaSupPath->setText(settings[QString("WPASUP_PATH")]);
ui->lineEdit_wpaSupDrivers->setText(settings[QString("WPA_DRIVERS")]); ui->lineEdit_wpaSupDrivers->setText(settings[QString("WPA_DRIVERS")]);
for (int i=0; i<settings.keys().count(); i++) for (int i=0; i<settings.keys().count(); i++)
if (debug) qDebug() << "[SettingsWindow]" << "[setSettings]" << ":" << if (debug) qDebug() << "[SettingsWindow]" << "[setSettings]" << ":" <<
settings.keys()[i] + QString("=") + settings[settings.keys()[i]]; settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
@ -344,7 +341,6 @@ QMap<QString, QString> SettingsWindow::getDefault()
if (debug) qDebug() << "[SettingsWindow]" << "[getDefault]"; if (debug) qDebug() << "[SettingsWindow]" << "[getDefault]";
QMap<QString, QString> settings; QMap<QString, QString> settings;
settings[QString("CTRL_DIR")] = QString("/run/wpa_supplicant_netctl-gui"); settings[QString("CTRL_DIR")] = QString("/run/wpa_supplicant_netctl-gui");
settings[QString("CTRL_GROUP")] = QString("users"); settings[QString("CTRL_GROUP")] = QString("users");
settings[QString("IFACE_DIR")] = QString("/sys/class/net/"); settings[QString("IFACE_DIR")] = QString("/sys/class/net/");
@ -362,7 +358,6 @@ QMap<QString, QString> SettingsWindow::getDefault()
settings[QString("WPACLI_PATH")] = QString("/usr/bin/wpa_cli"); settings[QString("WPACLI_PATH")] = QString("/usr/bin/wpa_cli");
settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant"); settings[QString("WPASUP_PATH")] = QString("/usr/bin/wpa_supplicant");
settings[QString("WPA_DRIVERS")] = QString("nl80211,wext"); settings[QString("WPA_DRIVERS")] = QString("nl80211,wext");
for (int i=0; i<settings.keys().count(); i++) for (int i=0; i<settings.keys().count(); i++)
if (debug) qDebug() << "[SettingsWindow]" << "[getDefault]" << ":" << if (debug) qDebug() << "[SettingsWindow]" << "[getDefault]" << ":" <<
settings.keys()[i] + QString("=") + settings[settings.keys()[i]]; settings.keys()[i] + QString("=") + settings[settings.keys()[i]];
@ -378,23 +373,18 @@ QMap<QString, QString> SettingsWindow::getSettings()
QMap<QString, QString> settings = getDefault(); QMap<QString, QString> settings = getDefault();
QFile configFile(file); QFile configFile(file);
QString fileStr; QString fileStr;
if (!configFile.open(QIODevice::ReadOnly)) if (!configFile.open(QIODevice::ReadOnly))
return settings; return settings;
while (true) { while (true) {
fileStr = QString(configFile.readLine()); fileStr = QString(configFile.readLine()).trimmed();
if (fileStr[0] != '#') { if (fileStr[0] == QChar('#')) continue;
if (fileStr.contains(QString("="))) if (fileStr[0] == QChar(';')) continue;
settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1] if (!fileStr.contains(QChar('='))) continue;
.remove(QChar(' ')) settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
.trimmed();
}
if (configFile.atEnd()) if (configFile.atEnd())
break; break;
} }
configFile.close(); configFile.close();
for (int i=0; i<settings.keys().count(); i++) for (int i=0; i<settings.keys().count(); i++)
if (debug) qDebug() << "[SettingsWindow]" << "[getSettings]" << ":" << if (debug) qDebug() << "[SettingsWindow]" << "[getSettings]" << ":" <<
settings.keys()[i] + QString("=") + settings[settings.keys()[i]]; settings.keys()[i] + QString("=") + settings[settings.keys()[i]];

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

@ -79,7 +79,7 @@ QString TunnelWidget::getIp(const QString rawIp)
if (ip[i].toInt() > 255) if (ip[i].toInt() > 255)
ip[i] = QString("255"); ip[i] = QString("255");
return ip.join(QString(".")); return ip.join(QChar('.'));
} }
@ -91,10 +91,10 @@ QMap<QString, QString> TunnelWidget::getSettings()
return tunnelSettings; return tunnelSettings;
tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'"); tunnelSettings[QString("Mode")] = QString("'") + ui->comboBox_mode->currentText() + QString("'");
if (!ui->lineEdit_local->text().split(QChar('.')).join(QString("")).remove(QString(" ")).isEmpty()) if (!ui->lineEdit_local->text().remove(QChar('.')).remove(QChar(' ')).isEmpty())
tunnelSettings[QString("Local")] = QString("'") + getIp(ui->lineEdit_local->text().remove(QString(" "))) + QString("'"); tunnelSettings[QString("Local")] = QString("'") + getIp(ui->lineEdit_local->text().remove(QChar(' '))) + QString("'");
if (!ui->lineEdit_remote->text().split(QChar('.')).join(QString("")).remove(QString(" ")).isEmpty()) if (!ui->lineEdit_remote->text().remove(QChar('.')).remove(QChar(' ')).isEmpty())
tunnelSettings[QString("Remote")] = QString("'") + getIp(ui->lineEdit_remote->text().remove(QString(" "))) + QString("'"); tunnelSettings[QString("Remote")] = QString("'") + getIp(ui->lineEdit_remote->text().remove(QChar(' '))) + QString("'");
return tunnelSettings; return tunnelSettings;
} }
@ -114,10 +114,13 @@ void TunnelWidget::setSettings(const QMap<QString, QString> settings)
if (tunnelSettings.contains(QString("Mode"))) if (tunnelSettings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++) for (int i=0; i<ui->comboBox_mode->count(); i++)
if (tunnelSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i)) if (tunnelSettings[QString("Mode")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
ui->comboBox_mode->setCurrentIndex(i); ui->comboBox_mode->setCurrentIndex(i);
if (tunnelSettings.contains(QString("Local"))) if (tunnelSettings.contains(QString("Local")))
ui->lineEdit_local->setText(tunnelSettings[QString("Local")].remove(QString("'"))); ui->lineEdit_local->setText(tunnelSettings[QString("Local")]
.remove(QChar('\'')).remove(QChar('"')));
if (tunnelSettings.contains(QString("Remote"))) if (tunnelSettings.contains(QString("Remote")))
ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")].remove(QString("'"))); ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")]
.remove(QChar('\'')).remove(QChar('"')));
} }

9
sources/gui/src/tuntapwidget.cpp
View File

@ -86,10 +86,13 @@ void TuntapWidget::setSettings(const QMap<QString, QString> settings)
if (tuntapSettings.contains(QString("Mode"))) if (tuntapSettings.contains(QString("Mode")))
for (int i=0; i<ui->comboBox_mode->count(); i++) for (int i=0; i<ui->comboBox_mode->count(); i++)
if (tuntapSettings[QString("Mode")].remove(QString("'")) == ui->comboBox_mode->itemText(i)) if (tuntapSettings[QString("Mode")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
ui->comboBox_mode->setCurrentIndex(i); ui->comboBox_mode->setCurrentIndex(i);
if (tuntapSettings.contains(QString("User"))) if (tuntapSettings.contains(QString("User")))
ui->lineEdit_user->setText(tuntapSettings[QString("User")].remove(QString("'"))); ui->lineEdit_user->setText(tuntapSettings[QString("User")]
.remove(QChar('\'')).remove(QChar('"')));
if (tuntapSettings.contains(QString("Group"))) if (tuntapSettings.contains(QString("Group")))
ui->lineEdit_group->setText(tuntapSettings[QString("Group")].remove(QString("'"))); ui->lineEdit_group->setText(tuntapSettings[QString("Group")]
.remove(QChar('\'')).remove(QChar('"')));
} }

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

@ -71,7 +71,7 @@ void WirelessWidget::clear()
QDir::separator() + QString("name")); QDir::separator() + QString("name"));
QString deviceName; QString deviceName;
if (device.open(QIODevice::ReadOnly)) if (device.open(QIODevice::ReadOnly))
deviceName = QString(device.readLine()).remove(QString("\n")); deviceName = QString(device.readLine()).trimmed();
ui->comboBox_rfkill->addItem(deviceName); ui->comboBox_rfkill->addItem(deviceName);
} }
} }
@ -227,7 +227,7 @@ QMap<QString, QString> WirelessWidget::getSettings()
QStringList section; QStringList section;
for (int i=0; i<ui->listWidget_wpaConfigSection->count(); i++) for (int i=0; i<ui->listWidget_wpaConfigSection->count(); i++)
section.append(QString("'") + ui->listWidget_wpaConfigSection->item(i)->text() + QString("'")); section.append(QString("'") + ui->listWidget_wpaConfigSection->item(i)->text() + QString("'"));
wirelessSettings[QString("WPAConfigSection")] = QString("\n") + section.join(QString("\n")) + QString("\n"); wirelessSettings[QString("WPAConfigSection")] = QString("\n") + section.join(QChar('\n')) + QString("\n");
} }
if (ui->comboBox_security->currentText() == QString("wpa-config")) if (ui->comboBox_security->currentText() == QString("wpa-config"))
wirelessSettings[QString("WPAConfigFile")] = QString("'") + ui->lineEdit_wpaConfig->text() + QString("'"); wirelessSettings[QString("WPAConfigFile")] = QString("'") + ui->lineEdit_wpaConfig->text() + QString("'");
@ -239,7 +239,7 @@ QMap<QString, QString> WirelessWidget::getSettings()
QStringList freqs; QStringList freqs;
for (int i=0; i<ui->listWidget_freq->count(); i++) for (int i=0; i<ui->listWidget_freq->count(); i++)
freqs.append(ui->listWidget_freq->item(i)->text()); freqs.append(ui->listWidget_freq->item(i)->text());
wirelessSettings[QString("ScanFrequencies")] = freqs.join(QString(" ")); wirelessSettings[QString("ScanFrequencies")] = freqs.join(QChar(' '));
} }
if (ui->spinBox_frequency->value() != 2000) if (ui->spinBox_frequency->value() != 2000)
wirelessSettings[QString("Frequency")] = QString::number(ui->spinBox_frequency->value()); wirelessSettings[QString("Frequency")] = QString::number(ui->spinBox_frequency->value());
@ -253,7 +253,7 @@ QMap<QString, QString> WirelessWidget::getSettings()
QStringList drivers; QStringList drivers;
for (int i=0; i<ui->listWidget_drivers->count(); i++) for (int i=0; i<ui->listWidget_drivers->count(); i++)
drivers.append(ui->listWidget_drivers->item(i)->text()); drivers.append(ui->listWidget_drivers->item(i)->text());
wirelessSettings[QString("WPADriver")] = QString("'") + drivers.join(QString(",")) + QString("'"); wirelessSettings[QString("WPADriver")] = QString("'") + drivers.join(QChar(',')) + QString("'");
} }
if (ui->comboBox_rfkill->currentText() != QString("auto")) if (ui->comboBox_rfkill->currentText() != QString("auto"))
wirelessSettings[QString("RFKill")] = ui->comboBox_rfkill->currentText(); wirelessSettings[QString("RFKill")] = ui->comboBox_rfkill->currentText();
@ -303,28 +303,35 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
if (wirelessSettings.contains(QString("Security"))) if (wirelessSettings.contains(QString("Security")))
for (int i=0; i<ui->comboBox_security->count(); i++) for (int i=0; i<ui->comboBox_security->count(); i++)
if (wirelessSettings[QString("Security")].remove(QString("'")) == ui->comboBox_security->itemText(i)) if (wirelessSettings[QString("Security")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_security->itemText(i))
ui->comboBox_security->setCurrentIndex(i); ui->comboBox_security->setCurrentIndex(i);
if (wirelessSettings.contains(QString("ESSID"))) if (wirelessSettings.contains(QString("ESSID")))
ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")].remove(QString("'"))); ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")]
.remove(QChar('\'')).remove(QChar('"')));
if (wirelessSettings.contains(QString("Key"))) if (wirelessSettings.contains(QString("Key")))
ui->lineEdit_key->setText(wirelessSettings[QString("Key")].remove(QString("'"))); ui->lineEdit_key->setText(wirelessSettings[QString("Key")]
.remove(QChar('\'')).remove(QChar('"')));
if (wirelessSettings.contains(QString("WPAConfigSection"))) { if (wirelessSettings.contains(QString("WPAConfigSection"))) {
QStringList custom; QStringList custom;
if (wirelessSettings[QString("WPAConfigSection")].contains(QString("\n"))) if (wirelessSettings[QString("WPAConfigSection")].contains(QChar('\n')))
custom = wirelessSettings[QString("WPAConfigSection")].split(QString("'\n'")); custom = wirelessSettings[QString("WPAConfigSection")].split(String("'\n'"));
else else
custom = wirelessSettings[QString("WPAConfigSection")].split(QString("' '")); custom = wirelessSettings[QString("WPAConfigSection")].split(QString("' '"));
for (int i=0; i<custom.count(); i++) for (int i=0; i<custom.count(); i++)
ui->listWidget_wpaConfigSection->addItem(custom[i].remove(QString("'"))); ui->listWidget_wpaConfigSection->addItem(custom[i]
.remove(QChar('\'')).remove(QChar('"')));
} }
if (wirelessSettings.contains(QString("WPAConfigFile"))) if (wirelessSettings.contains(QString("WPAConfigFile")))
ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")].remove(QString("'"))); ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")]
.remove(QChar('\'')).remove(QChar('"')));
if (wirelessSettings.contains(QString("Hidden"))) if (wirelessSettings.contains(QString("Hidden")))
if (wirelessSettings[QString("Hidden")].remove(QString("'")) == QString("yes")) if (wirelessSettings[QString("Hidden")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_hidden->setCheckState(Qt::Checked); ui->checkBox_hidden->setCheckState(Qt::Checked);
if (wirelessSettings.contains(QString("AdHoc"))) if (wirelessSettings.contains(QString("AdHoc")))
if (wirelessSettings[QString("AdHoc")].remove(QString("'")) == QString("yes")) if (wirelessSettings[QString("AdHoc")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_adhoc->setCheckState(Qt::Checked); ui->checkBox_adhoc->setCheckState(Qt::Checked);
if (wirelessSettings.contains(QString("ScanFrequencies"))) if (wirelessSettings.contains(QString("ScanFrequencies")))
ui->listWidget_freq->addItems(wirelessSettings[QString("ScanFrequencies")].split(QChar('\n'))); ui->listWidget_freq->addItems(wirelessSettings[QString("ScanFrequencies")].split(QChar('\n')));
@ -333,19 +340,23 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
if (wirelessSettings.contains(QString("Priority"))) if (wirelessSettings.contains(QString("Priority")))
ui->spinBox_priority->setValue(wirelessSettings[QString("Priority")].toInt()); ui->spinBox_priority->setValue(wirelessSettings[QString("Priority")].toInt());
if (wirelessSettings.contains(QString("Country"))) if (wirelessSettings.contains(QString("Country")))
ui->lineEdit_country->setText(wirelessSettings[QString("Country")].remove(QString("'"))); ui->lineEdit_country->setText(wirelessSettings[QString("Country")]
.remove(QChar('\'')).remove(QChar('"')));
if (wirelessSettings.contains(QString("WPAGroup"))) if (wirelessSettings.contains(QString("WPAGroup")))
ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")].remove(QString("'"))); ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")]
.remove(QChar('\'')).remove(QChar('"')));
if (wirelessSettings.contains(QString("WPADriver"))) if (wirelessSettings.contains(QString("WPADriver")))
ui->listWidget_drivers->addItems(wirelessSettings[QString("WPADriver")].split(QChar(','))); ui->listWidget_drivers->addItems(wirelessSettings[QString("WPADriver")].split(QChar(',')));
if (wirelessSettings.contains(QString("RFKill"))) if (wirelessSettings.contains(QString("RFKill")))
for (int i=0; i<ui->comboBox_rfkill->count(); i++) for (int i=0; i<ui->comboBox_rfkill->count(); i++)
if (wirelessSettings[QString("RFKill")].remove(QString("'")) == ui->comboBox_rfkill->itemText(i)) if (wirelessSettings[QString("RFKill")]
.remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_rfkill->itemText(i))
ui->comboBox_rfkill->setCurrentIndex(i); ui->comboBox_rfkill->setCurrentIndex(i);
if (wirelessSettings.contains(QString("TimeoutWPA"))) if (wirelessSettings.contains(QString("TimeoutWPA")))
ui->spinBox_timeoutWpa->setValue(wirelessSettings[QString("TimeoutWPA")].toInt()); ui->spinBox_timeoutWpa->setValue(wirelessSettings[QString("TimeoutWPA")].toInt());
if (wirelessSettings.contains(QString("ExcludeAuto"))) if (wirelessSettings.contains(QString("ExcludeAuto")))
if (wirelessSettings[QString("ExcludeAuto")].remove(QString("'")) == QString("yes")) if (wirelessSettings[QString("ExcludeAuto")]
.remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
ui->checkBox_exclude->setCheckState(Qt::Checked); ui->checkBox_exclude->setCheckState(Qt::Checked);
changeSecurity(ui->comboBox_security->currentText()); changeSecurity(ui->comboBox_security->currentText());

11
sources/plasmoid/netctl.cpp
View File

@ -106,12 +106,11 @@ QMap<QString, QString> Netctl::readDataEngineConfiguration()
fileStr = QString(confFile.readLine()).trimmed(); fileStr = QString(confFile.readLine()).trimmed();
if (fileStr[0] == QChar('#')) continue; if (fileStr[0] == QChar('#')) continue;
if (fileStr[0] == QChar(';')) continue; if (fileStr[0] == QChar(';')) continue;
if (fileStr.contains(QChar('='))) { if (!fileStr.contains(QChar('='))) continue;
value.clear(); value.clear();
for (int i=1; i<fileStr.split(QChar('=')).count(); i++) for (int i=1; i<fileStr.split(QChar('=')).count(); i++)
value.append(fileStr.split(QChar('='))[i]); value.append(fileStr.split(QChar('='))[i]);
rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('=')); rawConfig[fileStr.split(QChar('='))[0]] = value.join(QChar('='));
}
if (confFile.atEnd()) if (confFile.atEnd())
break; break;
} }