fix url links

are active

CHANGELOG

@@ -1,3 +1,12 @@
+Ver.1.4.9
+---------
+* library
+    * fix bug with invalid enabled profile definition (#46)
+    * some imrovements inside
+* plasmoid
+    * change rendering from Qt to native
+    * update plasmoid to recent plasma changes
+
 Ver.1.4.8
 ---------
 * gui

arch/PKGBUILD

@@ -3,7 +3,7 @@
 pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
          'plasma5-applet-netctl-gui')
-pkgver=1.4.8
+pkgver=1.4.9
 pkgrel=1
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('cmake' 'extra-cmake-modules' 'plasma-framework' 'qt5-tools')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('0c50a436064c31f890f69d5f321d2e27')
+md5sums=('64c04c36eea017e7c0ddf687d60de128')
 
 prepare() {
   rm -rf "${srcdir}/build-"{plasmoid,qt5}

arch/PKGBUILD-qt4

@@ -4,7 +4,7 @@ pkgbase=netctl-gui-qt4
 _pkgbase=netctl-gui
 pkgname=('libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
          'kdeplasma-applets-netctl-gui')
-pkgver=1.4.8
+pkgver=1.4.9
 pkgrel=1
 pkgdesc="Qt4 GUI for netctl. Also provides a widget for KDE4"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('automoc4' 'cmake' 'kdelibs')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${_pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('0c50a436064c31f890f69d5f321d2e27')
+md5sums=('64c04c36eea017e7c0ddf687d60de128')
 
 
 prepare() {
@@ -65,7 +65,6 @@ package_libnetctlgui-qt4() {
               'wpa_supplicant: wifi support')
   provides=('libnetctlgui')
   conflicts=('libnetctlgui')
-  install=""
 
   cd "${srcdir}/build-qt4/netctlgui"
   make DESTDIR="${pkgdir}" install

sources/3rdparty/task

@@ -1 +1 @@
-Subproject commit d2798204a1a84a23a9510aeda73d5b9b75d2c8eb
+Subproject commit dd52af08c9d6a2c8652d2d5e21bc2a433efb497a

sources/CMakeLists.txt

@@ -11,7 +11,7 @@ set (PROJECT_CONTACT "esalexeev@gmail.com")
 set (PROJECT_LICENSE "GPLv3")
 set (PROJECT_VERSION_MAJOR 1)
 set (PROJECT_VERSION_MINOR 4)
-set (PROJECT_VERSION_PATCH 8)
+set (PROJECT_VERSION_PATCH 9)
 set (PROJECT_VERSION ${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH})
 string (TIMESTAMP CURRENT_DATE "%Y-%m-%d %H:%M" UTC)
 string (TIMESTAMP CURRENT_YEAR "%Y")

sources/dataengine/netctl.cpp

@@ -86,7 +86,7 @@ QStringList Netctl::sources() const
 }
 
 
-QString Netctl::getCmdOutput(const QString cmd)
+QString Netctl::getCmdOutput(const QString cmd) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
@@ -135,7 +135,7 @@ bool Netctl::sourceRequestEvent(const QString &name)
 }
 
 
-QString Netctl::getExtIp(const QString cmd)
+QString Netctl::getExtIp(const QString cmd) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
@@ -144,34 +144,34 @@ QString Netctl::getExtIp(const QString cmd)
 }
 
 
-QString Netctl::getInfo(const QStringList profiles, const QStringList statuses)
+QString Netctl::getInfo(const QStringList profiles, const QStringList statuses) const
 {
     if (debug) qDebug() << PDEBUG;
     if (profiles.count() != statuses.count()) return QString("N\\A");
 
     QStringList list;
     for (int i=0; i<profiles.count(); i++)
-        list.append(QString("%1 (%2)").arg(profiles[i]).arg(statuses[i]));
+        list.append(QString("%1 (%2)").arg(profiles.at(i)).arg(statuses.at(i)));
     if (list.isEmpty()) list.append(QString("N\\A"));
 
     return list.join(QString(" | "));
 }
 
 
-QStringList Netctl::getInterfaceList()
+QStringList Netctl::getInterfaceList() const
 {
     if (debug) qDebug() << PDEBUG;
 
     QList<QNetworkInterface> rawList = QNetworkInterface::allInterfaces();
     QStringList interfacesList;
-    for (int i=0; i<rawList.count(); i++)
+    foreach(QNetworkInterface interface, rawList)
-        interfacesList.append(rawList[i].name());
+        interfacesList.append(interface.name());
 
     return interfacesList;
 }
 
 
-QString Netctl::getIntIp(const QAbstractSocket::NetworkLayerProtocol protocol)
+QString Netctl::getIntIp(const QAbstractSocket::NetworkLayerProtocol protocol) const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -181,11 +181,11 @@ QString Netctl::getIntIp(const QAbstractSocket::NetworkLayerProtocol protocol)
     else if (protocol == QAbstractSocket::IPv6Protocol)
         intIp = QString("::1/128");
     QList<QHostAddress> rawList = QNetworkInterface::allAddresses();
-    for (int i=0; i<rawList.count(); i++) {
+    foreach(QHostAddress address, rawList) {
-        if(rawList[i] == QHostAddress(QHostAddress::LocalHost)) continue;
+        if (address == QHostAddress(QHostAddress::LocalHost)) continue;
-        if(rawList[i] == QHostAddress(QHostAddress::LocalHostIPv6)) continue;
+        if (address == QHostAddress(QHostAddress::LocalHostIPv6)) continue;
-        if (rawList[i].protocol() != protocol) continue;
+        if (address.protocol() != protocol) continue;
-        intIp = rawList[i].toString();
+        intIp = address.toString();
         break;
     }
 
@@ -197,21 +197,24 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet
 {
     if (debug) qDebug() << PDEBUG;
 
-    netctlAutoStatus = true;
     QString output = getCmdOutput(QString("%1 list").arg(cmdNetctlAuto));
     if (output.isEmpty()) {
         output = getCmdOutput(QString("%1 list").arg(cmdNetctl));
         netctlAutoStatus = false;
-    }
+    } else
+        netctlAutoStatus = true;
 
     // parse
     QStringList currentProfiles;
-    QStringList profileList = output.split(QChar('\n'));
+    // workaround for first element spaces on which are trimmed
+    QStringList profileList = QString("  %1").arg(output).split(QChar('\n'));
     for (int i=0; i<profileList.count(); i++) {
-        bool isActive = (profileList[i][0] == QChar('*'));
+        bool isActive = (profileList.at(i)[0] == QChar('*'));
         profileList[i].remove(0, 2);
-        if (isActive) currentProfiles.append(profileList[i]);
+        if (isActive) currentProfiles.append(profileList.at(i));
     }
+    profileList.sort();
+    currentProfiles.sort();
 
     // return profiles
     currentProfile = currentProfiles;
@@ -220,7 +223,7 @@ QStringList Netctl::getProfileList(const QString cmdNetctl, const QString cmdNet
 }
 
 
-QStringList Netctl::getProfileStringStatus(const QString cmdNetctl)
+QStringList Netctl::getProfileStringStatus(const QString cmdNetctl) const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -230,8 +233,8 @@ QStringList Netctl::getProfileStringStatus(const QString cmdNetctl)
         return status;
     }
 
-    for (int i=0; i<currentProfile.count(); i++) {
+    foreach(QString profile, currentProfile) {
-        TaskResult process = runTask(QString("%1 is-enabled %2").arg(cmdNetctl).arg(currentProfile[i]));
+        TaskResult process = runTask(QString("%1 is-enabled %2").arg(cmdNetctl).arg(profile));
         if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
         if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
         status.append(process.exitCode == 0 ? QString("enabled") : QString("static"));
@@ -246,8 +249,8 @@ void Netctl::initSources()
     if (debug) qDebug() << PDEBUG;
 
     QStringList sourcesList = sources();
-    for (int i=0; i<sourcesList.count(); i++)
+    foreach(QString source, sourcesList)
-        setData(sourcesList[i], QString("value"), QString("N\\A"));
+        setData(source, QString("value"), QString("N\\A"));
 }
 
 

sources/dataengine/netctl.h

@@ -27,14 +27,14 @@ class Netctl : public Plasma::DataEngine
     Q_OBJECT
 
 public:
-    Netctl(QObject *parent, const QVariantList &args);
+    explicit Netctl(QObject *parent, const QVariantList &args);
-    ~Netctl();
+    virtual ~Netctl();
-    QString getExtIp(const QString cmd);
+    QString getExtIp(const QString cmd) const;
-    QString getInfo(const QStringList profiles, const QStringList statuses);
+    QString getInfo(const QStringList profiles, const QStringList statuses) const;
-    QStringList getInterfaceList();
+    QStringList getInterfaceList() const;
-    QString getIntIp(const QAbstractSocket::NetworkLayerProtocol protocol);
+    QString getIntIp(const QAbstractSocket::NetworkLayerProtocol protocol) const;
     QStringList getProfileList(const QString cmdNetctl, const QString cmdNetctlAuto);
-    QStringList getProfileStringStatus(const QString cmdNetctl);
+    QStringList getProfileStringStatus(const QString cmdNetctl) const;
 
 public slots:
     void initSources();
@@ -53,7 +53,7 @@ private:
     // configuration
     bool debug;
     QVariantMap configuration;
-    QString getCmdOutput(const QString cmd);
+    QString getCmdOutput(const QString cmd) const;
     void readConfiguration();
 };
 

sources/dataengine/plasma-dataengine-netctl.desktop

@@ -14,7 +14,7 @@ X-KDE-PluginInfo-Author=Evgeniy Alekseev
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=netctl
 X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/netctl-gui/
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/netctl-gui/
 X-KDE-PluginInfo-Category=Network
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3

sources/gui/docs/netctl-gui-dbus-api.html

