+ new Verbose* DBus calls

+ new force request to netctl (DBus)
+ PointType enum
+ notification on hidding,
+ new columns in WiFi menu
* improve user expierence
* fix language definition
* fix tests
* update 3rdparty components
* small refactoring

sources/helper/src/controladaptor.cpp

@@ -53,7 +53,7 @@ bool ControlAdaptor::Active()
 
 QString ControlAdaptor::ApiDocs()
 {
-    return (QString(DOCS_PATH) + QString("netctl-gui-dbus-api.html"));
+    return (QString("%1netctl-gui-dbus-api.html").arg(QString(DOCS_PATH)));
 }
 
 
@@ -82,8 +82,7 @@ QStringList ControlAdaptor::FindSettings()
 
     QStringList settingsList;
     for (int i=0; i<configuration.keys().count(); i++)
-        settingsList.append(configuration.keys()[i] + QString("==") +
-                            configuration[configuration.keys()[i]]);
+        settingsList.append(QString("%1==%2").arg(configuration.keys()[i]).arg(configuration[configuration.keys()[i]]));
 
     return settingsList;
 }
@@ -91,7 +90,7 @@ QStringList ControlAdaptor::FindSettings()
 
 QString ControlAdaptor::LibraryDocs()
 {
-    return (QString(DOCS_PATH) + QString("html/index.html"));
+    return (QString("html/index.html").arg(QString(DOCS_PATH)));
 }
 
 
