aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/core
diff options
context:
space:
mode:
Diffstat (limited to 'src-qt5/core')
-rw-r--r--src-qt5/core/libLumina/LUtils.cpp1
-rw-r--r--src-qt5/core/libLumina/LuminaXDG.cpp3
-rw-r--r--src-qt5/core/lumina-desktop/lumina-desktop.pro11
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey-zoom.jpgbin6269314 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey.jpgbin6508360 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpgbin2523711 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_green.jpgbin1286362 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue-zoom.jpgbin563037 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue.jpgbin361771 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpgbin926969 -> 0 bytes
-rw-r--r--src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_red.jpgbin1141515 -> 0 bytes
11 files changed, 3 insertions, 12 deletions
diff --git a/src-qt5/core/libLumina/LUtils.cpp b/src-qt5/core/libLumina/LUtils.cpp
index 65c6ac96..3d3c878a 100644
--- a/src-qt5/core/libLumina/LUtils.cpp
+++ b/src-qt5/core/libLumina/LUtils.cpp
@@ -123,6 +123,7 @@ bool LUtils::writeFile(QString filepath, QStringList contents, bool overwrite){
bool LUtils::isValidBinary(QString& bin){
//Trim off any quotes
if(bin.startsWith("\"") && bin.endsWith("\"")){ bin.chop(1); bin = bin.remove(0,1); }
+ if(bin.startsWith("\'") && bin.endsWith("\'")){ bin.chop(1); bin = bin.remove(0,1); }
//Now look for relative/absolute path
if(!bin.startsWith("/")){
//Relative path: search for it on the current "PATH" settings
diff --git a/src-qt5/core/libLumina/LuminaXDG.cpp b/src-qt5/core/libLumina/LuminaXDG.cpp
index aaca7bb1..492a296c 100644
--- a/src-qt5/core/libLumina/LuminaXDG.cpp
+++ b/src-qt5/core/libLumina/LuminaXDG.cpp
@@ -729,7 +729,8 @@ bool LFileInfo::isAVFile(){
bool LXDG::checkExec(QString exec){
//Return true(good) or false(bad)
//Check for quotes around the exec, and remove them as needed
- if(exec.startsWith("\"") && exec.count("\"")>=2){ exec = exec.section("\"",1,1); }
+ if(exec.startsWith("\"") && exec.count("\"")>=2){ exec = exec.section("\"",1,1).simplified(); }
+ if(exec.startsWith("\'") && exec.count("\'")>=2){ exec = exec.section("\'",1,1).simplified(); }
if(exec.startsWith("/")){ return QFile::exists(exec); }
else{
QStringList paths = QString(getenv("PATH")).split(":");
diff --git a/src-qt5/core/lumina-desktop/lumina-desktop.pro b/src-qt5/core/lumina-desktop/lumina-desktop.pro
index d4e57c5c..2c944a11 100644
--- a/src-qt5/core/lumina-desktop/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop/lumina-desktop.pro
@@ -77,17 +77,6 @@ fluxconf.files = fluxboxconf/fluxbox-init-rc \
fluxboxconf/fluxbox-keys
fluxconf.path = $${L_SHAREDIR}/lumina-desktop/
-wallpapers.files = wallpapers/Lumina_Wispy_gold.jpg \
- wallpapers/Lumina_Wispy_green.jpg \
- wallpapers/Lumina_Wispy_purple.jpg \
- wallpapers/Lumina_Wispy_red.jpg \
- wallpapers/Lumina_Wispy_blue-grey.jpg \
- wallpapers/Lumina_Wispy_blue-grey-zoom.jpg \
- wallpapers/Lumina_Wispy_grey-blue.jpg \
- wallpapers/Lumina_Wispy_grey-blue-zoom.jpg
-wallpapers.path = $${L_SHAREDIR}/wallpapers/Lumina-DE
-
-
defaults.files = defaults/luminaDesktop.conf \
defaults/compton.conf \
audiofiles/Logout.ogg \
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg
deleted file mode 100644
index 481ca438..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey-zoom.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey.jpg
deleted file mode 100644
index 9da67596..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_blue-grey.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpg
deleted file mode 100644
index cba03cee..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_gold.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_green.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_green.jpg
deleted file mode 100644
index 80b0d3e3..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_green.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg
deleted file mode 100644
index 4f753ed5..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue-zoom.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue.jpg
deleted file mode 100644
index c214cd78..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_grey-blue.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpg
deleted file mode 100644
index e4c3d7a8..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_purple.jpg
+++ /dev/null
Binary files differ
diff --git a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_red.jpg b/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_red.jpg
deleted file mode 100644
index a092f636..00000000
--- a/src-qt5/core/lumina-desktop/wallpapers/Lumina_Wispy_red.jpg
+++ /dev/null
Binary files differ
bgstack15