Get lumina-pingcursor integrated into the core package.

Also fix a couple random errors. Adjust the default "PREFIX" to /usr for all Linux distros for instance.

5 files changed, 12 insertions, 4 deletions

diff --git a/src-qt5/OS-detect.pri b/src-qt5/OS-detect.pri
index 2214016d..b61a137e 100644
--- a/src-qt5/OS-detect.pri
+++ b/src-qt5/OS-detect.pri
@@ -30,8 +30,7 @@ isEmpty(OS){
   QMAKE_LIBDIR =  $${PWD}/core/libLumina $$[QT_INSTALL_LIBS] $$LIBPREFIX/qt5 $$LIBPREFIX
 
   #Setup the default values for build settings (if not explicitly set previously)
-  isEmpty(PREFIX){ PREFIX=/usr/local }
-  isEmpty(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib }
+
   #message("General Settings: PREFIX=$${PREFIX}, LIBPREFIX=$${LIBPREFIX}")
   #Now go through and setup any known OS build settings
   #  which are different from the defaults
@@ -41,21 +40,25 @@ isEmpty(OS){
     LIBS += -L/usr/local/lib -L/usr/lib
 
   }else : freebsd-*{
+    isEmpty(PREFIX){ PREFIX=/usr/local }
     OS = FreeBSD
     LIBS += -L/usr/local/lib -L/usr/lib
      #Use the defaults for everything else
 
   }else : openbsd-*{
+    isEmpty(PREFIX){ PREFIX=/usr/local }
     OS = OpenBSD
     LIBS += -L/usr/local/lib -L/usr/lib
     #Use the defaults for everything else
 
   }else : netbsd-*{
+    isEmpty(PREFIX){ PREFIX=/usr/local }
     OS = NetBSD
     LIBS += -L/usr/local/lib -L/usr/lib
     #Use the defaults for everything else
 
   }else : linux-*{
+    isEmpty(PREFIX){ PREFIX=/usr }
     L_SESSDIR=/usr/share/xsessions
     OS=Linux
     LIBS += -L/usr/local/lib -L/usr/lib -L/lib
@@ -87,6 +90,7 @@ isEmpty(OS){
       isEmpty(L_MANDIR){ L_MANDIR = $${PREFIX}/share/man }
     }
   }else{
+    isEmpty(PREFIX){ PREFIX=/usr/local }
     OS="Unknown";
   }
 
@@ -96,6 +100,7 @@ isEmpty(OS){
 
   # Setup the dirs needed to find/load libraries
   INCLUDEPATH +=$${PREFIX}/include 
+  isEmpty(LIBPREFIX){ LIBPREFIX=$${PREFIX}/lib }
 
   # If the detailed install variables are not set - create them from the general vars
   isEmpty(L_BINDIR){ L_BINDIR = $${PREFIX}/bin }
diff --git a/src-qt5/core/core.pro b/src-qt5/core/core.pro
index 1ae58167..4b3edb88 100644
--- a/src-qt5/core/core.pro
+++ b/src-qt5/core/core.pro
@@ -8,6 +8,7 @@ SUBDIRS+= lumina-desktop \
 	lumina-session \
 	lumina-open \
 	lumina-info \
+	lumina-pingcursor \
 	$${PWD}/../../icon-theme \
 	lumina-theme-engine
 #	lumina-checkpass
diff --git a/src-qt5/core/lumina-desktop/defaults/compton.conf b/src-qt5/core/lumina-desktop/defaults/compton.conf
index a14fee29..b5561e51 100644
--- a/src-qt5/core/lumina-desktop/defaults/compton.conf
+++ b/src-qt5/core/lumina-desktop/defaults/compton.conf
@@ -15,7 +15,8 @@ shadow-exclude = [
 	"class_g = 'Conky'",
 	"class_g ?= 'Notify-osd'",
 	"class_g = 'Cairo-clock'",
-	"_GTK_FRAME_EXTENTS@:c"
+	"_GTK_FRAME_EXTENTS@:c",
+	"name = 'lumina-pingcursor'"
 ];
 # shadow-exclude = "n:e:Notification";
 # shadow-exclude-reg = "x10+0+0";
diff --git a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
index 9726d5a4..92f58e71 100644
--- a/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
+++ b/src-qt5/core/lumina-desktop/fluxboxconf/fluxbox-keys
@@ -144,3 +144,4 @@ Print   :Exec lumina-screenshot
 Mod1 Home   :Exec lumina-open -brightnessup
 Mod1 End   :Exec lumina-open -brightnessdown
 Pause  :Exec xscreensaver-command -lock
+Control Mod1 space :Exec lumina-pingcursor
diff --git a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
index e2ce6943..b03647f4 100644
--- a/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
+++ b/src-qt5/core/lumina-theme-engine/src/lthemeengine/lthemeengine.cpp
@@ -196,7 +196,7 @@ bool lthemeengine::setCursorTheme(QString cursorname){
     //Now save the file
     if( !QFile::exists(QDir::homePath()+"/.icons/default") ){
       //Need to create the directory first
-      QDir().mkpath(QDir::homePath()+"/.icons/default")
+      QDir().mkpath(QDir::homePath()+"/.icons/default");
     }
     QFile file(QDir::homePath()+"/.icons/default/index.theme");
     bool ok = false;