* drop absolute path from configuration

* add configuration from cmake building
* update submodules

CHANGELOG

@@ -1,3 +1,6 @@
+* all
+    * fix language component (refer to #45)
+
 Ver.1.4.6
 ---------
 * all

sources/3rdparty/language

@@ -1 +1 @@
-Subproject commit 204943574a95d5825fd7190608bfe6d76abf6da3
+Subproject commit 319125b1fafff9da14c89a94de6ba2852c90c9c2

sources/3rdparty/language-config.h

@@ -7,6 +7,8 @@
 #define LANGUAGES "en,ja,ru"
 // language key in the configuration file
 #define LANGUAGE_KEY "LANGUAGE"
+// name of config section in the file if any
+#define LANGUAGE_SECTION "Common"
 
 
 #endif /* LANGUAGE_CONFIG_H */

sources/CMakeLists.txt

@@ -23,6 +23,8 @@ message (STATUS "Build date: ${CURRENT_DATE}")
 # install options
 option (USE_CAPABILITIES "Use setcap to set capabilities for the helper" ON)
 option (USE_QT5 "Use Qt5 instead of Qt4" ON)
+# configuration
+include (config-defs.cmake)
 # components
 option (BUILD_GUI "Build GUI" ON)
 option (BUILD_HELPER "Build helper" ON)

sources/config-defs.cmake

@@ -0,0 +1,41 @@
+# default configuration options
+
+# [Common] section
+set (CFG_LANGUAGE "en" CACHE STRING "LANGUAGE key")
+set (CFG_MAINUPDATE "0" CACHE STRING "MAINUPDATE key")
+set (CFG_WIFIUPDATE "0" CACHE STRING "WIFIUPDATE key")
+set (CFG_SYSTRAY "true" CACHE STRING "SYSTRAY key")
+set (CFG_CLOSETOTRAY "true" CACHE STRING "CLOSETOTRAY key")
+set (CFG_STARTTOTRAY "false" CACHE STRING "STARTTOTRAY key")
+set (CFG_SKIPCOMPONENTS "false" CACHE STRING "SKIPCOMPONENTS key")
+
+# [Helper] section
+set (CFG_USE_HELPER "true" CACHE STRING "USE_HELPER key")
+set (CFG_FORCE_SUDO "false" CACHE STRING "FORCE_SUDO key")
+set (CFG_CLOSE_HELPER "false" CACHE STRING "CLOSE_HELPER key")
+set (CFG_HELPER_PATH "netctlgui-helper" CACHE STRING "HELPER_PATH key")
+set (CFG_HELPER_SERVICE "netctlgui-helper.service" CACHE STRING "HELPER_SERVICE key")
+
+# [netctl] section
+set (CFG_SYSTEMCTL_PATH "systemctl" CACHE STRING "SYSTEMCTL_PATH key")
+set (CFG_NETCTL_PATH "netctl" CACHE STRING "NETCTL_PATH key")
+set (CFG_NETCTLAUTO_PATH "netctl-auto" CACHE STRING "NETCTLAUTO_PATH key")
+set (CFG_NETCTLAUTO_SERVICE "netctl-auto" CACHE STRING "NETCTLAUTO_SERVICE key")
+set (CFG_PROFILE_DIR "/etc/netctl/" CACHE STRING "PROFILE_DIR key")
+
+# [sudo] section
+set (CFG_SUDO_PATH "kdesu" CACHE STRING "SUDO_PATH key")
+
+# [wpa_supplicant] section
+set (CFG_WPASUP_PATH "wpa_supplicant" CACHE STRING "WPASUP_PATH key")
+set (CFG_WPACLI_PATH "wpa_cli" CACHE STRING "WPACLI_PATH key")
+set (CFG_PID_FILE "/run/wpa_supplicant_$i.pid" CACHE STRING "PID_FILE key")
+set (CFG_WPA_DRIVERS "nl80211,wext" CACHE STRING "WPA_DRIVERS key")
+set (CFG_CTRL_DIR "/run/wpa_supplicant" CACHE STRING "CTRL_DIR key")
+set (CFG_CTRL_GROUP "users" CACHE STRING "CTRL_GROUP key")
+
+# [Other] section
+set (CFG_EDITOR_PATH "gvim" CACHE STRING "EDITOR_PATH key")
+set (CFG_IFACE_DIR "/sys/class/net/" CACHE STRING "IFACE_DIR key")
+set (CFG_RFKILL_DIR "/sys/class/rfkill/" CACHE STRING "RFKILL_DIR key")
+set (CFG_PREFERED_IFACE "" CACHE STRING "PREFERED_IFACE key")

sources/dataengine/netctl.cpp

@@ -113,8 +113,8 @@ void Netctl::readConfiguration()
     QSettings settings(fileName, QSettings::IniFormat);
 
     settings.beginGroup(QString("Netctl commands"));
-    configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("/usr/bin/netctl"));
+    configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("netctl"));
-    configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("/usr/bin/netctl-auto"));
+    configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("netctl-auto"));
     settings.endGroup();
 
     settings.beginGroup(QString("External IP"));

