From d3e1c4bca07a0362788ce56f6387f73dd9e17258 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Wed, 13 Aug 2014 11:41:30 +0400 Subject: [PATCH] add FindSettings key --- sources/gui/docs/netctl-gui-dbus-api.html | 5 + sources/helper/src/controladaptor.cpp | 25 ++++ sources/helper/src/controladaptor.h | 1 + .../include/netctlgui/netctlinteract.h | 5 + .../include/netctlgui/netctlprofile.h | 5 + sources/netctlgui/src/netctlinteract.cpp | 115 ++++++++++++++++++ sources/netctlgui/src/netctlprofile.cpp | 57 +++++++++ 7 files changed, 213 insertions(+) diff --git a/sources/gui/docs/netctl-gui-dbus-api.html b/sources/gui/docs/netctl-gui-dbus-api.html index 1097d38..39f8b0c 100644 --- a/sources/gui/docs/netctl-gui-dbus-api.html +++ b/sources/gui/docs/netctl-gui-dbus-api.html @@ -71,6 +71,11 @@ th.sub { true and closes the helper no + + QStringList FindSettings() + scans system and suggests the recommended configuration which will be used by the library + no + QString LibraryDocs() returns path to the library documentation diff --git a/sources/helper/src/controladaptor.cpp b/sources/helper/src/controladaptor.cpp index e8cface..a5cf4af 100644 --- a/sources/helper/src/controladaptor.cpp +++ b/sources/helper/src/controladaptor.cpp @@ -64,6 +64,31 @@ bool ControlAdaptor::Close() } +QStringList ControlAdaptor::FindSettings() +{ + QMap configuration; + // apply settings from Netctl class + QMap librarySettings = netctlCommand->getRecommendedConfiguration(); + for (int i=0; igetRecommendedConfiguration(); + for (int i=0; igetRecommendedConfiguration(); + for (int i=0; i getRecommendedConfiguration(); /** * @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 diff --git a/sources/netctlgui/include/netctlgui/netctlprofile.h b/sources/netctlgui/include/netctlgui/netctlprofile.h index 3e08c83..7342b14 100644 --- a/sources/netctlgui/include/netctlgui/netctlprofile.h +++ b/sources/netctlgui/include/netctlgui/netctlprofile.h @@ -67,6 +67,11 @@ public: * @return temporary profile name */ QString createProfile(const QString profile, const QMap settings); + /** + * @brief method which check system configuration and return recommended values to keys + * @return recommended parametrs + */ + static QMap getRecommendedConfiguration(); /** * @brief method which reads settings from profile * @param profile profile name diff --git a/sources/netctlgui/src/netctlinteract.cpp b/sources/netctlgui/src/netctlinteract.cpp index 00232e0..6384796 100644 --- a/sources/netctlgui/src/netctlinteract.cpp +++ b/sources/netctlgui/src/netctlinteract.cpp @@ -24,6 +24,7 @@ #include +#include #include "netctlgui.h" #include "pdebug.h" @@ -386,6 +387,120 @@ bool Netctl::isNetctlAutoRunning() } +/** + * @fn getRecommendedConfiguration + */ +QMap Netctl::getRecommendedConfiguration() +{ + QMap settings; + QString cmd; + TaskResult process; + QStringList recommended; + // force sudo + // find out helper exe + settings[QString("FORCE_SUDO")] = QString("true"); + recommended.clear(); + recommended.append(QString("netctlgui-helper")); + recommended.append(QString("netctlgui-helper-suid")); + for (int i=0; i +#include #include #include #include @@ -132,6 +133,62 @@ QString NetctlProfile::createProfile(const QString profile, const QMap NetctlProfile::getRecommendedConfiguration() +{ + QMap settings; + QString cmd; + TaskResult process; + QStringList recommended; + // force sudo + // find out helper exe + settings[QString("FORCE_SUDO")] = QString("true"); + recommended.clear(); + recommended.append(QString("netctlgui-helper")); + recommended.append(QString("netctlgui-helper-suid")); + for (int i=0; i