edited profile reading

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

README.md

@@ -64,6 +64,7 @@ Additional information
 TODO (wish list)
 ----------------
 
+* test profile reading
 * man pages
 
 Links

sources/gui/src/bridgewidget.cpp

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

sources/gui/src/ethernetwidget.cpp

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

sources/gui/src/generalwidget.cpp

@@ -179,34 +179,27 @@ void GeneralWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> generalSettings = settings;
 
     if (generalSettings.contains(QString("Description")))
-        ui->lineEdit_description->setText(generalSettings[QString("Description")]
+        ui->lineEdit_description->setText(generalSettings[QString("Description")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (generalSettings.contains(QString("Connection")))
         for (int i=0; i<ui->comboBox_connection->count(); i++)
-            if (generalSettings[QString("Connection")]
+            if (generalSettings[QString("Connection")] == ui->comboBox_connection->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_connection->itemText(i))
                 ui->comboBox_connection->setCurrentIndex(i);
     if (generalSettings.contains(QString("Interface")))
         for (int i=0; i<ui->comboBox_interface->count(); i++)
-            if (generalSettings[QString("Interface")]
+            if (generalSettings[QString("Interface")] == ui->comboBox_interface->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == 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")]
+        ui->lineEdit_execUpPost->setText(generalSettings[QString("ExecUpPost")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (generalSettings.contains(QString("ExecDownPre")))
-        ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")]
+        ui->lineEdit_execDownPre->setText(generalSettings[QString("ExecDownPre")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (generalSettings.contains(QString("ForceConnect")))
-        if (generalSettings[QString("ForceConnect")]
+        if (generalSettings[QString("ForceConnect")] == QString("yes"))
-                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_forceConnect->setCheckState(Qt::Checked);
     if (generalSettings.contains(QString("NETCTL_DEBUG")))
-        if (generalSettings[QString("NETCTL_DEBUG")]
+        if (generalSettings[QString("NETCTL_DEBUG")] == QString("yes"))
-                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_debug->setCheckState(Qt::Checked);
 }

sources/gui/src/ipwidget.cpp

@@ -492,99 +492,67 @@ void IpWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> 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; i<ui->comboBox_ip->count(); i++)
-                if (ipSettings[QString("IP")]
+                if (ipSettings[QString("IP")] == ui->comboBox_ip->itemText(i))
-                        .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip->itemText(i))
                     ui->comboBox_ip->setCurrentIndex(i);
         }
     }
     if (ipSettings.contains(QString("Address")))
-        ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")]
+        ui->listWidget_ipAddress->addItems(ipSettings[QString("Address")].split(QChar('\n')));
-                .remove(QChar('\'')).remove(QChar('"'))
-                .split(QChar(' ')));
     if (ipSettings.contains(QString("Gateway")))
-        ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")]
+        ui->lineEdit_gateway->setText(ipSettings[QString("Gateway")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("Routes")))
-        ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")]
+        ui->listWidget_ipRoutes->addItems(ipSettings[QString("Routes")].split(QChar('\n')));
-                .remove(QChar('\'')).remove(QChar('"'))
-                .split(QChar(' ')));
     if (ipSettings.contains(QString("IP6"))) {
-        if (ipSettings[QString("IP6")].remove(QChar('\''))
+        if (ipSettings[QString("IP6")] == QString("no"))
-                .remove(QChar('\'')).remove(QChar('"')) == QString("no"))
             ui->checkBox_ip6->setCheckState(Qt::Unchecked);
         else {
             ui->checkBox_ip6->setCheckState(Qt::Checked);
             for (int i=0; i<ui->comboBox_ip6->count(); i++)
-                if (ipSettings[QString("IP6")]
+                if (ipSettings[QString("IP6")] == ui->comboBox_ip6->itemText(i))
-                        .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_ip6->itemText(i))
                     ui->comboBox_ip6->setCurrentIndex(i);
         }
     }
     if (ipSettings.contains(QString("Address6")))
-        ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")]
+        ui->listWidget_ipAddress6->addItems(ipSettings[QString("Address6")].split(QChar('\n')));
-                .remove(QChar('\'')).remove(QChar('"'))
-                .split(QChar(' ')));
     if (ipSettings.contains(QString("Gateway6")))
-        ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")]
+        ui->lineEdit_gateway6->setText(ipSettings[QString("Gateway6")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("Routes6")))
-        ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")]
+        ui->listWidget_ipRoutes6->addItems(ipSettings[QString("Routes6")].split(QChar('\n')));
-                .remove(QChar('\'')).remove(QChar('"'))
+    if (ipSettings.contains(QString("IPCustom")))
-                .split(QChar(' ')));
+        ui->listWidget_custom->addItems(ipSettings[QString("IPCustom")].split(QChar('\n')));
-    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; i<custom.count(); i++)
-            ui->listWidget_custom->addItem(custom[i]
-                                           .remove(QChar('\'')).remove(QChar('"')));
-    }
     if (ipSettings.contains(QString("Hostname")))
-        ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")]
+        ui->lineEdit_hostname->setText(ipSettings[QString("Hostname")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("TimeoutDAD")))
         ui->spinBox_timeoutDad->setValue(ipSettings[QString("TimeoutDAD")].toInt());
     if (ipSettings.contains(QString("DHCPClient")))
         for (int i=0; i<ui->comboBox_dhcp->count(); i++)
-            if (ipSettings[QString("DHCPClient")]
+            if (ipSettings[QString("DHCPClient")] == ui->comboBox_dhcp->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == 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")]
+        ui->lineEdit_dhclientOpt->setText(ipSettings[QString("DhclientOptions")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DhclientOptions6")))
-        ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")]
+        ui->lineEdit_dhclientOpt6->setText(ipSettings[QString("DhclientOptions6")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("TimeoutDHCP")))
         ui->spinBox_timeoutDhcp->setValue(ipSettings[QString("TimeoutDHCP")].toInt());
     if (ipSettings.contains(QString("DHCPReleaseOnStop")))
-        if (ipSettings[QString("DHCPReleaseOnStop")]
+        if (ipSettings[QString("DHCPReleaseOnStop")] == QString("yes"))
-                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_dhcp->setCheckState(Qt::Checked);
     if (ipSettings.contains(QString("DNS")))
-        ui->listWidget_dns->addItems(ipSettings[QString("DNS")]
+        ui->listWidget_dns->addItems(ipSettings[QString("DNS")].split(QChar('\n')));
-                .remove(QChar('\'')).remove(QChar('"'))
-                .split(QChar(' ')));
     if (ipSettings.contains(QString("DNSDomain")))
-        ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")]
+        ui->lineEdit_dnsDomain->setText(ipSettings[QString("DNSDomain")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DNSSearch")))
-        ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")]
+        ui->lineEdit_dnsSearch->setText(ipSettings[QString("DNSSearch")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (ipSettings.contains(QString("DNSOptions")))
-        ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")]
+        ui->listWidget_dnsOptions->addItems(ipSettings[QString("DNSOptions")].split(QChar('\n')));
-                .remove(QChar('\'')).remove(QChar('"'))
-                .split(QChar(' ')));
 
     ipEnable(ui->checkBox_ip->checkState());
     changeIpMode(ui->comboBox_ip->currentText());

sources/gui/src/macvlanwidget.cpp

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

sources/gui/src/mobilewidget.cpp

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

sources/gui/src/pppoewidget.cpp

@@ -201,27 +201,22 @@ void PppoeWidget::setSettings(const QMap<QString, QString> settings)
     QMap<QString, QString> pppoeSettings = settings;
 
     if (pppoeSettings.contains(QString("User")))
-        ui->lineEdit_username->setText(pppoeSettings[QString("User")]
+        ui->lineEdit_username->setText(pppoeSettings[QString("User")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("Password")))
-        ui->lineEdit_password->setText(pppoeSettings[QString("Password")]
+        ui->lineEdit_password->setText(pppoeSettings[QString("Password")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("ConnectionMode")))
         for (int i=0; i<ui->comboBox_connection->count(); i++)
-            if (pppoeSettings[QString("ConnectionMode")]
+            if (pppoeSettings[QString("ConnectionMode")] == ui->comboBox_connection->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == 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")]
+        if (pppoeSettings[QString("DefaultRoute")] == QString("false"))
-                .remove(QChar('\'')).remove(QChar('"'))== QString("false"))
             ui->checkBox_route->setCheckState(Qt::Unchecked);
     if (pppoeSettings.contains(QString("UsePeerDNS")))
-        if (pppoeSettings[QString("UsePeerDNS")]
+        if (pppoeSettings[QString("UsePeerDNS")] == QString("false"))
-                .remove(QChar('\'')).remove(QChar('"')) == 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<QString, QString> 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")]
+        ui->lineEdit_options->setText(pppoeSettings[QString("OptionsFile")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEService")))
-        ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")]
+        ui->lineEdit_service->setText(pppoeSettings[QString("PPPoEService")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEAC")))
-        ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")]
+        ui->lineEdit_ac->setText(pppoeSettings[QString("PPPoEAC")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoESession")))
-        ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")]
+        ui->lineEdit_session->setText(pppoeSettings[QString("PPPoESession")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEMAC")))
-        ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")]
+        ui->lineEdit_mac->setText(pppoeSettings[QString("PPPoEMAC")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (pppoeSettings.contains(QString("PPPoEIP6")))
         if (pppoeSettings[QString("PPPoEIP6")] == QString("yes"))
             ui->checkBox_dns->setCheckState(Qt::Checked);

sources/gui/src/tunnelwidget.cpp

@@ -114,13 +114,10 @@ void TunnelWidget::setSettings(const QMap<QString, QString> settings)
 
     if (tunnelSettings.contains(QString("Mode")))
         for (int i=0; i<ui->comboBox_mode->count(); i++)
-            if (tunnelSettings[QString("Mode")]
+            if (tunnelSettings[QString("Mode")] == ui->comboBox_mode->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_mode->itemText(i))
                 ui->comboBox_mode->setCurrentIndex(i);
     if (tunnelSettings.contains(QString("Local")))
-        ui->lineEdit_local->setText(tunnelSettings[QString("Local")]
+        ui->lineEdit_local->setText(tunnelSettings[QString("Local")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (tunnelSettings.contains(QString("Remote")))
-        ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")]
+        ui->lineEdit_remote->setText(tunnelSettings[QString("Remote")]);
-                .remove(QChar('\'')).remove(QChar('"')));
 }

sources/gui/src/tuntapwidget.cpp

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

sources/gui/src/wirelesswidget.cpp

@@ -303,35 +303,21 @@ void WirelessWidget::setSettings(const QMap<QString, QString> settings)
 
     if (wirelessSettings.contains(QString("Security")))
         for (int i=0; i<ui->comboBox_security->count(); i++)
-            if (wirelessSettings[QString("Security")]
+            if (wirelessSettings[QString("Security")] == ui->comboBox_security->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == ui->comboBox_security->itemText(i))
                 ui->comboBox_security->setCurrentIndex(i);
     if (wirelessSettings.contains(QString("ESSID")))
-        ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")]
+        ui->lineEdit_essid->setText(wirelessSettings[QString("ESSID")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("Key")))
-        ui->lineEdit_key->setText(wirelessSettings[QString("Key")]
+        ui->lineEdit_key->setText(wirelessSettings[QString("Key")]);
-                .remove(QChar('\'')).remove(QChar('"')));
+    if (wirelessSettings.contains(QString("WPAConfigSection")))
-    if (wirelessSettings.contains(QString("WPAConfigSection")))  {
+        ui->listWidget_wpaConfigSection->addItems(wirelessSettings[QString("WPAConfigSection")].split(QChar('\n')));
-        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; i<custom.count(); i++)
-            ui->listWidget_wpaConfigSection->addItem(custom[i]
-                                                     .remove(QChar('\'')).remove(QChar('"')));
-    }
     if (wirelessSettings.contains(QString("WPAConfigFile")))
-        ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")]
+        ui->lineEdit_wpaConfig->setText(wirelessSettings[QString("WPAConfigFile")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("Hidden")))
-        if (wirelessSettings[QString("Hidden")]
+        if (wirelessSettings[QString("Hidden")] == QString("yes"))
-                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_hidden->setCheckState(Qt::Checked);
     if (wirelessSettings.contains(QString("AdHoc")))
-        if (wirelessSettings[QString("AdHoc")]
+        if (wirelessSettings[QString("AdHoc")] == QString("yes"))
-                .remove(QChar('\'')).remove(QChar('"')) == 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<QString, QString> 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")]
+        ui->lineEdit_country->setText(wirelessSettings[QString("Country")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("WPAGroup")))
-        ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")]
+        ui->lineEdit_wpaGroup->setText(wirelessSettings[QString("WPAGroup")]);
-                .remove(QChar('\'')).remove(QChar('"')));
     if (wirelessSettings.contains(QString("WPADriver")))
         ui->listWidget_drivers->addItems(wirelessSettings[QString("WPADriver")].split(QChar(',')));
     if (wirelessSettings.contains(QString("RFKill")))
         for (int i=0; i<ui->comboBox_rfkill->count(); i++)
-            if (wirelessSettings[QString("RFKill")]
+            if (wirelessSettings[QString("RFKill")] == ui->comboBox_rfkill->itemText(i))
-                    .remove(QChar('\'')).remove(QChar('"')) == 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")]
+        if (wirelessSettings[QString("ExcludeAuto")] == QString("yes"))
-                .remove(QChar('\'')).remove(QChar('"')) == QString("yes"))
             ui->checkBox_exclude->setCheckState(Qt::Checked);
 
     changeSecurity(ui->comboBox_security->currentText());

sources/netctlgui/src/netctlprofile.cpp

@@ -94,7 +94,7 @@ QString NetctlProfile::createProfile(const QString profile, const QMap<QString,
                 (settings.keys()[i] == QString("IPCustom")) ||
                 (settings.keys()[i] == QString("DNS")) ||
                 (settings.keys()[i] == QString("DNSOptions")) ||
-                (settings.keys()[i] == QString("WPAConfigSection")) ||
+                (settings.keys()[i] == QString("ScanFrequencies")) ||
                 (settings.keys()[i] == QString("WPAConfigSection")))
             out << QString("(") + settings[settings.keys()[i]] << QString(")") << endl;
         else
@@ -115,58 +115,28 @@ QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profi
         return QMap<QString, QString>();
     }
 
+    // getting variables list
     QMap<QString, QString> settings;
-    QString fileStr, profileUrl;
+    QProcess shell;
-    profileUrl = profileDirectory->absolutePath() + QDir::separator() + QFileInfo(profile).fileName();
+    QString profileUrl = profileDirectory->absolutePath() + QDir::separator() + QFileInfo(profile).fileName();
-    QFile profileFile(profileUrl);
+    QString cmd = QString("env -i bash -c \"source ") + profileUrl + QString("; set\"");
-    if (debug) qDebug() << "[NetctlProfile]" << "[getSettingsFromProfile]" << ":" << "Read from" << profileUrl;
+    if (debug) qDebug() << "[NetctlProfile]" << "[getSettingsFromProfile]" << ":" << "Run cmd" << cmd;
-    if (!profileFile.open(QIODevice::ReadOnly))
+    shell.start(cmd);
-        return settings;
+    shell.waitForFinished(-1);
-    while (true) {
+    if (debug) qDebug() << "[NetctlProfile]" << "[getSettingsFromProfile]" << ":" << "Cmd returns" << shell.exitCode();
-        fileStr = QString(profileFile.readLine());
+    QStringList output = QString(shell.readAllStandardOutput()).trimmed().split(QChar('\n'));
-        if (fileStr[0] == QChar('#')) continue;
+
-        if (fileStr.split(QChar('='), QString::SkipEmptyParts).count() != 2) continue;
+    // gettings variables
-        if ((fileStr.split(QChar('='))[1][0] == QChar('(')) &&
+    QStringList keys;
-                (fileStr.split(QChar('='))[1][fileStr.split(QChar('='))[1].size()-2] == QChar(')')))
+    for (int i=0; i<output.count(); i++)
-            settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1]
+        keys.append(output[i].split(QChar('='))[0]);
-                    .remove(QChar('('))
+    for (int i=0; i<keys.count(); i++){
-                    .remove(QChar(')'))
+        cmd = QString("env -i bash -c \"source ") + profileUrl +
-                    .trimmed();
+                QString(" && printf -- '%s\n' \"${") + keys[i] + ("[@]}\"");
-        else if (fileStr.split(QChar('='))[1][0] == QChar('(')) {
+        shell.start(cmd);
-            QString parameterName = fileStr.split(QChar('='))[0];
+        shell.waitForFinished(-1);
-            QStringList parameter;
+        settings[keys[i]] = shell.readAllStandardOutput().trimmed();
-            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;
-    }
-    profileFile.close();
 
     return settings;
 }

sources/plasmoid/netctl.cpp

@@ -74,7 +74,7 @@ void Netctl::init()
     // icon
     iconWidget = new Plasma::IconWidget(KIcon(""), QString(), this);
     iconWidget->setPreferredSize(30, 30);
-    connect(iconWidget, SIGNAL(doubleClicked()), this, SLOT(showGui()));
+    connect(iconWidget, SIGNAL(clicked()), this, SLOT(showGui()));
     fullSpaceLayout->addItem(iconWidget);
     // text
     textLabel = new Plasma::Label();