@@ -290,12 +290,12 @@ small {
   </tr>
   <!-- general information -->
   <tr>
-    <td>QString ActiveProfile()</td>
+    <td>QStringList ActiveProfile()</td>
     <td>returns active profile from netctl or netctl-auto</td>
     <td>no</td>
   </tr>
   <tr>
-    <td>QString ActiveProfileStatus()</td>
+    <td>QStringList ActiveProfileStatus()</td>
     <td>returns active profile status from netctl or netctl-auto. May be <code>netctl-auto</code>, <code>active (enabled)</code>, <code>active (static)</code>, <code>inactive (enabled)</code>, <code>inactive (static)</code></td>
     <td>no</td>
   </tr>
@@ -305,7 +305,7 @@ small {
     <td>no</td>
   </tr>
   <tr>
-    <td>QString netctlActiveProfile()</td>
+    <td>QStringList netctlActiveProfile()</td>
     <td>returns active profile from netctl even if netctl-auto is running</td>
     <td>no</td>
   </tr>
@@ -464,7 +464,7 @@ small {
 
 <h2><a href="#links" class="anchor" id="links"></a>External links</h2>
 <ul>
-  <li><a href="http://arcanis.name/projects/netctl-gui/">Homepage</a></li>
+  <li><a href="https://arcanis.me/projects/netctl-gui/">Homepage</a></li>
   <li><a href="https://github.com/arcan1s/netctl-gui">Repository</a></li>
   <li><a href="https://github.com/arcan1s/netctl-gui/issues">Bugtracker</a></li>
 </ul>

sources/gui/docs/netctl-gui-security-notes.html

@@ -98,7 +98,7 @@ env -i bash -c "source '<profile>'; for i in ${!<key>[@]}; do ec
 
 <h2><a href="#links" class="anchor" id="links"></a>External links</h2>
 <ul>
-  <li><a href="http://arcanis.name/projects/netctl-gui/">Homepage</a></li>
+  <li><a href="https://arcanis.me/projects/netctl-gui/">Homepage</a></li>
   <li><a href="https://github.com/arcan1s/netctl-gui">Repository</a></li>
   <li><a href="https://github.com/arcan1s/netctl-gui/issues">Bugtracker</a></li>
 </ul>

sources/gui/src/calls.cpp

@@ -177,7 +177,7 @@ InterfaceAnswer connectToEssid(const QString essid, QMap<QString,QString> settin
 }
 
 
-netctlInformation generalInformation(NetctlInterface* interface, const bool useHelper,
+netctlInformation generalInformation(NetctlInterface *interface, const bool useHelper,
                                      const bool debug)
 {
     if (debug) qDebug() << PDEBUG;
@@ -204,7 +204,7 @@ netctlInformation generalInformation(NetctlInterface* interface, const bool useH
 }
 
 
-QMap<QString, QString> profileInformation(const QString profile, NetctlInterface* interface,
+QMap<QString, QString> profileInformation(const QString profile, NetctlInterface *interface,
                                           const bool useHelper, const bool debug)
 {
     if (!useHelper) return interface->profileSettings(profile);

sources/gui/src/mainwidget.cpp

@@ -94,8 +94,10 @@ void MainWidget::update()
 {
     if (debug) qDebug() << PDEBUG;
 
+    if (mainWindow->currentTab() == 0) {
         updateMainTab();
         updateMenuMain();
+    }
 
     if (timer.interval() != 0) return timer.start();
 }

sources/gui/src/mainwindow.cpp

@@ -111,6 +111,14 @@ MainWindow::~MainWindow()
 }
 
 
+int MainWindow::currentTab()
+{
+    if (debug) qDebug() << PDEBUG;
+
+    return ui->stackedWidget->currentIndex();
+}
+
+
 Qt::ToolBarArea MainWindow::getToolBarArea()
 {
     if (debug) qDebug() << PDEBUG;

sources/gui/src/mainwindow.h

@@ -42,11 +42,12 @@ class MainWindow : public QMainWindow
     Q_OBJECT
 
 public:
-    explicit MainWindow(QWidget *parent = 0,
+    explicit MainWindow(QWidget *parent = nullptr,
                         const QVariantMap args = QVariantMap(),
-                        QTranslator *qtAppTranslator = 0,
+                        QTranslator *qtAppTranslator = nullptr,
-                        QTranslator *appTranslator = 0);
+                        QTranslator *appTranslator = nullptr);
     ~MainWindow();
+    int currentTab();
     Qt::ToolBarArea getToolBarArea();
     void emitNeedToBeConfigured();
     QStringList printSettings();

sources/gui/src/mobilewidget.ui

@@ -89,9 +89,6 @@
            <property name="toolTip">
             <string>The username and password to connect with</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
           </widget>
          </item>
         </layout>
@@ -125,9 +122,6 @@
            <property name="toolTip">
             <string>The access point (apn) to connect on</string>
            </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
           </widget>
          </item>
         </layout>

sources/gui/src/wifimenuwidget.cpp

@@ -75,8 +75,10 @@ void WiFiMenuWidget::update()
 {
     if (debug) qDebug() << PDEBUG;
 
+    if (mainWindow->currentTab() == 2) {
         updateWifiTab();
         updateMenuWifi();
+    }
 
     if (timer.interval() != 0) return timer.start();
 }

sources/helper/src/netctladaptor.cpp

@@ -39,25 +39,25 @@ NetctlAdaptor::~NetctlAdaptor()
 
 
 // netctlCommand
-QString NetctlAdaptor::ActiveProfile()
+QStringList NetctlAdaptor::ActiveProfile()
 {
     if (isNetctlAutoActive())
         return netctlCommand->autoGetActiveProfile();
     else
-        return netctlCommand->getActiveProfile().join(QChar('|'));
+        return netctlCommand->getActiveProfile();
 }
 
 
-QString NetctlAdaptor::ActiveProfileStatus()
+QStringList NetctlAdaptor::ActiveProfileStatus()
 {
     if (isNetctlAutoActive())
-        return QString("netctl-auto");
+        return QStringList() << QString("netctl-auto");
     else {
         QStringList status;
-        QStringList profiles = ActiveProfile().split(QChar('|'));
+        QStringList profiles = ActiveProfile();
         for (int i=0; i<profiles.count(); i++)
             status.append(netctlCommand->getProfileStatus(profiles[i]));
-        return status.join(QChar('|'));
+        return status;
     }
 }
 
@@ -108,9 +108,9 @@ bool NetctlAdaptor::isProfileEnabled(const QString profile)
 }
 
 
-QString NetctlAdaptor::netctlActiveProfile()
+QStringList NetctlAdaptor::netctlActiveProfile()
 {
-    return netctlCommand->getActiveProfile().join(QChar('|'));
+    return netctlCommand->getActiveProfile();
 }
 
 

sources/helper/src/netctladaptor.h

@@ -37,8 +37,8 @@ public:
 
 public slots:
     // netctlCommand
-    QString ActiveProfile();
+    QStringList ActiveProfile();
-    QString ActiveProfileStatus();
+    QStringList ActiveProfileStatus();
     bool autoIsProfileActive(const QString profile);
     bool autoIsProfileEnabled(const QString profile);
     QStringList Information();
@@ -46,7 +46,7 @@ public slots:
     bool isNetctlAutoEnabled();
     bool isProfileActive(const QString profile);
     bool isProfileEnabled(const QString profile);
-    QString netctlActiveProfile();
+    QStringList netctlActiveProfile();
     QStringList netctlProfileList();
     QStringList netctlVerboseProfileList();
     QStringList ProfileList();

sources/netctlgui/include/netctlgui/netctlinteract.h

@@ -30,10 +30,9 @@
 #include <QMap>
 #include <QObject>
 
-#include "version.h"
-
 
 class NetctlProfile;
+struct TaskResult;
 
 /**
  * @struct netctlProfileInfo
@@ -94,81 +93,75 @@ public:
     /**
      * @brief Netctl class destructor
      */
-    ~Netctl();
+    virtual ~Netctl();
     // general information
     /**
      * @brief method which returns active profile name
-     * @return profile name or ""
+     * @return Netctl::getActiveProfileTemplate()
      */
-    QStringList getActiveProfile();
+    QStringList getActiveProfile() const;
     /**
      * @brief method which returns active profile name from netctl-auto
-     * @return profile name or ""
+     * @return Netctl::getActiveProfileTemplate()
      */
-    QString autoGetActiveProfile();
+    QStringList autoGetActiveProfile() const;
     /**
      * @brief method which returns profile informations from netctl
-     * @return list of profiles
+     * @return Netctl::getProfileListTemplate()
      */
-    QList<netctlProfileInfo> getProfileList();
+    QList<netctlProfileInfo> getProfileList() const;
     /**
      * @brief method which returns profile informations from netctl-auto
-     * @return list of profiles from netctl-auto
+     * @return Netctl::getProfileListTemplate()
      */
-    QList<netctlProfileInfo> getProfileListFromNetctlAuto();
+    QList<netctlProfileInfo> getProfileListFromNetctlAuto() const;
-    /**
-     * @brief method which gets description from profile
-     * @param profile        profile name
-     * @return profile description or ""
-     */
-    Q_DECL_DEPRECATED QString getProfileDescription(const QString profile);
     /**
      * @brief method which gets profile status
      * @param profile        profile name
      * @return profile status. It may be "active (enabled)", "active (static)",
      *         "inactive (enabled)", "inactive (static)"
      */
-    QString getProfileStatus(const QString profile);
+    QString getProfileStatus(const QString profile) const;
     /**
     * @brief method which checks if profile is active
     * @param profile profile name
     * @return false if profile is inactive
     * @return true if profile is active
     */
-    bool isProfileActive(const QString profile);
+    bool isProfileActive(const QString profile) const;
     /**
      * @brief method which checks if profile is enabled
      * @param profile        profile name
      * @return false if profile is disabled
      * @return true if profile is enabled
      */
-    bool isProfileEnabled(const QString profile);
+    bool isProfileEnabled(const QString profile) const;
     /**
      * @brief method which checks if profile is active (netctl-auto)
      * @param profile        profile name
      * @return false if profile is inactive
      * @return true if profile is active
      */
-    bool autoIsProfileActive(const QString profile);
+    bool autoIsProfileActive(const QString profile) const;
     /**
      * @brief method which checks if profile is enabled (netctl-auto)
      * @param profile        profile name
      * @return false if profile is disabled
      * @return true if profile is enabled
      */
-    bool autoIsProfileEnabled(const QString profile);
+    bool autoIsProfileEnabled(const QString profile) const;
     /**
      * @brief method which checks netctl-auto autoload status
      * @return false if netctl-auto is disabled
      * @return true if netctl-auto is enabled
      */
-    bool isNetctlAutoEnabled();
+    bool isNetctlAutoEnabled() const;
     /**
      * @brief method which checks netctl-auto status
      * @return false if netctl-auto is inactive
      * @return true if netctl-auto is active
      */
-    bool isNetctlAutoRunning();
+    bool isNetctlAutoRunning() const;
     /**
      * @brief method which check system configuration and return recommended values to keys
      * @return recommended parametrs
@@ -178,7 +171,7 @@ public:
      * @brief method which gets wireless interface list from PREFERED_IFACE and IFACE_DIR
      * @return interface list. If PREFERED_IFACE is not empty it will be first element
      */
-    QStringList getWirelessInterfaceList();
+    QStringList getWirelessInterfaceList() const;
 
 public slots:
     // functions
@@ -189,101 +182,101 @@ public slots:
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool enableProfile(const QString profile);
+    bool enableProfile(const QString profile) const;
     /**
      * @brief method which force starts profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool forceStartProfile(const QString profile);
+    bool forceStartProfile(const QString profile) const;
     /**
      * @brief method which force stops profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool forceStopProfile(const QString profile);
+    bool forceStopProfile(const QString profile) const;
     /**
      * @brief method which reenables profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool reenableProfile(const QString profile);
+    bool reenableProfile(const QString profile) const;
     /**
      * @brief method which restarts profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool restartProfile(const QString profile);
+    bool restartProfile(const QString profile) const;
     /**
      * @brief method which starts or stops profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool startProfile(const QString profile);
+    bool startProfile(const QString profile) const;
     /**
      * @brief method which stops all profiles
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool stopAllProfiles();
+    bool stopAllProfiles() const;
     /**
      * @brief method which starts another profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool switchToProfile(const QString profile);
+    bool switchToProfile(const QString profile) const;
     // netctl-auto
     /**
      * @brief method which sets all profiles disabled (netctl-auto)
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoDisableAllProfiles();
+    bool autoDisableAllProfiles() const;
     /**
      * @brief method which sets profile disabled or enabled (netctl-auto)
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoEnableProfile(const QString profile);
+    bool autoEnableProfile(const QString profile) const;
     /**
      * @brief method which sets all profiles enabled (netctl-auto)
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoEnableAllProfiles();
+    bool autoEnableAllProfiles() const;
     /**
      * @brief method which switchs to profile (netctl-auto)
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoStartProfile(const QString profile);
+    bool autoStartProfile(const QString profile) const;
     // netctl-auto service
     /**
      * @brief method which sets netctl-auto service enabled or disabled
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoEnableService();
+    bool autoEnableService() const;
     /**
      * @brief method which restarted netctl-auto service
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoRestartService();
+    bool autoRestartService() const;
     /**
      * @brief method which starts or stops netctl-auto service
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool autoStartService();
+    bool autoStartService() const;
 
 private:
     /**
@@ -297,7 +290,7 @@ private:
     /**
      * @brief use RootProcess instead of QProcess. Default is true
      */
-    bool useSuid = true;
+    bool useSuid;
     /**
      * @brief directory with interfaces. Default is "/sys/class/net/"
      */
@@ -305,27 +298,27 @@ private:
     /**
      * @brief prefered interface for WiFi. Default is ""
      */
-    QString mainInterface = QString(PREFERED_IFACE);
+    QString mainInterface;
     /**
      * @brief path to netctl command. Default is "netctl"
      */
-    QString netctlCommand = QString(NETCTL_PATH);
+    QString netctlCommand;
     /**
      * @brief path to netctl-auto command. Default is "netctl-auto"
      */
-    QString netctlAutoCommand = QString(NETCTLAUTO_PATH);
+    QString netctlAutoCommand;
     /**
      * @brief netctl-auto service name. Default is "netctl-auto"
      */
-    QString netctlAutoService = QString(NETCTLAUTO_SERVICE);
+    QString netctlAutoService;
     /**
      * @brief path to sudo command. Default is "kdesu"
      */
-    QString sudoCommand = QString(SUDO_PATH);
+    QString sudoCommand;
     /**
      * @brief path to systemctl command. Default is "systemctl"
      */
-    QString systemctlCommand = QString(SYSTEMCTL_PATH);
+    QString systemctlCommand;
     // functions
     /**
      * @brief method which calls command
@@ -333,21 +326,22 @@ private:
      * @param command        command which will be called
      * @param commandLine    command which will be passed to command
      * @param argument       argument which will be passed to commandLine
-     * @return false if components are not found or command exit code is not equal to 0
+     * @return process object
-     * @return true if the method was completed without errors
      */
-    bool cmdCall(const bool sudo, const QString command,
+    TaskResult cmdCall(const bool sudo, const QString command,
-                 const QString commandLine, const QString argument = 0);
+                       const QString commandLine, const QString argument = QString()) const;
     /**
-     * @brief method which calls command and returns its output
+     * @brief method which parse output for profile data
-     * @param sudo           set true if sudo is needed
+     * @param data          profile list data
-     * @param command        command which will be called
+     * @return list of active profiles if any
-     * @param commandLine    command which will be passed to command
-     * @param argument       argument which will be passed to commandLine
-     * @return command output
      */
-    QString getCmdOutput(const bool sudo, const QString command,
+    QStringList getActiveProfileTemplate(const QList<netctlProfileInfo> data) const;
-                         const QString commandLine, const QString argument = 0);
+    /**
+     * @brief get profile list from sources
+     * @param isAuto        use netctl-auto instead of netctl
+     * @return profile list
+     */
+    QList<netctlProfileInfo> getProfileListTemplate(const bool isAuto) const;
 };
 
 

sources/netctlgui/include/netctlgui/netctlinterface.h

@@ -109,7 +109,7 @@ public:
     /**
      * @brief NetctlInterface class destructor
      */
-    ~NetctlInterface();
+    virtual ~NetctlInterface();
     // control methods
     /**
      * @brief method which creates and copies profile
@@ -120,7 +120,7 @@ public:
      * @return InterfaceAnswer::True if profile is created
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer createProfile(const QString profile, const QMap<QString, QString> settings);
+    InterfaceAnswer createProfile(const QString profile, const QMap<QString, QString> settings) const;
     /**
      * @brief method which connects to ESSID
      * @remark netctl independ
@@ -130,7 +130,7 @@ public:
      * @return InterfaceAnswer::True if profile is active
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer connectToEssid(const QString essid, QMap<QString, QString> settings);
+    InterfaceAnswer connectToEssid(const QString essid, QMap<QString, QString> settings) const;
     /**
      * @brief method which connects to existent profile by ESSID
      * @remark netctl independ
@@ -139,7 +139,7 @@ public:
      * @return InterfaceAnswer::True if profile is active
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer connectToKnownEssid(const QString essid);
+    InterfaceAnswer connectToKnownEssid(const QString essid) const;
     /**
      * @brief method which creates wireless profile and connects to it
      * @remark netctl independ
@@ -149,7 +149,7 @@ public:
      * @return InterfaceAnswer::True if profile is active
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer connectToUnknownEssid(const QString essid, QMap<QString, QString> settings);
+    InterfaceAnswer connectToUnknownEssid(const QString essid, QMap<QString, QString> settings) const;
     /**
      * @brief method which enables or disables selected profile and returns its status
      * @remark netctl only
@@ -158,7 +158,7 @@ public:
      * @return InterfaceAnswer::True if profile is enabled
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer enableProfile(const QString profile);
+    InterfaceAnswer enableProfile(const QString profile) const;
     /**
      * @brief method which removes selected profile
      * @remark netctl independ
@@ -166,7 +166,7 @@ public:
      * @return InterfaceAnswer::True if profile does not exists anymore
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer removeProfile(const QString profile);
+    InterfaceAnswer removeProfile(const QString profile) const;
     /**
      * @brief method which restarts selected profile and returns its status
      * @remark netctl only
@@ -175,7 +175,7 @@ public:
      * @return InterfaceAnswer::True if profile is active
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer restartProfile(const QString profile);
+    InterfaceAnswer restartProfile(const QString profile) const;
     /**
      * @brief method which starts/stops or switchs to selected profile and returns its status
      * @remark netctl only
@@ -184,14 +184,14 @@ public:
      * @return InterfaceAnswer::True if profile is active
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer startProfile(const QString profile);
+    InterfaceAnswer startProfile(const QString profile) const;
     /**
      * @brief method which stops all profiles
      * @remark netctl only
      * @return InterfaceAnswer::True if there are no errors
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer stopAllProfiles();
+    InterfaceAnswer stopAllProfiles() const;
     /**
      * @brief method which switchs to selected profile and returns its status
      * @remark both netctl and netctl-auto
@@ -200,26 +200,26 @@ public:
      * @return InterfaceAnswer::True if profile is active
      * @return InterfaceAnswer::Error if an error occurs
      */
-    InterfaceAnswer switchToProfile(const QString profile);
+    InterfaceAnswer switchToProfile(const QString profile) const;
     // information
     /**
      * @brief method which returns general information
      * @remark both netctl and netctl-auto
      * @return netctlInformation structure
      */
-    netctlInformation information();
+    netctlInformation information() const;
     /**
      * @brief method which reads settings from profile
      * @param profile         profile name
      * @return settings from profile
      */
-    QMap<QString, QString> profileSettings(const QString profile);
+    QMap<QString, QString> profileSettings(const QString profile) const;
     /**
      * @brief method which returns current status
      * @remark both netctl and netctl-auto
      * @return netctlCurrent structure
      */
-    netctlCurrent status();
+    netctlCurrent status() const;
 
 private:
     /**

sources/netctlgui/include/netctlgui/netctlprofile.h

@@ -30,8 +30,6 @@
 #include <QMap>
 #include <QObject>
 
-#include "version.h"
-
 
 /**
  * @brief The NetctlProfile class interacts with netctl profiles
@@ -54,21 +52,21 @@ public:
     /**
       * @brief Netctl class destructor
       */
-    ~NetctlProfile();
+    virtual ~NetctlProfile();
     /**
      * @brief method which copies temporary profile to PROFILE_DIR
      * @param oldPath        path to temprorary profile
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool copyProfile(const QString oldPath);
+    bool copyProfile(const QString oldPath) const;
     /**
      * @brief method which creates temporary profile
      * @param profile        profile name
      * @param settings       profile configuration. All available keys will be printed to the profile
      * @return temporary profile name
      */
-    QString createProfile(const QString profile, const QMap<QString, QString> settings);
+    QString createProfile(const QString profile, const QMap<QString, QString> settings) const;
     /**
      * @brief method which check system configuration and return recommended values to keys
      * @return recommended parametrs
@@ -79,28 +77,28 @@ public:
      * @param profile        profile name
      * @return settings from profile
      */
-    QMap<QString, QString> getSettingsFromProfile(const QString profile);
+    QMap<QString, QString> getSettingsFromProfile(const QString profile) const;
     /**
      * @brief method which return value from profile by key
      * @param profile        profile name
      * @param key            required key
      * @return value by key
      */
-    QString getValueFromProfile(const QString profile, const QString key);
+    QString getValueFromProfile(const QString profile, const QString key) const;
     /**
      * @brief method which return values from profile by keys
      * @param profile        profile name
      * @param keys           required keys
      * @return values by keys
      */
-    QStringList getValuesFromProfile(const QString profile, const QStringList keys);
+    QStringList getValuesFromProfile(const QString profile, const QStringList keys) const;
     /**
      * @brief method which removes profile
      * @param profile        profile name
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool removeProfile(const QString profile);
+    bool removeProfile(const QString profile) const;
 
 private:
     /**
@@ -110,7 +108,7 @@ private:
     /**
      * @brief use RootProcess instead of QProcess. Default is true
      */
-    bool useSuid = true;
+    bool useSuid;
     /**
      * @brief directory which contains profiles. Default is "/etc/netctl"
      */
@@ -118,7 +116,7 @@ private:
     /**
      * @brief path to sudo command. Default is "kdesu"
      */
-    QString sudoCommand = QString(SUDO_PATH);
+    QString sudoCommand;
 };
 
 

sources/netctlgui/include/netctlgui/wpasupinteract.h

@@ -30,8 +30,6 @@
 #include <QMap>
 #include <QObject>
 
-#include "version.h"
-
 
 class Netctl;
 class NetctlProfile;
@@ -113,14 +111,14 @@ public:
     /**
      * @brief WpaSup class destructor
      */
-    ~WpaSup();
+    virtual ~WpaSup();
     // general information
     /**
      * @brief method which gets profile name by ESSID
      * @param essid          ESSID name
      * @return profile name
      */
-    QString existentProfile(const QString essid);
+    QString existentProfile(const QString essid) const;
     /**
      * @brief method which check system configuration and return recommended values to keys
      * @return recommended parametrs
@@ -132,14 +130,7 @@ public:
      * @return false if profile is inactive
      * @return true if profile is active
      */
-    bool isProfileActive(const QString essid);
+    bool isProfileActive(const QString essid) const;
-    /**
-     * @brief method which checks profile existence by ESSID
-     * @param essid          ESSID name
-     * @return false if profile does not exist
-     * @return true if profile exists
-     */
-    Q_DECL_DEPRECATED bool isProfileExists(const QString essid);
 
 public slots:
     // functions
@@ -147,24 +138,24 @@ public slots:
      * @brief method which returns active point information
      * @return current point information
      */
-    netctlWifiInfo current();
+    netctlWifiInfo current() const;
     /**
      * @brief method which scans WiFi networks
      * @return list of essids
      */
-    QList<netctlWifiInfo> scanWifi();
+    QList<netctlWifiInfo> scanWifi() const;
     /**
      * @brief method which calls wpa_supplicant
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool startWpaSupplicant();
+    bool startWpaSupplicant() const;
     /**
      * @brief method which send TERMINATE signal to wpa_supplicant
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool stopWpaSupplicant();
+    bool stopWpaSupplicant() const;
 
 private:
     /**
@@ -182,54 +173,54 @@ private:
     /**
      * @brief use RootProcess instead of QProcess. Default is true
      */
-    bool useSuid = true;
+    bool useSuid;
     /**
      * @brief path to ctrl_directory. Defaults is "/run/wpa_supplicant"
      */
-    QString ctrlDir = QString(CTRL_DIR);
+    QString ctrlDir;
     /**
      * @brief group which is owner of CTRL_DIR. Default is "users"
      */
-    QString ctrlGroup = QString(CTRL_GROUP);
+    QString ctrlGroup;
     /**
      * @brief wpa_supplicant PID file. $i is interface. Default is "/run/wpa_supplicant_$i.pid"
      */
-    QString pidFile = QString(PID_FILE);
+    QString pidFile;
     /**
      * @brief path to sudo command. Default is "kdesu"
      */
-    QString sudoCommand = QString(SUDO_PATH);
+    QString sudoCommand;
     /**
      * @brief path to wpa_cli command. Default is "wpa_cli"
      */
-    QString wpaCliPath = QString(WPACLI_PATH);
+    QString wpaCliPath;
     /**
      * @brief wpa_supplicant drivers comma separated. Default is "nl80211,wext"
      */
-    QString wpaDrivers = QString(WPA_DRIVERS);
+    QString wpaDrivers;
     /**
      * @brief path to wpa_supplicant command. Default is "wpa_supplicant"
      */
-    QString wpaSupPath = QString(WPASUP_PATH);
+    QString wpaSupPath;
     // functions
     /**
      * @brief method which calls wpa_cli and returns its output
      * @param commandLine    command which will be passed to wpa_cli
      * @return wpa_cli output
      */
-    QString getWpaCliOutput(const QString commandLine);
+    QString getWpaCliOutput(const QString commandLine) const;
     /**
      * @brief method which will be called to sleep thread
      * @param sec            time interval, seconds
      */
-    bool waitForProcess(const int sec);
+    bool waitForProcess(const int sec) const;
     /**
      * @brief method which calls wpa_cli
      * @param commandLine    command which will be passed to wpa_cli
      * @return false if components are not found or command exit code is not equal to 0
      * @return true if the method was completed without errors
      */
-    bool wpaCliCall(const QString commandLine);
+    bool wpaCliCall(const QString commandLine) const;
 };
 
 

sources/netctlgui/src/netctlinteract.cpp

@@ -30,6 +30,8 @@
 #include <pdebug/pdebug.h>
 #include <task/taskadds.h>
 
+#include "version.h"
+
 
 /**
  * @class Netctl
@@ -42,27 +44,16 @@ Netctl::Netctl(const bool debugCmd, const QMap<QString, QString> settings)
 {
     netctlProfile = new NetctlProfile(debug, settings);
 
-    if (settings.contains(QString("IFACE_DIR")))
+    ifaceDirectory = new QDir(settings.value(QString("IFACE_DIR"), QString(IFACE_DIR)));
-        ifaceDirectory = new QDir(settings[QString("IFACE_DIR")]);
+    mainInterface = settings.value(QString("PREFERED_IFACE"), QString(PREFERED_IFACE));
-    else
+    netctlCommand = settings.value(QString("NETCTL_PATH"), QString(NETCTL_PATH));
-        ifaceDirectory = new QDir(QString(IFACE_DIR));
+    netctlAutoCommand = settings.value(QString("NETCTLAUTO_PATH"), QString(NETCTLAUTO_PATH));
-    if (settings.contains(QString("PREFERED_IFACE")))
+    netctlAutoService = settings.value(QString("NETCTLAUTO_SERVICE"), QString(NETCTLAUTO_SERVICE));
-        mainInterface = settings[QString("PREFERED_IFACE")];
+    sudoCommand = settings.value(QString("SUDO_PATH"), QString(SUDO_PATH));
-    if (settings.contains(QString("NETCTL_PATH")))
+    systemctlCommand = settings.value(QString("SYSTEMCTL_PATH"), QString(SYSTEMCTL_PATH));
-        netctlCommand = settings[QString("NETCTL_PATH")];
+    useSuid = (settings.value(QString("FORCE_SUDO"), QString("true")) != QString("true"));
-    if (settings.contains(QString("NETCTLAUTO_PATH")))
-        netctlAutoCommand = settings[QString("NETCTLAUTO_PATH")];
-    if (settings.contains(QString("NETCTLAUTO_SERVICE")))
-        netctlAutoService = settings[QString("NETCTLAUTO_SERVICE")];
-    if (settings.contains(QString("SUDO_PATH")))
-        sudoCommand = settings[QString("SUDO_PATH")];
-    if (settings.contains(QString("SYSTEMCTL_PATH")))
-        systemctlCommand = settings[QString("SYSTEMCTL_PATH")];
-    if (settings.contains(QString("FORCE_SUDO")))
-        useSuid = (settings[QString("FORCE_SUDO")] != QString("true"));
 
-    if (useSuid)
+    if (useSuid) sudoCommand = QString("");
-        sudoCommand = QString("");
 }
 
 
@@ -78,207 +69,61 @@ Netctl::~Netctl()
 }
 
 
-// functions
-/**
- * @fn cmdCall
- */
-bool Netctl::cmdCall(const bool sudo, const QString command, const QString commandLine, const QString argument)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Command" << command;
-    if (debug) qDebug() << PDEBUG << ":" << "Command line" << commandLine;
-    if (debug) qDebug() << PDEBUG << ":" << "Argument" << argument;
-    if (command.isEmpty()) {
-        if (debug) qDebug() << PDEBUG << ":" << "Could not find command";
-        return false;
-    }
-
-    QString cmd = QString("");
-    if (sudo)
-        cmd = QString("%1 ").arg(sudoCommand);
-    cmd += QString("%1 %2").arg(command).arg(commandLine);
-    if (!argument.isEmpty())
-        cmd += QString(" \"%1\"").arg(argument);
-    if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
-    TaskResult process = runTask(cmd, (useSuid && sudo));
-    if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
-        if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
-
-    return (process.exitCode == 0);
-}
-
-
-/**
- * @fn getCmdOutput
- */
-QString Netctl::getCmdOutput(const bool sudo, const QString command, const QString commandLine, const QString argument)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Command" << command;
-    if (debug) qDebug() << PDEBUG << ":" << "Command line" << commandLine;
-    if (debug) qDebug() << PDEBUG << ":" << "Argument" << argument;
-    if (command.isEmpty()) {
-        if (debug) qDebug() << PDEBUG << ":" << "Could not find command";
-        return QString();
-    }
-
-    QString cmd = QString("");
-    if (sudo)
-        cmd = QString("%1 ").arg(sudoCommand);
-    cmd += QString("%1 %2").arg(command).arg(commandLine);
-    if (!argument.isEmpty())
-        cmd += QString(" \"%1\"").arg(argument);
-    if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
-    TaskResult process = runTask(cmd, (useSuid && sudo));
-    if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
-        if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
-
-    return process.output;
-}
-
-
 // general information
 /**
  * @fn getActiveProfile
  */
-QStringList Netctl::getActiveProfile()
+QStringList Netctl::getActiveProfile() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    QStringList profile;
+    return getActiveProfileTemplate(getProfileList());
-    QList<netctlProfileInfo> fullProfilesInfo = getProfileList();
-    for (int i=0; i<fullProfilesInfo.count(); i++)
-        if (fullProfilesInfo[i].active)
-            profile.append(fullProfilesInfo[i].name);
-
-    return profile;
 }
 
 
 /**
  * @fn autoGetActiveProfile
  */
