aboutsummaryrefslogtreecommitdiff
path: root/libLumina
diff options
context:
space:
mode:
authorKen Moore <ken@pcbsd.org>2015-06-23 14:24:49 -0400
committerKen Moore <ken@pcbsd.org>2015-06-23 14:24:49 -0400
commitc3b62157bdd6a30b4115b192e62d204314fbd6e8 (patch)
treedea7b83aa3f1c6f6be03a6bbee123031f897f452 /libLumina
parentAdjust/verify all the XDG routines which touch a file based on the desktop na... (diff)
downloadlumina-c3b62157bdd6a30b4115b192e62d204314fbd6e8.tar.gz
lumina-c3b62157bdd6a30b4115b192e62d204314fbd6e8.tar.bz2
lumina-c3b62157bdd6a30b4115b192e62d204314fbd6e8.zip
Add a new option in luminaDesktop.conf for auto-generating desktop icons/launchers.
Diffstat (limited to 'libLumina')
-rw-r--r--libLumina/LuminaUtils.cpp2
-rw-r--r--libLumina/LuminaXDG.cpp2
2 files changed, 3 insertions, 1 deletions
diff --git a/libLumina/LuminaUtils.cpp b/libLumina/LuminaUtils.cpp
index f9baac9b..c3f01c8f 100644
--- a/libLumina/LuminaUtils.cpp
+++ b/libLumina/LuminaUtils.cpp
@@ -343,6 +343,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){
if(tmp[i].startsWith("#") || !tmp[i].contains("=") ){ continue; }
QString var = tmp[i].section("=",0,0).toLower().simplified();
QString val = tmp[i].section("=",1,1).section("#",0,0).toLower().simplified();
+ QString istrue = (val=="true") ? "true": "false";
//Change in 0.8.5 - use "_" instead of "." within variables names - need backwards compat for a little while
if(var.contains(".")){ var.replace(".","_"); }
//Now parse the variable and put the value in the proper file
@@ -350,6 +351,7 @@ void LUtils::LoadSystemDefaults(bool skipOS){
else if(var=="desktop_backgroundfiles"){ deskset << "background\\filelist="+val; }
else if(var=="desktop_backgroundrotateminutes"){ deskset << "background\\minutesToChange="+val; }
else if(var=="desktop_plugins"){ deskset << "pluginlist="+val; }
+ else if(var=="desktop_generate_icons"){ deskset << "generateDesktopIcons="+istrue; }
}
if(!tmp.isEmpty()){ deskset << ""; } //space between sections
diff --git a/libLumina/LuminaXDG.cpp b/libLumina/LuminaXDG.cpp
index 40752a8c..ed576f23 100644
--- a/libLumina/LuminaXDG.cpp
+++ b/libLumina/LuminaXDG.cpp
@@ -406,7 +406,7 @@ void LXDG::setEnvironmentVars(){
setenv("XDG_DATA_HOME",QString(QDir::homePath()+"/.local/share").toUtf8(), 0);
setenv("XDG_CONFIG_HOME",QString(QDir::homePath()+"/.config").toUtf8(), 0);
setenv("XDG_DATA_DIRS","/usr/local/share:/usr/share", 0);
- setenv("XDG_CONFIG_DIRS","/etc/xdg", 0);
+ setenv("XDG_CONFIG_DIRS","/etc/xdg:/usr/local/etc/xdg", 0);
setenv("XDG_CACHE_HOME",QString(QDir::homePath()+"/.cache").toUtf8(), 0);
//Don't set "XDG_RUNTIME_DIR" yet - need to look into the specs
}
bgstack15