sources/dataengine/plasma-dataengine-netctl.conf

@@ -1,6 +1,6 @@
 [Netctl commands]
-NETCTLCMD=/usr/bin/netctl
+NETCTLCMD=netctl
-NETCTLAUTOCMD=/usr/bin/netctl-auto
+NETCTLAUTOCMD=netctl-auto
 
 [External IP]
 EXTIP4CMD=curl ip4.telize.com

sources/gui/src/settingswindow.cpp

@@ -591,49 +591,49 @@ QMap<QString, QString> SettingsWindow::getSettings(QString fileName)
 
     config[QString("LANGUAGE")] = Language::defineLanguage(fileName, QString());
     settings.beginGroup(QString("Common"));
-    config[QString("LANGUAGE")] = settings.value(QString("LANGUAGE"), QString("en")).toString();
+    config[QString("LANGUAGE")] = settings.value(QString("LANGUAGE"), QString(LANGUAGE)).toString();
-    config[QString("MAINUPDATE")] = settings.value(QString("MAINUPDATE"), QString("0")).toString();
+    config[QString("MAINUPDATE")] = settings.value(QString("MAINUPDATE"), QString(MAINUPDATE)).toString();
-    config[QString("WIFIUPDATE")] = settings.value(QString("WIFIUPDATE"), QString("0")).toString();
+    config[QString("WIFIUPDATE")] = settings.value(QString("WIFIUPDATE"), QString(WIFIUPDATE)).toString();
-    config[QString("SYSTRAY")] = settings.value(QString("SYSTRAY"), QString("true")).toString();
+    config[QString("SYSTRAY")] = settings.value(QString("SYSTRAY"), QString(SYSTRAY)).toString();
-    config[QString("CLOSETOTRAY")] = settings.value(QString("CLOSETOTRAY"), QString("true")).toString();
+    config[QString("CLOSETOTRAY")] = settings.value(QString("CLOSETOTRAY"), QString(CLOSETOTRAY)).toString();
-    config[QString("STARTTOTRAY")] = settings.value(QString("STARTTOTRAY"), QString("false")).toString();
+    config[QString("STARTTOTRAY")] = settings.value(QString("STARTTOTRAY"), QString(STARTTOTRAY)).toString();
-    config[QString("SKIPCOMPONENTS")] = settings.value(QString("SKIPCOMPONENTS"), QString("false")).toString();
+    config[QString("SKIPCOMPONENTS")] = settings.value(QString("SKIPCOMPONENTS"), QString(SKIPCOMPONENTS)).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("Helper"));
-    config[QString("USE_HELPER")] = settings.value(QString("USE_HELPER"), QString("true")).toString();
+    config[QString("USE_HELPER")] = settings.value(QString("USE_HELPER"), QString(USE_HELPER)).toString();
-    config[QString("FORCE_SUDO")] = settings.value(QString("FORCE_SUDO"), QString("false")).toString();
+    config[QString("FORCE_SUDO")] = settings.value(QString("FORCE_SUDO"), QString(FORCE_SUDO)).toString();
-    config[QString("CLOSE_HELPER")] = settings.value(QString("CLOSE_HELPER"), QString("false")).toString();
+    config[QString("CLOSE_HELPER")] = settings.value(QString("CLOSE_HELPER"), QString(CLOSE_HELPER)).toString();
-    config[QString("HELPER_PATH")] = settings.value(QString("HELPER_PATH"), QString("/usr/bin/netctlgui-helper")).toString();
+    config[QString("HELPER_PATH")] = settings.value(QString("HELPER_PATH"), QString(HELPER_PATH)).toString();
-    config[QString("HELPER_SERVICE")] = settings.value(QString("HELPER_SERVICE"), QString("netctlgui-helper.service")).toString();
+    config[QString("HELPER_SERVICE")] = settings.value(QString("HELPER_SERVICE"), QString(HELPER_SERVICE)).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("netctl"));
-    config[QString("SYSTEMCTL_PATH")] = settings.value(QString("SYSTEMCTL_PATH"), QString("/usr/bin/systemctl")).toString();
+    config[QString("SYSTEMCTL_PATH")] = settings.value(QString("SYSTEMCTL_PATH"), QString(SYSTEMCTL_PATH)).toString();
-    config[QString("NETCTL_PATH")] = settings.value(QString("NETCTL_PATH"), QString("/usr/bin/netctl")).toString();
+    config[QString("NETCTL_PATH")] = settings.value(QString("NETCTL_PATH"), QString(NETCTL_PATH)).toString();
-    config[QString("NETCTLAUTO_PATH")] = settings.value(QString("NETCTLAUTO_PATH"), QString("/usr/bin/netctl-auto")).toString();
+    config[QString("NETCTLAUTO_PATH")] = settings.value(QString("NETCTLAUTO_PATH"), QString(NETCTLAUTO_PATH)).toString();
-    config[QString("NETCTLAUTO_SERVICE")] = settings.value(QString("NETCTLAUTO_SERVICE"), QString("netctl-auto")).toString();
+    config[QString("NETCTLAUTO_SERVICE")] = settings.value(QString("NETCTLAUTO_SERVICE"), QString(NETCTLAUTO_SERVICE)).toString();
-    config[QString("PROFILE_DIR")] = settings.value(QString("PROFILE_DIR"), QString("/etc/netctl")).toString();
+    config[QString("PROFILE_DIR")] = settings.value(QString("PROFILE_DIR"), QString(PROFILE_DIR)).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("sudo"));
-    config[QString("SUDO_PATH")] = settings.value(QString("SUDO_PATH"), QString("/usr/bin/kdesu")).toString();
+    config[QString("SUDO_PATH")] = settings.value(QString("SUDO_PATH"), QString(SUDO_PATH)).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("wpa_supplicant"));
-    config[QString("WPASUP_PATH")] = settings.value(QString("WPASUP_PATH"), QString("/usr/bin/wpa_supplicant")).toString();
+    config[QString("WPASUP_PATH")] = settings.value(QString("WPASUP_PATH"), QString(WPASUP_PATH)).toString();
-    config[QString("WPACLI_PATH")] = settings.value(QString("WPACLI_PATH"), QString("/usr/bin/wpa_cli")).toString();
+    config[QString("WPACLI_PATH")] = settings.value(QString("WPACLI_PATH"), QString(WPACLI_PATH)).toString();
-    config[QString("PID_FILE")] = settings.value(QString("PID_FILE"), QString("/run/wpa_supplicant_$i.pid")).toString();
+    config[QString("PID_FILE")] = settings.value(QString("PID_FILE"), QString(PID_FILE)).toString();
-    config[QString("WPA_DRIVERS")] = settings.value(QString("WPA_DRIVERS"), QString("nl80211,wext")).toString();
+    config[QString("WPA_DRIVERS")] = settings.value(QString("WPA_DRIVERS"), QString(WPA_DRIVERS)).toString();
-    config[QString("CTRL_DIR")] = settings.value(QString("CTRL_DIR"), QString("/run/wpa_supplicant")).toString();
+    config[QString("CTRL_DIR")] = settings.value(QString("CTRL_DIR"), QString(CTRL_DIR)).toString();
-    config[QString("CTRL_GROUP")] = settings.value(QString("CTRL_GROUP"), QString("users")).toString();
+    config[QString("CTRL_GROUP")] = settings.value(QString("CTRL_GROUP"), QString(CTRL_GROUP)).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("Other"));
-    config[QString("EDITOR_PATH")] = settings.value(QString("EDITOR_PATH"), QString("/usr/bin/gvim")).toString();
+    config[QString("EDITOR_PATH")] = settings.value(QString("EDITOR_PATH"), QString(EDITOR_PATH)).toString();
-    config[QString("IFACE_DIR")] = settings.value(QString("IFACE_DIR"), QString("/sys/class/net/")).toString();
+    config[QString("IFACE_DIR")] = settings.value(QString("IFACE_DIR"), QString(IFACE_DIR)).toString();
-    config[QString("RFKILL_DIR")] = settings.value(QString("RFKILL_DIR"), QString("/sys/class/rfkill/")).toString();
+    config[QString("RFKILL_DIR")] = settings.value(QString("RFKILL_DIR"), QString(RFKILL_DIR)).toString();
-    config[QString("PREFERED_IFACE")] = settings.value(QString("PREFERED_IFACE"), QString("")).toString();
+    config[QString("PREFERED_IFACE")] = settings.value(QString("PREFERED_IFACE"), QString(PREFERED_IFACE)).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("Toolbars"));