@@ -99,8 +98,7 @@ QString ControlAdaptor::Pony()
 {
     QString pony;
     QFile ponyFile(QString(":pinkiepie"));
-    if (!ponyFile.open(QIODevice::ReadOnly))
-        return pony;
+    if (!ponyFile.open(QIODevice::ReadOnly)) return pony;
     pony = QTextCodec::codecForMib(106)->toUnicode(ponyFile.readAll());
     ponyFile.close();
 
@@ -110,7 +108,7 @@ QString ControlAdaptor::Pony()
 
 QString ControlAdaptor::SecurityDocs()
 {
-    return (QString(DOCS_PATH) + QString("netctl-gui-security-notes.html"));
+    return (QString("%1netctl-gui-security-notes.html").arg(QString(DOCS_PATH)));
 }
 
 
@@ -251,7 +249,7 @@ bool ControlAdaptor::Remove(const QString profile)
 
 
 // wpaCommand
-QStringList ControlAdaptor::WiFi()
+QStringList ControlAdaptor::VerboseWiFi()
 {
     QList<netctlWifiInfo> wifiPoints = wpaCommand->scanWifi();
     QStringList info;
@@ -259,7 +257,11 @@ QStringList ControlAdaptor::WiFi()
         QStringList point;
         point.append(wifiPoints[i].name);
         point.append(wifiPoints[i].security);
-        point.append(wifiPoints[i].frequencies.join(QChar(',')));
+        point.append(QString::number(wifiPoints[i].type));
+        QStringList freqList;
+        for (int j=0; j<wifiPoints[i].frequencies.count(); j++)
+            freqList.append(QString::number(wifiPoints[i].frequencies[j]));
+        point.append(freqList.join(QChar(',')));
         point.append(wifiPoints[i].macs.join(QChar(',')));
         point.append(QString::number(wifiPoints[i].signal));
         point.append(QString::number(wifiPoints[i].active));
@@ -269,3 +271,21 @@ QStringList ControlAdaptor::WiFi()
 
     return info;
 }
+
+
+QStringList ControlAdaptor::WiFi()
+{
+    QList<netctlWifiInfo> wifiPoints = wpaCommand->scanWifi();
+    QStringList info;
+    for (int i=0; i<wifiPoints.count(); i++) {
+        QStringList point;
+        point.append(wifiPoints[i].name);
+        point.append(wifiPoints[i].security);
+        point.append(QString::number(wifiPoints[i].signal));
+        point.append(QString::number(wifiPoints[i].active));
+        point.append(QString::number(wifiPoints[i].exists));
+        info.append(point.join(QChar('|')));
+    }
+
+    return info;
+}

sources/helper/src/controladaptor.h

@@ -68,6 +68,7 @@ public slots:
     bool Create(const QString profile, const QStringList settingsList);
     bool Remove(const QString profile);
     // wpaCommand
+    QStringList VerboseWiFi();
     QStringList WiFi();
 
 private:

sources/helper/src/main.cpp

@@ -110,10 +110,10 @@ int main(int argc, char *argv[])
     QString language = Language::defineLanguage(args[QString("config")].toString(),
             args[QString("options")].toString());
     QTranslator qtTranslator;
-    qtTranslator.load(QString("qt_") + language, QLibraryInfo::location(QLibraryInfo::TranslationsPath));
+    qtTranslator.load(QString("qt_%1").arg(language), QLibraryInfo::location(QLibraryInfo::TranslationsPath));
     a.installTranslator(&qtTranslator);
     QTranslator translator;
-    translator.load(QString(":/translations-helper/") + language);
+    translator.load(QString(":/translations-helper/%1").arg(language));
     a.installTranslator(&translator);
 
     // running

sources/helper/src/messages.cpp

@@ -32,7 +32,7 @@ QString errorMessage()
 QMap<QString, QVariant> getArgs()
 {
     QMap<QString, QVariant> args;
-    args[QString("config")] = QString(QDir::homePath() + QString("/.config/netctl-gui.conf"));
+    args[QString("config")] = QString("%1/.config/netctl-gui.conf").arg(QDir::homePath());
     args[QString("debug")] = false;
     args[QString("nodaemon")] = false;
     args[QString("session")] = false;

sources/helper/src/netctladaptor.cpp

@@ -106,7 +106,69 @@ bool NetctlAdaptor::isProfileEnabled(const QString profile)
 }
 
 
+QString NetctlAdaptor::netctlActiveProfile()
+{
+    return netctlCommand->getActiveProfile().join(QChar('|'));
+}
+
+
+QStringList NetctlAdaptor::netctlProfileList()
+{
+    QList<netctlProfileInfo> profilesInfo = netctlCommand->getProfileList();
+    QStringList info;
+    for (int i=0; i<profilesInfo.count(); i++) {
+        QStringList profileInfo;
+        profileInfo.append(profilesInfo[i].name);
+        profileInfo.append(profilesInfo[i].description);
+        profileInfo.append(QString::number(profilesInfo[i].active));
+        profileInfo.append(QString::number(profilesInfo[i].enabled));
+        info.append(profileInfo.join(QChar('|')));
+    }
+
+    return info;
+}
+
+
+QStringList NetctlAdaptor::netctlVerboseProfileList()
+{
+    QList<netctlProfileInfo> profilesInfo = netctlCommand->getProfileList();
+    QStringList info;
+    for (int i=0; i<profilesInfo.count(); i++) {
+        QStringList profileInfo;
+        profileInfo.append(profilesInfo[i].name);
+        profileInfo.append(profilesInfo[i].description);
+        profileInfo.append(profilesInfo[i].essid);
+        profileInfo.append(QString::number(profilesInfo[i].active));
+        profileInfo.append(QString::number(profilesInfo[i].enabled));
+        info.append(profileInfo.join(QChar('|')));
+    }
+
+    return info;
+}
+
+
 QStringList NetctlAdaptor::ProfileList()
+{
+    QList<netctlProfileInfo> profilesInfo;
+    if (isNetctlAutoActive())
+        profilesInfo = netctlCommand->getProfileListFromNetctlAuto();
+    else
+        profilesInfo = netctlCommand->getProfileList();
+    QStringList info;
+    for (int i=0; i<profilesInfo.count(); i++) {
+        QStringList profileInfo;
+        profileInfo.append(profilesInfo[i].name);
+        profileInfo.append(profilesInfo[i].description);
+        profileInfo.append(QString::number(profilesInfo[i].active));
+        profileInfo.append(QString::number(profilesInfo[i].enabled));
+        info.append(profileInfo.join(QChar('|')));
+    }
+
+    return info;
+}
+
+
+QStringList NetctlAdaptor::VerboseProfileList()
 {
     QList<netctlProfileInfo> profilesInfo;
     if (isNetctlAutoActive())
@@ -134,8 +196,7 @@ QStringList NetctlAdaptor::Profile(const QString profile)
     QMap<QString, QString> settings = netctlProfile->getSettingsFromProfile(profile);
     QStringList settingsList;
     for (int i=0; i<settings.keys().count(); i++)
-        settingsList.append(settings.keys()[i] + QString("==") +
-                            settings[settings.keys()[i]]);
+        settingsList.append(QString("%1==%2").arg(settings.keys()[i]).arg(settings[settings.keys()[i]]));
 
     return settingsList;
 }

sources/helper/src/netctladaptor.h

@@ -46,7 +46,11 @@ public slots:
     bool isNetctlAutoEnabled();
     bool isProfileActive(const QString profile);
     bool isProfileEnabled(const QString profile);
+    QString netctlActiveProfile();
+    QStringList netctlProfileList();
+    QStringList netctlVerboseProfileList();
     QStringList ProfileList();
+    QStringList VerboseProfileList();
     // netctlProfile
     QStringList Profile(const QString profile);
     QString ProfileValue(const QString profile, const QString key);

sources/helper/src/netctlhelper.cpp

@@ -40,8 +40,7 @@ NetctlHelper::NetctlHelper(QObject *parent, QMap<QString, QVariant> args)
       system(args[QString("system")].toBool())
 {
     updateConfiguration();
-    if (!args[QString("nodaemon")].toBool())
-        daemon(0, 0);
+    if (!args[QString("nodaemon")].toBool()) daemon(0, 0);
 }
 
 
@@ -59,8 +58,7 @@ QStringList NetctlHelper::printSettings()
 
     QStringList settingsList;
     for (int i=0; i<configuration.keys().count(); i++)
-        settingsList.append(configuration.keys()[i] + QString("==") +
-                            configuration[configuration.keys()[i]]);
+        settingsList.append(QString("%1==%2").arg(configuration.keys()[i]).arg(configuration[configuration.keys()[i]]));
 
     return settingsList;
 }
@@ -179,8 +177,7 @@ QMap<QString, QString> NetctlHelper::getSettings(const QString file)
     settings.endGroup();
 
     for (int i=0; i<config.keys().count(); i++)
-        if (debug) qDebug() << PDEBUG << ":" << config.keys()[i] + QString("=") +
-                               config[config.keys()[i]];
+        if (debug) qDebug() << PDEBUG << ":" << QString("%1=%2").arg(config.keys()[i]).arg(config[config.keys()[i]]);
 
     return config;
 }