Merge remote-tracking branch 'origin/master'

25 files changed, 511 insertions, 57 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index e1251c01..ed4d644b 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -22,6 +22,7 @@ QThread* Lumina::EVThread = 0;
 RootWindow* Lumina::ROOTWIN = 0;
 XDGDesktopList* Lumina::APPLIST = 0;
 LShortcutEvents* Lumina::SHORTCUTS = 0;
+DesktopManager* Lumina::DESKMAN = 0;
 
 LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lumina-desktop-unified"){
   //Initialize the global objects to null pointers
@@ -49,10 +50,11 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
   Lumina::NEF = new NativeEventFilter();
   Lumina::NWS = new NativeWindowSystem();
   Lumina::SS = new LScreenSaver();
+  Lumina::DESKMAN = new DesktopManager();
   //Now put the Native Window System into it's own thread to keep things snappy
   Lumina::EVThread = new QThread();
-    //Lumina::NWS->moveToThread(Lumina::EVThread);
-  //Lumina::EVThread->start();
+    Lumina::DESKMAN->moveToThread(Lumina::EVThread);
+  Lumina::EVThread->start();
   Lumina::APPLIST = XDGDesktopList::instance();
   Lumina::ROOTWIN = new RootWindow();
   Lumina::SHORTCUTS = new LShortcutEvents(); //this can be moved to it's own thread eventually as well