sources/helper/CMakeLists.txt

@@ -18,13 +18,16 @@ add_subdirectory (${SUBPROJECT_SOURCE_DIR})
 # build man
 file (GLOB SUBPROJECT_MAN_IN *.1)
 file (GLOB SUBPROJECT_MAN5_IN *.5)
+file (GLOB SUBPROJECT_CONF_IN netctl-gui.conf)
 file (RELATIVE_PATH SUBPROJECT_MAN ${CMAKE_SOURCE_DIR} ${SUBPROJECT_MAN_IN})
 file (RELATIVE_PATH SUBPROJECT_MAN5 ${CMAKE_SOURCE_DIR} ${SUBPROJECT_MAN5_IN})
+file (RELATIVE_PATH SUBPROJECT_CONF ${CMAKE_SOURCE_DIR} ${SUBPROJECT_CONF_IN})
 configure_file (${SUBPROJECT_MAN_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN})
 configure_file (${SUBPROJECT_MAN5_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5})
+configure_file (${SUBPROJECT_CONF_IN} ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_CONF})
 
 install (FILES org.netctlgui.helper.conf DESTINATION ${DBUS_SYSTEMCONF_PATH})
-install (FILES netctl-gui.conf DESTINATION /etc)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_CONF} DESTINATION /etc)
 install (FILES netctlgui-helper.service DESTINATION ${SYSTEMD_SERVICE_PATH})
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN} DESTINATION share/man/man1/)
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${SUBPROJECT_MAN5} DESTINATION share/man/man5/)