-QString Netctl::autoGetActiveProfile()
+QStringList Netctl::autoGetActiveProfile() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    QString profile = QString("");
+    return getActiveProfileTemplate(getProfileListFromNetctlAuto());
-    QList<netctlProfileInfo> fullProfilesInfo = getProfileListFromNetctlAuto();
-    for (int i=0; i<fullProfilesInfo.count(); i++)
-        if (fullProfilesInfo[i].active) {
-            profile = fullProfilesInfo[i].name;
-            break;
-        }
-
-    return profile;
 }
 
 
 /**
  * @fn getProfileList
  */
-QList<netctlProfileInfo> Netctl::getProfileList()
+QList<netctlProfileInfo> Netctl::getProfileList() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    QList<netctlProfileInfo> fullProfilesInfo;
+    return getProfileListTemplate(false);
-    QStringList output = getCmdOutput(false, netctlCommand, QString("list"))
-            .split(QChar('\n'), QString::SkipEmptyParts);
-    for (int i=0; i<output.count(); i++) {
-        netctlProfileInfo profileInfo;
-        profileInfo.name = output[i].mid(2, -1);
-        profileInfo.active = (output[i][0] == QChar('*'));
-        profileInfo.enabled = isProfileEnabled(profileInfo.name);
-        // external
-        QStringList keys;
-        keys.append(QString("Connection"));
-        keys.append(QString("Description"));
-        keys.append(QString("ESSID"));
-        keys.append(QString("Interface"));
-        QStringList profileValues = netctlProfile->getValuesFromProfile(profileInfo.name,
-                                                                        keys);
-        profileInfo.description = profileValues[1];
-        profileInfo.essid = profileValues[2];
-        profileInfo.interface = profileValues[3];
-        profileInfo.type = profileValues[0];
-        profileInfo.netctlAuto = false;
-        fullProfilesInfo.append(profileInfo);
-    }
-
-    return fullProfilesInfo;
 }
 
 
 /**
  * @fn getProfileListFromNetctlAuto
  */
-QList<netctlProfileInfo> Netctl::getProfileListFromNetctlAuto()
+QList<netctlProfileInfo> Netctl::getProfileListFromNetctlAuto() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    QList<netctlProfileInfo> fullProfilesInfo;
+    return getProfileListTemplate(true);
-    QStringList output = getCmdOutput(false, netctlAutoCommand, QString("list"))
-            .split(QChar('\n'), QString::SkipEmptyParts);
-    for (int i=0; i<output.count(); i++) {
-        netctlProfileInfo profileInfo;
-        profileInfo.name = output[i].mid(2, -1);
-        profileInfo.active = (output[i][0] == QChar('*'));
-        profileInfo.enabled = (output[i][0] != QChar('!'));
-        // external
-        QStringList keys;
-        keys.append(QString("Connection"));
-        keys.append(QString("Description"));
-        keys.append(QString("ESSID"));
-        keys.append(QString("Interface"));
-        QStringList profileValues = netctlProfile->getValuesFromProfile(profileInfo.name,
-                                                                        keys);
-        profileInfo.description = profileValues[1];
-        profileInfo.essid = profileValues[2];
-        profileInfo.interface = profileValues[3];
-        profileInfo.type = profileValues[0];
-        profileInfo.netctlAuto = true;
-        fullProfilesInfo.append(profileInfo);
-    }
-
-    return fullProfilesInfo;
-}
-
-
-/**
- * @fn getProfileDescription
- */
-QString Netctl::getProfileDescription(const QString profile)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
-    if (netctlProfile == 0) {
-        if (debug) qDebug() << PDEBUG << ":" << "Could not find library";
-        return QString();
-    }
-
-    return netctlProfile->getValueFromProfile(profile, QString("Description"));
 }
 
 
 /**
  * @fn getProfileStatus
  */
-QString Netctl::getProfileStatus(const QString profile)
+QString Netctl::getProfileStatus(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    QString status;
+    QString status = isProfileActive(profile) ? QString("active") : QString("inactive");
-    if (isProfileActive(profile))
+    status += isProfileEnabled(profile) ?  QString(" (enabled)") : QString(" (static)");
-        status = QString("active");
-    else
-        status = QString("inactive");
-    if (isProfileEnabled(profile))
-        status += QString(" (enabled)");
-    else
-        status += QString(" (static)");
 
     return status;
 }
@@ -287,42 +132,40 @@ QString Netctl::getProfileStatus(const QString profile)
 /**
  * @fn isProfileActive
  */
-bool Netctl::isProfileActive(const QString profile)
+bool Netctl::isProfileActive(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    QString output = getCmdOutput(false, netctlCommand, QString("status"), profile);
+    return cmdCall(false, netctlCommand, QString("status"), profile).status();
-
-    return (output.contains(QString("Active: active")));
 }
 
 
 /**
  * @fn isProfileEnabled
  */
-bool Netctl::isProfileEnabled(const QString profile)
+bool Netctl::isProfileEnabled(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    return cmdCall(false, netctlCommand, QString("is-enabled"), profile);
+    return cmdCall(false, netctlCommand, QString("is-enabled"), profile).output == QString("enabled\n");
 }
 
 
 /**
  * @fn autoIsProfileActive
  */