@@ -73,6 +75,7 @@ LSession::~LSession(){
   if(DesktopSettings::instance()!=0){ DesktopSettings::instance()->deleteLater(); }
   if(Lumina::ROOTWIN!=0){ Lumina::ROOTWIN->deleteLater(); }
   if(Lumina::APPLIST!=0){ Lumina::APPLIST->deleteLater(); }
+  if(Lumina::DESKMAN!=0){ Lumina::DESKMAN->deleteLater(); }
 }
 
 void LSession::setupSession(){
@@ -104,6 +107,10 @@ void LSession::setupSession(){
     splash.showScreen("user");
   if(DEBUG){ qDebug() << " - Init User Files:" << timer->elapsed();}
   //checkUserFiles(); //adds these files to the watcher as well
+  Lumina::NWS->setRoot_numberOfWorkspaces(QStringList() << "one" << "two");
+  Lumina::NWS->setRoot_currentWorkspace(0);
+
+  Lumina::DESKMAN->start();
   Lumina::ROOTWIN->start();
   //Initialize the internal variables
   //DESKTOPS.clear();
@@ -124,14 +131,12 @@ void LSession::setupSession(){
 
   //Initialize the desktops
     splash.showScreen("desktop");
-  if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed(); }
+  /*if(DEBUG){ qDebug() << " - Init Desktops:" << timer->elapsed(); }
   QList<QScreen*> scrns= QApplication::screens();
   for(int i=0; i<scrns.length(); i++){
     qDebug() << "   --- Load Wallpaper for Screen:" << scrns[i]->name();
     RootDesktopObject::instance()->ChangeWallpaper(scrns[i]->name(),QUrl::fromLocalFile(LOS::LuminaShare()+"desktop-background.jpg").toString() );
-  }
-  Lumina::NWS->setRoot_numberOfWorkspaces(QStringList() << "one" << "two");
-  Lumina::NWS->setRoot_currentWorkspace(0);
+  }*/
 
   if(DEBUG){ qDebug() << " - Create Desktop Context Menu"; }
 
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Grav.json b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Grav.json
new file mode 100644
index 00000000..8d75d399
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/Grav.json
@@ -0,0 +1,25 @@
+{
+  "name" : {
+    "default" : "Grav"
+  },
+  "description" : {
+    "default" : "Simulates a solar system, with a single star and planets erratically orbiting that star"
+  },
+  "author" : {
+    "name" : "Zackary Welch",
+    "email" : "zwelch@ixsystems.com",
+    "website" : "https://github.com/ZackaryWelch",
+    "company" : "iXsystems",
+    "company_website" : "http://ixsystems.com"
+  },
+  "meta" : {
+    "license" : "3-clause BSD",
+    "license_url" : "https://github.com/trueos/lumina/blob/master/LICENSE",
+    "copyright" : "Copyright (c) 2017, Ken Moore (ken@ixsystems.com)",
+    "date_created" : "20171101",
+    "version" : "1.0"
+  },
+  "qml" : {
+    "exec" : "qml_scripts/Grav.qml"
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
index 7a3c33cd..d1e5d3c9 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Grav.qml
@@ -4,11 +4,13 @@ import QtGraphicalEffects 1.0
 Rectangle {
   id : canvas
   anchors.fill: parent
-  width: 800
-  height: 600
+  width: Screen.width 
+  height: Screen.height
   color: "black"
 
   //TODO Add orbital trails option
+  //TODO Fix jitteryness and start position
+  //TODO Make orbits more extreme 
 
   //Between 5 and 15 planets, read from settings
   property int planets: Math.round(( Math.random() * 10 ) + 5 )
@@ -30,6 +32,7 @@ Rectangle {
       property double a: Math.sqrt(b*b+c*c)
       //Random angle of rotation
       property double th: Math.random() * Math.PI 
+      property var path: []
 
       //Calculates starting position
       x: Math.round(cx + a * Math.cos(th))
@@ -45,34 +48,40 @@ Rectangle {
       //Give each planet a random color, semi-transparent
       color: Qt.rgba(Math.random(), Math.random(), Math.random(), 0.5)
 
-      Timer {
+      /*Timer {
         //Each planet updates between 1ms and 51ms (smaller times=faster)
         interval: Math.round(Math.random() * 50 ) + 1
         repeat: true
         running: true
-        property bool starting: true
         property int time: 0
 
         onTriggered: {
-          //Move a planet 80 pixels away from the sun if the planet is too close
-          if(starting) {
-            if(x > cx && Math.abs(cx-x) < 80) {
-              x+=80
-            }else if(x < cx && Math.abs(cx-x) < 80) {
-              x-=80
-            }
-
-            if(y > cy && Math.abs(cy-y) < 80) {
-              y+=80
-            }else if(y < cy && Math.abs(cy-y) < 80) {
-              y-=80
-            }
-            starting = false;
-          }
           //Parametric equation that calculates the position of the general ellipse. Completes a loop ever 314 cycles. Credit to 
           x = cx+a*Math.cos(2*Math.PI*(time/314.0))*Math.cos(th) - b*Math.sin(2*Math.PI*(time/314.0))*Math.sin(th)
           y = cy+a*Math.cos(2*Math.PI*(time/314.0))*Math.sin(th) + b*Math.sin(2*Math.PI*(time/314.0))*Math.cos(th)
           time++;
+
+          //Move a planet 80 pixels away from the sun if the planet is too close
+          if(x > cx && Math.abs(cx-x) < 80) {
+            x+=80
+          }else if(x < cx && Math.abs(cx-x) < 80) {
+            x-=80
+          }
+
+          if(y > cy && Math.abs(cy-y) < 80) {
+            y+=80
+          }else if(y < cy && Math.abs(cy-y) < 80) {
+            y-=80
+          }
+        }
+      }*/
+
+      Component.onCompleted: {
+        pahtX[0] = x
+        pahtY[0] = y
+        for(int i = 1; i <= 200; i++) {
+          pathX[i] = cx+a*Math.cos(2*Math.PI*(i/200.0)*Math.cos(th) - b*Math.sin(2*Math.PI*(i/200.0)*Math.sin(th)
+          pathY[i] = cy+a*Math.cos(2*Math.PI*(i/200.0)*Math.sin(th) + b*Math.sin(2*Math.PI*(i/200.0)*Math.cos(th)
         }
       }
     }
diff --git a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml
index e7d0626d..9948537b 100644
--- a/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml
+++ b/src-qt5/core/lumina-desktop-unified/extrafiles/screensavers/qml_scripts/Video.qml
@@ -4,10 +4,8 @@ import QtQuick.Window 2.2
 import Qt.labs.folderlistmodel 2.1
 
 Rectangle {
-  //width: Screen.width
-  //height: Screen.height
-  width: 800
-  height: 600
+  width: Screen.width
+  height: Screen.height
   color: "black"
 
   FolderListModel {
diff --git a/src-qt5/core/lumina-desktop-unified/global-includes.h b/src-qt5/core/lumina-desktop-unified/global-includes.h
index 40987ad4..fbc3c4f7 100644
--- a/src-qt5/core/lumina-desktop-unified/global-includes.h
+++ b/src-qt5/core/lumina-desktop-unified/global-includes.h
@@ -59,10 +59,6 @@
 #include <QQmlEngine>
 #include <QQuickImageProvider>
 
-// C++ Backend classes for QML interface
-#include <RootDesktopObject.h>
-#include <ScreenObject.h>
-
 // libLumina includes
 #include <LuminaX11.h>
 #include <LuminaXDG.h>
@@ -80,6 +76,9 @@
 #include <LIconCache.h>
 #include <LFileInfo.h>
 
+// C++ Backend classes for QML interface
+#include <RootDesktopObject.h>
+#include <ScreenObject.h>
 
 //Setup any global defines (no classes or global objects: use "global-objects.h" for that)
 
diff --git a/src-qt5/core/lumina-desktop-unified/global-objects.h b/src-qt5/core/lumina-desktop-unified/global-objects.h
index c204587f..4cea60c2 100644
--- a/src-qt5/core/lumina-desktop-unified/global-objects.h
+++ b/src-qt5/core/lumina-desktop-unified/global-objects.h
@@ -22,9 +22,10 @@
 //#include "src-events/LXcbEventFilter.h"
 //#endif
 #include "src-events/LShortcutEvents.h"
-
+#include "src-desktop/DesktopManager.h"
 #include "src-screensaver/LScreenSaver.h"
 //#include "src-WM/LWindowManager.h"
+
 #include <RootWindow.h>
 #include "LSession.h"
 
@@ -43,13 +44,13 @@ namespace Lumina{
 
 	//extern EventFilter *EFILTER; //Native Event Watcher
 	extern LShortcutEvents *SHORTCUTS; //Keyboard/mouse shortcut events
-	//extern DesktopSettings *SETTINGS; //All Settings files
+
 	//ScreenSaver
 	extern LScreenSaver *SS;
 	//Root Window
 	extern RootWindow *ROOTWIN;
-	//Window Manager
-	//LWindowManager *WM;
+	//Desktop Manager
+	extern DesktopManager *DESKMAN;
 	//Application List
 	extern XDGDesktopList *APPLIST;
 
diff --git a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
index 21e46b22..bb987e25 100644
--- a/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
+++ b/src-qt5/core/lumina-desktop-unified/lumina-desktop.pro
@@ -24,7 +24,7 @@ include(../libLumina/ExternalProcess.pri)
 include(../../src-cpp/NativeWindow.pri)
 include(../libLumina/XDGMime.pri)
 
-include(../../src-cpp/plugins-screensaver.pri)
+include(../../src-cpp/plugins-base.pri)
 
 #include  all the main individual source groups
 include(src-screensaver/screensaver.pri)
@@ -124,7 +124,7 @@ TRANSLATIONS =  i18n/lumina-desktop_af.ts \
                 i18n/lumina-desktop_zu.ts
 
 dotrans.path=$${L_SHAREDIR}/lumina-desktop/i18n/
-dotrans.extra=cd i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/
+dotrans.extra=cd $$PWD/i18n && $${LRELEASE} -nounfinished *.ts && cp *.qm $(INSTALL_ROOT)$${L_SHAREDIR}/lumina-desktop/i18n/
 
 INSTALLS += target desktop defaults extrafiles
 
diff --git a/src-qt5/core/lumina-desktop-unified/main.cpp b/src-qt5/core/lumina-desktop-unified/main.cpp
index ed2b9b4c..3cf35e50 100644
--- a/src-qt5/core/lumina-desktop-unified/main.cpp
+++ b/src-qt5/core/lumina-desktop-unified/main.cpp
@@ -39,11 +39,11 @@ int main(int argc, char ** argv)
     QTime *timer=0;
     if(DEBUG){ timer = new QTime(); timer->start(); }
     if(DEBUG){ qDebug() << "Theme Init:" << timer->elapsed(); }
-    LuminaThemeEngine theme(&a);
-    QObject::connect(&theme, SIGNAL(updateIcons()), &a, SLOT(reloadIconTheme()) );
+    /*LuminaThemeEngine theme(&a);
+    QObject::connect(&theme, SIGNAL(updateIcons()), &a, SLOT(reloadIconTheme()) );*/
     if(DEBUG){ qDebug() << "Session Setup:" << timer->elapsed(); }
     QTimer::singleShot(0, &a, SLOT(setupSession()) );
-    theme.refresh();
+    //theme.refresh();
     if(DEBUG){ qDebug() << "Exec Time:" << timer->elapsed(); delete timer;}
     int retCode = a.exec();
     qDebug() << "Finished Closing Down Unified Lumina";
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp
new file mode 100644
index 00000000..d6d06be9
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.cpp
@@ -0,0 +1,139 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017-2018, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "DesktopManager.h"
+
+#include "global-objects.h"
+
+// === PUBLIC ===
+DesktopManager::DesktopManager(){
+
+}
+
+DesktopManager::~DesktopManager(){
+
+}
+
+void DesktopManager::start(){
+  connect(DesktopSettings::instance(), SIGNAL(FileModified(DesktopSettings::File)), this, SLOT(settingsChanged(DesktopSettings::File)) );
+  //Perform the initial load of the settings files
+  QTimer::singleShot(0, this, SLOT(updateDesktopSettings()) );
+  QTimer::singleShot(0, this, SLOT(updatePanelSettings()) );
+  QTimer::singleShot(0, this, SLOT(updatePluginSettings()) );
+  QTimer::singleShot(0, this, SLOT(updateMenuSettings()) );
+  QTimer::singleShot(0, this, SLOT(updateAnimationSettings()) );
+}
+
+void DesktopManager::stop(){
+  disconnect(DesktopSettings::instance(), SIGNAL(FileModified(DesktopSettings::File)), this, SLOT(settingsChanged(DesktopSettings::File)) );
+}
+
+// === PRIVATE ===
+void DesktopManager::updateWallpaper(QString screen_id, int wkspace){
+  QString current = RootDesktopObject::instance()->CurrentWallpaper(screen_id);
+  if(!current.isEmpty()){ current = QUrl(current).toLocalFile(); } //convert it back to the normal file syntax
+  //First find the list of options from the settings
+  //First look for a list that matches this exact screen/workspace combo
+  QStringList wpaperList = DesktopSettings::instance()->value(DesktopSettings::Desktop, "wallpapers/"+screen_id+"_wk_"+QString::number(wkspace), QStringList()).toStringList();
+  //Next look for a list that matches this exact workspace
+  if(wpaperList.isEmpty()){ wpaperList= DesktopSettings::instance()->value(DesktopSettings::Desktop, "wallpapers/default_wk_"+QString::number(wkspace), QStringList()).toStringList(); }
+  //Next look for a list that matches this exact screen
+  if(wpaperList.isEmpty()){ wpaperList= DesktopSettings::instance()->value(DesktopSettings::Desktop, "wallpapers/"+screen_id, QStringList()).toStringList(); }
+  //Now look for a list that matches any screen/workspace
+  if(wpaperList.isEmpty()){ wpaperList= DesktopSettings::instance()->value(DesktopSettings::Desktop, "wallpapers/default", QStringList()).toStringList(); }
+  //Now use the failover wallpaper directory
+  if(wpaperList.isEmpty()){ wpaperList << LOS::LuminaShare()+"../wallpapers/lumina-nature"; }
+  //Wallpaper selection/randomization
+  if(wpaperList.count()==1 && wpaperList.first()==current){ return; } //nothing to do - just the same image
+  QString wpaper;
+  QStringList bgL = wpaperList; //need a copy at the moment - could change the entire list in a second (opening a dir for instance)
+  while(wpaper.isEmpty() || QFileInfo(wpaper).isDir()){
+    QString prefix;
+    if(!wpaper.isEmpty()){
+      //Got a directory - update the list of files and re-randomize the selection
+      QStringList imgs = LUtils::imageExtensions(true);
+      QDir tdir(wpaper);
+      prefix=wpaper+"/";
+      bgL = tdir.entryList(imgs, QDir::Files | QDir::NoDotAndDotDot, QDir::Name);
+      //If directory no longer has any valid images - remove it from list and try again
+      if(bgL.isEmpty()){
+        wpaperList.removeAll(wpaper); //invalid directory - remove it from the list for the moment
+        bgL = wpaperList; //reset the list back to the original list (not within a directory)
+      }
+    }
+    //Verify that there are files in the list - otherwise use the default
+    if(bgL.isEmpty()){ wpaper="default"; break; }
+    int index = ( qrand() % bgL.length() );
+    if(index== bgL.indexOf(current)){ //if the current wallpaper was selected by the randomization again
+      //Go to the next in the list
+      if(index < 0 || index >= bgL.length()-1){ index = 0; } //if invalid or last item in the list - go to first
+      else{ index++; } //go to next
+    }
+    wpaper = prefix+bgL[index];
+  }
+  //Now go ahead and set the wallpaper in the screen object
+  if(wpaper.isEmpty() || wpaper=="default"){ wpaper = LOS::LuminaShare()+"desktop-background.jpg"; } //failover image
+  qDebug() << "Updating Wallpaper:" << screen_id << wpaper;
+  RootDesktopObject::instance()->ChangeWallpaper(screen_id,QUrl::fromLocalFile(wpaper).toString() );
+}
+
+void DesktopManager::updatePanels(QString panel_id){
+
+}
+
+void DesktopManager::updatePlugins(QString plugin_id){
+
+}
+
+// === PUBLIC SLOTS ===
+void DesktopManager::workspaceChanged(int wknum){
+  qDebug() << "Got Workspace Changed:" << wknum;
+
+}
+
+void DesktopManager::settingsChanged(DesktopSettings::File type){
+  switch(type){
+	case DesktopSettings::Desktop:
+	  QTimer::singleShot(0, this, SLOT(updateDesktopSettings()) );
+	case DesktopSettings::Panels:
+	  QTimer::singleShot(0, this, SLOT(updatePanelSettings()) );
+	case DesktopSettings::Plugins:
+	  QTimer::singleShot(0, this, SLOT(updatePluginSettings()) );
+	case DesktopSettings::ContextMenu:
+	  QTimer::singleShot(0, this, SLOT(updateMenuSettings()) );
+	case DesktopSettings::Animation:
+	  QTimer::singleShot(0, this, SLOT(updateAnimationSettings()) );
+	default:
+	  break;
+	  //Do nothing - not a settings change we care about here
+  }
+}
+
+// === PRIVATE SLOTS ===
+void DesktopManager::updateDesktopSettings(){
+  qDebug() << "Update Desktop Settings...";
+  QList<QScreen*> scrns= QApplication::screens();
+  int wkspace = Lumina::NWS->currentWorkspace();
+  for(int i=0; i<scrns.length(); i++){ updateWallpaper(scrns[i]->name(), wkspace); }
+
+}
+
+void DesktopManager::updatePanelSettings(){
+
+}
+
+void DesktopManager::updatePluginSettings(){
+
+}
+
+void DesktopManager::updateMenuSettings(){
+
+}
+
+void DesktopManager::updateAnimationSettings(){
+
+}
+
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.h b/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.h
new file mode 100644
index 00000000..df681afa
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/DesktopManager.h
@@ -0,0 +1,44 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017-2018, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+// This is the main class that updates the interface objects
+//    on-demand as settings files and other stuff changes
+//===========================================
+#ifndef _LUMINA_DESKTOP_OBJECT_MANAGER_H
+#define _LUMINA_DESKTOP_OBJECT_MANAGER_H
+
+#include <global-includes.h>
+
+class DesktopManager : public QObject {
+	Q_OBJECT
+public:
+	DesktopManager();
+	~DesktopManager();
+
+	void start();
+	void stop();
+
+private:
+	void updateWallpaper(QString screen_id, int wkspace);
+	void updatePanels(QString panel_id);
+	void updatePlugins(QString plugin_id);
+
+public slots:
+	void workspaceChanged(int);
+	void settingsChanged(DesktopSettings::File);
+
+private slots:
+	void updateDesktopSettings();
+	void updatePanelSettings();
+	void updatePluginSettings();
+	void updateMenuSettings();
+	void updateAnimationSettings();
+
+signals:
+	void PanelLocationsChanged(); //reserved screen space changed
+};
+
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
index e4c4faeb..f4a6882d 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/desktop.pri
@@ -1,8 +1,10 @@
 QT *= gui widgets qml quick
 
-SOURCES *= $${PWD}/RootWindow.cpp
+SOURCES *= $${PWD}/RootWindow.cpp \
+		$${PWD}/Desktopmanager.cpp
 
-HEADERS *= $${PWD}/RootWindow.h
+HEADERS *= $${PWD}/RootWindow.h \
+		$${PWD}/DesktopManager.h
 
 #update the includepath so we can just #include as needed without paths
 INCLUDEPATH *= $${PWD}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/PanelObject.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/PanelObject.cpp
new file mode 100644
index 00000000..471da58f
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/PanelObject.cpp
@@ -0,0 +1,44 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+#include "PanelObject.h"
+#include <QQmlEngine>
+#include <QDebug>
+
+PanelObject::PanelObject(QString id, QObject *parent) : QObject(parent){
+  panel_id = id;
+}
+
+void PanelObject::RegisterType(){
+  static bool done = false;
+  if(done){ return; }
+  done=true;
+  qmlRegisterType<PanelObject>("Lumina.Backend.PanelObject",2,0, "PanelObject");
+}
+
+QString PanelObject::name(){ return panel_id; }
+QString PanelObject::background(){
+  if(bg.isEmpty()){ return "transparent"; }
+  return bg;
+}
+int PanelObject::x(){ return geom.x(); }
+int PanelObject::y(){ return geom.y(); }
+int PanelObject::width(){ return geom.width(); }
+int PanelObject::height(){ return geom.height(); }
+
+void PanelObject::setBackground(QString fileOrColor){
+  if(bg!=fileOrColor){
+    bg = fileOrColor;
+    emit backgroundChanged();
+  }
+}
+
+void PanelObject::setGeometry( QRect newgeom ){
+  if(geom!=newgeom){
+    geom = newgeom;
+    emit geomChanged();
+  }
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/PanelObject.h b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/PanelObject.h
new file mode 100644
index 00000000..a788fa07
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/PanelObject.h
@@ -0,0 +1,49 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+// This is the base C++ object that is used to pass Panel info to the QML classes
+//===========================================
+#ifndef _LUMINA_DESKTOP_PANEL_OBJECT_H
+#define _LUMINA_DESKTOP_PANEL_OBJECT_H
+#include <QObject>
+#include <QString>
+#include <QScreen>
+
+class PanelObject : public QObject {
+	Q_OBJECT
+	Q_PROPERTY( QString name READ name )
+	Q_PROPERTY( QString background READ background NOTIFY backgroundChanged)
+	Q_PROPERTY( int x READ x NOTIFY geomChanged)
+	Q_PROPERTY( int y READ y NOTIFY geomChanged)
+	Q_PROPERTY( int width READ width NOTIFY geomChanged)
+	Q_PROPERTY( int height READ height NOTIFY geomChanged)
+
+private:
+	QString panel_id, bg;
+	QRect geom;
+
+public:
+	PanelObject(QString id = "", QObject *parent = 0);
+
+	static void RegisterType();
+
+	Q_INVOKABLE QString name();
+	Q_INVOKABLE QString background();
+	Q_INVOKABLE int x();
+	Q_INVOKABLE int y();
+	Q_INVOKABLE int width();
+	Q_INVOKABLE int height();
+
+public slots:
+	void setBackground(QString fileOrColor);
+	void setGeometry(QRect newgeom);
+
+signals:
+	void backgroundChanged();
+	void geomChanged();
+};
+
+#endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp
index 60cf56c3..4b01fa0d 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.cpp
@@ -21,6 +21,9 @@ RootDesktopObject::~RootDesktopObject(){
 }
 
 void RootDesktopObject::RegisterType(){
+  static bool done = false;
+  if(done){ return; }
+  done=true;
   qmlRegisterType<RootDesktopObject>("Lumina.Backend.RootDesktopObject", 2, 0, "RootDesktopObject");
   //Also register any types that are needed by this class
   ScreenObject::RegisterType();
@@ -47,6 +50,47 @@ ScreenObject* RootDesktopObject::screen(QString id){
   return 0;
 }
 
+QStringList RootDesktopObject::panels(){
+  //qDebug() << "Request Panels:" << panel_objects.length();
+  QStringList names;
+  for(int i=0; i<panel_objects.length(); i++){ names << panel_objects[i]->name(); }
+  return names;
+}
+
+PanelObject* RootDesktopObject::panel(QString id){
+  //qDebug() << "Got Panel Request:" << id;
+  for(int i=0; i<panel_objects.length(); i++){
+    if(panel_objects[i]->name()==id){ return panel_objects[i]; }
+  }
+  return 0;
+}
+
+QStringList RootDesktopObject::windows(){
+  //qDebug() << "Request Panels:" << panel_objects.length();
+  QStringList names;
+  for(int i=0; i<window_objects.length(); i++){ names << QString::number(window_objects[i]->id()); }
+  return names;
+}
+
+NativeWindow* RootDesktopObject::window(QString id){
+  //qDebug() << "Got Panel Request:" << id;
+  WId chk = id.toInt(); //numerical ID's in this case
+  for(int i=0; i<window_objects.length(); i++){
+    if(window_objects[i]->id()==chk){ return window_objects[i]; }
+  }
+  return 0;
+}
+
+void RootDesktopObject::setPanels(QList<PanelObject*> list){
+  panel_objects = list;
+  emit panelsChanged();
+}
+
+void RootDesktopObject::setWindows(QList<NativeWindow*> list){
+  window_objects = list;
+  emit windowsChanged();
+}
+
 void RootDesktopObject::logout(){
   emit startLogout();
 }
@@ -85,4 +129,13 @@ void RootDesktopObject::ChangeWallpaper(QString screen, QString value){
   }
 }
 
+QString RootDesktopObject::CurrentWallpaper(QString screen){
+  for(int i=0; i<s_objects.length(); i++){
+    if(s_objects[i]->name()==screen){ return s_objects[i]->background();}
+  }
+  return ""; //unknown
+}
+
+
+
 // === PRIVATE ===
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h
index ba586701..7d5182c4 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/RootDesktopObject.h
@@ -10,6 +10,7 @@
 #define _LUMINA_DESKTOP_QML_BACKEND_ROOT_DESKTOP_OBJECT_H
 #include <QObject>
 #include <QList>
+#include <global-includes.h>
 
 #include "ScreenObject.h"
 
@@ -17,6 +18,8 @@ class RootDesktopObject : public QObject{
 	Q_OBJECT
 	//Define all the QML Properties here (interface between QML and the C++ methods below)
 	Q_PROPERTY( QStringList screens READ screens NOTIFY screensChanged)
+	Q_PROPERTY( QStringList panels READ panels NOTIFY panelsChanged)
+	Q_PROPERTY( QStringList windows READ windows NOTIFY windowsChanged);
 
 public:
 	//main contructor/destructor
@@ -29,24 +32,38 @@ public:
 	static RootDesktopObject* instance();
 
 	//QML Read Functions
-	QStringList screens();
+	Q_INVOKABLE QStringList screens();
 	Q_INVOKABLE ScreenObject* screen(QString id);
+	Q_INVOKABLE QStringList panels();
+	Q_INVOKABLE PanelObject* panel(QString id);
+	Q_INVOKABLE QStringList windows();
+	Q_INVOKABLE NativeWindow* window(QString id);
+
+	void setPanels(QList<PanelObject*> list);
+	void setWindows(QList<NativeWindow*> list);
 
 	//QML Access Functions
 	Q_INVOKABLE void logout();
 	Q_INVOKABLE void lockscreen();
 	Q_INVOKABLE void mousePositionChanged();
+
 private:
 	QList<ScreenObject*> s_objects;
+	QList<PanelObject*> panel_objects;
+	QList<NativeWindow*> window_objects;
 
 public slots:
 	void updateScreens(); //rescan/update screen objects
 	void ChangeWallpaper(QString screen, QString);
+	QString CurrentWallpaper(QString screen);
 
 private slots:
 
 signals:
 	void screensChanged();
+	void panelsChanged();
+	void windowsChanged();
+
 	void startLogout();
 	void mouseMoved();
 	void lockScreen();
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp
index 4c1d6189..82622403 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.cpp
@@ -13,7 +13,12 @@ ScreenObject::ScreenObject(QScreen *scrn, QObject *parent) : QObject(parent){
 }
 
 void ScreenObject::RegisterType(){
+  static bool done = false;
+  if(done){ return; }
+  done=true;
   qmlRegisterType<ScreenObject>("Lumina.Backend.ScreenObject",2,0, "ScreenObject");
+  //Also register any types that are needed by this class
+  PanelObject::RegisterType();
 }
 
 QString ScreenObject::name(){ return bg_screen->name(); }
@@ -29,3 +34,24 @@ void ScreenObject::setBackground(QString fileOrColor){
     emit backgroundChanged();
   }
 }
+
+void ScreenObject::setPanels(QList<PanelObject*> list){
+  panel_objects = list;
+  emit panelsChanged();
+}
+
+//QML Read Functions
+QStringList ScreenObject::panels(){
+  //qDebug() << "Request Panels:" << panel_objects.length();
+  QStringList names;
+  for(int i=0; i<panel_objects.length(); i++){ names << panel_objects[i]->name(); }
+  return names;
+}
+
+PanelObject* ScreenObject::panel(QString id){
+  //qDebug() << "Got Panel Request:" << id;
+  for(int i=0; i<panel_objects.length(); i++){
+    if(panel_objects[i]->name()==id){ return panel_objects[i]; }
+  }
+  return 0;
+}
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h
index 8076f1ae..1afff6d2 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/ScreenObject.h
@@ -12,6 +12,8 @@
 #include <QString>
 #include <QScreen>
 
+#include "PanelObject.h"
+
 class ScreenObject : public QObject {
 	Q_OBJECT
 	Q_PROPERTY( QString name READ name )
@@ -20,10 +22,12 @@ class ScreenObject : public QObject {
 	Q_PROPERTY( int y READ y NOTIFY geomChanged)
 	Q_PROPERTY( int width READ width NOTIFY geomChanged)
 	Q_PROPERTY( int height READ height NOTIFY geomChanged)
+	Q_PROPERTY( QStringList panels READ panels NOTIFY panelsChanged)
 
 private:
 	QScreen *bg_screen;
 	QString bg;
+	QList<PanelObject*> panel_objects;
 
 public:
 	ScreenObject(QScreen *scrn = 0, QObject *parent = 0);
@@ -36,6 +40,10 @@ public:
 	Q_INVOKABLE int y();
 	Q_INVOKABLE int width();
 	Q_INVOKABLE int height();
+	Q_INVOKABLE QStringList panels();
+	Q_INVOKABLE PanelObject* panel(QString id);
+
+	void setPanels(QList<PanelObject*> list);
 
 public slots:
 	void setBackground(QString fileOrColor);
@@ -43,6 +51,7 @@ public slots:
 signals:
 	void backgroundChanged();
 	void geomChanged();
+	void panelsChanged();
 };
 
 #endif
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri
index 33b699da..899f4968 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-cpp/src-cpp.pri
@@ -1,8 +1,9 @@
 SOURCES *= $${PWD}/RootDesktopObject.cpp \
-		$${PWD}/ScreenObject.cpp
+		$${PWD}/ScreenObject.cpp \
+		$${PWD}/PanelObject.cpp
 
 HEADERS *= $${PWD}/RootDesktopObject.h \
-		$${PWD}/ScreenObject.h
+		$${PWD}/ScreenObject.h \
+		$${PWD}/PanelObject.h
 
 INCLUDEPATH *= $${PWD}
-
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml
new file mode 100644
index 00000000..846b5b55
--- /dev/null
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Panel.qml
@@ -0,0 +1,26 @@
+//===========================================
+//  Lumina-desktop source code
+//  Copyright (c) 2017, Ken Moore
+//  Available under the 3-clause BSD license
+//  See the LICENSE file for full details
+//===========================================
+import QtQuick 2.2
+import QtQuick.Window 2.2
+import QtQuick.Controls 1
+
+import Lumina.Backend.PanelObject 2.0
+
+AnimatedImage {
+    //C++ backend object
+    property string screen_id
+    property PanelObject object
+
+    //Normal geometries/placements
+    asynchronous: true
+    clip: true
+    source: object.background
+    x: object.x
+    y: object.y
+    width: object.width
+    height: object.height
+  }
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml
index e0381e23..c564ee42 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/RootDesktop.qml
@@ -46,11 +46,12 @@ Rectangle {
   //Create the context menu itself
  QML.ContextMenu { id: contextMenu }
 
-  //Setup the wallpapers
+  //Setup the screens/wallpapers
   Repeater{
     model: RootObject.screens
-    QML.WallpaperImage{
+    QML.Screen{
       screen_id: modelData
+      object: RootObject.screen(modelData)
       z: 0+index
     }
   }
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/WallpaperImage.qml b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Screen.qml
index 1b44963f..3b83653a 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/WallpaperImage.qml
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/Screen.qml
@@ -13,7 +13,7 @@ import Lumina.Backend.ScreenObject 2.0
 AnimatedImage {
     //C++ backend object
     property string screen_id
-    property ScreenObject object: RootObject.screen(screen_id)
+    property ScreenObject object
 
     //Normal geometries/placements
     asynchronous: true
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri
index fed18e02..ad07902a 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.pri
@@ -2,7 +2,8 @@
 lupdate_only{
   SOURCES *= $${PWD}/RootDesktop.qml \
 		$${PWD}/ContextMenu.qml \
-		$${PWD}/WallpaperImage.qml
+		$${PWD}/Screen.qml \
+		$${PWD}/Panel.qml
 }
 
 RESOURCES *= $${PWD}/src-qml.qrc
diff --git a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc
index ebdcc606..b0c66e20 100644
--- a/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc
+++ b/src-qt5/core/lumina-desktop-unified/src-desktop/src-qml/src-qml.qrc
@@ -2,6 +2,7 @@
   <qresource prefix="qml">
     <file>RootDesktop.qml</file>
     <file>ContextMenu.qml</file>
-    <file>WallpaperImage.qml</file>
+    <file>Screen.qml</file>
+    <file>Panel.qml</file>
   </qresource>
 </RCC>
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
index 7c098887..aa3214a2 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
@@ -7,6 +7,9 @@
 
 #include "SSBaseWidget.h"
 
+//Relative directory to search along the XDG paths for screensavers
+#define REL_DIR QString("/lumina-desktop/screensavers")
+
 #define DEBUG 0
 
 // ========
@@ -39,10 +42,10 @@ void SSBaseWidget::startPainting(){
   stopPainting();
   //If a random plugin - grab one of the known plugins
   if(plugType=="random"){
-    QList<SSPlugin> valid = SSPluginSystem::findAllPlugins();
+    QList<SSPlugin> valid = PluginSystem::findAllPlugins<SSPlugin>(REL_DIR);
     if(!valid.isEmpty()){ cplug = valid[ qrand()%valid.length() ]; } //grab a random plugin
   }else if(plugType!="none"){
-    cplug = SSPluginSystem::findPlugin(plugType);
+    cplug = PluginSystem::findPlugin<SSPlugin>(plugType, REL_DIR);
   }
   if(DEBUG){ qDebug() << " - Screen Saver:" << plugType << cplug.scriptURL() << cplug.isValid(); }
   if(cplug.isValid()){
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
index 72e02702..e0a03d17 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.h
@@ -10,6 +10,7 @@
 #define _LUMINA_DESKTOP_SCREEN_SAVER_BASE_WIDGET_H
 
 #include "global-includes.h"
+#include <plugins-base.h>
 #include <plugins-screensaver.h>
 
 class SSBaseWidget : public QQuickView{
@@ -25,8 +26,8 @@ public slots:
 	void stopPainting();
 
 private:
-        QString plugType;
-        SSPlugin cplug;
+  QString plugType;
+  SSPlugin cplug;
 	QTimer *restartTimer;
 
 private slots: