diff --git a/CHANGELOG b/CHANGELOG index c9b6f13..6c56b89 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -19,6 +19,7 @@ Ver.1.2.0: * [gui] refactoring of configuration interface * [lib] more debug information * [plasmoid] edited configuration interface +* [plasmoid] changed double click event to click event Ver.1.1.0 (netctl-1.7 update): + [gui] added frequency diff --git a/README.md b/README.md index 4057ff8..17fe942 100644 --- a/README.md +++ b/README.md @@ -64,6 +64,7 @@ Additional information TODO (wish list) ---------------- +* test profile reading * man pages Links diff --git a/sources/gui/src/bridgewidget.cpp b/sources/gui/src/bridgewidget.cpp index 4e80b88..8ab9810 100644 --- a/sources/gui/src/bridgewidget.cpp +++ b/sources/gui/src/bridgewidget.cpp @@ -76,7 +76,6 @@ void BridgeWidget::setSettings(const QMap settings) QMap bridgeSettings = settings; if (bridgeSettings.contains(QString("SkipForwardingDelay"))) - if (bridgeSettings[QString("SkipForwardingDelay")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (bridgeSettings[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 de8ea79..660afdb 100644 --- a/sources/gui/src/ethernetwidget.cpp +++ b/sources/gui/src/ethernetwidget.cpp @@ -145,20 +145,16 @@ void EthernetWidget::setSettings(const QMap settings) QMap ethernetSettings = settings; if (ethernetSettings.contains(QString("SkipNoCarrier"))) - if (ethernetSettings[QString("SkipNoCarrier")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (ethernetSettings[QString("SkipNoCarrier")] == QString("yes")) ui->checkBox_skip->setCheckState(Qt::Checked); if (ethernetSettings.contains(QString("Auth8021X"))) - if (ethernetSettings[QString("Auth8021X")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (ethernetSettings[QString("Auth8021X")] == QString("yes")) ui->checkBox_8021x->setCheckState(Qt::Checked); if (ethernetSettings.contains(QString("WPAConfigFile"))) - ui->lineEdit_wpaConfig->setText(ethernetSettings[QString("WPAConfigFile")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_wpaConfig->setText(ethernetSettings[QString("WPAConfigFile")]); if (ethernetSettings.contains(QString("WPADriver"))) for (int i=0; icomboBox_driver->count(); i++) - if (ethernetSettings[QString("WPADriver")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_driver->itemText(i)) + if (ethernetSettings[QString("WPADriver")] == ui->comboBox_driver->itemText(i)) ui->comboBox_driver->setCurrentIndex(i); if (ethernetSettings.contains(QString("TimeoutCarrier"))) ui->spinBox_timeoutCarrier->setValue(ethernetSettings[QString("TimeoutCarrier")].toInt()); diff --git a/sources/gui/src/generalwidget.cpp b/sources/gui/src/generalwidget.cpp index 8df2933..a9cf9ac 100644 --- a/sources/gui/src/generalwidget.cpp +++ b/sources/gui/src/generalwidget.cpp @@ -179,34 +179,27 @@ void GeneralWidget::setSettings(const QMap settings) QMap generalSettings = settings; if (generalSettings.contains(QString("Description"))) - ui->lineEdit_description->setText(generalSettings[QString("Description")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_description->setText(generalSettings[QString("Description")]); if (generalSettings.contains(QString("Connection"))) for (int i=0; icomboBox_connection->count(); i++) - if (generalSettings[QString("Connection")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i)) + if (generalSettings[QString("Connection")] == ui->comboBox_connection->itemText(i)) ui->comboBox_connection->setCurrentIndex(i); if (generalSettings.contains(QString("Interface"))) for (int i=0; icomboBox_interface->count(); i++) - if (generalSettings[QString("Interface")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_interface->itemText(i)) + if (generalSettings[QString("Interface")] == ui->comboBox_interface->itemText(i)) ui->comboBox_interface->setCurrentIndex(i); if (generalSettings.contains(QString("BindsToInterfaces"))) - ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar(' '))); + ui->listWidget_bindto->addItems(generalSettings[QString("BindsToInterfaces")].split(QChar('\n'))); if (generalSettings.contains(QString("After"))) - ui->listWidget_after->addItems(generalSettings[QString("After")].split(QChar(' '))); + ui->listWidget_after->addItems(generalSettings[QString("After")].split(QChar('\n'))); if (generalSettings.contains(QString("ExecUpPost"))) - ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")]); if (generalSettings.contains(QString("ExecDownPre"))) - ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")]); if (generalSettings.contains(QString("ForceConnect"))) - if (generalSettings[QString("ForceConnect")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (generalSettings[QString("ForceConnect")] == QString("yes")) ui->checkBox_forceConnect->setCheckState(Qt::Checked); if (generalSettings.contains(QString("NETCTL_DEBUG"))) - if (generalSettings[QString("NETCTL_DEBUG")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (generalSettings[QString("NETCTL_DEBUG")] == QString("yes")) ui->checkBox_debug->setCheckState(Qt::Checked); } diff --git a/sources/gui/src/ipwidget.cpp b/sources/gui/src/ipwidget.cpp index 6ff3a8a..2d479b8 100644 --- a/sources/gui/src/ipwidget.cpp +++ b/sources/gui/src/ipwidget.cpp @@ -492,99 +492,67 @@ void IpWidget::setSettings(const QMap settings) QMap ipSettings = settings; if (ipSettings.contains(QString("IP"))) { - if (ipSettings[QString("IP")].remove(QChar('\'')).remove(QChar('"')) == QString("no")) + if (ipSettings[QString("IP")] == QString("no")) ui->checkBox_ip->setCheckState(Qt::Unchecked); else { ui->checkBox_ip->setCheckState(Qt::Checked); for (int i=0; icomboBox_ip->count(); i++) - if (ipSettings[QString("IP")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip->itemText(i)) + if (ipSettings[QString("IP")] == ui->comboBox_ip->itemText(i)) ui->comboBox_ip->setCurrentIndex(i); } } if (ipSettings.contains(QString("Address"))) - ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")] - .remove(QChar('\'')).remove(QChar('"')) - .split(QChar(' '))); + ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")].split(QChar('\n'))); if (ipSettings.contains(QString("Gateway"))) - ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")]); if (ipSettings.contains(QString("Routes"))) - ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")] - .remove(QChar('\'')).remove(QChar('"')) - .split(QChar(' '))); + ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")].split(QChar('\n'))); if (ipSettings.contains(QString("IP6"))) { - if (ipSettings[QString("IP6")].remove(QChar('\'')) - .remove(QChar('\'')).remove(QChar('"')) == QString("no")) + if (ipSettings[QString("IP6")] == QString("no")) ui->checkBox_ip6->setCheckState(Qt::Unchecked); else { ui->checkBox_ip6->setCheckState(Qt::Checked); for (int i=0; icomboBox_ip6->count(); i++) - if (ipSettings[QString("IP6")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip6->itemText(i)) + if (ipSettings[QString("IP6")] == ui->comboBox_ip6->itemText(i)) ui->comboBox_ip6->setCurrentIndex(i); } } if (ipSettings.contains(QString("Address6"))) - ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")] - .remove(QChar('\'')).remove(QChar('"')) - .split(QChar(' '))); + ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")].split(QChar('\n'))); if (ipSettings.contains(QString("Gateway6"))) - ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")]); if (ipSettings.contains(QString("Routes6"))) - ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")] - .remove(QChar('\'')).remove(QChar('"')) - .split(QChar(' '))); - if (ipSettings.contains(QString("IPCustom"))) { - QStringList custom; - if (ipSettings[QString("IPCustom")].contains(QString("\n"))) - custom = ipSettings[QString("IPCustom")].split(QString("'\n'")); - else - custom = ipSettings[QString("IPCustom")].split(QString("' '")); - for (int i=0; ilistWidget_custom->addItem(custom[i] - .remove(QChar('\'')).remove(QChar('"'))); - } + ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")].split(QChar('\n'))); + if (ipSettings.contains(QString("IPCustom"))) + ui->listWidget_custom->addItems(ipSettings[QString("IPCustom")].split(QChar('\n'))); if (ipSettings.contains(QString("Hostname"))) - ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")]); if (ipSettings.contains(QString("TimeoutDAD"))) ui->spinBox_timeoutDad->setValue(ipSettings[QString("TimeoutDAD")].toInt()); if (ipSettings.contains(QString("DHCPClient"))) for (int i=0; icomboBox_dhcp->count(); i++) - if (ipSettings[QString("DHCPClient")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_dhcp->itemText(i)) + if (ipSettings[QString("DHCPClient")] == ui->comboBox_dhcp->itemText(i)) ui->comboBox_dhcp->setCurrentIndex(i); if (ipSettings.contains(QString("DhcpcdOptions"))) ui->lineEdit_dhcpcdOpt->setText(ipSettings[QString("DhcpcdOptions")] .remove(QChar('\'')).remove(QChar('"'))); if (ipSettings.contains(QString("DhclientOptions"))) - ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")]); if (ipSettings.contains(QString("DhclientOptions6"))) - ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")]); if (ipSettings.contains(QString("TimeoutDHCP"))) ui->spinBox_timeoutDhcp->setValue(ipSettings[QString("TimeoutDHCP")].toInt()); if (ipSettings.contains(QString("DHCPReleaseOnStop"))) - if (ipSettings[QString("DHCPReleaseOnStop")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (ipSettings[QString("DHCPReleaseOnStop")] == QString("yes")) ui->checkBox_dhcp->setCheckState(Qt::Checked); if (ipSettings.contains(QString("DNS"))) - ui->listWidget_dns->addItems(ipSettings[QString("DNS")] - .remove(QChar('\'')).remove(QChar('"')) - .split(QChar(' '))); + ui->listWidget_dns->addItems(ipSettings[QString("DNS")].split(QChar('\n'))); if (ipSettings.contains(QString("DNSDomain"))) - ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")]); if (ipSettings.contains(QString("DNSSearch"))) - ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")]); if (ipSettings.contains(QString("DNSOptions"))) - ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")] - .remove(QChar('\'')).remove(QChar('"')) - .split(QChar(' '))); + ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")].split(QChar('\n'))); ipEnable(ui->checkBox_ip->checkState()); changeIpMode(ui->comboBox_ip->currentText()); diff --git a/sources/gui/src/macvlanwidget.cpp b/sources/gui/src/macvlanwidget.cpp index 5cc1fbf..24cdda3 100644 --- a/sources/gui/src/macvlanwidget.cpp +++ b/sources/gui/src/macvlanwidget.cpp @@ -87,8 +87,7 @@ void MacvlanWidget::setSettings(const QMap settings) if (macvlanSettings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) - if (macvlanSettings[QString("Mode")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i)) + if (macvlanSettings[QString("Mode")] == ui->comboBox_mode->itemText(i)) ui->comboBox_mode->setCurrentIndex(i); if (macvlanSettings.contains(QString("MACAddress"))) ui->lineEdit_mac->setText(macvlanSettings[QString("MACAddress")]); diff --git a/sources/gui/src/mobilewidget.cpp b/sources/gui/src/mobilewidget.cpp index 312ca64..3cc35e4 100644 --- a/sources/gui/src/mobilewidget.cpp +++ b/sources/gui/src/mobilewidget.cpp @@ -147,33 +147,25 @@ void MobileWidget::setSettings(const QMap settings) QMap mobileSettings = settings; if (mobileSettings.contains(QString("User"))) - ui->lineEdit_username->setText(mobileSettings[QString("User")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_username->setText(mobileSettings[QString("User")]); if (mobileSettings.contains(QString("Password"))) - ui->lineEdit_password->setText(mobileSettings[QString("Password")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_password->setText(mobileSettings[QString("Password")]); if (mobileSettings.contains(QString("AccessPointName"))) - ui->lineEdit_apn->setText(mobileSettings[QString("AccessPointName")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_apn->setText(mobileSettings[QString("AccessPointName")]); if (mobileSettings.contains(QString("PIN"))) - ui->lineEdit_pin->setText(mobileSettings[QString("PIN")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_pin->setText(mobileSettings[QString("PIN")]); if (mobileSettings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) - if (mobileSettings[QString("Mode")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i)) + if (mobileSettings[QString("Mode")] == ui->comboBox_mode->itemText(i)) ui->comboBox_mode->setCurrentIndex(i); if (mobileSettings.contains(QString("MaxFail"))) ui->spinBox_fail->setValue(mobileSettings[QString("MaxFail")].toInt()); if (mobileSettings.contains(QString("DefaultRoute"))) - if (mobileSettings[QString("DefaultRoute")] - .remove(QChar('\'')).remove(QChar('"')) == QString("false")) + if (mobileSettings[QString("DefaultRoute")] == QString("false")) ui->checkBox_route->setCheckState(Qt::Unchecked); if (mobileSettings.contains(QString("UsePeerDNS"))) - if (mobileSettings[QString("UsePeerDNS")] - .remove(QChar('\'')).remove(QChar('"'))== QString("false")) + if (mobileSettings[QString("UsePeerDNS")] == QString("false")) ui->checkBox_dns->setCheckState(Qt::Unchecked); if (mobileSettings.contains(QString("OptionsFile"))) - ui->lineEdit_options->setText(mobileSettings[QString("OptionsFile")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_options->setText(mobileSettings[QString("OptionsFile")]); } diff --git a/sources/gui/src/pppoewidget.cpp b/sources/gui/src/pppoewidget.cpp index 974ba6c..deff8ec 100644 --- a/sources/gui/src/pppoewidget.cpp +++ b/sources/gui/src/pppoewidget.cpp @@ -201,27 +201,22 @@ void PppoeWidget::setSettings(const QMap settings) QMap pppoeSettings = settings; if (pppoeSettings.contains(QString("User"))) - ui->lineEdit_username->setText(pppoeSettings[QString("User")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_username->setText(pppoeSettings[QString("User")]); if (pppoeSettings.contains(QString("Password"))) - ui->lineEdit_password->setText(pppoeSettings[QString("Password")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_password->setText(pppoeSettings[QString("Password")]); if (pppoeSettings.contains(QString("ConnectionMode"))) for (int i=0; icomboBox_connection->count(); i++) - if (pppoeSettings[QString("ConnectionMode")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i)) + if (pppoeSettings[QString("ConnectionMode")] == ui->comboBox_connection->itemText(i)) ui->comboBox_connection->setCurrentIndex(i); if (pppoeSettings.contains(QString("IdleTimeout"))) ui->spinBox_timeout->setValue(pppoeSettings[QString("IdleTimeout")].toInt()); if (pppoeSettings.contains(QString("MaxFail"))) ui->spinBox_fail->setValue(pppoeSettings[QString("MaxFail")].toInt()); if (pppoeSettings.contains(QString("DefaultRoute"))) - if (pppoeSettings[QString("DefaultRoute")] - .remove(QChar('\'')).remove(QChar('"'))== QString("false")) + if (pppoeSettings[QString("DefaultRoute")] == QString("false")) ui->checkBox_route->setCheckState(Qt::Unchecked); if (pppoeSettings.contains(QString("UsePeerDNS"))) - if (pppoeSettings[QString("UsePeerDNS")] - .remove(QChar('\'')).remove(QChar('"')) == QString("false")) + if (pppoeSettings[QString("UsePeerDNS")] == QString("false")) ui->checkBox_dns->setCheckState(Qt::Unchecked); if (pppoeSettings.contains(QString("PPPUnit"))) ui->lineEdit_unit->setText(pppoeSettings[QString("PPPUnit")]); @@ -230,20 +225,15 @@ void PppoeWidget::setSettings(const QMap settings) if (pppoeSettings.contains(QString("LCPEchoFailure"))) ui->spinBox_lcpFailure->setValue(pppoeSettings[QString("LCPEchoFailure")].toInt()); if (pppoeSettings.contains(QString("OptionsFile"))) - ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")]); if (pppoeSettings.contains(QString("PPPoEService"))) - ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")]); if (pppoeSettings.contains(QString("PPPoEAC"))) - ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")]); if (pppoeSettings.contains(QString("PPPoESession"))) - ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")]); if (pppoeSettings.contains(QString("PPPoEMAC"))) - ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")]); if (pppoeSettings.contains(QString("PPPoEIP6"))) if (pppoeSettings[QString("PPPoEIP6")] == QString("yes")) ui->checkBox_dns->setCheckState(Qt::Checked); diff --git a/sources/gui/src/tunnelwidget.cpp b/sources/gui/src/tunnelwidget.cpp index 60e3214..850a93f 100644 --- a/sources/gui/src/tunnelwidget.cpp +++ b/sources/gui/src/tunnelwidget.cpp @@ -114,13 +114,10 @@ void TunnelWidget::setSettings(const QMap settings) if (tunnelSettings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) - if (tunnelSettings[QString("Mode")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i)) + if (tunnelSettings[QString("Mode")] == ui->comboBox_mode->itemText(i)) ui->comboBox_mode->setCurrentIndex(i); if (tunnelSettings.contains(QString("Local"))) - ui->lineEdit_local->setText(tunnelSettings[QString("Local")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_local->setText(tunnelSettings[QString("Local")]); if (tunnelSettings.contains(QString("Remote"))) - ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")]); } diff --git a/sources/gui/src/tuntapwidget.cpp b/sources/gui/src/tuntapwidget.cpp index 00d234a..b7ef97a 100644 --- a/sources/gui/src/tuntapwidget.cpp +++ b/sources/gui/src/tuntapwidget.cpp @@ -86,13 +86,10 @@ void TuntapWidget::setSettings(const QMap settings) if (tuntapSettings.contains(QString("Mode"))) for (int i=0; icomboBox_mode->count(); i++) - if (tuntapSettings[QString("Mode")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i)) + if (tuntapSettings[QString("Mode")] == ui->comboBox_mode->itemText(i)) ui->comboBox_mode->setCurrentIndex(i); if (tuntapSettings.contains(QString("User"))) - ui->lineEdit_user->setText(tuntapSettings[QString("User")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_user->setText(tuntapSettings[QString("User")]); if (tuntapSettings.contains(QString("Group"))) - ui->lineEdit_group->setText(tuntapSettings[QString("Group")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_group->setText(tuntapSettings[QString("Group")]); } diff --git a/sources/gui/src/wirelesswidget.cpp b/sources/gui/src/wirelesswidget.cpp index 8fc467b..d154b56 100644 --- a/sources/gui/src/wirelesswidget.cpp +++ b/sources/gui/src/wirelesswidget.cpp @@ -303,35 +303,21 @@ void WirelessWidget::setSettings(const QMap settings) if (wirelessSettings.contains(QString("Security"))) for (int i=0; icomboBox_security->count(); i++) - if (wirelessSettings[QString("Security")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_security->itemText(i)) + if (wirelessSettings[QString("Security")] == ui->comboBox_security->itemText(i)) ui->comboBox_security->setCurrentIndex(i); if (wirelessSettings.contains(QString("ESSID"))) - ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")]); if (wirelessSettings.contains(QString("Key"))) - ui->lineEdit_key->setText(wirelessSettings[QString("Key")] - .remove(QChar('\'')).remove(QChar('"'))); - if (wirelessSettings.contains(QString("WPAConfigSection"))) { - QStringList custom; - if (wirelessSettings[QString("WPAConfigSection")].contains(QChar('\n'))) - custom = wirelessSettings[QString("WPAConfigSection")].split(QString("'\n'")); - else - custom = wirelessSettings[QString("WPAConfigSection")].split(QString("' '")); - for (int i=0; ilistWidget_wpaConfigSection->addItem(custom[i] - .remove(QChar('\'')).remove(QChar('"'))); - } + ui->lineEdit_key->setText(wirelessSettings[QString("Key")]); + if (wirelessSettings.contains(QString("WPAConfigSection"))) + ui->listWidget_wpaConfigSection->addItems(wirelessSettings[QString("WPAConfigSection")].split(QChar('\n'))); if (wirelessSettings.contains(QString("WPAConfigFile"))) - ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")]); if (wirelessSettings.contains(QString("Hidden"))) - if (wirelessSettings[QString("Hidden")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (wirelessSettings[QString("Hidden")] == QString("yes")) ui->checkBox_hidden->setCheckState(Qt::Checked); if (wirelessSettings.contains(QString("AdHoc"))) - if (wirelessSettings[QString("AdHoc")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (wirelessSettings[QString("AdHoc")] == QString("yes")) ui->checkBox_adhoc->setCheckState(Qt::Checked); if (wirelessSettings.contains(QString("ScanFrequencies"))) ui->listWidget_freq->addItems(wirelessSettings[QString("ScanFrequencies")].split(QChar('\n'))); @@ -340,23 +326,19 @@ void WirelessWidget::setSettings(const QMap settings) if (wirelessSettings.contains(QString("Priority"))) ui->spinBox_priority->setValue(wirelessSettings[QString("Priority")].toInt()); if (wirelessSettings.contains(QString("Country"))) - ui->lineEdit_country->setText(wirelessSettings[QString("Country")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_country->setText(wirelessSettings[QString("Country")]); if (wirelessSettings.contains(QString("WPAGroup"))) - ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")] - .remove(QChar('\'')).remove(QChar('"'))); + ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")]); if (wirelessSettings.contains(QString("WPADriver"))) ui->listWidget_drivers->addItems(wirelessSettings[QString("WPADriver")].split(QChar(','))); if (wirelessSettings.contains(QString("RFKill"))) for (int i=0; icomboBox_rfkill->count(); i++) - if (wirelessSettings[QString("RFKill")] - .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_rfkill->itemText(i)) + if (wirelessSettings[QString("RFKill")] == ui->comboBox_rfkill->itemText(i)) ui->comboBox_rfkill->setCurrentIndex(i); if (wirelessSettings.contains(QString("TimeoutWPA"))) ui->spinBox_timeoutWpa->setValue(wirelessSettings[QString("TimeoutWPA")].toInt()); if (wirelessSettings.contains(QString("ExcludeAuto"))) - if (wirelessSettings[QString("ExcludeAuto")] - .remove(QChar('\'')).remove(QChar('"')) == QString("yes")) + if (wirelessSettings[QString("ExcludeAuto")] == QString("yes")) ui->checkBox_exclude->setCheckState(Qt::Checked); changeSecurity(ui->comboBox_security->currentText()); diff --git a/sources/netctlgui/src/netctlprofile.cpp b/sources/netctlgui/src/netctlprofile.cpp index 77a0504..a7a2532 100644 --- a/sources/netctlgui/src/netctlprofile.cpp +++ b/sources/netctlgui/src/netctlprofile.cpp @@ -94,7 +94,7 @@ QString NetctlProfile::createProfile(const QString profile, const QMap NetctlProfile::getSettingsFromProfile(const QString profi return QMap(); } + // getting variables list QMap settings; - QString fileStr, profileUrl; - profileUrl = profileDirectory->absolutePath() + QDir::separator() + QFileInfo(profile).fileName(); - QFile profileFile(profileUrl); - if (debug) qDebug() << "[NetctlProfile]" << "[getSettingsFromProfile]" << ":" << "Read from" << profileUrl; - if (!profileFile.open(QIODevice::ReadOnly)) - return settings; - while (true) { - fileStr = QString(profileFile.readLine()); - if (fileStr[0] == QChar('#')) continue; - if (fileStr.split(QChar('='), QString::SkipEmptyParts).count() != 2) continue; - if ((fileStr.split(QChar('='))[1][0] == QChar('(')) && - (fileStr.split(QChar('='))[1][fileStr.split(QChar('='))[1].size()-2] == QChar(')'))) - settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1] - .remove(QChar('(')) - .remove(QChar(')')) - .trimmed(); - else if (fileStr.split(QChar('='))[1][0] == QChar('(')) { - QString parameterName = fileStr.split(QChar('='))[0]; - QStringList parameter; - if (!fileStr.split(QChar('='))[1] - .remove(QChar('(')) - .remove(QChar(')')) - .trimmed() - .isEmpty()) - parameter.append(fileStr.split(QChar('='))[1] - .remove(QChar('(')) - .remove(QChar(')')) - .trimmed()); - while(true) { - fileStr = QString(profileFile.readLine()); - if (fileStr[fileStr.size()-2] == QChar(')')) - break; - if (!fileStr.remove(QChar('(')) - .remove(QChar(')')) - .trimmed() - .isEmpty()) - parameter.append(fileStr.remove(QChar('(')) - .remove(QChar(')')) - .trimmed()); - if (profileFile.atEnd()) - break; - } - settings[parameterName] = parameter.join(QChar('\n')); - } - else - settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1] - .trimmed(); - if (profileFile.atEnd()) - break; + QProcess shell; + QString profileUrl = profileDirectory->absolutePath() + QDir::separator() + QFileInfo(profile).fileName(); + QString cmd = QString("env -i bash -c \"source ") + profileUrl + QString("; set\""); + if (debug) qDebug() << "[NetctlProfile]" << "[getSettingsFromProfile]" << ":" << "Run cmd" << cmd; + shell.start(cmd); + shell.waitForFinished(-1); + if (debug) qDebug() << "[NetctlProfile]" << "[getSettingsFromProfile]" << ":" << "Cmd returns" << shell.exitCode(); + QStringList output = QString(shell.readAllStandardOutput()).trimmed().split(QChar('\n')); + + // gettings variables + QStringList keys; + for (int i=0; isetPreferredSize(30, 30); - connect(iconWidget, SIGNAL(doubleClicked()), this, SLOT(showGui())); + connect(iconWidget, SIGNAL(clicked()), this, SLOT(showGui())); fullSpaceLayout->addItem(iconWidget); // text textLabel = new Plasma::Label();