sources/helper/netctl-gui.conf

@@ -5,81 +5,81 @@
 
 [Common]
 # application language
-LANGUAGE=en
+#LANGUAGE="@CFG_LANGUAGE@"
 # auto update interval for main tab in seconds
 # 0 means there is no updates
-MAINUPDATE=0
+#MAINUPDATE="@CFG_MAINUPDATE@"
 # auto update interval for wifi tab in seconds
 # 0 means there is no updates
-WIFIUPDATE=0
+#WIFIUPDATE="@CFG_WIFIUPDATE@"
 # create system tray icon.
 # This option is not recognized by netctlgui-helper
-SYSTRAY=true
+#SYSTRAY="@CFG_SYSTRAY@"
 # close helper after GUI application quit.
 # This option is not recognized by netctlgui-helper
-CLOSETOTRAY=true
+#CLOSETOTRAY="@CFG_CLOSETOTRAY@"
 # start netctl-gui minimized to tray if it is available.
 # This option is not recognized by netctlgui-helper
-STARTTOTRAY=false
+#STARTTOTRAY="@CFG_STARTTOTRAY@"
 # skip external components checking
 # This option is not recognized by netctlgui-helper
-SKIPCOMPONENTS=false
+#SKIPCOMPONENTS="@CFG_SKIPCOMPONENTS@"
 
 [Helper]
 # use netctlgui-helper if it is available.
 # This option is not recognized by netctlgui-helper
-USE_HELPER=true
+#USE_HELPER="@CFG_USE_HELPER@"
 # force use SUDO_PATH for helper instead of using setuid(3) to child processes
-FORCE_SUDO=false
+#FORCE_SUDO="@CFG_FORCE_SUDO@"
 # hide application to tray on exit if tray is available.
 # This option is not recognized by netctlgui-helper
-CLOSE_HELPER=false
+#CLOSE_HELPER="@CFG_CLOSE_HELPER@"
 # path to netctlgui-helper.
 # This option is not recognized by netctlgui-helper
-HELPER_PATH=/usr/bin/netctlgui-helper
+#HELPER_PATH="@CFG_HELPER_PATH@"
 # netctlgui-helper service name.
 # This option is not recognized by netctlgui-helper
-HELPER_SERVICE=netctlgui-helper.service
+#HELPER_SERVICE="@CFG_HELPER_SERVICE@"
 
 [netctl]
 # path to systemctl
-SYSTEMCTL_PATH=/usr/bin/systemctl
+#SYSTEMCTL_PATH="@CFG_SYSTEMCTL_PATH@"
 # path to netctl
-NETCTL_PATH=/usr/bin/netctl
+#NETCTL_PATH="@CFG_NETCTL_PATH@"
 # path to netctl-auto
-NETCTLAUTO_PATH=/usr/bin/netctl-auto
+#NETCTLAUTO_PATH="@CFG_NETCTLAUTO_PATH@"
 # netctl-auto service name without .service suffix
-NETCTLAUTO_SERVICE=netctl-auto
+#NETCTLAUTO_SERVICE="@CFG_NETCTLAUTO_SERVICE@"
 # path to netctl profile directory
-PROFILE_DIR=/etc/netctl/
+#PROFILE_DIR="@CFG_PROFILE_DIR@"
 
 [sudo]
 # path to sudo frontend
