arcanis/netctl-gui
1
0
Fork 0
mirror of https://github.com/arcan1s/netctl-gui.git synced 2025-07-13 13:55:51 +00:00
Code Issues Projects Releases Wiki Activity

* drop absolute path from configuration

Browse Source 
* add configuration from cmake building
* update submodules
This commit is contained in:
arcan1s
2015-06-27 05:10:56 +03:00
parent aed09bf798
commit 5018232c08
21 changed files with 209 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sources/plasmoid-kde4/netctl.cpp
View File

@ -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("NETCTLAUTOCMD")] = settings.value(QString("NETCTLAUTOCMD"), QString("/usr/bin/netctl-auto")).toString();
configuration[QString("NETCTLCMD")] = settings.value(QString("NETCTLCMD"), QString("netctl")).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("helper")] = cg.readEntry("helperPath", "/usr/bin/netctlgui-helper");
paths[QString("netctl")] = cg.readEntry("netctlPath", "/usr/bin/netctl");
paths[QString("netctlAuto")] = cg.readEntry("netctlAutoPath", "/usr/bin/netctl-auto");
paths[QString("sudo")] = cg.readEntry("sudoPath", "/usr/bin/kdesu");
paths[QString("wifi")] = cg.readEntry("wifiPath", "/usr/bin/netctl-gui -t 3");
paths[QString("gui")] = cg.readEntry("guiPath", "netctl-gui");
paths[QString("helper")] = cg.readEntry("helperPath", "netctlgui-helper");
paths[QString("netctl")] = cg.readEntry("netctlPath", "netctl");
paths[QString("netctlAuto")] = cg.readEntry("netctlAutoPath", "netctl-auto");
paths[QString("sudo")] = cg.readEntry("sudoPath", "kdesu");
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);