-bool Netctl::autoIsProfileActive(const QString profile)
+bool Netctl::autoIsProfileActive(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
     bool status = false;
     QList<netctlProfileInfo> profiles = getProfileListFromNetctlAuto();
-    for (int i=0; i<profiles.count(); i++) {
+    foreach(netctlProfileInfo profileInfo, profiles) {
-        if (profiles[i].name == profile) continue;
+        if (profileInfo.name != profile) continue;
-        status = profiles[i].active;
+        status = profileInfo.active;
         break;
     }
 
@@ -333,16 +176,16 @@ bool Netctl::autoIsProfileActive(const QString profile)
 /**
  * @fn autoIsProfileEnabled
  */
-bool Netctl::autoIsProfileEnabled(const QString profile)
+bool Netctl::autoIsProfileEnabled(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
     bool status = false;
     QList<netctlProfileInfo> profiles = getProfileListFromNetctlAuto();
-    for (int i=0; i<profiles.count(); i++) {
+    foreach(netctlProfileInfo profileInfo, profiles) {
-        if (profiles[i].name == profile) continue;
+        if (profileInfo.name != profile) continue;
-        status = profiles[i].enabled;
+        status = profileInfo.enabled;
         break;
     }
 
@@ -353,7 +196,7 @@ bool Netctl::autoIsProfileEnabled(const QString profile)
 /**
  * @fn isNetctlAutoEnabled
  */
-bool Netctl::isNetctlAutoEnabled()
+bool Netctl::isNetctlAutoEnabled() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlAutoService.isEmpty()) {
@@ -366,16 +209,16 @@ bool Netctl::isNetctlAutoEnabled()
         return false;
     }
 
-    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces[0]);
+    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces.first());
 
-    return cmdCall(false, systemctlCommand, QString("is-enabled"), argument);
+    return cmdCall(false, systemctlCommand, QString("is-enabled"), argument).status();
 }
 
 
 /**
  * @fn isNetctlAutoRunning
  */
-bool Netctl::isNetctlAutoRunning()
+bool Netctl::isNetctlAutoRunning() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlAutoService.isEmpty()) {
@@ -388,9 +231,9 @@ bool Netctl::isNetctlAutoRunning()
         return false;
     }
 
-    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces[0]);
+    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces.first());
 
-    return cmdCall(false, systemctlCommand, QString("is-active"), argument);
+    return cmdCall(false, systemctlCommand, QString("is-active"), argument).status();
 }
 
 
@@ -408,9 +251,9 @@ QMap<QString, QString> Netctl::getRecommendedConfiguration()
     recommended.clear();
     recommended.append(QString("netctlgui-helper"));
     recommended.append(QString("netctlgui-helper-suid"));
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("FORCE_SUDO")] = QString("false");
             break;
         }
@@ -436,9 +279,9 @@ QMap<QString, QString> Netctl::getRecommendedConfiguration()
     settings[QString("NETCTL_PATH")] = QString("");
     recommended.clear();
     recommended.append("netctl");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("NETCTL_PATH")] = process.output.trimmed();
             break;
         }
@@ -448,9 +291,9 @@ QMap<QString, QString> Netctl::getRecommendedConfiguration()
     settings[QString("NETCTLAUTO_PATH")] = QString("");
     recommended.clear();
     recommended.append("netctl-auto");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("NETCTLAUTO_PATH")] = process.output.trimmed();
             break;
         }
@@ -478,9 +321,9 @@ QMap<QString, QString> Netctl::getRecommendedConfiguration()
     recommended.append("sudo");
     recommended.append("kdesu");
     recommended.append("gksu");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("SUDO_PATH")] = process.output.trimmed();
             break;
         }
@@ -490,9 +333,9 @@ QMap<QString, QString> Netctl::getRecommendedConfiguration()
     settings[QString("SYSTEMCTL_PATH")] = QString("");
     recommended.clear();
     recommended.append("systemctl");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("SYSTEMCTL_PATH")] = process.output.trimmed();
             break;
         }
@@ -505,7 +348,7 @@ QMap<QString, QString> Netctl::getRecommendedConfiguration()
 /**
  * @fn getWirelessInterfaceList
  */
-QStringList Netctl::getWirelessInterfaceList()
+QStringList Netctl::getWirelessInterfaceList() const
 {
     if (debug) qDebug() << PDEBUG;
     if (ifaceDirectory == nullptr) {
@@ -517,11 +360,11 @@ QStringList Netctl::getWirelessInterfaceList()
     if (!mainInterface.isEmpty())
         interfaces.append(mainInterface);
     QStringList allInterfaces = ifaceDirectory->entryList(QDir::Dirs | QDir::NoDotAndDotDot);
-    for (int i=0; i<allInterfaces.count(); i++) {
+    foreach(QString interface, allInterfaces) {
-        QString dir = QString("%1/%2/wireless").arg(ifaceDirectory->path()).arg(allInterfaces[i]);
+        QString dir = QString("%1/%2/wireless").arg(ifaceDirectory->path()).arg(interface);
         if (debug) qDebug() << PDEBUG << ":" << "Check directory" << dir;
         if (QDir(dir).exists())
-            interfaces.append(allInterfaces[i]);
+            interfaces.append(interface);
     }
 
     return interfaces;
@@ -532,159 +375,156 @@ QStringList Netctl::getWirelessInterfaceList()
 /**
  * @fn enableProfile
  */
-bool Netctl::enableProfile(const QString profile)
+bool Netctl::enableProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    if (isProfileEnabled(profile))
+    return cmdCall(true, netctlCommand,
-        return cmdCall(true, netctlCommand, QString("disable"), profile);
+                   isProfileEnabled(profile) ? QString("disable") : QString("enable"),
-    else
+                   profile).status();
-        return cmdCall(true, netctlCommand, QString("enable"), profile);
 }
 
 
 /**
  * @fn forceStartProfile
  */
-bool Netctl::forceStartProfile(const QString profile)
+bool Netctl::forceStartProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    return cmdCall(true, netctlCommand, QString("start"), profile);
+    return cmdCall(true, netctlCommand, QString("start"), profile).status();
 }
 
 
 /**
  * @fn forceStopProfile
  */
-bool Netctl::forceStopProfile(const QString profile)
+bool Netctl::forceStopProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    return cmdCall(true, netctlCommand, QString("stop"), profile);
+    return cmdCall(true, netctlCommand, QString("stop"), profile).status();
 }
 
 
 /**
  * @fn reenableProfile
  */
-bool Netctl::reenableProfile(const QString profile)
+bool Netctl::reenableProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    return cmdCall(true, netctlCommand, QString("reenable"), profile);
+    return cmdCall(true, netctlCommand, QString("reenable"), profile).status();
 }
 
 
 /**
  * @fn restartProfile
  */
-bool Netctl::restartProfile(const QString profile)
+bool Netctl::restartProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    return cmdCall(true, netctlCommand, QString("restart"), profile);
+    return cmdCall(true, netctlCommand, QString("restart"), profile).status();
 }
 
 
 /**
  * @fn startProfile
  */
-bool Netctl::startProfile(const QString profile)
+bool Netctl::startProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    if (isProfileActive(profile))
+    return cmdCall(true, netctlCommand,
-        return cmdCall(true, netctlCommand, QString("stop"), profile);
+                   isProfileActive(profile) ? QString("stop") : QString("start"),
-    else
+                   profile).status();
-        return cmdCall(true, netctlCommand, QString("start"), profile);
 }
 
 
 /**
  * @fn stopAllProfiles
  */
-bool Netctl::stopAllProfiles()
+bool Netctl::stopAllProfiles() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    return cmdCall(true, netctlCommand, QString("stop-all"));
+    return cmdCall(true, netctlCommand, QString("stop-all")).status();
 }
 
 
 /**
  * @fn switchToProfile
  */
-bool Netctl::switchToProfile(const QString profile)
+bool Netctl::switchToProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
     return ((isProfileActive(profile)) ||
-            (cmdCall(true, netctlCommand, QString("switch-to"), profile)));
+            (cmdCall(true, netctlCommand, QString("switch-to"), profile)).status());
 }
 
 
 /**
  * @fn autoDisableAllProfiles
  */
-bool Netctl::autoDisableAllProfiles()
+bool Netctl::autoDisableAllProfiles() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    return cmdCall(false, netctlAutoCommand, QString("disable-all"));
+    return cmdCall(false, netctlAutoCommand, QString("disable-all")).status();
 }
 
 
 /**
  * @fn autoEnableProfile
  */
-bool Netctl::autoEnableProfile(const QString profile)
+bool Netctl::autoEnableProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
-    if (autoIsProfileEnabled(profile))
+    return cmdCall(false, netctlAutoCommand,
-        return cmdCall(false, netctlAutoCommand, QString("disable"), profile);
+                   autoIsProfileEnabled(profile) ? QString("disable") : QString("enable"),
-    else
+                   profile).status();
-        return cmdCall(false, netctlAutoCommand, QString("enable"), profile);
 }
 
 
 /**
  * @fn autoEnableAllProfiles
  */
-bool Netctl::autoEnableAllProfiles()
+bool Netctl::autoEnableAllProfiles() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    return cmdCall(false, netctlAutoCommand, QString("enable-all"));
+    return cmdCall(false, netctlAutoCommand, QString("enable-all")).status();
 }
 
 
 /**
  * @fn autoStartProfile
  */
-bool Netctl::autoStartProfile(const QString profile)
+bool Netctl::autoStartProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
 
     return ((autoIsProfileActive(profile)) ||
-            (cmdCall(false, netctlAutoCommand, QString("switch-to"), profile)));
+            (cmdCall(false, netctlAutoCommand, QString("switch-to"), profile)).status());
 }
 
 
 /**
  * @fn autoEnableService
  */
-bool Netctl::autoEnableService()
+bool Netctl::autoEnableService() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlAutoService.isEmpty()) {
@@ -697,19 +537,18 @@ bool Netctl::autoEnableService()
         return false;
     }
 
-    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces[0]);
+    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces.first());
 
-    if (isNetctlAutoEnabled())
+    return cmdCall(true, systemctlCommand,
-        return cmdCall(true, systemctlCommand, QString("disable"), argument);
+                   isNetctlAutoEnabled() ? QString("disable") : QString("enable"),
-    else
+                   argument).status();
-        return cmdCall(true, systemctlCommand, QString("enable"), argument);
 }
 
 
 /**
  * @fn autoRestartService
  */
-bool Netctl::autoRestartService()
+bool Netctl::autoRestartService() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlAutoService.isEmpty()) {
@@ -722,17 +561,17 @@ bool Netctl::autoRestartService()
         return false;
     }
 
-    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces[0]);
+    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces.first());
 
     return ((!isNetctlAutoRunning()) ||
-            (cmdCall(true, systemctlCommand, QString("restart"), argument)));
+            (cmdCall(true, systemctlCommand, QString("restart"), argument)).status());
 }
 
 
 /**
  * @fn autoStartService
  */
-bool Netctl::autoStartService()
+bool Netctl::autoStartService() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlAutoService.isEmpty()) {
@@ -745,10 +584,87 @@ bool Netctl::autoStartService()
         return false;
     }
 
-    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces[0]);
+    QString argument = QString("%1@%2.service").arg(netctlAutoService).arg(interfaces.first());
 
-    if (isNetctlAutoRunning())
+    return cmdCall(true, systemctlCommand,
-        return cmdCall(true, systemctlCommand, QString("stop"), argument);
+                   isNetctlAutoRunning() ? QString("stop") : QString("start"),
-    else
+                   argument).status();
-        return cmdCall(true, systemctlCommand, QString("start"), argument);
+}
+
+
+// functions
+/**
+ * @fn cmdCall
+ */
+TaskResult Netctl::cmdCall(const bool sudo, const QString command,
+                           const QString commandLine, const QString argument) const
+{
+    if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "Command" << command;
+    if (debug) qDebug() << PDEBUG << ":" << "Command line" << commandLine;
+    if (debug) qDebug() << PDEBUG << ":" << "Argument" << argument;
+
+    QString cmd = QString("");
+    if (sudo) cmd = QString("%1 ").arg(sudoCommand);
+    cmd += QString("%1 %2").arg(command).arg(commandLine);
+    if (!argument.isEmpty())  cmd += QString(" \"%1\"").arg(argument);
+    if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
+    TaskResult process = runTask(cmd, (useSuid && sudo));
+    if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
+    if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
+
+    return process;
+};
+
+
+/**
+ * @fn getActiveProfileTemplate
+ */
+QStringList Netctl::getActiveProfileTemplate(const QList<netctlProfileInfo> data) const
+{
+    if (debug) qDebug() << PDEBUG;
+
+    QStringList profiles;
+    foreach(netctlProfileInfo profile, data) {
+        if (!profile.active) continue;
+        profiles.append(profile.name);
+    }
+
+    return profiles;
+}
+
+
+/**
+ * @fn getProfileListTemplate
+ */
+QList<netctlProfileInfo> Netctl::getProfileListTemplate(const bool isAuto) const
+{
+    if (debug) qDebug() << PDEBUG;
+
+    QList<netctlProfileInfo> fullProfilesInfo;
+    QStringList output = QString(cmdCall(false, isAuto ? netctlAutoCommand : netctlCommand,
+                                         QString("list")).output)
+                                 .split(QChar('\n'), QString::SkipEmptyParts);
+    foreach(QString profile, output) {
+        netctlProfileInfo profileInfo;
+        profileInfo.name = profile.mid(2, -1);
+        profileInfo.active = (profile[0] == QChar('*'));
+        profileInfo.enabled = isAuto ? (profile[0] != QChar('!')) : isProfileEnabled(profileInfo.name);
+        // external
+        QStringList keys;
+        keys.append(QString("Connection"));
+        keys.append(QString("Description"));
+        keys.append(QString("ESSID"));
+        keys.append(QString("Interface"));
+        QStringList profileValues = netctlProfile->getValuesFromProfile(profileInfo.name,
+                                                                        keys);
+        profileInfo.description = profileValues[1];
+        profileInfo.essid = profileValues[2];
+        profileInfo.interface = profileValues[3];
+        profileInfo.type = profileValues[0];
+        profileInfo.netctlAuto = isAuto;
+        fullProfilesInfo.append(profileInfo);
+    }
+
+    return fullProfilesInfo;
 }

sources/netctlgui/src/netctlinterface.cpp

@@ -60,7 +60,8 @@ NetctlInterface::~NetctlInterface()
 /**
  * @fn connectToEssid
  */
