release 1.3.1

1) systemd-user doesn't work correctly with session bus
2) systemd-user cannot set capabilities

.gitmodules

@@ -0,0 +1,12 @@
+[submodule "sources/3rdparty/tasks"]
+	path = sources/3rdparty/tasks
+	url = https://github.com/mhogomchungu/tasks.git
+[submodule "sources/3rdparty/pdebug"]
+	path = sources/3rdparty/pdebug
+	url = https://github.com/arcan1s/qtadds-pdebug.git
+[submodule "sources/3rdparty/language"]
+	path = sources/3rdparty/language
+	url = https://github.com/arcan1s/qtadds-language.git
+[submodule "sources/3rdparty/task"]
+	path = sources/3rdparty/task
+	url = https://github.com/arcan1s/qtadds-taskadds-qprocess.git

CHANGELOG

@@ -1,3 +1,15 @@
+Ver.1.3.1
+---------
+* gui:
+    * more correct calls of boolean DBus methods
+    * edit helper icon
+* helper:
+    * more correct calls of boolean DBus methods
+    * more correct systemd service
+    * add ability to create session bus
+
+***
+
 Ver.1.3.0
 ---------
 * all:
@@ -46,7 +58,7 @@ Ver.1.3.0
     - remove SleepThread class
     * rewrite to use [tasks](https://github.com/mhogomchungu/tasks) (see #7)
     * rename getInterfaceList() to getWirelessInterfaceList()
-    * change temporaty directory from $HOME/.cache to system one
+    * change temporary directory from $HOME/.cache to system one
 * plasmoid:
     + add 3rd party license information
     + allow plasmoid to use system tray

arch/PKGBUILD

@@ -4,7 +4,7 @@ pkgbase=netctl-gui
 pkgname=('libnetctlgui' 'netctlgui-helper' 'netctl-gui'
          'libnetctlgui-qt4' 'netctlgui-helper-qt4' 'netctl-gui-qt4'
          'kdeplasma-applets-netctl-gui')
-pkgver=1.3.0
+pkgver=1.3.1
 pkgrel=1
 pkgdesc="Qt4/Qt5 GUI for netctl. Also provides a widget for KDE"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ url="http://arcanis.name/projects/netctl-gui"
 license=('GPL3')
 makedepends=('automoc4' 'cmake' 'kdelibs' 'qt5-base' 'qt5-tools')
 source=("https://github.com/arcan1s/netctl-gui/releases/download/V.${pkgver}/${pkgbase}-${pkgver}-src.tar.xz")
-md5sums=('9b56b04258855258ed30549f1039b8f8')
+md5sums=('d57bf3773f6cd9ead91c2669a02360fb')
 
 
 prepare() {
@@ -84,7 +84,8 @@ package_netctlgui-helper() {
   depends=('libnetctlgui')
   provides=('netctlgui-helper-qt4')
   conflicts=('netctlgui-helper-qt4')
-  backup=('etc/netctlgui-helper.conf')
+  backup=('etc/netctlgui-helper.conf'
+          'etc/dbus-1/system.d/org.netctlgui.helper.conf')
   install="netctlgui-helper.install"
 
   cd "${srcdir}/build-qt5/helper"
@@ -126,7 +127,8 @@ package_netctlgui-helper-qt4() {
   depends=('libnetctlgui-qt4')
   provides=('netctlgui-helper')
   conflicts=('netctlgui-helper')
-  backup=('etc/netctlgui-helper.conf')
+  backup=('etc/netctlgui-helper.conf'
+          'etc/dbus-1/system.d/org.netctlgui.helper.conf')
   install="netctlgui-helper.install"
 
   cd "${srcdir}/build-qt4/helper"

arch/libnetctlgui.install

@@ -1,5 +1,5 @@
 post_install() {
-  xdg-icon-resource forceupdate --theme hicolor 2> /dev/null
+  true
 }
 
 post_upgrade() {

arch/netctlgui-helper.install

@@ -1,5 +1,9 @@
 post_install() {
   setcap cap_setuid=ep usr/bin/netctlgui-helper 2>/dev/null || chmod +s usr/bin/ping
+  cat << EOF
+Note: users should be in network group if you want to get them access to the system bus
+See http://arcanis.name/devs/netctl-gui-security-notes.html#helper
+EOF
 }
 
 post_upgrade() {

create_archive.sh

@@ -3,10 +3,12 @@
 ARCHIVE="netctl-gui"
 SRCDIR="sources"
 FILES="AUTHORS CHANGELOG COPYING README.md"
-IGNORELIST="build en.qm ru.qm netctl-gui.qm *.cppcheck"
+IGNORELIST="build *.qm *.cppcheck .git*"
 VERSION=$(grep -m1 PROJECT_VERSION_MAJOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_MINOR sources/CMakeLists.txt | awk '{print $3}' | cut -c 1).\
 $(grep -m1 PROJECT_VERSION_PATCH sources/CMakeLists.txt | awk '{print $3}' | cut -c 1)
+# update submodules
+git submodule update --init --recursive
 # create archive
 [[ -e ${ARCHIVE}-${VERSION}-src.tar.xz ]] && rm -f "${ARCHIVE}-${VERSION}-src.tar.xz"
 [[ -d ${ARCHIVE} ]] && rm -rf "${ARCHIVE}"

sources/3rdparty/language-config.h

@@ -0,0 +1,12 @@
+#ifndef LANGUAGE_CONFIG_H
+#define LANGUAGE_CONFIG_H
+
+
+// put your languages here comma separated
+// the first language is default language
+#define LANGUAGES "en,ru"
+// language key in the configuration file
+#define LANGUAGE_KEY "LANGUAGE"
+
+
+#endif /* LANGUAGE_CONFIG_H */

sources/3rdparty/language/language.cpp

@@ -1,115 +0,0 @@
-/***************************************************************************
- *   This file is part of netctl-gui                                       *
- *                                                                         *
- *   netctl-gui is free software: you can redistribute it and/or           *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   netctl-gui is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
- ***************************************************************************/
-
-
-#include "language.h"
-
-#include <QFile>
-#include <QLocale>
-
-
-Language::Language()
-{
-}
-
-
-QString Language::checkLanguage(const QString language, const QString defaultLanguage)
-{
-    QStringList availableLanguages = getAvailableLanguages();
-    for (int i=0; i<availableLanguages.count(); i++)
-        if (language == availableLanguages[i])
-            return availableLanguages[i];
-    for (int i=0; i<availableLanguages.count(); i++)
-        if (language.contains(availableLanguages[i] + QChar('_')))
-            return availableLanguages[i];
-
-    return defaultLanguage;
-}
-
-
-QString Language::defineLanguage(const QString configPath, const QString options)
-{
-    QMap<QString, QString> optionsDict = parseOptions(options);
-    if (optionsDict.contains(QString("LANGUAGE")))
-        if (getAvailableLanguages().contains(optionsDict[QString("LANGUAGE")]))
-            return optionsDict[QString("LANGUAGE")];
-
-    QString language;
-    language = defineLanguageFromFile(configPath);
-    if (language.isEmpty())
-        language = defineLanguageFromLocale();
-    language = checkLanguage(language, QString("en"));
-
-    return language;
-}
-
-
-QString Language::defineLanguageFromFile(const QString configPath)
-{
-    QMap<QString, QString> settings;
-    if (configPath.isEmpty())
-        return QString("");
-    QFile configFile(configPath);
-    QString fileStr;
-    if (!configFile.open(QIODevice::ReadOnly))
-        return QString("");
-    while (true) {
-        fileStr = QString(configFile.readLine()).trimmed();
-        if ((fileStr.isEmpty()) && (!configFile.atEnd())) continue;
-        if ((fileStr[0] == QChar('#')) && (!configFile.atEnd())) continue;
-        if ((fileStr[0] == QChar(';')) && (!configFile.atEnd())) continue;
-        if (fileStr.contains(QChar('=')))
-            settings[fileStr.split(QChar('='))[0]] = fileStr.split(QChar('='))[1];
-        if (configFile.atEnd()) break;
-    }
-    configFile.close();
-
-    if (settings.contains(QString("LANGUAGE")))
-        return settings[QString("LANGUAGE")];
-    else
-        return QString("");
-}
-
-
-QString Language::defineLanguageFromLocale()
-{
-    return QLocale::system().name();
-}
-
-
-QStringList Language::getAvailableLanguages()
-{
-    QStringList languages;
-    languages.append(QString("en"));
-    languages.append(QString("ru"));
-
-    return languages;
-}
-
-
-QMap<QString, QString> Language::parseOptions(const QString options)
-{
-    QMap<QString, QString> optionsDict;
-    for (int i=0; i<options.split(QChar(',')).count(); i++) {
-        if (options.split(QChar(','))[i].split(QChar('=')).count() < 2)
-            continue;
-        optionsDict[options.split(QChar(','))[i].split(QChar('='))[0]] =
-                options.split(QChar(','))[i].split(QChar('='))[1];
-    }
-
-    return optionsDict;
-}

sources/3rdparty/language/language.h

@@ -1,43 +0,0 @@
-/***************************************************************************
- *   This file is part of netctl-gui                                       *
- *                                                                         *
- *   netctl-gui is free software: you can redistribute it and/or           *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   netctl-gui is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
- ***************************************************************************/
-
-#ifndef LANGUAGE_H
-#define LANGUAGE_H
-
-#include <QStringList>
-
-
-class Language : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit Language();
-    static QString checkLanguage(const QString language,
-                                 const QString defaultLanguage = QString("en"));
-    static QString defineLanguage(const QString configPath,
-                                  const QString options = QString("OPTIONS"));
-    static QString defineLanguageFromFile(const QString configPath);
-    static QString defineLanguageFromLocale();
-    static QStringList getAvailableLanguages();
-
-private:
-    static QMap<QString, QString> parseOptions(const QString options);
-};
-
-
-#endif /* LANGUAGE_H */

sources/3rdparty/pdebug/pdebug.h

@@ -1,45 +0,0 @@
-/***************************************************************************
- *   This file is part of netctl-gui                                       *
- *                                                                         *
- *   netctl-gui is free software: you can redistribute it and/or           *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   netctl-gui is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
- ***************************************************************************/
-
-
-#ifndef PRETTY_DEBUG_H
-#define PRETTY_DEBUG_H
-
-
-inline const char *pDebug(const std::string prettyFunction)
-{
-    return prettyFunction.c_str();
-}
-
-
-inline std::string pFuncInfo(const std::string prettyFunction)
-{
-    size_t colons = prettyFunction.find("::");
-    // workaround for functions which are not belong to any class
-    if (colons == std::string::npos)
-        colons = prettyFunction.rfind("(");
-    size_t begin = prettyFunction.substr(0, colons).rfind(" ") + 1;
-    size_t end = prettyFunction.rfind("(") - begin;
-
-    return "[" + prettyFunction.substr(begin, end) + "]";
-}
-
-
-#define PDEBUG pDebug(pFuncInfo(__PRETTY_FUNCTION__))
-
-
-#endif /* PRETTY_DEBUG_H */

sources/3rdparty/task/README.md

@@ -1,41 +0,0 @@
-
-
-Asynchronous programming in Qt/C++ using tasks,continuations and resumable functions.
-
-This project is inspired by this[1] video on channel9.
-
-The project seeks to do async based programming in Qt/C++ using modern C++ with lambdas.
-
-The project has two sets of APIs.
-
-1. Task::run().then() API provides async based programming with continuation[4].
-
-2. Task::await() API provides the first API presented in a different way[5].
-
-Under certain use cases,they can be used interchangeably, and in others,only one or the other can be used.Some of the problems
-the first API causes and solved by the second API are discussed in this[7] youtube video.
-
-Example use case for the Task::run().then() API can be found here[0]. Additional example is [2] where an API is
-declared and [3] where the declared API is used.
-
-Example use case of the Task::await() API is here[6] where a function call "blocks" waiting for a result without "hanging" the entire GUI application.
-
-A short tutorial on task/async/await as implemented in C# can be viewed from this[8] link.
-
-[0] https://github.com/mhogomchungu/tasks/blob/master/example.cpp
-
-[1] http://channel9.msdn.com/Blogs/Charles/Asynchronous-Programming-for-C-Developers-PPL-Tasks-and-Windows-8
-
-[2] https://github.com/mhogomchungu/zuluCrypt/blob/d0439a4e36521e42fa9392b82dcefd3224d53334/zuluMount-gui/zulumounttask.h#L61
-
-[3] https://github.com/mhogomchungu/zuluCrypt/blob/d0439a4e36521e42fa9392b82dcefd3224d53334/zuluMount-gui/mainwindow.cpp#L812
-
-[4] Disscussion about this can be found on the following link among other places: http://isocpp.org/files/papers/N3558.pdf
-
-[5] Disscussion about this can be found on the following link among other places: http://isocpp.org/files/papers/N3564.pdf
-
-[6] https://github.com/mhogomchungu/zuluCrypt/blob/7123e3c3a7c8c5b3b3b6958464fd92a7f780d827/zuluMount-gui/keydialog.cpp#L511
-
-[7] https://www.youtube.com/watch?v=Y475RshtAHA
-
-[8] http://www.youtube.com/watch?v=DqjIQiZ_ql4

sources/3rdparty/task/task.h

@@ -1,385 +0,0 @@
-/*
- * copyright: 2014
- * name : mhogo mchungu
- * email: mhogomchungu@gmail.com
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
- * FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE
- * COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES (INCLUDING,
- * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
- * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
- * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#ifndef __TASK_H_INCLUDED__
-#define __TASK_H_INCLUDED__
-
-#include <utility>
-#include <future>
-#include <functional>
-#include <QThread>
-#include <QEventLoop>
-
-/*
- *
- * Examples on how to use the library are at the end of this file.
- *
- */
-
-namespace Task
-{
-	class Thread : public QThread
-	{
-		Q_OBJECT
-	public:
-		Thread()
-		{
-			connect( this,SIGNAL( finished() ),this,SLOT( deleteLater() ) ) ;
-		}
-	protected:
-		virtual ~Thread()
-		{
-		}
-	private:
-		virtual void run( void )
-		{
-		}
-	};
-
-	template< typename T >
-	class future
-	{
-	public:
-		future() : m_function( []( T t ){ Q_UNUSED( t ) ; } )
-		{
-		}
-		void setActions( std::function< void( void ) > start,
-				 std::function< void( void ) > cancel,
-				 std::function< T ( void ) > get )
-		{
-			m_start  = std::move( start ) ;
-			m_cancel = std::move( cancel ) ;
-			m_get    = std::move( get ) ;
-		}
-		void then( std::function< void( T ) > function )
-		{
-			m_function = std::move( function ) ;
-			m_start() ;
-		}
-		T get()
-		{
-			return m_get() ;
-		}
-		T await()
-		{
-			QEventLoop p ;
-
-			T q ;
-
-			m_function = [ & ]( T r ){ q = std::move( r ) ; p.exit() ; } ;
-
-			m_start() ;
-
-			p.exec() ;
-
-			return q ;
-		}
-		void start()
-		{
-			m_start() ;
-		}
-		void cancel()
-		{
-			m_cancel() ;
-		}
-		void run( T r )
-		{
-			m_function( std::move( r ) ) ;
-		}
-	private:
-		std::function< void( T ) > m_function ;
-		std::function< void( void ) > m_start ;
-		std::function< void( void ) > m_cancel ;
-		std::function< T ( void ) > m_get ;
-	};
-
-	template< typename T >
-	class ThreadHelper : public Thread
-	{
-	public:
-		ThreadHelper( std::function< T ( void ) >&& function ) : m_function( std::move( function ) )
-		{
-		}
-		future<T>& Future( void )
-		{
-			m_future.setActions( [ this ](){ this->start() ; },
-					     [ this ](){ this->deleteLater() ; },
-					     [ this ](){ T r = m_function() ; this->deleteLater() ; return r ; } ) ;
-			return m_future ;
-		}
-	private:
-		~ThreadHelper()
-		{
-			m_future.run( std::move( m_cargo ) ) ;
-		}
-		void run( void )
-		{
-			m_cargo =  m_function() ;
-		}
-		std::function< T ( void ) > m_function ;
-		future<T> m_future ;
-		T m_cargo ;
-	};
-
-	class future_1
-	{
-	public:
-		future_1() : m_function( [](){} )
-		{
-		}
-		void setActions( std::function< void( void ) > start,
-				 std::function< void( void ) > cancel,
-				 std::function< void( void ) > get )
-		{
-			m_start  = std::move( start ) ;
-			m_cancel = std::move( cancel ) ;
-			m_get    = std::move( get ) ;
-		}
-		void then( std::function< void( void ) > function )
-		{
-			m_function = std::move( function ) ;
-			m_start() ;
-		}
-		void get()
-		{
-			m_get() ;
-		}
-		void await()
-		{
-			QEventLoop p ;
-
-			m_function = [ & ](){ p.exit() ; } ;
-
-			m_start() ;
-
-			p.exec() ;
-		}
-		void start()
-		{
-			m_start() ;
-		}
-		void run()
-		{
-			m_function() ;
-		}
-		void cancel()
-		{
-			m_cancel() ;
-		}
-	private:
-		std::function< void( void ) > m_function ;
-		std::function< void( void ) > m_start ;
-		std::function< void( void ) > m_cancel ;
-		std::function< void( void ) > m_get ;
-	};
-
-	class ThreadHelper_1 : public Thread
-	{
-	public:
-		ThreadHelper_1( std::function< void ( void ) >&& function ) : m_function( std::move( function ) )
-		{
-		}
-		future_1& Future( void )
-		{
-			m_future.setActions( [ this ](){ this->start() ; },
-					     [ this ](){ this->deleteLater() ; },
-					     [ this ](){ m_function() ; this->deleteLater() ; } ) ;
-			return m_future ;
-		}
-	private:
-		~ThreadHelper_1()
-		{
-			m_future.run() ;
-		}
-		void run( void )
-		{
-			m_function() ;
-		}
-		std::function< void ( void ) > m_function ;
-		future_1 m_future ;
-	};
-
-	/*
-	 * Below APIs runs two tasks,the first one will run in a different thread and
-	 * the second one will be run on the original thread after the completion of the
-	 * first one.
-	 */
-
-	template< typename T >
-	future<T>& run( std::function< T ( void ) > function )
-	{
-		auto t = new ThreadHelper<T>( std::move( function ) ) ;
-		return t->Future() ;
-	}
-
-	static inline future_1& run( std::function< void( void ) > function )
-	{
-		auto t = new ThreadHelper_1( std::move( function ) ) ;
-		return t->Future() ;
-	}
-
-	static inline void exec( std::function< void( void ) > function )
-	{
-		Task::run( std::move( function ) ).start() ;
-	}
-
-	/*
-	 * Below APIs implements resumable functions where a function will be "blocked"
-	 * waiting for the function to return without "hanging" the current thread.
-	 *
-	 * recommending reading up on C#'s await keyword to get a sense of what is being
-	 * discussed below.
-	 */
-
-	static inline void await( Task::future_1& e )
-	{
-		e.await() ;
-	}
-
-	static inline void await( std::function< void( void ) > function )
-	{
-		Task::run( std::move( function ) ).await() ;
-	}
-
-	template< typename T >
-	T await( std::function< T ( void ) > function )
-	{
-		return Task::run<T>( std::move( function ) ).await() ;
-	}
-
-	template< typename T >
-	T await( Task::future<T>& e )
-	{
-		return e.await() ;
-	}
-
-	template< typename T >
-	T await( std::future<T>&& t )
-	{
-		return Task::await<T>( [ & ](){ return t.get() ; } ) ;
-	}
-}
-
-#if 0
-
-/*
- * Examples on how to use the library
- */
-/*
- * templated version that passes a return value of one function to another function
- */
-auto _a = [](){
-	/*
-	 * task _a does what task _a does here.
-	 *
-	 * This function body will run on a different thread
-	 */
-	return 0 ;
-}
-
-auto _b = []( int r ){
-	/*
-	 *
-	 * task _b does what task _b does here.
-	 *
-	 * r is a const reference to a value returned by _a
-	 *
-	 * This function body will run on the original thread
-	 */
-}
-
-Task::run<int>( _a ).then( _b ) ;
-
-alternatively,
-
-Task::future<int>& e = Task::run( _a ) ;
-
-e.then( _b ) ;
-
-/*
- * Non templated version that does not pass around return value
- */
-auto _c = [](){
-	/*
-	 * task _a does what task _a does here.
-	 *
-	 * This function body will run on a different thread
-	 */
-}
-
-auto _d = [](){
-	/*
-	 * task _b does what task _b does here.
-	 *
-	 * r is a const reference to a value returned by _a
-	 *
-	 * This function body will run on the original thread
-	 */
-}
-
-Task::run( _c ).then( _d ) ;
-
-/*
- * if no continuation
- */
-Task::exec( _c ) ;
-
-/*
- * Task::await() is used to "block" without "hanging" the calling thread until the function returns.
- *
- * Its use case is to do sync programming without hanging the calling thread.
- *
- * example use case for it is to "block" on function in a GUI thread withough blocking the GUI thread
- * hanging the application.
- */
-
-/*
- * await example when the called function return no result
- */
-Task::await( _c ) ;
-
-/*
- * await example when the called function return a result
- */
-int r = Task::await<int>( _a ) ;
-
-alternatively,
-
-Task::future<int>& e = Task::run<int>( _a ) ;
-
-int r = e.await() ;
-
-alternatively,
-
-int r = Task::run<int>( _a ).await() ;
-
-#endif
-
-#endif //__TASK_H_INCLUDED__

sources/3rdparty/task/taskadds.cpp

@@ -1,44 +0,0 @@
-/***************************************************************************
- *   This file is part of netctl-gui                                       *
- *                                                                         *
- *   netctl-gui is free software: you can redistribute it and/or           *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   netctl-gui is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
- ***************************************************************************/
-
-
-#include "taskadds.h"
-
-
-TaskResult runTask(const QString cmd, const bool useSuid)
-{
-    return Task::await<TaskResult>( [ & ]() {
-        TaskResult r;
-        if (useSuid) {
-            RootProcess command;
-            command.start(cmd);
-            command.waitForFinished(-1);
-            r.exitCode = command.exitCode();
-            r.output = command.readAllStandardOutput();
-            r.error = command.readAllStandardError();
-        } else {
-            QProcess command;
-            command.start(cmd);
-            command.waitForFinished(-1);
-            r.exitCode = command.exitCode();
-            r.output = command.readAllStandardOutput();
-            r.error = command.readAllStandardError();
-        }
-
-        return r;
-    });
-}

sources/3rdparty/task/taskadds.h

@@ -1,47 +0,0 @@
-/***************************************************************************
- *   This file is part of netctl-gui                                       *
- *                                                                         *
- *   netctl-gui is free software: you can redistribute it and/or           *
- *   modify it under the terms of the GNU General Public License as        *
- *   published by the Free Software Foundation, either version 3 of the    *
- *   License, or (at your option) any later version.                       *
- *                                                                         *
- *   netctl-gui is distributed in the hope that it will be useful,         *
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of        *
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the         *
- *   GNU General Public License for more details.                          *
- *                                                                         *
- *   You should have received a copy of the GNU General Public License     *
- *   along with netctl-gui. If not, see http://www.gnu.org/licenses/       *
- ***************************************************************************/
-
-
-#ifndef TASKADDS_H
-#define TASKADDS_H
-
-#include <QProcess>
-#include <unistd.h>
-
-#include "task.h"
-
-
-class RootProcess : public QProcess
-{
-protected:
-    void setupChildProcess()
-    {
-        ::setuid(0);
-    };
-};
-
-
-struct TaskResult
-{
-    int exitCode;
-    QByteArray error;
-    QByteArray output;
-};
-TaskResult runTask(const QString cmd, const bool useSuid = true);
-
-
-#endif /* TASKADDS_H */

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 3)
-set (PROJECT_VERSION_PATCH 0)
+set (PROJECT_VERSION_PATCH 1)
 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/gui/docs/netctl-gui-dbus-api.html

@@ -1,3 +1,4 @@
+<!doctype html>
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
@@ -20,26 +21,26 @@ th {
 th.sub {
   font-style: italic;
   font-weight: normal;
+}
+small {
+  font-size: 70%;
 }
     </style>
-      <h1>netctl-gui DBus API description</h1>
-      <h3>Project version : @PROJECT_VERSION@</h3>
-      <ol>
-        <li><a href="#api">DBus API</a></li>
-        <li><a href="#helper">Helper API</a></li>
-        <ul>
-          <li><a href="#ctrl">Helper ctrl API</a></li>
-          <li><a href="#netctl">Helper netctl API</a></li>
-        </ul>
-        <li><a href="#gui">GUI API</a></li>
-        <ul>
-          <li><a href="#netctlgui">GUI netctlgui API</a></li>
-        </ul>
-        <li><a href="#links">External links</a></li>
-      </ol>
   </head>
   <body>
 
+<h1>netctl-gui DBus API description</h1>
+<h3>Project version : @PROJECT_VERSION@</h3>
+<ol>
+  <li><a href="#api">DBus API</a></li>
+  <li><a href="#helper">Helper API</a></li>
+  <li><a href="#ctrl">Helper ctrl API</a></li>
+  <li><a href="#netctl">Helper netctl API</a></li>
+  <li><a href="#gui">GUI API</a></li>
+  <li><a href="#netctlgui">GUI netctlgui API</a></li>
+  <li><a href="#links">External links</a></li>
+</ol>
+
 <h2><a href="#api" class="anchor" id="api"></a>DBus API</h2>
 <table>
   <tbody><tr>
@@ -371,10 +372,10 @@ th.sub {
   <li><a href="https://github.com/arcan1s/netctl-gui/issues">Bugtracker</a></li>
 </ul>
 
-<p align="center" style="font-size: 70%">
+<small>
   &copy; 2014-@CURRENT_YEAR@ <a href="mailto:@PROJECT_CONTACT@">@PROJECT_AUTHOR@</a><br>
   This software is licensed under @PROJECT_LICENSE@
-</p>
+</small>
 
   </body>
 </html>

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

@@ -1,47 +1,54 @@
+<!doctype html>
 <html>
   <head>
     <meta http-equiv="content-type" content="text/html; charset=utf-8">
     <title>netctl-gui secutiry notes</title>
     <style type="text/css">
-
+img {
+  display: block;
+  margin: 0 auto;
+}
+small {
+  font-size: 70%;
+}
     </style>
-      <h1>netctl-gui security notes</h1>
-      <h3>Project version : @PROJECT_VERSION@</h3>
-      <ol>
-        <li><a href="#description">Description</a></li>
-        <li><a href="#arch">Architecture</a></li>
-        <li><a href="#library">Library</a></li>
-        <li><a href="#helper">Helper</a></li>
-        <li><a href="#gui">Graphical interface</a></li>
-        <li><a href="#kde">KDE components</a></li>
-        <li><a href="#links">External links</a></li>
-      </ol>
   </head>
   <body>
 
+<h1>netctl-gui security notes</h1>
+<h3>Project version : @PROJECT_VERSION@</h3>
+<ol>
+  <li><a href="#arch">Architecture</a></li>
+  <li><a href="#library">Library</a></li>
+  <li><a href="#helper">Helper</a></li>
+  <li><a href="#gui">Graphical interface</a></li>
+  <li><a href="#kde">KDE components</a></li>
+  <li><a href="#links">External links</a></li>
+</ol>
+
 <h2><a href="#description" class="anchor" id="description"></a>Description</h2>
 <p></p>
 
 <h2><a href="#arch" class="anchor" id="arch"></a>Architecture</h2>
-<img src="architecture.png" alt="architecture" align="middle">
+<img src="architecture.png" alt="architecture">
 
 <h2><a href="#library" class="anchor" id="library"></a>Library</h2>
-<p>According to <a href="#arch">the scheme<a> the library gets information from netctl and can control it. Also it provides some additional functions such as a profile creation and removal and access to wpa_supplicant functions. Some functions do not require additional permissions, but other ones do it. All dynamic arguments including profile names and paths are in double quotes to avoid white spaces problem. The functions which <b>require</b> root privileges are:</p>
+<p>According to <a href="#arch">the scheme</a> the library gets information from netctl and can control it. Also it provides some additional functions such as a profile creation and removal and access to wpa_supplicant functions. Some functions do not require additional permissions, but other ones do it. All dynamic arguments including profile names and paths are in double quotes to avoid white spaces problem. The functions which <b>require</b> root privileges are:</p>
 <ul>
   <li>Netctl control module</li>
-  <ul>
+  <li><ul>
     <li><code>netctl stop-all|start|stop|restart|switch-to|enable|disable|reenable &lt;profile&gt;</code>. They are commands which provide a general control to netctl.</li>
     <li><code>systemctl start|restart|enable &lt;netctl-auto@service&gt;</code>. They are commands which provide ability to control netctl-auto systemd service.</li>
-  </ul>
+  </ul></li>
   <li>Netctl profiles module</li>
-  <ul>
+  <li><ul>
     <li>Copying of a temporary profile from home directory to netctl profiles directory. <code>cp</code> command is used for it.</li>
     <li>Removal of a profile. <code>rm</code> command is used for it.</li>
-  </ul>
+  </ul></li>
   <li>WiFi module</li>
-  <ul>
+  <li><ul>
     <li>This module require root privileges to start <code>wpa_supplicant</code> only. For the futher interaction user must be in <code>CTRL_GROUP</code>.</li>
-  </ul>
+  </ul></li>
 </ul>
 
 <p>If library will be initialized with <code>FORCE_SUDO=true</code> than it will use <code>sudo</code> command (which can be transferred to the library by <code>SUDO_PATH</code> option). Otherwise it will try to set UID of children processes to 0. Please note that <code>sudo</code> command and UID setting will be used only for those commands which require it.</p>
@@ -96,10 +103,10 @@ env -i bash -c "source '&lt;profile&gt;'; for i in &#36;{!&lt;key&gt;[@]}; do ec
   <li><a href="https://github.com/arcan1s/netctl-gui/issues">Bugtracker</a></li>
 </ul>
 
-<p align="center" style="font-size: 70%">
+<small>
   &copy; 2014-@CURRENT_YEAR@ <a href="mailto:@PROJECT_CONTACT@">@PROJECT_AUTHOR@</a><br>
   This software is licensed under @PROJECT_LICENSE@
-</p>
+</small>
 
   </body>
-</html>
+</html>

sources/gui/src/main.cpp

@@ -43,7 +43,7 @@ bool existingSessionOperation(const QString operation)
     QDBusMessage response = bus.call(request);
     QList<QVariant> arguments = response.arguments();
 
-    return !arguments.isEmpty();
+    return (!arguments.isEmpty() && bool(arguments[0].toInt()));
 }
 
 

sources/gui/src/mainwindow.cpp

@@ -234,7 +234,7 @@ bool MainWindow::isHelperActive()
                                                DBUS_HELPER_INTERFACE, QString("Active"),
                                                QList<QVariant>(), true, debug);
 
-    return (!responce.isEmpty());
+    return (!responce.isEmpty() && bool(responce[0].toInt()));
 }
 
 

sources/gui/src/settingswindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>680</width>
-    <height>397</height>
+    <width>678</width>
+    <height>395</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -73,7 +73,7 @@
          </property>
          <property name="icon">
           <iconset resource="../../resources/resources.qrc">
-           <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
+           <normaloff>:/icon-helper.png</normaloff>:/icon-helper.png</iconset>
          </property>
         </item>
         <item>
@@ -136,8 +136,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>464</width>
-               <height>336</height>
+               <width>462</width>
+               <height>330</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_7">
@@ -218,8 +218,8 @@
               <rect>
                <x>0</x>
                <y>0</y>
-               <width>397</width>
-               <height>256</height>
+               <width>462</width>
+               <height>330</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_13">
@@ -389,7 +389,7 @@
                <x>0</x>
                <y>0</y>
                <width>436</width>
-               <height>165</height>
+               <height>173</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_2">
@@ -576,7 +576,7 @@
                <x>0</x>
                <y>0</y>
                <width>436</width>
-               <height>43</height>
+               <height>45</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_9">
@@ -646,7 +646,7 @@
                <x>0</x>
                <y>0</y>
                <width>277</width>
-               <height>190</height>
+               <height>194</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -843,7 +843,7 @@
                <x>0</x>
                <y>0</y>
                <width>436</width>
-               <height>103</height>
+               <height>107</height>
               </rect>
              </property>
              <layout class="QVBoxLayout" name="verticalLayout_11">

sources/helper/bash-completions

@@ -25,6 +25,7 @@ _netctlgui_helper_arglist=(
     '--nodaemon'
     '--replace'
     '--restore'
+    '--session'
     '--system'
     '-v'
     '--version'

sources/helper/netctlgui-helper.1

@@ -23,6 +23,8 @@ do not run as daemon
 force replace the existing session
 .IP "--restore"
 force restore the existing session
+.IP "--session"
+force create user DBus session
 .IP "--system"
 do not read user configuration
 .IP "-v, --version"

sources/helper/netctlgui-helper.service

@@ -1,9 +1,11 @@
 [Unit]
 Description=netctlgui-helper daemon
+Documentation=man:netctlgui-helper(1) man:netctl-gui.conf(5)
 
 [Service]
-Type=forking
-ExecStart=/usr/bin/netctlgui-helper --system
+Type=dbus
+BusName=org.netctlgui.helper
+ExecStart=/usr/bin/netctlgui-helper --nodaemon --system
 
 [Install]
 WantedBy=multi-user.target

sources/helper/src/CMakeLists.txt

@@ -47,8 +47,8 @@ else ()
         set (TRANSLATIONS_BINARY ${TRANSLATIONS_BINARY} ${QM})
         add_custom_command (OUTPUT ${QM} COMMAND ${QT_LRELEASE_EXECUTABLE} ${TS} MAIN_DEPENDENCY ${TS})
     endforeach ()
-    add_custom_target (translations-header COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS})
-    add_custom_command (TARGET translations-header COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
+    add_custom_target (translations-helper COMMAND ${QT_LUPDATE_EXECUTABLE} ${HEADERS} ${SOURCES} -ts ${TRANSLATIONS})
+    add_custom_command (TARGET translations-helper COMMAND ${QT_LRELEASE_EXECUTABLE} ${TRANSLATIONS})
 endif()
 
 add_executable (${SUBPROJECT} ${SOURCES} ${HEADERS} ${MOC_SOURCES} ${QRC_SOURCES} ${TRANSLATIONS})

sources/helper/src/main.cpp

@@ -43,7 +43,7 @@ bool existingSessionOperation(const QString operation)
     QDBusMessage response = bus.call(request);
     QList<QVariant> arguments = response.arguments();
 
-    return !arguments.isEmpty();
+    return (!arguments.isEmpty() && bool(arguments[0].toInt()));
 }
 
 
@@ -68,6 +68,9 @@ int main(int argc, char *argv[])
         } else if (QString(argv[i]) == QString("--restore")) {
             // restore
             args[QString("state")] = (int) 2;
+        } else if (QString(argv[i]) == QString("--session")) {
+            // session
+            args[QString("session")] = true;
         } else if (QString(argv[i]) == QString("--system")) {
             // system
             args[QString("system")] = true;
@@ -96,6 +99,7 @@ int main(int argc, char *argv[])
                 .arg(QString::number(geteuid())).toUtf8().data() << endl;
         cout << QCoreApplication::translate("NetctlHelper", "See security notes for more details.")
                 .toUtf8().data() << endl;
+        args[QString("session")] = true;
     }
 
 #if QT_VERSION >= 0x050000

sources/helper/src/messages.cpp

@@ -37,6 +37,7 @@ QMap<QString, QVariant> getArgs()
     args[QString("config")] = QString(QDir::homePath() + QString("/.config/netctl-gui.conf"));
     args[QString("debug")] = false;
     args[QString("nodaemon")] = false;
+    args[QString("session")] = false;
     args[QString("state")] = (int) 0;
     args[QString("system")] = false;
     args[QString("help")] = false;
@@ -65,6 +66,8 @@ QString helpMessage()
             .arg(QCoreApplication::translate("NetctlHelper", "force replace the existing session"));
     helpMessage += QString("       --restore         - %1\n")
             .arg(QCoreApplication::translate("NetctlHelper", "force restore the existing session"));
+    helpMessage += QString("       --session         - %1\n")
+            .arg(QCoreApplication::translate("NetctlHelper", "force create user DBus session"));
     helpMessage += QString("       --system          - %1\n")
             .arg(QCoreApplication::translate("NetctlHelper", "do not read user configuration, system-wide only"));
     helpMessage += QString(" %1\n").arg(QCoreApplication::translate("NetctlHelper", "Show messages:"));

sources/helper/src/netctlhelper.cpp

@@ -35,6 +35,7 @@ NetctlHelper::NetctlHelper(QObject *parent, QMap<QString, QVariant> args)
     : QObject(parent),
       configPath(args[QString("config")].toString()),
       debug(args[QString("debug")].toBool()),
+      session(args[QString("session")].toBool()),
       system(args[QString("system")].toBool())
 {
     updateConfiguration();
@@ -88,6 +89,25 @@ void NetctlHelper::createInterface()
         if (debug) qDebug() << PDEBUG << ":" << bus.lastError().message();
         return quitHelper();
     }
+    // session bus
+    if (!session) return;
+    QDBusConnection sessionBus = QDBusConnection::sessionBus();
+    if (!sessionBus.registerService(DBUS_HELPER_SERVICE)) {
+        if (debug) qDebug() << PDEBUG << ":" << "Could not register session service";
+        if (debug) qDebug() << PDEBUG << ":" << sessionBus.lastError().message();
+    }
+    if (!sessionBus.registerObject(DBUS_LIB_PATH,
+                                   new NetctlAdaptor(this, debug, configuration),
+                                   QDBusConnection::ExportAllContents)) {
+        if (debug) qDebug() << PDEBUG << ":" << "Could not register session library object";
+        if (debug) qDebug() << PDEBUG << ":" << sessionBus.lastError().message();
+    }
+    if (!sessionBus.registerObject(DBUS_CTRL_PATH,
+                                   new ControlAdaptor(this, debug, configuration),
+                                   QDBusConnection::ExportAllContents)) {
+        if (debug) qDebug() << PDEBUG << ":" << "Could not register session control object";
+        if (debug) qDebug() << PDEBUG << ":" << sessionBus.lastError().message();
+    }
 }
 
 
@@ -98,6 +118,11 @@ void NetctlHelper::deleteInterface()
     QDBusConnection::systemBus().unregisterObject(DBUS_LIB_PATH);
     QDBusConnection::systemBus().unregisterObject(DBUS_CTRL_PATH);
     QDBusConnection::systemBus().unregisterService(DBUS_HELPER_SERVICE);
+    // session bus
+    if (!session) return;
+    QDBusConnection::sessionBus().unregisterObject(DBUS_LIB_PATH);
+    QDBusConnection::sessionBus().unregisterObject(DBUS_CTRL_PATH);
+    QDBusConnection::sessionBus().unregisterService(DBUS_HELPER_SERVICE);
 }
 
 

sources/helper/src/netctlhelper.h

@@ -41,6 +41,7 @@ private:
     QString configPath;
     QMap<QString, QString> configuration;
     bool debug;
+    bool session;
     bool system;
     void createInterface();
     void deleteInterface();

sources/helper/zsh-completions

@@ -24,6 +24,7 @@ _netctlgui_helper_arglist=(
     {'--nodaemon','--nodaemon'}'[do not start as daemon]'
     {'--replace','--replace'}'[force replace the existing session]'
     {'--restore','--restore'}'[force restore the existing session]'
+    {'--session','--session'}'[force create user DBus session]'
     {'--system','--system'}'[do not read user configuration]'
     {'(--version)-v','(-v)--version'}'[show version and exit]'
     {'(--info)-i','(-i)--info'}'[show build information and exit]'

sources/resources/resources.qrc

@@ -5,6 +5,7 @@
     <file>translations/ru.qm</file>
 <!--     icons -->
     <file>icon.png</file>
+    <file>icon-helper.png</file>
     <file>wifi.png</file>
     <file>network-idle-64x64.png</file>
     <file>network-offline-64x64.png</file>