diff options
Diffstat (limited to 'lumina-desktop/Globals.h')
| -rw-r--r-- | lumina-desktop/Globals.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/lumina-desktop/Globals.h b/lumina-desktop/Globals.h index 64b1e438..b2cac1eb 100644 --- a/lumina-desktop/Globals.h +++ b/lumina-desktop/Globals.h @@ -8,6 +8,7 @@ #define _LUMINA_DESKTOP_GLOBALS_H #include <LuminaUtils.h> +#include "../global.h" #include <unistd.h> #include <stdio.h> @@ -26,11 +27,11 @@ public: class SYSTEM{ public: //Installation location for finding default files - static QString installDir(){ return "/usr/local/share/Lumina-DE/"; } + static QString installDir(){ return PREFIX + "/share/Lumina-DE/"; } //Current Username static QString user(){ return QString::fromLocal8Bit(getlogin()); } //Current Hostname - static QString hostname(){ + static QString hostname(){ char name[BUFSIZ]; int count = gethostname(name,sizeof(name)); if (count < 0) { @@ -46,25 +47,25 @@ public: #endif // #ifdef __linux //Restart the system static void restart(){ system("(shutdown -r now) &"); } - + //Determine if there is battery support static bool hasBattery(){ int val = LUtils::getCmdOutput("apm -l").join("").toInt(); return (val >= 0 && val <= 100); } - + //Get the current battery charge percentage static int batteryCharge(){ int charge = LUtils::getCmdOutput("apm -l").join("").toInt(); - if(charge > 100){ charge = -1; } //invalid charge + if(charge > 100){ charge = -1; } //invalid charge return charge; } - + //Get the current battery charge percentage static bool batteryIsCharging(){ return (LUtils::getCmdOutput("apm -a").join("").simplified() == "1"); } - + //Get the amount of time remaining for the battery static int batterySecondsLeft(){ return LUtils::getCmdOutput("apm -t").join("").toInt(); |