-SUDO_PATH=/usr/bin/sudo
+#SUDO_PATH="@CFG_SUDO_PATH@"
 
 [wpa_supplicant]
 # path to wpa_supplicant
-WPASUP_PATH=/usr/bin/wpa_supplicant
+#WPASUP_PATH="@CFG_WPASUP_PATH@"
 # path to wpa_cli
-WPACLI_PATH=/usr/bin/wpa_cli
+#WPACLI_PATH="@CFG_WPACLI_PATH@"
 # wpa_supplicant PID file
 # $i is interface
-PID_FILE=/run/wpa_supplicant_$i.pid
+#PID_FILE="@CFG_PID_FILE@"
 # wpa_supplicant drivers for wireless interface comma separated
-WPA_DRIVERS="nl80211,wext"
+#WPA_DRIVERS="@CFG_WPA_DRIVERS@"
 # path to control directory which is required by wpa_supplicant
-CTRL_DIR=/run/wpa_supplicant
+#CTRL_DIR="@CFG_CTRL_DIR@"
 # group which is owner of CTRL_DIR
-CTRL_GROUP=users
+#CTRL_GROUP="@CFG_CTRL_GROUP@"
 
 [Other]
 # path to external editor
 # This option is not recognized by netctlgui-helper
-EDITOR_PATH=/usr/bin/gvim
+#EDITOR_PATH="@CFG_EDITOR_PATH@"
 # path to directory which contains interface information
-IFACE_DIR=/sys/class/net/
+#IFACE_DIR="@CFG_IFACE_DIR@"
 # path to directory with rfkill devices.
 # This option is not recognized by netctlgui-helper
-RFKILL_DIR=/sys/class/rfkill/
+#RFKILL_DIR="@CFG_RFKILL_DIR@"
 # prefered wireless interface
-PREFERED_IFACE=
+#PREFERED_IFACE="@CFG_PREFERED_IFACE@"

sources/helper/netctl-gui.conf.5

@@ -32,10 +32,10 @@ force use
 for helper instead of using
 .BR setuid (3)
 to child processes
-.IP "EDITOR_PATH=/usr/bin/gvim"
+.IP "EDITOR_PATH=gvim"
 path to an external editor. This option is not recognized by
 .BR netctlgui-helper (1)
-.IP "HELPER_PATH=/usr/bin/netctlgui-helper"
+.IP "HELPER_PATH=netctlgui-helper"
 path to
 .BR netctlgui-helper (1)
 This option is not recognized by
@@ -50,10 +50,10 @@ path to directory which contains interface information
 application language
 .IP "MAINUPDATE=0"
 main tab autoupdate interval in seconds. 0 is disable autoupdate
-.IP "NETCTL_PATH=/usr/bin/netctl"
+.IP "NETCTL_PATH=netctl"
 path to
 .BR netctl (1)
-.IP "NETCTLAUTO_PATH=/usr/bin/netctl-auto"
+.IP "NETCTLAUTO_PATH=netctl-auto"
 path to
 .BR netctl-auto (1)
 .IP "NETCTLAUTO_SERVICE=netctl-auto"
@@ -83,11 +83,11 @@ start
 .BR netctl-gui (1)
 minimized to tray if it is available. This option is not recognized by
 .BR netctlgui-helper (1)
-.IP "SUDO_PATH=/usr/bin/kdesu"
+.IP "SUDO_PATH=kdesu"
 path to
 .BR sudo (8)
 frontend
-.IP "SYSTEMCTL_PATH=/usr/bin/systemctl"
+.IP "SYSTEMCTL_PATH=systemctl"
 path to
 .BR systemctl (1)
 .IP "SYSTRAY=true"
@@ -100,10 +100,10 @@ if it is available. This option is not recognized by
 .BR netctlgui-helper (1)
 .IP "WIFIUPDATE=0"
 WiFi tab autoupdate interval in seconds. 0 is disable autoupdate
-.IP "WPACLI_PATH=/usr/bin/wpa_cli"
+.IP "WPACLI_PATH=wpa_cli"
 path to
 .BR wpa_cli (8)
-.IP "WPASUP_PATH=/usr/bin/wpa_supplicant"
+.IP "WPASUP_PATH=wpa_supplicant"
 path to
 .BR wpa_supplicant (8)
 .IP "WPA_DRIVERS=nl80211,wext"

sources/netctlgui/include/netctlgui/netctlinteract.h

@@ -30,6 +30,8 @@
 #include <QMap>
 #include <QObject>
 
+#include "version.h"
+
 
 class NetctlProfile;
 
@@ -303,27 +305,27 @@ private:
     /**
      * @brief prefered interface for WiFi. Default is ""
      */
