diff options
| -rw-r--r-- | libLumina/LuminaUtils.cpp | 2 | ||||
| -rw-r--r-- | libLumina/LuminaXDG.cpp | 2 | ||||
| -rw-r--r-- | lumina-desktop/defaults/luminaDesktop.conf | 1 |
3 files changed, 4 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 } diff --git a/lumina-desktop/defaults/luminaDesktop.conf b/lumina-desktop/defaults/luminaDesktop.conf index effc8da4..844e9169 100644 --- a/lumina-desktop/defaults/luminaDesktop.conf +++ b/lumina-desktop/defaults/luminaDesktop.conf @@ -39,6 +39,7 @@ desktop_visiblepanels=1 #[0/1/2] The number of panels visible by default #desktop.backgroundfiles= #list of absolute file paths for image files (disable for Lumina default) desktop_backgroundrotateminutes=5 #[positive integer] number of minutes between background rotations (if multiple files) desktop_plugins=desktopview #list of plugins to be shown on the desktop by default +desktop_generate_icons=false #[true/false] Auto-generate launchers for ~/Desktop items #PANEL SETTINGS (preface with panel1.<setting> or panel2.<setting>, depending on the number of panels you have visible by default) panel1_location=top #[top/bottom/left/right] Screen edge the panel should be on |