intermediate commit

This commit is contained in:
arcan1s
2014-08-09 07:56:17 +04:00
parent 6a3e3b14b3
commit 6b7d5d3800
23 changed files with 287 additions and 162 deletions

View File

@ -65,6 +65,7 @@ public:
* @brief Netctl class constructor
* @param debugCmd show debug messages
* @param settings default settings. Needed keys are
* FORCE_SUDO (force to use sudo),
* IFACE_DIR (path to directory with interfaces),
* PREFERED_IFACE (prefered interface for WiFi),
* NETCTL_PATH (path to netctl command),
@ -244,9 +245,13 @@ private:
*/
NetctlProfile *netctlProfile = nullptr;
/**
* @brief show debug messages
* @brief show debug messages. Default is false
*/
bool debug;
bool debug = false;
/**
* @brief use RootProcess instead of QProcess. Default is true
*/
bool useSuid = true;
/**
* @brief directory with interfaces. Default is "/sys/class/net/"
*/
@ -254,27 +259,27 @@ private:
/**
* @brief prefered interface for WiFi. Default is ""
*/
QString mainInterface;
QString mainInterface = QString("");
/**
* @brief path to netctl command. Default is "/usr/bin/netctl"
*/
QString netctlCommand;
QString netctlCommand = QString("/usr/bin/netctl");
/**
* @brief path to netctl-auto command. Default is "/usr/bin/netctl-auto"
*/
QString netctlAutoCommand;
QString netctlAutoCommand = QString("/usr/bin/netctl-auto");
/**
* @brief netctl-auto service name. Default is "netctl-auto"
*/
QString netctlAutoService;
QString netctlAutoService = QString("netctl-auto");
/**
* @brief path to sudo command. Default is "/usr/bin/kdesu"
*/
QString sudoCommand;
QString sudoCommand = QString("/usr/bin/kdesu");
/**
* @brief path to systemctl command. Default is "/usr/bin/systemctl"
*/
QString systemctlCommand;
QString systemctlCommand = QString("/usr/bin/systemctl");
// functions
/**
* @brief method which calls command

View File

@ -43,6 +43,7 @@ public:
* @brief NetctlProfile class constructor
* @param debugCmd show debug messages
* @param settings default settings. Needed keys are
* FORCE_SUDO (force to use sudo),
* PROFILE_DIR (path to directory which contains profiles),
* SUDO_PATH (path to sudo command)
*/
@ -89,9 +90,13 @@ public:
private:
/**
* @brief show debug messages
* @brief show debug messages. Default is false
*/
bool debug;
bool debug = false;
/**
* @brief use RootProcess instead of QProcess. Default is true
*/
bool useSuid = true;
/**
* @brief directory which contains profiles. Default is "/etc/netctl"
*/
@ -99,7 +104,7 @@ private:
/**
* @brief path to sudo command. Default is "/usr/bin/kdesu"
*/
QString sudoCommand;
QString sudoCommand = QString("/usr/bin/kdesu");
};

View File

@ -137,35 +137,39 @@ private:
/**
* @brief show debug messages
*/
bool debug;
bool debug = false;
/**
* @brief use RootProcess instead of QProcess. Default is true
*/
bool useSuid = true;
/**
* @brief path to ctrl_directory. Defaults is "/run/wpa_supplicant_netctl-gui"
*/
QString ctrlDir;
QString ctrlDir = QString("/run/wpa_supplicant_netctl-gui");
/**
* @brief group which is owner of CTRL_DIR. Default is "users"
*/
QString ctrlGroup;
QString ctrlGroup = QString("users");
/**
* @brief wpa_supplicant PID file. Default is "/run/wpa_supplicant_netctl-gui.pid"
*/
QString pidFile;
QString pidFile = QString("/run/wpa_supplicant_netctl-gui.pid");
/**
* @brief path to sudo command. Default is "/usr/bin/kdesu"
*/
QString sudoCommand;
QString sudoCommand = QString("/usr/bin/kdesu");
/**
* @brief path to wpa_cli command. Default is "/usr/bin/wpa_cli"
*/
QString wpaCliPath;
QString wpaCliPath = QString("/usr/bin/wpa_cli");
/**
* @brief wpa_supplicant drivers comma separated. Default is "nl80211,wext"
*/
QString wpaDrivers;
QString wpaDrivers = QString("nl80211,wext");
/**
* @brief path to wpa_supplicant command. Default is "/usr/bin/wpa_supplicant"
*/
QString wpaSupPath;
QString wpaSupPath = QString("/usr/bin/wpa_supplicant");
// functions
/**
* @brief method which calls wpa_cli and returns its output