-    QString mainInterface = QString("");
+    QString mainInterface = QString(PREFERED_IFACE);
     /**
-     * @brief path to netctl command. Default is "/usr/bin/netctl"
+     * @brief path to netctl command. Default is "netctl"
      */
-    QString netctlCommand = QString("/usr/bin/netctl");
+    QString netctlCommand = QString(NETCTL_PATH);
     /**
-     * @brief path to netctl-auto command. Default is "/usr/bin/netctl-auto"
+     * @brief path to netctl-auto command. Default is "netctl-auto"
      */
-    QString netctlAutoCommand = QString("/usr/bin/netctl-auto");
+    QString netctlAutoCommand = QString(NETCTLAUTO_PATH);
     /**
      * @brief netctl-auto service name. Default is "netctl-auto"
      */
-    QString netctlAutoService = QString("netctl-auto");
+    QString netctlAutoService = QString(NETCTLAUTO_SERVICE);
     /**
-     * @brief path to sudo command. Default is "/usr/bin/kdesu"
+     * @brief path to sudo command. Default is "kdesu"
      */
-    QString sudoCommand = QString("/usr/bin/kdesu");
+    QString sudoCommand = QString(SUDO_PATH);
     /**
-     * @brief path to systemctl command. Default is "/usr/bin/systemctl"
+     * @brief path to systemctl command. Default is "systemctl"
      */
-    QString systemctlCommand = QString("/usr/bin/systemctl");
+    QString systemctlCommand = QString(SYSTEMCTL_PATH);
     // functions
     /**
      * @brief method which calls command

sources/netctlgui/include/netctlgui/netctlprofile.h

@@ -30,6 +30,8 @@
 #include <QMap>
 #include <QObject>
 
+#include "version.h"
+
 
 /**
  * @brief The NetctlProfile class interacts with netctl profiles
@@ -114,9 +116,9 @@ private:
      */
     QDir *profileDirectory = nullptr;
     /**
-     * @brief path to sudo command. Default is "/usr/bin/kdesu"
+     * @brief path to sudo command. Default is "kdesu"
      */
-    QString sudoCommand = QString("/usr/bin/kdesu");
+    QString sudoCommand = QString(SUDO_PATH);
 };
 
 

sources/netctlgui/include/netctlgui/wpasupinteract.h

@@ -30,6 +30,8 @@
 #include <QMap>
 #include <QObject>
 
+#include "version.h"
+
 
 class Netctl;
 class NetctlProfile;
@@ -184,31 +186,31 @@ private:
     /**
      * @brief path to ctrl_directory. Defaults is "/run/wpa_supplicant"
      */
-    QString ctrlDir = QString("/run/wpa_supplicant");
+    QString ctrlDir = QString(CTRL_DIR);
     /**
      * @brief group which is owner of CTRL_DIR. Default is "users"
      */
-    QString ctrlGroup = QString("users");
+    QString ctrlGroup = QString(CTRL_GROUP);
     /**
      * @brief wpa_supplicant PID file. $i is interface. Default is "/run/wpa_supplicant_$i.pid"
      */
-    QString pidFile = QString("/run/wpa_supplicant_$i.pid");
+    QString pidFile = QString(PID_FILE);
     /**
-     * @brief path to sudo command. Default is "/usr/bin/kdesu"
+     * @brief path to sudo command. Default is "kdesu"
      */
-    QString sudoCommand = QString("/usr/bin/kdesu");
+    QString sudoCommand = QString(SUDO_PATH);
     /**
-     * @brief path to wpa_cli command. Default is "/usr/bin/wpa_cli"
+     * @brief path to wpa_cli command. Default is "wpa_cli"
      */
-    QString wpaCliPath = QString("/usr/bin/wpa_cli");
+    QString wpaCliPath = QString(WPACLI_PATH);
     /**
      * @brief wpa_supplicant drivers comma separated. Default is "nl80211,wext"
      */
-    QString wpaDrivers = QString("nl80211,wext");
+    QString wpaDrivers = QString(WPA_DRIVERS);
     /**
-     * @brief path to wpa_supplicant command. Default is "/usr/bin/wpa_supplicant"
+     * @brief path to wpa_supplicant command. Default is "wpa_supplicant"
      */