-InterfaceAnswer NetctlInterface::connectToEssid(const QString essid, QMap<QString, QString> settings)
+InterfaceAnswer NetctlInterface::connectToEssid(const QString essid,
+                                                QMap<QString, QString> settings) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -83,7 +84,7 @@ InterfaceAnswer NetctlInterface::connectToEssid(const QString essid, QMap<QStrin
 /**
  * @fn connectToKnownEssid
  */
-InterfaceAnswer NetctlInterface::connectToKnownEssid(const QString essid)
+InterfaceAnswer NetctlInterface::connectToKnownEssid(const QString essid) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -105,7 +106,8 @@ InterfaceAnswer NetctlInterface::connectToKnownEssid(const QString essid)
 /**
  * @fn connectToUnknownEssid
  */
-InterfaceAnswer NetctlInterface::connectToUnknownEssid(const QString essid, QMap<QString, QString> settings)
+InterfaceAnswer NetctlInterface::connectToUnknownEssid(const QString essid,
+                                                       QMap<QString, QString> settings) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -121,7 +123,7 @@ InterfaceAnswer NetctlInterface::connectToUnknownEssid(const QString essid, QMap
     QStringList interfaces = netctlCommand->getWirelessInterfaceList();
     if (interfaces.isEmpty()) return InterfaceAnswer::Error;
     settings[QString("Description")] = QString("'Automatically generated profile by Netctl GUI'");
-    settings[QString("Interface")] = interfaces[0];
+    settings[QString("Interface")] = interfaces.first();
     settings[QString("Connection")] = QString("wireless");
     settings[QString("ESSID")] = QString("'%1'").arg(essid);
     settings[QString("IP")] = QString("dhcp");
@@ -139,7 +141,8 @@ InterfaceAnswer NetctlInterface::connectToUnknownEssid(const QString essid, QMap
 /**
  * @fn createProfile
  */
-InterfaceAnswer NetctlInterface::createProfile(const QString profile, const QMap<QString, QString> settings)
+InterfaceAnswer NetctlInterface::createProfile(const QString profile,
+                                               const QMap<QString, QString> settings) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -157,7 +160,7 @@ InterfaceAnswer NetctlInterface::createProfile(const QString profile, const QMap
 /**
  * @fn enableProfile
  */
-InterfaceAnswer NetctlInterface::enableProfile(const QString profile)
+InterfaceAnswer NetctlInterface::enableProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -174,7 +177,7 @@ InterfaceAnswer NetctlInterface::enableProfile(const QString profile)
 /**
  * @fn removeProfile
  */
-InterfaceAnswer NetctlInterface::removeProfile(const QString profile)
+InterfaceAnswer NetctlInterface::removeProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlProfile == nullptr) {
@@ -189,7 +192,7 @@ InterfaceAnswer NetctlInterface::removeProfile(const QString profile)
 /**
  * @fn restartProfile
  */
-InterfaceAnswer NetctlInterface::restartProfile(const QString profile)
+InterfaceAnswer NetctlInterface::restartProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -206,7 +209,7 @@ InterfaceAnswer NetctlInterface::restartProfile(const QString profile)
 /**
  * @fn startProfile
  */
-InterfaceAnswer NetctlInterface::startProfile(const QString profile)
+InterfaceAnswer NetctlInterface::startProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -227,7 +230,7 @@ InterfaceAnswer NetctlInterface::startProfile(const QString profile)
 /**
  * @fn stopAllProfiles
  */
-InterfaceAnswer NetctlInterface::stopAllProfiles()
+InterfaceAnswer NetctlInterface::stopAllProfiles() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -242,7 +245,7 @@ InterfaceAnswer NetctlInterface::stopAllProfiles()
 /**
  * @fn switchToProfile
  */
-InterfaceAnswer NetctlInterface::switchToProfile(const QString profile)
+InterfaceAnswer NetctlInterface::switchToProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -267,7 +270,7 @@ InterfaceAnswer NetctlInterface::switchToProfile(const QString profile)
 /**
  * @fn information
  */
-netctlInformation NetctlInterface::information()
+netctlInformation NetctlInterface::information() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -288,7 +291,7 @@ netctlInformation NetctlInterface::information()
 /**
  * @fn profileSettings
  */
-QMap<QString, QString> NetctlInterface::profileSettings(const QString profile)
+QMap<QString, QString> NetctlInterface::profileSettings(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlProfile == nullptr) {
@@ -303,7 +306,7 @@ QMap<QString, QString> NetctlInterface::profileSettings(const QString profile)
 /**
  * @fn status
  */
-netctlCurrent NetctlInterface::status()
+netctlCurrent NetctlInterface::status() const
 {
     if (debug) qDebug() << PDEBUG;
     if (netctlCommand == nullptr) {
@@ -318,11 +321,11 @@ netctlCurrent NetctlInterface::status()
         profiles = netctlCommand->getProfileListFromNetctlAuto();
     else
         profiles = netctlCommand->getProfileList();
-    for (int i=0; i<profiles.count(); i++) {
+    foreach(netctlProfileInfo profile, profiles) {
-        current.profiles.append(profiles[i].name);
+        current.profiles.append(profile.name);
-        if (!profiles[i].active) continue;
+        if (!profile.active) continue;
-        current.current.append(profiles[i].name);
+        current.current.append(profile.name);
-        current.enables.append(profiles[i].enabled);
+        current.enables.append(profile.enabled);
     }
 
     return current;

sources/netctlgui/src/netctlprofile.cpp

@@ -33,6 +33,8 @@
 #include <pdebug/pdebug.h>
 #include <task/taskadds.h>
 
+#include "version.h"
+
 
 /**
  * @class NetctlProfile
@@ -43,17 +45,11 @@
 NetctlProfile::NetctlProfile(const bool debugCmd, const QMap<QString, QString> settings)
     : debug(debugCmd)
 {
-    if (settings.contains(QString("PROFILE_DIR")))
+    profileDirectory = new QDir(settings.value(QString("PROFILE_DIR"), QString(PROFILE_DIR)));
-        profileDirectory = new QDir(settings[QString("PROFILE_DIR")]);
+    sudoCommand = settings.value(QString("SUDO_PATH"), QString(SUDO_PATH));
-    else
+    useSuid = (settings.value(QString("FORCE_SUDO"), QString("true")) != QString("true"));
-        profileDirectory = new QDir(QString(PROFILE_DIR));
-    if (settings.contains(QString("SUDO_PATH")))
-        sudoCommand = settings[QString("SUDO_PATH")];
-    if (settings.contains(QString("FORCE_SUDO")))
-        useSuid = (settings[QString("FORCE_SUDO")] != QString("true"));
 
-    if (useSuid)
+    if (useSuid) sudoCommand = QString("");
-        sudoCommand = QString("");
 }
 
 
@@ -71,7 +67,7 @@ NetctlProfile::~NetctlProfile()
 /**
  * @fn copyProfile
  */
-bool NetctlProfile::copyProfile(const QString oldPath)
+bool NetctlProfile::copyProfile(const QString oldPath) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Path" << oldPath;
@@ -87,17 +83,16 @@ bool NetctlProfile::copyProfile(const QString oldPath)
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     TaskResult process = runTask(cmd, useSuid);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
 
-    return (process.exitCode == 0);
+    return process.status();
 }
 
 
 /**
  * @fn createProfile
  */
-QString NetctlProfile::createProfile(const QString profile, const QMap<QString, QString> settings)
+QString NetctlProfile::createProfile(const QString profile, const QMap<QString, QString> settings) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
@@ -108,22 +103,22 @@ QString NetctlProfile::createProfile(const QString profile, const QMap<QString,
     if (!profileFile.open(QIODevice::WriteOnly | QIODevice::Text))
         return profileTempName;
     QTextStream out(&profileFile);
-    for (int i=0; i<settings.keys().count(); i++) {
+    foreach(QString key, settings.keys()) {
-        out << settings.keys()[i] << QString("=");
+        out << key << QString("=");
-        if ((settings.keys()[i] == QString("BindsToInterfaces")) ||
+        if ((key == QString("BindsToInterfaces")) ||
-            (settings.keys()[i] == QString("After")) ||
+            (key == QString("After")) ||
-            (settings.keys()[i] == QString("Address")) ||
+            (key == QString("Address")) ||
-            (settings.keys()[i] == QString("Routes")) ||
+            (key == QString("Routes")) ||
-            (settings.keys()[i] == QString("Address6")) ||
+            (key == QString("Address6")) ||
-            (settings.keys()[i] == QString("Routes6")) ||
+            (key == QString("Routes6")) ||
-            (settings.keys()[i] == QString("IPCustom")) ||
+            (key == QString("IPCustom")) ||
-            (settings.keys()[i] == QString("DNS")) ||
+            (key == QString("DNS")) ||
-            (settings.keys()[i] == QString("DNSOptions")) ||
+            (key == QString("DNSOptions")) ||
-            (settings.keys()[i] == QString("ScanFrequencies")) ||
+            (key == QString("ScanFrequencies")) ||
-            (settings.keys()[i] == QString("WPAConfigSection")))
+            (key == QString("WPAConfigSection")))
-            out << QString("(%1)").arg(settings[settings.keys()[i]]) << endl;
+            out << QString("(%1)").arg(settings[key]) << endl;
         else
-            out << settings[settings.keys()[i]] << endl;
+            out << settings[key] << endl;
     }
     profileFile.close();
 
@@ -145,9 +140,9 @@ QMap<QString, QString> NetctlProfile::getRecommendedConfiguration()
     recommended.clear();
     recommended.append(QString("netctlgui-helper"));
     recommended.append(QString("netctlgui-helper-suid"));
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("FORCE_SUDO")] = QString("false");
             break;
         }
@@ -172,9 +167,9 @@ QMap<QString, QString> NetctlProfile::getRecommendedConfiguration()
     recommended.append("sudo");
     recommended.append("kdesu");
     recommended.append("gksu");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("SUDO_PATH")] = process.output.trimmed();
             break;
         }
@@ -187,7 +182,7 @@ QMap<QString, QString> NetctlProfile::getRecommendedConfiguration()
 /**
  * @fn getSettingsFromProfile
  */
-QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profile)
+QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
@@ -202,13 +197,12 @@ QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profi
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     TaskResult process = runTask(cmd, false);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
     QStringList output = QString(process.output).trimmed().split(QChar('\n'));
     QStringList systemVariables;
     systemVariables.append(QString("PIPESTATUS"));
-    for (int i=0; i<output.count(); i++)
+    foreach(QString str, output)
-        systemVariables.append(output[i].split(QChar('='))[0]);
+        systemVariables.append(str.split(QChar('=')).first());
     // profile variables
     QMap<QString, QString> settings;
     QString profileUrl = QString("%1/%2").arg(profileDirectory->absolutePath()).arg(QFileInfo(profile).fileName());
@@ -216,20 +210,19 @@ QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profi
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     process = runTask(cmd, false);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
     output = QString(process.output).trimmed().split(QChar('\n'));
 
     // read variables
     QStringList keys;
-    for (int i=0; i<output.count(); i++)
+    foreach(QString str, output)
-        if (!systemVariables.contains(output[i].split(QChar('='))[0]))
+        if (!systemVariables.contains(str.split(QChar('=')).first()))
-            keys.append(output[i].split(QChar('='))[0]);
+            keys.append(str.split(QChar('=')).first());
-    for (int i=0; i<keys.count(); i++){
+    foreach(QString key, keys) {
-        cmd = QString("env -i bash -c \"source '%1'; for i in ${!%2[@]}; do echo ${%2[$i]}; done\"").arg(profileUrl).arg(keys[i]);
+        cmd = QString("env -i bash -c \"source '%1'; for i in ${!%2[@]}; do echo ${%2[$i]}; done\"").arg(profileUrl).arg(key);
         process = runTask(cmd, false);
-        settings[keys[i]] = process.output.trimmed();
+        settings[key] = process.output.trimmed();
-        if (debug) qDebug() << PDEBUG << ":" << keys[i] << "=" << settings[keys[i]];
+        if (debug) qDebug() << PDEBUG << ":" << key << "=" << settings[key];
     }
 
     return settings;
@@ -239,20 +232,20 @@ QMap<QString, QString> NetctlProfile::getSettingsFromProfile(const QString profi
 /**
  * @fn getValueFromProfile
  */
-QString NetctlProfile::getValueFromProfile(const QString profile, const QString key)
+QString NetctlProfile::getValueFromProfile(const QString profile, const QString key) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
     if (debug) qDebug() << PDEBUG << ":" << "Key" << key;
 
-    return getValuesFromProfile(profile, QStringList() << key)[0];
+    return getValuesFromProfile(profile, QStringList() << key).first();
 }
 
 
 /**
  * @fn getValuesFromProfile
  */
-QStringList NetctlProfile::getValuesFromProfile(const QString profile, const QStringList keys)
+QStringList NetctlProfile::getValuesFromProfile(const QString profile, const QStringList keys) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
@@ -260,8 +253,8 @@ QStringList NetctlProfile::getValuesFromProfile(const QString profile, const QSt
 
     QMap<QString, QString> settings = getSettingsFromProfile(profile);
     QStringList values;
-    for (int i=0; i<keys.count(); i++)
+    foreach(QString key, keys)
-        values.append(settings[keys[i]]);
+        values.append(settings[key]);
 
     return values;
 }
@@ -270,7 +263,7 @@ QStringList NetctlProfile::getValuesFromProfile(const QString profile, const QSt
 /**
  * @fn removeProfile
  */
-bool NetctlProfile::removeProfile(const QString profile)
+bool NetctlProfile::removeProfile(const QString profile) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Profile" << profile;
@@ -284,8 +277,7 @@ bool NetctlProfile::removeProfile(const QString profile)
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     TaskResult process = runTask(cmd, useSuid);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
 
-    return (process.exitCode == 0);
+    return process.status();
 }

sources/netctlgui/src/wpasupinteract.cpp

@@ -30,6 +30,8 @@
 #include <pdebug/pdebug.h>
 #include <task/taskadds.h>
 
+#include "version.h"
+
 
 /**
  * @class WpaSup
@@ -43,25 +45,16 @@ WpaSup::WpaSup(const bool debugCmd, const QMap<QString, QString> settings)
     netctlCommand = new Netctl(debug, settings);
     netctlProfile = new NetctlProfile(debug, settings);
 
-    if (settings.contains(QString("CTRL_DIR")))
+    ctrlDir = settings.value(QString("CTRL_DIR"), QString(CTRL_DIR));
-        ctrlDir = settings[QString("CTRL_DIR")];
+    ctrlGroup = settings.value(QString("CTRL_GROUP"), QString(CTRL_GROUP));
-    if (settings.contains(QString("CTRL_GROUP")))
+    pidFile = settings.value(QString("PID_FILE"), QString(PID_FILE));
-        ctrlGroup = settings[QString("CTRL_GROUP")];
+    sudoCommand = settings.value(QString("SUDO_PATH"), QString(SUDO_PATH));
-    if (settings.contains(QString("PID_FILE")))
+    wpaCliPath = settings.value(QString("WPACLI_PATH"), QString(WPACLI_PATH));
-        pidFile = settings[QString("PID_FILE")];
+    wpaDrivers = settings.value(QString("WPA_DRIVERS"), QString(WPA_DRIVERS));
-    if (settings.contains(QString("SUDO_PATH")))
+    wpaSupPath = settings.value(QString("WPASUP_PATH"), QString(WPASUP_PATH));
-        sudoCommand = settings[QString("SUDO_PATH")];
+    useSuid = (settings.value(QString("FORCE_SUDO"), QString("true")) != QString("true"));
-    if (settings.contains(QString("WPACLI_PATH")))
-        wpaCliPath = settings[QString("WPACLI_PATH")];
-    if (settings.contains(QString("WPA_DRIVERS")))
-        wpaDrivers = settings[QString("WPA_DRIVERS")];
-    if (settings.contains(QString("WPASUP_PATH")))
-        wpaSupPath = settings[QString("WPASUP_PATH")];
-    if (settings.contains(QString("FORCE_SUDO")))
-        useSuid = (settings[QString("FORCE_SUDO")] != QString("true"));
 
-    if (useSuid)
+    if (useSuid) sudoCommand = QString("");
-        sudoCommand = QString("");
 }
 
 
@@ -81,7 +74,7 @@ WpaSup::~WpaSup()
 /**
  * @fn existentProfile
  */
-QString WpaSup::existentProfile(const QString essid)
+QString WpaSup::existentProfile(const QString essid) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "ESSID" << essid;
@@ -94,11 +87,11 @@ QString WpaSup::existentProfile(const QString essid)
         return QString();
     }
 
-    QString profileFile = QString("");
+    QString profileFile;
     QList<netctlProfileInfo> profileList = netctlCommand->getProfileList();
-    for (int i=0; i<profileList.count(); i++) {
+    foreach(netctlProfileInfo profile, profileList) {
-        if (essid != profileList[i].essid) continue;
+        if (essid != profile.essid) continue;
-        profileFile = profileList[i].name;
+        profileFile = profile.name;
         break;
     }
 
@@ -121,16 +114,16 @@ QMap<QString, QString> WpaSup::getRecommendedConfiguration()
     // ctrl group
     // check group list and find out 'network', 'users', 'root'
     settings[QString("CTRL_GROUP")] = QString("");
-    gid_t gtpList[99];
+    gid_t gtpList[size];
     int grpSize = getgroups(size, gtpList);
     recommended.clear();
     recommended.append("network");
     recommended.append("users");
     recommended.append("root");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        for (int j=0; j<grpSize; j++)
+        for (int i=0; i<grpSize; i++)
-            if (recommended[i] == QString(getgrgid(gtpList[j])->gr_name)) {
+            if (rec == QString(getgrgid(gtpList[i])->gr_name)) {
-                settings[QString("CTRL_GROUP")] = recommended[i];
+                settings[QString("CTRL_GROUP")] = rec;
                 break;
             }
         if (!settings[QString("CTRL_GROUP")].isEmpty()) break;
@@ -141,9 +134,9 @@ QMap<QString, QString> WpaSup::getRecommendedConfiguration()
     recommended.clear();
     recommended.append(QString("netctlgui-helper"));
     recommended.append(QString("netctlgui-helper-suid"));
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("FORCE_SUDO")] = QString("false");
             break;
         }
@@ -158,9 +151,9 @@ QMap<QString, QString> WpaSup::getRecommendedConfiguration()
     recommended.append("sudo");
     recommended.append("kdesu");
     recommended.append("gksu");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("SUDO_PATH")] = process.output.trimmed();
             break;
         }
@@ -170,9 +163,9 @@ QMap<QString, QString> WpaSup::getRecommendedConfiguration()
     settings[QString("WPACLI_PATH")] = QString("true");
     recommended.clear();
     recommended.append("wpa_cli");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("WPACLI_PATH")] = process.output.trimmed();
             break;
         }
