aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-04-17 16:19:52 -0400
committerKen Moore <ken@pcbsd.org>2015-04-17 16:19:52 -0400
commit8531986b66ebfb1523355bb854cec991a30beb93 (patch)
treeaaa4f1654517206186abefbc384c2efc02723910
parentA couple changes to lumina-config: (diff)
parentFix the implementation of the hardware brightness control on PC-BSD. Now it w... (diff)
downloadlumina-8531986b66ebfb1523355bb854cec991a30beb93.tar.gz
lumina-8531986b66ebfb1523355bb854cec991a30beb93.tar.bz2
lumina-8531986b66ebfb1523355bb854cec991a30beb93.zip
Merge branch 'master' of github.com:pcbsd/lumina
-rw-r--r--libLumina/LuminaOS-FreeBSD.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/libLumina/LuminaOS-FreeBSD.cpp b/libLumina/LuminaOS-FreeBSD.cpp
index 73637048..430a31fc 100644
--- a/libLumina/LuminaOS-FreeBSD.cpp
+++ b/libLumina/LuminaOS-FreeBSD.cpp
@@ -8,6 +8,7 @@
#include "LuminaOS.h"
#include <unistd.h>
+#include <QDebug>
//can't read xbrightness settings - assume invalid until set
static int screenbrightness = -1;
@@ -71,17 +72,18 @@ void LOS::setScreenBrightness(int percent){
//ensure bounds
if(percent<0){percent=0;}
else if(percent>100){ percent=100; }
- float pf = percent/100.0; //convert to a decimel
//Run the command(s)
bool success = false;
// - try hardware setting first (PC-BSD only)
if(QFile::exists("/usr/local/bin/pc-sysconfig")){
- QString ret = LUtils::getCmdOutput("pc-sysconfig \"setscreenbrightness "+QString::number(percent)+"\"").join("");
- success = (ret.simplified() == "[SUCCESS]");
+ QString ret = LUtils::getCmdOutput("pc-sysconfig", QStringList() <<"setscreenbrightness "+QString::number(percent)).join("");
+ success = ret.toLower().contains("success");
+ qDebug() << "Set hardware brightness:" << percent << success;
}
// - if hardware brightness does not work, use software brightness
if(!success){
QString cmd = "xbrightness %1";
+ float pf = percent/100.0; //convert to a decimel
cmd = cmd.arg( QString::number( int(65535*pf) ) );
success = (0 == LUtils::runCmd(cmd) );
}
bgstack15