-    QString wpaSupPath = QString("/usr/bin/wpa_supplicant");
+    QString wpaSupPath = QString(WPASUP_PATH);
     // functions
     /**
      * @brief method which calls wpa_cli and returns its output

sources/netctlgui/src/netctlinteract.cpp

@@ -45,7 +45,7 @@ Netctl::Netctl(const bool debugCmd, const QMap<QString, QString> settings)
     if (settings.contains(QString("IFACE_DIR")))
         ifaceDirectory = new QDir(settings[QString("IFACE_DIR")]);
     else
-        ifaceDirectory = new QDir(QString("/sys/class/net/"));
+        ifaceDirectory = new QDir(QString(IFACE_DIR));
     if (settings.contains(QString("PREFERED_IFACE")))
         mainInterface = settings[QString("PREFERED_IFACE")];
     if (settings.contains(QString("NETCTL_PATH")))

sources/netctlgui/src/netctlprofile.cpp

@@ -46,7 +46,7 @@ NetctlProfile::NetctlProfile(const bool debugCmd, const QMap<QString, QString> s
     if (settings.contains(QString("PROFILE_DIR")))
         profileDirectory = new QDir(settings[QString("PROFILE_DIR")]);
     else
-        profileDirectory = new QDir(QString("/etc/netctl/"));
+        profileDirectory = new QDir(QString(PROFILE_DIR));
     if (settings.contains(QString("SUDO_PATH")))
         sudoCommand = settings[QString("SUDO_PATH")];
     if (settings.contains(QString("FORCE_SUDO")))

sources/plasmoid-kde4/netctl.cpp

@@ -154,8 +154,8 @@ QMap<QString, QString> Netctl::readDataEngineConfiguration()
     QSettings settings(fileName, QSettings::IniFormat);
 
     settings.beginGroup(QString("Netctl commands"));
-    configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("/usr/bin/netctl")).toString();
+    configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("netctl")).toString();
-    configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("/usr/bin/netctl-auto")).toString();
+    configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("netctl-auto")).toString();
     settings.endGroup();
 
     settings.beginGroup(QString("External IP"));
@@ -836,12 +836,12 @@ void Netctl::configChanged()
     KConfigGroup cg = config();
 
     autoUpdateInterval = cg.readEntry("autoUpdateInterval", 1000);
-    paths[QString("gui")] = cg.readEntry("guiPath", "/usr/bin/netctl-gui");
+    paths[QString("gui")] = cg.readEntry("guiPath", "netctl-gui");
-    paths[QString("helper")] = cg.readEntry("helperPath", "/usr/bin/netctlgui-helper");
+    paths[QString("helper")] = cg.readEntry("helperPath", "netctlgui-helper");
-    paths[QString("netctl")] = cg.readEntry("netctlPath", "/usr/bin/netctl");
+    paths[QString("netctl")] = cg.readEntry("netctlPath", "netctl");
-    paths[QString("netctlAuto")] = cg.readEntry("netctlAutoPath", "/usr/bin/netctl-auto");
+    paths[QString("netctlAuto")] = cg.readEntry("netctlAutoPath", "netctl-auto");
-    paths[QString("sudo")] = cg.readEntry("sudoPath", "/usr/bin/kdesu");
+    paths[QString("sudo")] = cg.readEntry("sudoPath", "kdesu");
-    paths[QString("wifi")] = cg.readEntry("wifiPath", "/usr/bin/netctl-gui -t 3");
+    paths[QString("wifi")] = cg.readEntry("wifiPath", "netctl-gui -t 3");
     useSudo = cg.readEntry("useSudo", true);
     useWifi = cg.readEntry("useWifi", false);
     useHelper = cg.readEntry("useHelper", true);

sources/plasmoid-kf5/package/contents/config/main.xml

@@ -11,22 +11,22 @@
       <default>100</default>
     </entry>
     <entry name="guiPath" type="string">
-      <default>/usr/bin/netctl-gui</default>
+      <default>netctl-gui</default>
     </entry>
     <entry name="helperPath" type="string">
-      <default>/usr/bin/netctlgui-helper</default>
+      <default>netctlgui-helper</default>
     </entry>
     <entry name="netctlPath" type="string">
-      <default>/usr/bin/netctl</default>
+      <default>netctl</default>
     </entry>
     <entry name="netctlAutoPath" type="string">
-      <default>/usr/bin/netctl-auto</default>
+      <default>netctl-auto</default>
     </entry>
     <entry name="sudoPath" type="string">
-      <default>/usr/bin/kdesu</default>
+      <default>kdesu</default>
     </entry>
     <entry name="wifiPath" type="string">
-      <default>/usr/bin/netctl-gui -t 3</default>
+      <default>netctl-gui -t 3</default>
     </entry>
     <entry name="useHelper" type="bool">
       <default>true</default>

sources/plasmoid-kf5/plugin/netctladds.cpp

@@ -344,8 +344,8 @@ QVariantMap NetctlAdds::readDataEngineConfiguration()
     QSettings settings(fileName, QSettings::IniFormat);
 
     settings.beginGroup(QString("Netctl commands"));
-    configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("/usr/bin/netctl"));
+    configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("netctl"));
-    configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("/usr/bin/netctl-auto"));
+    configuration[QString("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("netctl-auto"));
     settings.endGroup();
 
     settings.beginGroup(QString("External IP"));

sources/plasmoid-kf5/plugin/netctladds.h

@@ -42,22 +42,22 @@ public:
     Q_INVOKABLE QString valueByKey(const QString key);
     // context menu
     Q_INVOKABLE void enableProfileSlot(const bool useHelper = true,
-                                       const QString cmd = QString("/usr/bin/netctl"),
+                                       const QString cmd = QString("netctl"),
                                        const QString sudoCmd = QString(""));
     Q_INVOKABLE void restartProfileSlot(const bool useHelper = true,
-                                        const QString cmd = QString("/usr/bin/netctl"),
+                                        const QString cmd = QString("netctl"),
                                         const QString sudoCmd = QString(""));
     Q_INVOKABLE void startProfileSlot(const bool useHelper = true,
-                                      const QString cmd = QString("/usr/bin/netctl"),
+                                      const QString cmd = QString("netctl"),
                                       const QString sudoCmd = QString(""));
     Q_INVOKABLE void stopProfileSlot(const bool useHelper = true,
-                                     const QString cmd = QString("/usr/bin/netctl"),
+                                     const QString cmd = QString("netctl"),
                                      const QString sudoCmd = QString(""));
     Q_INVOKABLE void stopAllProfilesSlot(const bool useHelper = true,
-                                         const QString cmd = QString("/usr/bin/netctl"),
+                                         const QString cmd = QString("netctl"),
                                          const QString sudoCmd = QString(""));
     Q_INVOKABLE void switchToProfileSlot(const bool useHelper = true,
-                                         const QString cmd = QString("/usr/bin/netctl-auto"));
+                                         const QString cmd = QString("netctl-auto"));
     // dataengine
     Q_INVOKABLE QVariantMap readDataEngineConfiguration();
     Q_INVOKABLE void writeDataEngineConfiguration(const QVariantMap configuration);

sources/version.h.in

@@ -52,4 +52,40 @@
 #define DBUS_INTERFACE_PATH "/interface"
 #define DBUS_LIB_PATH "/netctl"
 
+// defaul configuration
+// [Common] section
+#define LANGUAGE "@CFG_LANGUAGE@"
+#define MAINUPDATE "@CFG_MAINUPDATE@"
+#define WIFIUPDATE "@CFG_WIFIUPDATE@"
+#define SYSTRAY "@CFG_SYSTRAY@"
+#define CLOSETOTRAY "@CFG_CLOSETOTRAY@"
+#define STARTTOTRAY "@CFG_STARTTOTRAY@"
+#define SKIPCOMPONENTS "@CFG_SKIPCOMPONENTS@"
+// [Helper] section
+#define USE_HELPER "@CFG_USE_HELPER@"
+#define FORCE_SUDO "@CFG_FORCE_SUDO@"
+#define CLOSE_HELPER "@CFG_CLOSE_HELPER@"
+#define HELPER_PATH "@CFG_HELPER_PATH@"
+#define HELPER_SERVICE "@CFG_HELPER_SERVICE@"
+// [netctl] section
+#define SYSTEMCTL_PATH "@CFG_SYSTEMCTL_PATH@"
+#define NETCTL_PATH "@CFG_NETCTL_PATH@"
+#define NETCTLAUTO_PATH "@CFG_NETCTLAUTO_PATH@"
+#define NETCTLAUTO_SERVICE "@CFG_NETCTLAUTO_SERVICE@"
+#define PROFILE_DIR "@CFG_PROFILE_DIR@"
+// [sudo] section
+#define SUDO_PATH "@CFG_SUDO_PATH@"
+// [wpa_supplicant] section
+#define WPASUP_PATH "@CFG_WPASUP_PATH@"
+#define WPACLI_PATH "@CFG_WPACLI_PATH@"
+#define PID_FILE "@CFG_PID_FILE@"
+#define WPA_DRIVERS "@CFG_WPA_DRIVERS@"
+#define CTRL_DIR "@CFG_CTRL_DIR@"
+#define CTRL_GROUP "@CFG_CTRL_GROUP@"
+// [Other] section
+#define EDITOR_PATH "@CFG_EDITOR_PATH@"
+#define IFACE_DIR "@CFG_IFACE_DIR@"
+#define RFKILL_DIR "@CFG_RFKILL_DIR@"
+#define PREFERED_IFACE "@CFG_PREFERED_IFACE@"
+
 #endif /* VERSION_H */