@@ -185,9 +178,9 @@ QMap<QString, QString> WpaSup::getRecommendedConfiguration()
     settings[QString("WPASUP_PATH")] = QString("true");
     recommended.clear();
     recommended.append("wpa_supplicant");
-    for (int i=0; i<recommended.count(); i++) {
+    foreach(QString rec, recommended) {
-        process = runTask(QString("which %1").arg(recommended[i]), false);
+        process = runTask(QString("which %1").arg(rec), false);
-        if (process.exitCode == 0) {
+        if (process.status()) {
             settings[QString("WPASUP_PATH")] = process.output.trimmed();
             break;
         }
@@ -200,7 +193,7 @@ QMap<QString, QString> WpaSup::getRecommendedConfiguration()
 /**
  * @fn isProfileActive
  */
-bool WpaSup::isProfileActive(const QString essid)
+bool WpaSup::isProfileActive(const QString essid) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "ESSID" << essid;
@@ -213,50 +206,14 @@ bool WpaSup::isProfileActive(const QString essid)
         return false;
     }
 
-    QString profileFile;
+    return netctlCommand->isProfileActive(existentProfile(essid));
-    QList<netctlProfileInfo> profileList = netctlCommand->getProfileList();
-    for (int i=0; i<profileList.count(); i++) {
-        if (essid != profileList[i].essid) continue;
-        profileFile = profileList[i].name;
-        break;
-    }
-
-    return netctlCommand->isProfileActive(profileFile);
-}
-
-
-/**
- * @fn isProfileExists
- */
-bool WpaSup::isProfileExists(const QString essid)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "ESSID" << essid;
-    if (netctlCommand == nullptr) {
-        if (debug) qDebug() << PDEBUG << ":" << "Could not find library";
-        return false;
-    }
-    if (netctlProfile == nullptr) {
-        if (debug) qDebug() << PDEBUG << ":" << "Could not find library";
-        return false;
-    }
-
-    bool exists = false;
-    QList<netctlProfileInfo> profileList = netctlCommand->getProfileList();
-    for (int i=0; i<profileList.count(); i++) {
-        if (essid != profileList[i].essid) continue;
-        exists = true;
-        break;
-    }
-
-    return exists;
 }
 
 
 /**
  * @fn current
  */
