From 879fb958e17dffa76a99611b9f3b5b0a435f38ad Mon Sep 17 00:00:00 2001
From: Ken Moore <ken@ixsystems.com>
Date: Mon, 20 Nov 2017 17:37:23 -0500
Subject: Add another layer of defaults to the wallpapers. If nothing is
 specified, try to load the PREFIX/share/wallpapers/lumina-nature directory.
 If that does not exist, it will use the original fallback of the
 defaultBackground.jpg file in the share directory.

---
 src-qt5/core/lumina-desktop/LDesktop.cpp                | 2 +-
 src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src-qt5')

diff --git a/src-qt5/core/lumina-desktop/LDesktop.cpp b/src-qt5/core/lumina-desktop/LDesktop.cpp
index 71b10bd5..a7ab1340 100644
--- a/src-qt5/core/lumina-desktop/LDesktop.cpp
+++ b/src-qt5/core/lumina-desktop/LDesktop.cpp
@@ -535,7 +535,7 @@ void LDesktop::UpdateBackground(){
   //Get the list of background(s) to show
   QStringList bgL = settings->value(DPREFIX+"background/filelist-workspace-"+QString::number( LSession::handle()->XCB->CurrentWorkspace()), QStringList()).toStringList();
   if(bgL.isEmpty()){ bgL = settings->value(DPREFIX+"background/filelist", QStringList()).toStringList(); }
-
+  if(bgL.isEmpty()){ bgL << LOS::LuminaShare()+"../wallpapers/lumina-nature"; } //Use this entire directory by default if nothing specified
   //qDebug() << " - List:" << bgL << CBG;
     //Remove any invalid files
     for(int i=0; i<bgL.length(); i++){
diff --git a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
index 40ece4f0..e4229038 100644
--- a/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
+++ b/src-qt5/core/lumina-desktop/defaults/luminaDesktop.conf
@@ -6,12 +6,12 @@
 #  system corresponding to the XDG mime-type specifications for default applications
 #  See Here for specifications: http://www.freedesktop.org/wiki/Specifications/mime-apps-spec/
 
-# Possible Desktop Plugins (Lumina version 0.9.1): 
+# Possible Desktop Plugins: 
 #   calendar, applauncher[::absolute path to *.desktop file], desktopview, notepad, audioplayer, rssreader
-# Possible Panel Plugins (Lumina version 0.9.1):
+# Possible Panel Plugins:
 #   userbutton, desktopbar, spacer, desktopswitcher, battery, clock, systemdashboard, systemstart
 #   taskmanager[-nogroups], systemtray, homebutton, appmenu, applauncher[::absolute path to *.desktop file]
-# Possible Menu Plugins (Lumina version 0.9.1):
+# Possible Menu Plugins:
 #   terminal, filemanager, applications, line, settings, windowlist, app::<absolute path to *.desktop file>
 
 #GENERAL SESSION SETTINGS 
-- 
cgit