Add "DESTDIR" build option support to the Lumina project files (needed for Fedora packaging).

Also convert the last X11 usage in LPanel over to XCB

12 files changed, 19 insertions, 19 deletions

diff --git a/libLumina/libLumina.pro b/libLumina/libLumina.pro
index 2cfd20db..d7df7960 100644
--- a/libLumina/libLumina.pro
+++ b/libLumina/libLumina.pro
@@ -13,7 +13,7 @@ system(./make-global-h.sh $$PREFIX)
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
 }
-target.path = $$LIBPREFIX
+target.path = $$DESTDIR$$LIBPREFIX
 
 DESTDIR= $$_PRO_FILE_PWD_/
 
diff --git a/lumina-config/lumina-config.pro b/lumina-config/lumina-config.pro
index f7df7cdf..0add04d9 100644
--- a/lumina-config/lumina-config.pro
+++ b/lumina-config/lumina-config.pro
@@ -6,7 +6,7 @@ TARGET = lumina-config
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-desktop/LPanel.cpp b/lumina-desktop/LPanel.cpp
index 4cdbcbfd..11b4629c 100644
--- a/lumina-desktop/LPanel.cpp
+++ b/lumina-desktop/LPanel.cpp
@@ -134,9 +134,9 @@ void LPanel::UpdatePanel(bool geomonly){
     this->setMaximumSize(sz);
     this->setGeometry(xloc,0,sz.width(), sz.height());
     //qDebug() << " - Reserve Panel Localation";
-    if(!hidden){ LX11::ReservePanelLocation(this->winId(), xloc, 0, this->width(), ht, "top"); }
+    if(!hidden){ LSession::handle()->XCB->ReserveLocation(this->winId(), this->geometry(), "top"); }
     else{ 
-      LX11::ReservePanelLocation(this->winId(), xloc, 0, this->width(), hidesize, "top");
+     LSession::handle()->XCB->ReserveLocation(this->winId(), QRect(xloc, 0, this->width(), hidesize), "top");
       hidepoint = QPoint(xloc, hidesize-ht);
       showpoint = QPoint(xloc, 0);
       this->move(hidepoint); //Could bleed over onto the screen above
@@ -149,9 +149,9 @@ void LPanel::UpdatePanel(bool geomonly){
     this->setMinimumSize(sz);
     this->setMaximumSize(sz);
     this->setGeometry(xloc,xhi-ht,sz.width(), ht );
-    if(!hidden){ LX11::ReservePanelLocation(this->winId(), xloc, xhi-ht, this->width(), ht, "bottom"); }
+    if(!hidden){ LSession::handle()->XCB->ReserveLocation(this->winId(), this->geometry(), "bottom"); }
     else{ 
-      LX11::ReservePanelLocation(this->winId(), xloc, xhi-hidesize, this->width(), hidesize, "bottom"); 
+      LSession::handle()->XCB->ReserveLocation(this->winId(), QRect(xloc, xhi-hidesize, this->width(), hidesize), "bottom"); 
       hidepoint = QPoint(xloc, xhi-hidesize);
       showpoint = QPoint(xloc, xhi-ht);
       this->move(hidepoint); //Could bleed over onto the screen below
@@ -165,9 +165,9 @@ void LPanel::UpdatePanel(bool geomonly){
     this->setMinimumSize(sz);
     this->setMaximumSize(sz);
     this->setGeometry(xloc,yloc, ht, sz.height());
-    if(!hidden){ LX11::ReservePanelLocation(this->winId(), xloc, yloc, ht, sz.height(), "left"); }
+    if(!hidden){ LSession::handle()->XCB->ReserveLocation(this->winId(), this->geometry(), "left"); }
     else{ 
-      LX11::ReservePanelLocation(this->winId(), xloc, yloc, hidesize, sz.height(), "left"); 
+      LSession::handle()->XCB->ReserveLocation(this->winId(), QRect(xloc, yloc, hidesize, sz.height()), "left"); 
       hidepoint = QPoint(xloc-ht+hidesize, yloc);
       showpoint = QPoint(xloc, yloc);
       this->move(hidepoint); //Could bleed over onto the screen left
@@ -181,9 +181,9 @@ void LPanel::UpdatePanel(bool geomonly){
     this->setMinimumSize(sz);
     this->setMaximumSize(sz);
     this->setGeometry(xloc+xwid-ht,yloc,ht, sz.height());
-    if(!hidden){ LX11::ReservePanelLocation(this->winId(), xloc+xwid-ht, yloc, ht, sz.height(), "right"); }  
+    if(!hidden){ LSession::handle()->XCB->ReserveLocation(this->winId(), this->geometry(), "right"); }  
     else{ 
-      LX11::ReservePanelLocation(this->winId(), xloc+xwid-hidesize, yloc, hidesize, sz.height(), "right"); 
+      LSession::handle()->XCB->ReserveLocation(this->winId(), QRect(xloc+xwid-hidesize, yloc, hidesize, sz.height()), "right"); 
       hidepoint = QPoint(xloc+xwid-hidesize, yloc);
       showpoint = QPoint(xloc+xwid-ht, yloc);
       this->move(hidepoint); //Could bleed over onto the screen right
diff --git a/lumina-desktop/lumina-desktop.pro b/lumina-desktop/lumina-desktop.pro
index dc20fd98..5996cfab 100644
--- a/lumina-desktop/lumina-desktop.pro
+++ b/lumina-desktop/lumina-desktop.pro
@@ -6,7 +6,7 @@ TARGET = Lumina-DE
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-fileinfo/lumina-fileinfo.pro b/lumina-fileinfo/lumina-fileinfo.pro
index 8e04136f..5cab34c9 100644
--- a/lumina-fileinfo/lumina-fileinfo.pro
+++ b/lumina-fileinfo/lumina-fileinfo.pro
@@ -8,7 +8,7 @@ TEMPLATE = app
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-fm/lumina-fm.pro b/lumina-fm/lumina-fm.pro
index ed3b49ec..adf23749 100644
--- a/lumina-fm/lumina-fm.pro
+++ b/lumina-fm/lumina-fm.pro
@@ -6,7 +6,7 @@ TARGET = lumina-fm
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-info/lumina-info.pro b/lumina-info/lumina-info.pro
index 509bf7ad..fcdfecee 100644
--- a/lumina-info/lumina-info.pro
+++ b/lumina-info/lumina-info.pro
@@ -8,7 +8,7 @@ isEmpty(PREFIX) {
 target.path = $$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
- LIBPREFIX = $$PREFIX/lib
+ LIBPREFIX = $$DESTDIR$$PREFIX/lib
 }
 
 TEMPLATE = app
diff --git a/lumina-open/lumina-open.pro b/lumina-open/lumina-open.pro
index ded03086..46ad57b8 100644
--- a/lumina-open/lumina-open.pro
+++ b/lumina-open/lumina-open.pro
@@ -6,7 +6,7 @@ TARGET = lumina-open
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-screenshot/lumina-screenshot.pro b/lumina-screenshot/lumina-screenshot.pro
index ee71bfa6..2f5adcf0 100644
--- a/lumina-screenshot/lumina-screenshot.pro
+++ b/lumina-screenshot/lumina-screenshot.pro
@@ -6,7 +6,7 @@ TARGET = lumina-screenshot
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-search/lumina-search.pro b/lumina-search/lumina-search.pro
index 92c95a14..ff63864c 100644
--- a/lumina-search/lumina-search.pro
+++ b/lumina-search/lumina-search.pro
@@ -6,7 +6,7 @@ TARGET = lumina-search
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-wm-INCOMPLETE/lumina-wm.pro b/lumina-wm-INCOMPLETE/lumina-wm.pro
index 3c680799..df82e69b 100644
--- a/lumina-wm-INCOMPLETE/lumina-wm.pro
+++ b/lumina-wm-INCOMPLETE/lumina-wm.pro
@@ -6,7 +6,7 @@ TARGET = lumina-wm
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib
diff --git a/lumina-xconfig/lumina-xconfig.pro b/lumina-xconfig/lumina-xconfig.pro
index 139f2bd5..bc050966 100644
--- a/lumina-xconfig/lumina-xconfig.pro
+++ b/lumina-xconfig/lumina-xconfig.pro
@@ -6,7 +6,7 @@ TARGET = lumina-xconfig
 isEmpty(PREFIX) {
  PREFIX = /usr/local
 }
-target.path = $$PREFIX/bin
+target.path = $$DESTDIR$$PREFIX/bin
 
 isEmpty(LIBPREFIX) {
  LIBPREFIX = $$PREFIX/lib