-netctlWifiInfo WpaSup::current()
+netctlWifiInfo WpaSup::current() const
 {
     if (debug) qDebug() << PDEBUG;
     if (pidFile.isEmpty()) {
@@ -269,7 +226,7 @@ netctlWifiInfo WpaSup::current()
         return netctlWifiInfo();
     }
     QString _pidFile = pidFile;
-    _pidFile.replace(QString("$i"), interfaces[0]);
+    _pidFile.replace(QString("$i"), interfaces.first());
     if (debug) qDebug() << PDEBUG << ":" << "PID file" << _pidFile << QFile(_pidFile).exists();
 
     netctlWifiInfo current;
@@ -278,21 +235,21 @@ netctlWifiInfo WpaSup::current()
     if (!rawText.contains(QString("wpa_state=COMPLETED\n"))) return current;
 
     QStringList rawList = rawText.split(QChar('\n'), QString::SkipEmptyParts);
-    for (int i=0; i<rawList.count(); i++) {
+    foreach(QString element, rawList) {
-        QStringList line = rawList[i].split(QChar('='));
+        QStringList line = element.split(QChar('='));
         if (line.count() != 2) continue;
-        if (line[0] == QString("bssid"))
+        if (line.at(0) == QString("bssid"))
-            current.macs.append(line[1]);
+            current.macs.append(line.at(1));
-        else if (line[0] == QString("freq")) {
+        else if (line.at(0) == QString("freq")) {
-            if ((line[1].toInt() >= 5000) && (line[1].toInt() < 6000))
+            if ((line.at(1).toInt() >= 5000) && (line.at(1).toInt() < 6000))
                 current.type = PointType::FiveG;
-            else if ((line[1].toInt() < 5000) && (line[1].toInt() > 2000))
+            else if ((line.at(1).toInt() < 5000) && (line.at(1).toInt() > 2000))
                 current.type = PointType::TwoG;
-            current.frequencies.append(line[1].toInt());
+            current.frequencies.append(line.at(1).toInt());
-        } else if (line[0] == QString("ssid"))
+        } else if (line.at(0) == QString("ssid"))
-            current.name = line[1];
+            current.name = line.at(1);
-        else if (line[0] == QString("key_mgmt")) {
+        else if (line.at(0) == QString("key_mgmt")) {
-            QString security = line[1];
+            QString security = line.at(1);
             if (security.contains(QString("WPA2")))
                 security = QString("WPA2");
             else if (security.contains(QString("WPA")))
@@ -316,7 +273,7 @@ netctlWifiInfo WpaSup::current()
 /**
  * @fn scanWifi
  */
-QList<netctlWifiInfo> WpaSup::scanWifi()
+QList<netctlWifiInfo> WpaSup::scanWifi() const
 {
     if (debug) qDebug() << PDEBUG;
     if (pidFile.isEmpty()) {
@@ -329,7 +286,7 @@ QList<netctlWifiInfo> WpaSup::scanWifi()
         return QList<netctlWifiInfo>();
     }
     QString _pidFile = pidFile;
-    _pidFile.replace(QString("$i"), interfaces[0]);
+    _pidFile.replace(QString("$i"), interfaces.first());
     if (debug) qDebug() << PDEBUG << ":" << "PID file" << _pidFile << QFile(_pidFile).exists();
 
     bool terminateOnExit = (!QFile(_pidFile).exists());
@@ -353,25 +310,25 @@ QList<netctlWifiInfo> WpaSup::scanWifi()
     else
         profiles = netctlCommand->getProfileList();
     // iterate by wifi output
-    for (int i=0; i<rawList.count(); i++) {
+    foreach(QString element, rawList) {
-        QStringList line = rawList[i].split(QChar('\t'));
+        QStringList line = element.split(QChar('\t'));
         if (line.count() != 5) continue;
-        QString name = line[4];
+        QString name = line.at(4);
         if (name.isEmpty()) name = QString("<hidden>");
         // append mac and frequency if exists
         int index = names.indexOf(name);
         if ((name != QString("<hidden>")) && (index > -1)) {
-            scanResults[index].frequencies.append(line[1].toInt());
+            scanResults[index].frequencies.append(line.at(1).toInt());
-            scanResults[index].macs.append(line[0]);
+            scanResults[index].macs.append(line.at(0));
-            if (scanResults[index].signal < line[2].toInt())
+            if (scanResults[index].signal < line.at(2).toInt())
-                scanResults[index].signal = line[2].toInt();
+                scanResults[index].signal = line.at(2).toInt();
             // check type
-            if ((line[1].toInt() >= 5000) && (line[1].toInt() < 6000)) {
+            if ((line.at(1).toInt() >= 5000) && (line.at(1).toInt() < 6000)) {
                 if (scanResults[index].type == PointType::None)
                     scanResults[index].type = PointType::FiveG;
                 else if (scanResults[index].type == PointType::TwoG)
                     scanResults[index].type = PointType::TwoAndFiveG;
-            } else if ((line[1].toInt() < 5000) && (line[1].toInt() > 2000)) {
+            } else if ((line.at(1).toInt() < 5000) && (line.at(1).toInt() > 2000)) {
                 if (scanResults[index].type == PointType::None)
                     scanResults[index].type = PointType::TwoG;
                 else if (scanResults[index].type == PointType::FiveG)
@@ -388,28 +345,28 @@ QList<netctlWifiInfo> WpaSup::scanWifi()
         netctlProfileInfo profile;
         profile.name = QString("");
         profile.active = false;
-        for (int j=0; j<profiles.count(); j++) {
+        foreach(netctlProfileInfo pr, profiles) {
-            if (wifiPoint.name != profiles[j].essid) continue;
+            if (wifiPoint.name != pr.essid) continue;
-            profile = profiles[j];
+            profile = pr;
             break;
         }
         wifiPoint.active = profile.active;
         wifiPoint.exists = (!profile.name.isEmpty());
         // mac
-        wifiPoint.macs.append(line[0]);
+        wifiPoint.macs.append(line.at(0));
         // frequencies
-        wifiPoint.frequencies.append(line[1].toInt());
+        wifiPoint.frequencies.append(line.at(1).toInt());
         // type
         // check type
-        if ((line[1].toInt() >= 5000) && (line[1].toInt() < 6000)) {
+        if ((line.at(1).toInt() >= 5000) && (line.at(1).toInt() < 6000)) {
             wifiPoint.type = PointType::FiveG;
-        } else if ((line[1].toInt() < 5000) && (line[1].toInt() > 2000)) {
+        } else if ((line.at(1).toInt() < 5000) && (line.at(1).toInt() > 2000)) {
             wifiPoint.type = PointType::TwoG;
         }
         // point signal
-        wifiPoint.signal = line[2].toInt();
+        wifiPoint.signal = line.at(2).toInt();
         // point security
-        QString security = line[3];
+        QString security = line.at(3);
         if (security.contains(QString("WPA2")))
             security = QString("WPA2");
         else if (security.contains(QString("WPA")))
@@ -433,7 +390,7 @@ QList<netctlWifiInfo> WpaSup::scanWifi()
 /**
  * @fn startWpaSupplicant
  */
-bool WpaSup::startWpaSupplicant()
+bool WpaSup::startWpaSupplicant() const
 {
     if (debug) qDebug() << PDEBUG;
     if (ctrlDir.isEmpty()) {
@@ -466,28 +423,27 @@ bool WpaSup::startWpaSupplicant()
         return false;
     }
     QString _pidFile = pidFile;
-    _pidFile.replace(QString("$i"), interfaces[0]);
+    _pidFile.replace(QString("$i"), interfaces.first());
     if (debug) qDebug() << PDEBUG << ":" << "PID file" << _pidFile << QFile(_pidFile).exists();
 
     if (QFile(_pidFile).exists()) return (QFileInfo(ctrlDir).group() == ctrlGroup);
     QString cmd = QString("%1 %2 -B -P \"%3\" -i %4 -D %5 -C \"DIR=%6 GROUP=%7\"")
-                    .arg(sudoCommand).arg(wpaSupPath).arg(_pidFile).arg(interfaces[0])
+                    .arg(sudoCommand).arg(wpaSupPath).arg(_pidFile).arg(interfaces.first())
                     .arg(wpaDrivers).arg(ctrlDir).arg(ctrlGroup);
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     TaskResult process = runTask(cmd, useSuid);
     waitForProcess(1);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
 
-    return (process.exitCode == 0);
+    return process.status();
 }
 
 
 /**
  * @fn stopWpaSupplicant
  */
-bool WpaSup::stopWpaSupplicant()
+bool WpaSup::stopWpaSupplicant() const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -499,7 +455,7 @@ bool WpaSup::stopWpaSupplicant()
 /**
  * @fn getWpaCliOutput
  */
-QString WpaSup::getWpaCliOutput(const QString commandLine)
+QString WpaSup::getWpaCliOutput(const QString commandLine) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Command" << commandLine;
@@ -517,11 +473,10 @@ QString WpaSup::getWpaCliOutput(const QString commandLine)
         return QString();
     }
 
-    QString cmd = QString("%1 -i %2 -p %3 %4").arg(wpaCliPath).arg(interfaces[0]).arg(ctrlDir).arg(commandLine);
+    QString cmd = QString("%1 -i %2 -p %3 %4").arg(wpaCliPath).arg(interfaces.first()).arg(ctrlDir).arg(commandLine);
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     TaskResult process = runTask(cmd);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
 
     return process.output;
@@ -531,7 +486,7 @@ QString WpaSup::getWpaCliOutput(const QString commandLine)
 /**
  * @fn waitForProcess
  */
-bool WpaSup::waitForProcess(const int sec)
+bool WpaSup::waitForProcess(const int sec) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Interval" << sec;
@@ -546,7 +501,7 @@ bool WpaSup::waitForProcess(const int sec)
 /**
  * @fn wpaCliCall
  */
-bool WpaSup::wpaCliCall(const QString commandLine)
+bool WpaSup::wpaCliCall(const QString commandLine) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Command" << commandLine;
@@ -564,13 +519,12 @@ bool WpaSup::wpaCliCall(const QString commandLine)
         return false;
     }
 
-    QString cmd = QString("%1 -i %2 -p %3 %4").arg(wpaCliPath).arg(interfaces[0]).arg(ctrlDir).arg(commandLine);
+    QString cmd = QString("%1 -i %2 -p %3 %4").arg(wpaCliPath).arg(interfaces.first()).arg(ctrlDir).arg(commandLine);
     if (debug) qDebug() << PDEBUG << ":" << "Run cmd" << cmd;
     TaskResult process = runTask(cmd);
     waitForProcess(1);
     if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode;
-    if (process.exitCode != 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error;
 
-    return (process.exitCode == 0);
+    return process.status();
 }

sources/plasmoid-kde4/plasma-applet-netctl.desktop

@@ -12,7 +12,7 @@ X-KDE-PluginInfo-Author=Evgeniy Alekseev
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=netctl
 X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/netctl-gui/
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/netctl-gui/
 X-KDE-PluginInfo-Category=Network
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3

sources/plasmoid-kf5/metadata.desktop

@@ -15,7 +15,7 @@ X-KDE-PluginInfo-Author=Evgeniy Alekseev
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.netctl
 X-KDE-PluginInfo-Version=@PROJECT_VERSION@
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/netctl-gui
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/netctl-gui
 X-KDE-PluginInfo-Category=Network
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3

sources/plasmoid-kf5/package/contents/ui/about.qml

@@ -19,17 +19,21 @@ import QtQuick 2.0
 import QtQuick.Controls 1.3 as QtControls
 import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.netctl 1.0
+import org.kde.plasma.private.netctl 1.0
 
 
 Item {
     id: aboutPage
+    // backend
+    NetctlAdds {
+        id: netctlAdds;
+    }
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: NetctlAdds.isDebugEnabled()
+    property bool debug: netctlAdds.isDebugEnabled()
 
     Column {
         id: pageColumn
@@ -44,20 +48,20 @@ Item {
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignHCenter
-                        text: NetctlAdds.getAboutText("header")
+                        text: netctlAdds.getAboutText("header")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
-                        text: NetctlAdds.getAboutText("description")
+                        text: netctlAdds.getAboutText("description")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignLeft
                         textFormat: Text.RichText
-                        text: NetctlAdds.getAboutText("links")
+                        text: netctlAdds.getAboutText("links")
                         onLinkActivated: Qt.openUrlExternally(link);
                     }
 
@@ -66,7 +70,7 @@ Item {
                         font.capitalization: Font.SmallCaps
                         horizontalAlignment: Text.AlignHCenter
                         textFormat: Text.RichText
-                        text: NetctlAdds.getAboutText("copy")
+                        text: netctlAdds.getAboutText("copy")
                     }
                 }
             }
@@ -78,14 +82,14 @@ Item {
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
-                        text: NetctlAdds.getAboutText("translators")
+                        text: netctlAdds.getAboutText("translators")
                     }
 
                     QtControls.Label {
                         QtLayouts.Layout.fillWidth: true
                         horizontalAlignment: Text.AlignJustify
                         textFormat: Text.RichText
-                        text: NetctlAdds.getAboutText("3rdparty")
+                        text: netctlAdds.getAboutText("3rdparty")
                         onLinkActivated: Qt.openUrlExternally(link);
                     }
                 }

sources/plasmoid-kf5/package/contents/ui/appearance.qml

@@ -21,17 +21,21 @@ import QtQuick.Controls.Styles 1.3 as QtStyles
 import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 
-import org.kde.plasma.netctl 1.0
+import org.kde.plasma.private.netctl 1.0
 
 
 Item {
     id: appearancePage
+    // backend
+    NetctlAdds {
+        id: netctlAdds;
+    }
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: NetctlAdds.isDebugEnabled()
+    property bool debug: netctlAdds.isDebugEnabled()
     property variant weight: {
         25: 0,
         50: 1,
@@ -110,7 +114,10 @@ Item {
                 id: selectFont
                 width: parent.width * 2 / 3
                 text: plasmoid.configuration.fontFamily
-                onClicked: fontDialog.visible = true
+                onClicked: {
+                    fontDialog.setFont()
+                    fontDialog.visible = true
+                }
             }
         }
 
@@ -308,21 +315,28 @@ Item {
         id: colorDialog
         title: i18n("Select a color")
         color: selectColor.text
-        onAccepted: {
+        onAccepted: selectColor.text = colorDialog.color
-            selectColor.text = colorDialog.color
-        }
     }
 
     QtDialogs.FontDialog {
         id: fontDialog
         title: i18n("Select a font")
-        font: Qt.font({ family: selectFont.text, pointSize: fontSize.value, weight: Font.Normal })
+        signal setFont
+
         onAccepted: {
             selectFont.text = fontDialog.font.family
             fontSize.value = fontDialog.font.pointSize
             fontStyle.currentIndex = fontDialog.font.italic ? 1 : 0
             fontWeight.currentIndex = weight[fontDialog.font.weight]
         }
+        onSetFont: {
+            fontDialog.font = Qt.font({
+                family: selectFont.text,
+                pointSize: fontSize.value > 0 ? fontSize.value : 12,
+                italic: fontStyle.currentIndex == 1,
+                weight: Font.Normal,
+            })
+        }
     }
 
     Component.onCompleted: {

sources/plasmoid-kf5/package/contents/ui/dataengine.qml

@@ -21,19 +21,23 @@ import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles
 
-import org.kde.plasma.netctl 1.0
+import org.kde.plasma.private.netctl 1.0
 
 
 Item {
     id: dataenginePage
+    // backend
+    NetctlAdds {
+        id: netctlAdds;
+    }
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: NetctlAdds.isDebugEnabled()
+    property bool debug: netctlAdds.isDebugEnabled()
 
-    property variant cfg_dataengine: NetctlAdds.readDataEngineConfiguration()
+    property variant cfg_dataengine: netctlAdds.readDataEngineConfiguration()
 
     Column {
         id: pageColumn
@@ -228,6 +232,6 @@ Item {
     Component.onDestruction: {
         cfg_dataengine["EXTIP4"] = extIp4.checked ? "true" : "false"
         cfg_dataengine["EXTIP6"] = extIp6.checked ? "true" : "false"
-        NetctlAdds.writeDataEngineConfiguration(cfg_dataengine)
+        netctlAdds.writeDataEngineConfiguration(cfg_dataengine)
     }
 }

sources/plasmoid-kf5/package/contents/ui/main.qml

@@ -22,15 +22,19 @@ import org.kde.plasma.plasmoid 2.0
 import org.kde.plasma.core 2.0 as PlasmaCore
 import org.kde.plasma.components 2.0 as PlasmaComponents
 
-import org.kde.plasma.netctl 1.0
+import org.kde.plasma.private.netctl 1.0
 
 
 Item {
     id: main
+    // backend
+    NetctlAdds {
+        id: netctlAdds;
+    }
 
     // variables
     // internal
-    property bool debug: NetctlAdds.isDebugEnabled()
+    property bool debug: netctlAdds.isDebugEnabled()
     property variant fontWeight: {
         "light": Font.Light,
         "normal": Font.Normal,
@@ -52,8 +56,9 @@ Item {
     }
     property string sudoPath: plasmoid.configuration.useSudo ? plasmoid.configuration.sudoPath : ""
     // signals
-    signal needUpdate
+    signal needIconUpdate(string newIcon)
-    signal needMenuUpdate
+    signal needTextUpdate(string newText, string newToolTip)
+    signal needMenuUpdate(string current, string stringStatus, bool status)
 
     // init
     Plasmoid.icon: iconPath["false"]
@@ -71,7 +76,7 @@ Item {
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
 
-            NetctlAdds.setDataBySource(sourceName, data)
+            netctlAdds.setDataBySource(sourceName, data)
         }
     }
 
@@ -92,6 +97,7 @@ Item {
             font.pointSize: plasmoid.configuration.fontSize
             font.weight: fontWeight[plasmoid.configuration.fontWeight]
             horizontalAlignment: align[plasmoid.configuration.textAlign]
+            renderType: Text.NativeRendering
             textFormat: Text.RichText
             text: "N\\A"
         }
@@ -109,28 +115,30 @@ Item {
         plasmoid.setAction("restartProfile", i18n("Restart profile"), "view-refresh")
         plasmoid.setAction("enableProfile", i18n("Enable profile"))
         plasmoid.setAction("startWifi", i18n("Show WiFi menu"), "netctl-gui-wifi")
-        // helper
+        // init submodule
-        if (plasmoid.configuration.useHelper) {
+        Plasmoid.userConfiguringChanged(false)
-            NetctlAdds.runCmd(plasmoid.configuration.helperPath)
+
-            plasmoid.configuration.useHelper = NetctlAdds.checkHelperStatus()
+        netctlAdds.needIconToBeUpdated.connect(needIconUpdate)
+        netctlAdds.needMenuUpdate.connect(needMenuUpdate)
+        netctlAdds.needTextToBeUpdated.connect(needTextUpdate)
     }
 
-        NetctlAdds.needToBeUpdated.connect(needUpdate)
+    onNeedIconUpdate: {
+        if (debug) console.log("[main::onNeedIconUpdate]")
+
+        icon.source = iconPath[newIcon]
+        Plasmoid.icon = iconPath[newIcon]
     }
 
-    onNeedUpdate: {
+    onNeedTextUpdate: {
-        if (debug) console.log("[main::onNeedUpdate]")
+        if (debug) console.log("[main::onNeedTextUpdate]")
 
-        var iconStatus = NetctlAdds.valueByKey("active")
+        text.text = newText
-        icon.source = iconPath[iconStatus]
+        Plasmoid.toolTipSubText = newToolTip
-        Plasmoid.icon = iconPath[iconStatus]
-        text.text = NetctlAdds.parsePattern(plasmoid.configuration.textPattern)
-        Plasmoid.toolTipSubText = NetctlAdds.valueByKey("info")
-        needMenuUpdate()
     }
 
     onNeedMenuUpdate: {
-        if (debug) console.log("[main::onNetctlStateChanged]")
+        if (debug) console.log("[main::onNeedMenuUpdate]")
 
         var titleAction = plasmoid.action("titleAction")
         var startAction = plasmoid.action("startProfile")
@@ -141,10 +149,6 @@ Item {
         var enableAction = plasmoid.action("enableProfile")
         var wifiAction = plasmoid.action("startWifi")
 
-        var current = NetctlAdds.valueByKey("current")
-        var status = NetctlAdds.valueByKey("active") == "true"
-        var stringStatus = NetctlAdds.valueByKey("status")
-
         titleAction.iconSource = plasmoid.icon
         titleAction.text = current + " " + stringStatus
 
@@ -186,16 +190,29 @@ Item {
         wifiAction.visible = plasmoid.configuration.useWifi
     }
 
+    Plasmoid.onUserConfiguringChanged: {
+        if (plasmoid.userConfiguring) return
+        if (debug) console.log("[main::onUserConfiguringChanged]")
+
+        // helper
+        if (plasmoid.configuration.useHelper) {
+            netctlAdds.runCmd(plasmoid.configuration.helperPath)
+            plasmoid.configuration.useHelper = netctlAdds.checkHelperStatus()
+        }
+        // init submodule
+        netctlAdds.setPattern(plasmoid.configuration.textPattern)
+    }
+
     function action_titleAction() {
         if (debug) console.log("[main::action_titleAction]")
 
-        NetctlAdds.runCmd(plasmoid.configuration.guiPath)
+        netctlAdds.runCmd(plasmoid.configuration.guiPath)
     }
 
     function action_startProfile() {
         if (debug) console.log("[main::action_startProfile]")
 
-        NetctlAdds.startProfileSlot(plasmoid.configuration.useHelper,
+        netctlAdds.startProfileSlot(plasmoid.configuration.useHelper,
                                     plasmoid.configuration.netctlPath,
                                     sudoPath)
     }
@@ -203,7 +220,7 @@ Item {
     function action_stopProfile() {
         if (debug) console.log("[main::action_stopProfile]")
 
-        NetctlAdds.stopProfileSlot(plasmoid.configuration.useHelper,
+        netctlAdds.stopProfileSlot(plasmoid.configuration.useHelper,
                                    plasmoid.configuration.netctlPath,
                                    sudoPath)
     }
@@ -211,7 +228,7 @@ Item {
     function action_stopAllProfiles() {
         if (debug) console.log("[main::action_stopAllProfiles]")
 
-        NetctlAdds.stopAllProfilesSlot(plasmoid.configuration.useHelper,
+        netctlAdds.stopAllProfilesSlot(plasmoid.configuration.useHelper,
                                        plasmoid.configuration.netctlPath,
                                        sudoPath)
     }
@@ -219,14 +236,14 @@ Item {
     function action_switchToProfile() {
         if (debug) console.log("[main::action_switchToProfile]")
 
-        NetctlAdds.switchToProfileSlot(plasmoid.configuration.useHelper,
+        netctlAdds.switchToProfileSlot(plasmoid.configuration.useHelper,
                                        plasmoid.configuration.netctlAutoPath)
     }
 
     function action_restartProfile() {
         if (debug) console.log("[main::action_restartProfile]")
 
-        NetctlAdds.restartProfileSlot(plasmoid.configuration.useHelper,
+        netctlAdds.restartProfileSlot(plasmoid.configuration.useHelper,
                                       plasmoid.configuration.netctlPath,
                                       sudoPath)
     }
@@ -234,7 +251,7 @@ Item {
     function action_enableProfile() {
         if (debug) console.log("[main::action_enableProfile]")
 
-        NetctlAdds.enableProfileSlot(plasmoid.configuration.useHelper,
+        netctlAdds.enableProfileSlot(plasmoid.configuration.useHelper,
                                      plasmoid.configuration.netctlPath,
                                      sudoPath)
     }
@@ -242,6 +259,6 @@ Item {
     function action_startWifi() {
         if (debug) console.log("[main::action_startWifi]")
 
-        NetctlAdds.runCmd(plasmoid.configuration.wifiPath)
+        netctlAdds.runCmd(plasmoid.configuration.wifiPath)
     }
 }

sources/plasmoid-kf5/package/contents/ui/widget.qml

@@ -21,17 +21,20 @@ import QtQuick.Dialogs 1.1 as QtDialogs
 import QtQuick.Layouts 1.0 as QtLayouts
 import QtQuick.Controls.Styles 1.3 as QtStyles
 
-import org.kde.plasma.netctl 1.0
+import org.kde.plasma.private.netctl 1.0
 
 
 Item {
     id: widgetPage
+    NetctlAdds {
+        id: netctlAdds;
+    }
     width: childrenRect.width
     height: childrenRect.height
     implicitWidth: pageColumn.implicitWidth
     implicitHeight: pageColumn.implicitHeight
 
-    property bool debug: NetctlAdds.isDebugEnabled()
+    property bool debug: netctlAdds.isDebugEnabled()
 
     property alias cfg_autoUpdateInterval: autoUpdate.value
     property alias cfg_guiPath: guiPath.text

sources/plasmoid-kf5/package/metadata.desktop

@@ -14,8 +14,8 @@ X-Plasma-RemoteLocation=
 X-KDE-PluginInfo-Author=Evgeniy Alekseev
 X-KDE-PluginInfo-Email=esalexeev@gmail.com
 X-KDE-PluginInfo-Name=org.kde.plasma.netctl
-X-KDE-PluginInfo-Version=1.4.8
+X-KDE-PluginInfo-Version=1.4.9
-X-KDE-PluginInfo-Website=http://arcanis.name/projects/netctl-gui
+X-KDE-PluginInfo-Website=https://arcanis.me/projects/netctl-gui
 X-KDE-PluginInfo-Category=Network
 X-KDE-PluginInfo-Depends=
 X-KDE-PluginInfo-License=GPLv3

sources/plasmoid-kf5/plugin/CMakeLists.txt

@@ -21,13 +21,12 @@ include_directories (${CMAKE_SOURCE_DIR}
                      ${Qt_INCLUDE}
                      ${Kf5_INCLUDE})
 
-file (GLOB_RECURSE SUBPROJECT_SOURCE ${PROJECT_TRDPARTY_DIR}/pdebug/*.cpp
+file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp)
-                                     *.cpp)
 file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
 add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
 target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
 
-install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/netctl)
+install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/netctl)
-install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/netctl)
+install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/netctl)
 install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})

sources/plasmoid-kf5/plugin/netctl.cpp

@@ -21,18 +21,9 @@
 #include "netctladds.h"
 
 
-static QObject *netctl_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
-{
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-
-    return new NetctlAdds();
-}
-
-
 void NetctlPlugin::registerTypes(const char *uri)
 {
-    Q_ASSERT(uri == QLatin1String("org.kde.plasma.netctl"));
+    Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.netctl"));
 
-    qmlRegisterSingletonType<NetctlAdds>(uri, 1, 0, "NetctlAdds", netctl_singletontype_provider);
+    qmlRegisterType<NetctlAdds>(uri, 1, 0, "NetctlAdds");
 }

sources/plasmoid-kf5/plugin/netctladds.cpp

@@ -27,7 +27,6 @@
 #include <QStandardPaths>
 
 #include <pdebug/pdebug.h>
-#include <pdebug/pdebug-time.h>
 
 #include "netctladds.h"
 #include "version.h"
@@ -36,13 +35,13 @@
 NetctlAdds::NetctlAdds(QObject *parent)
     : QObject(parent)
 {
-    qInstallMessageHandler(debugString);
     // debug
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
     QString debugEnv = environment.value(QString("DEBUG"), QString("no"));
     debug = (debugEnv == QString("yes"));
 
     connect(this, SIGNAL(needToNotify(bool)), this, SLOT(notifyAboutStatusChanging(bool)));
+    connect(this, SIGNAL(needToBeUpdated()), this, SLOT(parsePattern()));
 }
 
 
@@ -52,7 +51,7 @@ NetctlAdds::~NetctlAdds()
 }
 
 
-void NetctlAdds::notifyAboutStatusChanging(const bool currentStatus)
+void NetctlAdds::notifyAboutStatusChanging(const bool currentStatus) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Status" << currentStatus;
@@ -64,7 +63,21 @@ void NetctlAdds::notifyAboutStatusChanging(const bool currentStatus)
 }
 
 
-QList<QVariant> NetctlAdds::sendDBusRequest(const QString cmd, const QList<QVariant> args)
+void NetctlAdds::parsePattern() const
+{
+    if (debug) qDebug() << PDEBUG;
+
+    QString parsed = pattern;
+    foreach(QString value, values.keys())
+        parsed.replace(QString("$%1").arg(value), values[value]);
+    // fix newline
+    parsed.replace(QString("\n"), QString("<br>"));
+
+    return emit(needTextToBeUpdated(parsed, values[QString("info")]));
+}
+
+
+QVariantList NetctlAdds::sendDBusRequest(const QString cmd, const QVariantList args) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "cmd" << cmd;
@@ -73,26 +86,24 @@ QList<QVariant> NetctlAdds::sendDBusRequest(const QString cmd, const QList<QVari
     QDBusConnection bus = QDBusConnection::systemBus();
     QDBusMessage request = QDBusMessage::createMethodCall(DBUS_HELPER_SERVICE, DBUS_CTRL_PATH,
                                                           DBUS_HELPER_INTERFACE, cmd);
-    if (!args.isEmpty())
+    if (!args.isEmpty()) request.setArguments(args);
-        request.setArguments(args);
     QDBusMessage response = bus.call(request, QDBus::BlockWithGui);
-    QList<QVariant> arguments = response.arguments();
+    QVariantList arguments = response.arguments();
-    if (arguments.size() == 0)
     if (debug) qDebug() << PDEBUG << ":" << "Error message" << response.errorMessage();
 
     return arguments;
 }
 
 
-bool NetctlAdds::checkHelperStatus()
+bool NetctlAdds::checkHelperStatus() const
 {
     if (debug) qDebug() << PDEBUG;
 
-    return sendDBusRequest(QString("Active"), QList<QVariant>()).isEmpty();
+    return !sendDBusRequest(QString("Active")).isEmpty();
 }
 
 
-QString NetctlAdds::getAboutText(const QString type)
+QString NetctlAdds::getAboutText(const QString type) const
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Type" << type;
@@ -120,9 +131,9 @@ QString NetctlAdds::getAboutText(const QString type)
         QStringList trdPartyList = QString(TRDPARTY_LICENSE).split(QChar(';'), QString::SkipEmptyParts);
         for (int i=0; i<trdPartyList.count(); i++)
             trdPartyList[i] = QString("<a href=\"%3\">%1</a> (%2 license)")
-                    .arg(trdPartyList[i].split(QChar(','))[0])
+                    .arg(trdPartyList.at(i).split(QChar(',')).at(0))
-                    .arg(trdPartyList[i].split(QChar(','))[1])
+                    .arg(trdPartyList.at(i).split(QChar(',')).at(1))
-                    .arg(trdPartyList[i].split(QChar(','))[2]);
+                    .arg(trdPartyList.at(i).split(QChar(',')).at(2));
         text = i18n("This software uses: %1", trdPartyList.join(QString(", ")));
     }
 
@@ -130,7 +141,7 @@ QString NetctlAdds::getAboutText(const QString type)
 }
 
 
-bool NetctlAdds::isDebugEnabled()
+bool NetctlAdds::isDebugEnabled() const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -138,21 +149,7 @@ bool NetctlAdds::isDebugEnabled()
 }
 
 
-QString NetctlAdds::parsePattern(const QString pattern)
+void NetctlAdds::runCmd(const QString cmd) const
-{
-    if (debug) qDebug() << PDEBUG;
-
-    QString parsed = pattern;
-    for (int i=0; i<values.keys().count(); i++)
-        parsed.replace(QString("$%1").arg(values.keys()[i]), valueByKey(values.keys()[i]));
-    // fix newline
-    parsed.replace(QString("\n"), QString("<br>"));
-
-    return parsed;
-}
-
-
-void NetctlAdds::runCmd(const QString cmd)
 {
     if (debug) qDebug() << PDEBUG;
     if (debug) qDebug() << PDEBUG << ":" << "Cmd" << cmd;
@@ -174,10 +171,23 @@ void NetctlAdds::setDataBySource(const QString sourceName, const QVariantMap dat
     values[sourceName] = data[QString("value")].toString();
 
     if (needUpdate) {
-        emit(needToBeUpdated());
+        if (sourceName == QString("active")) {
-        if (sourceName == QString("active"))
             emit(needToNotify(values[QString("active")] == QString("true")));
+            emit(needIconToBeUpdated(values[QString("active")]));
         }
+        emit(needToBeUpdated());
+        emit(needMenuUpdate(values[QString("current")], values[QString("status")],
+                            values[QString("active")] == QString("true")));
+    }
+}
+
+
+void NetctlAdds::setPattern(const QString _pattern)
+{
+    if (debug) qDebug() << PDEBUG;
+    if (debug) qDebug() << PDEBUG << ":" << "Pattern" << _pattern;
+
+    pattern = _pattern;
 }
 
 
@@ -197,17 +207,8 @@ void NetctlAdds::sendNotification(const QString eventId, const QString message)
 }
 
 
-QString NetctlAdds::valueByKey(const QString key)
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Key" << key;
-
-    return values[key];
-}
-
-
 // context menu
-void NetctlAdds::enableProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd)
+void NetctlAdds::enableProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd) const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -220,82 +221,75 @@ void NetctlAdds::enableProfileSlot(const bool useHelper, const QString cmd, cons
         sendNotification(QString("Info"), i18n("Set profile %1 enabled", values[QString("current")]));
     }
     if (useHelper) {
-        QList<QVariant> args;
+        QVariantList args;
         args.append(values[QString("current")]);
         sendDBusRequest(QString("Enable"), args);
     } else {
-        QProcess command;
+        runCmd(QString("%1 %2%3%4").arg(sudoCmd).arg(cmd).arg(enableStatus).arg(values[QString("current")]));
-        QString commandLine = QString("%1 %2%3%4").arg(sudoCmd).arg(cmd).arg(enableStatus).arg(values[QString("current")]);
-        command.startDetached(commandLine);
     }
 }
 
 
-void NetctlAdds::restartProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd)
+void NetctlAdds::restartProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd) const
 {
     if (debug) qDebug() << PDEBUG;
 
     sendNotification(QString("Info"), i18n("Restart profile %1", values[QString("current")]));
     if (useHelper) {
-        QList<QVariant> args;
+        QVariantList args;
         args.append(values[QString("current")]);
         sendDBusRequest(QString("Restart"), args);
     } else {
-        QProcess command;
+        runCmd(QString("%1 %2 restart %3").arg(sudoCmd).arg(cmd).arg(values[QString("current")]));
-        QString commandLine = QString("%1 %2 restart %3").arg(sudoCmd).arg(cmd).arg(values[QString("current")]);
-        command.startDetached(commandLine);
     }
 }
 
 
-void NetctlAdds::startProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd)
+void NetctlAdds::startProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd) const
 {
     if (debug) qDebug() << PDEBUG;
 
     QStringList profiles = values[QString("profiles")].split(QChar(','));
     bool ok;
-    QString profile = QInputDialog::getItem(0, i18n("Select profile"), i18n("Profile:"),
+    QString profile = QInputDialog::getItem(nullptr, i18n("Select profile"), i18n("Profile:"),
                                             profiles, 0, false, &ok);
     if (!ok || profile.isEmpty()) return;
 
     sendNotification(QString("Info"), i18n("Start profile %1", profile));
     if (useHelper) {
-        QList<QVariant> args;
+        QVariantList args;
         args.append(profile);
         if (values[QString("active")] == QString("true"))
             sendDBusRequest(QString("SwitchTo"), args);
         else
             sendDBusRequest(QString("Start"), args);
     } else {
-        QProcess command;
         QString commandLine = QString("%1 %2").arg(sudoCmd).arg(cmd);
         if (values[QString("active")] == QString("true"))
             commandLine += QString(" switch-to %1").arg(profile);
         else
             commandLine += QString(" start %1").arg(profile);
-        command.startDetached(commandLine);
+        runCmd(commandLine);
     }
 }
 
 
-void NetctlAdds::stopProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd)
+void NetctlAdds::stopProfileSlot(const bool useHelper, const QString cmd, const QString sudoCmd) const
 {
     if (debug) qDebug() << PDEBUG;
 
     sendNotification(QString("Info"), i18n("Stop profile %1", values[QString("current")]));
     if (useHelper) {
-        QList<QVariant> args;
+        QVariantList args;
         args.append(values[QString("current")]);
         sendDBusRequest(QString("Start"), args);
     } else {
-        QProcess command;
+        runCmd(QString("%1 %2 stop %3").arg(sudoCmd).arg(cmd).arg(values[QString("current")]));
-        QString commandLine = QString("%1 %2 stop %3").arg(sudoCmd).arg(cmd).arg(values[QString("current")]);
-        command.startDetached(commandLine);
     }
 }
 
 
-void NetctlAdds::stopAllProfilesSlot(const bool useHelper, const QString cmd, const QString sudoCmd)
+void NetctlAdds::stopAllProfilesSlot(const bool useHelper, const QString cmd, const QString sudoCmd) const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -303,37 +297,33 @@ void NetctlAdds::stopAllProfilesSlot(const bool useHelper, const QString cmd, co
     if (useHelper)
         sendDBusRequest(QString("StopAll"), QList<QVariant>());
     else {
-        QProcess command;
+        runCmd(QString("%1 %2 stop-all").arg(sudoCmd).arg(cmd));
-        QString commandLine = QString("%1 %2 stop-all").arg(sudoCmd).arg(cmd);
-        command.startDetached(commandLine);
     }
 }
 
 
-void NetctlAdds::switchToProfileSlot(const bool useHelper, const QString cmd)
+void NetctlAdds::switchToProfileSlot(const bool useHelper, const QString cmd) const
 {
     if (debug) qDebug() << PDEBUG;
 
     QStringList profiles = values[QString("profiles")].split(QChar(','));
     bool ok;
-    QString profile = QInputDialog::getItem(0, i18n("Select profile"), i18n("Profile:"),
+    QString profile = QInputDialog::getItem(nullptr, i18n("Select profile"), i18n("Profile:"),
                                             profiles, 0, false, &ok);
     if (!ok || profile.isEmpty()) return;
 
     sendNotification(QString("Info"), i18n("Switch to profile %1", profile));
     if (useHelper) {
-        QList<QVariant> args;
+        QVariantList args;
         args.append(profile);
         sendDBusRequest(QString("autoStart"), args);
     } else {
-        QProcess command;
+        runCmd(QString("%1 switch-to %2").arg(cmd).arg(profile));
-        QString commandLine = QString("%1 switch-to %2").arg(cmd).arg(profile);
-        command.startDetached(commandLine);
     }
 }
 
 
-QVariantMap NetctlAdds::readDataEngineConfiguration()
+QVariantMap NetctlAdds::readDataEngineConfiguration() const
 {
     if (debug) qDebug() << PDEBUG;
 
@@ -359,7 +349,7 @@ QVariantMap NetctlAdds::readDataEngineConfiguration()
 }
 
 
-void NetctlAdds::writeDataEngineConfiguration(const QVariantMap configuration)
+void NetctlAdds::writeDataEngineConfiguration(const QVariantMap configuration) const
 {
     if (debug) qDebug() << PDEBUG;
 

sources/plasmoid-kf5/plugin/netctladds.h

@@ -32,47 +32,52 @@ public:
     NetctlAdds(QObject *parent = 0);
     ~NetctlAdds();
 
-    Q_INVOKABLE bool checkHelperStatus();
+    Q_INVOKABLE bool checkHelperStatus() const;
-    Q_INVOKABLE QString getAboutText(const QString type = "header");
+    Q_INVOKABLE QString getAboutText(const QString type = QString("header")) const;
-    Q_INVOKABLE bool isDebugEnabled();
+    Q_INVOKABLE bool isDebugEnabled() const;
-    Q_INVOKABLE QString parsePattern(const QString pattern);
+    Q_INVOKABLE void runCmd(const QString cmd) const;
-    Q_INVOKABLE void runCmd(const QString cmd);
     Q_INVOKABLE void setDataBySource(const QString sourceName, const QVariantMap data);
+    Q_INVOKABLE void setPattern(const QString _pattern);
     Q_INVOKABLE static void sendNotification(const QString eventId, const QString message);
-    Q_INVOKABLE QString valueByKey(const QString key);
     // context menu
     Q_INVOKABLE void enableProfileSlot(const bool useHelper = true,
                                        const QString cmd = QString("netctl"),
-                                       const QString sudoCmd = QString(""));
+                                       const QString sudoCmd = QString("")) const;
     Q_INVOKABLE void restartProfileSlot(const bool useHelper = true,
                                         const QString cmd = QString("netctl"),
-                                        const QString sudoCmd = QString(""));
+                                        const QString sudoCmd = QString("")) const;
     Q_INVOKABLE void startProfileSlot(const bool useHelper = true,
                                       const QString cmd = QString("netctl"),
-                                      const QString sudoCmd = QString(""));
+                                      const QString sudoCmd = QString("")) const;
     Q_INVOKABLE void stopProfileSlot(const bool useHelper = true,
                                      const QString cmd = QString("netctl"),
-                                     const QString sudoCmd = QString(""));
+                                     const QString sudoCmd = QString("")) const;
     Q_INVOKABLE void stopAllProfilesSlot(const bool useHelper = true,
                                          const QString cmd = QString("netctl"),
-                                         const QString sudoCmd = QString(""));
+                                         const QString sudoCmd = QString("")) const;
     Q_INVOKABLE void switchToProfileSlot(const bool useHelper = true,
-                                         const QString cmd = QString("netctl-auto"));
+                                         const QString cmd = QString("netctl-auto")) const;
     // dataengine
-    Q_INVOKABLE QVariantMap readDataEngineConfiguration();
+    Q_INVOKABLE QVariantMap readDataEngineConfiguration() const;
-    Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration);
+    Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration) const;
 
 signals:
-    void needToBeUpdated();
+    void needIconToBeUpdated(const QString newIcon) const;
-    void needToNotify(const bool currentStatus);
+    void needMenuUpdate(const QString current, const QString status, const bool isActive) const;
+    void needTextToBeUpdated(const QString newText, const QString newToolTip) const;
+    void needToBeUpdated() const;
+    void needToNotify(const bool currentStatus) const;
 
 private slots:
-    void notifyAboutStatusChanging(const bool currentStatus);
+    void notifyAboutStatusChanging(const bool currentStatus) const;
+    void parsePattern() const;
 
 private:
     bool debug = false;
-    QList<QVariant> sendDBusRequest(const QString cmd, const QList<QVariant> args = QList<QVariant>());
+    QVariantList sendDBusRequest(const QString cmd,
-    QMap<QString, QString> values;
+                                 const QVariantList args = QVariantList()) const;
+    QString pattern;
+    QHash<QString, QString> values;
 };
 
 

sources/plasmoid-kf5/plugin/qmldir

@@ -1,3 +1,3 @@
-module org.kde.plasma.netctl
+module org.kde.plasma.private.netctl
 
 plugin netctlplugin

sources/test/testnetctl.cpp

@@ -133,7 +133,7 @@ void TestNetctl::test_getActiveProfile()
     QStringList result = netctl->getActiveProfile();
     QStringList dbus;
     if (helper)
-        dbus = sendDBusRequest(QString("/netctl"), QString("netctlActiveProfile"))[0].toString().split(QChar('|'));
+        dbus = sendDBusRequest(QString("/netctl"), QString("netctlActiveProfile"))[0].toStringList();
     netctl->startProfile(QString("netctlgui-test-dummy"));
     delete netctl;
 

sources/version.h.in

@@ -12,7 +12,7 @@
 #define DOCS_PATH "@CMAKE_INSTALL_PREFIX@/share/doc/netctl-gui/"
 
 // links
-#define HOMEPAGE "http://arcanis.name/projects/netctl-gui/"
+#define HOMEPAGE "https://arcanis.me/projects/netctl-gui/"
 #define REPOSITORY "https://github.com/arcan1s/netctl-gui"
 #define BUGTRACKER "https://github.com/arcan1s/netctl-gui/issues"
 #define TRANSLATION "https://github.com/arcan1s/netctl-gui/issues/3"