Merge branch 'master' of github.com:trueos/lumina

4 files changed, 11 insertions, 9 deletions

diff --git a/src-qt5/core/lumina-desktop-unified/LSession.cpp b/src-qt5/core/lumina-desktop-unified/LSession.cpp
index bcbeeeb4..df70b22e 100644
--- a/src-qt5/core/lumina-desktop-unified/LSession.cpp
+++ b/src-qt5/core/lumina-desktop-unified/LSession.cpp
@@ -29,6 +29,7 @@ LSession::LSession(int &argc, char ** argv) : LSingleApplication(argc, argv, "lu
   //Initialize the global objects to null pointers
   qRegisterMetaType< Qt::Key >("Qt::Key");
   qRegisterMetaType< NativeWindow::Property >("NativeWindow::Property");
+  qRegisterMetaType< QList< NativeWindow::Property > >("QList<NativeWindow::Property>");
 
   mediaObj = 0; //private object used for playing login/logout chimes
  if(this->isPrimaryProcess()){
@@ -225,6 +226,7 @@ void LSession::setupGlobalConnections(){
   connect(Lumina::SHORTCUTS, SIGNAL(LaunchApplication(QString), this, SLOT(LaunchApplication(QString)) );
   connect(Lumina::SHORTCUTS, SIGNAL(LaunchStandardApplication(QString)), this, SLOT(LaunchStandardApplication(QString)) );
   connect(Lumina::SHORTCUTS, SIGNAL(LockSession()), Lumina::SS, SLOT(LockScreenNow()) );
+
   //Root window connections
   connect(Lumina::ROOTWIN, SIGNAL(RegisterVirtualRoot(WId)), Lumina::NWS, SLOT(RegisterVirtualRoot(WId)) );
   connect(Lumina::ROOTWIN, SIGNAL(RootResized(QRect)), Lumina::NWS, SLOT(setRoot_desktopGeometry(QRect)) );
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
index 9f280a47..bfcfa54d 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/LScreenSaver.cpp
@@ -8,7 +8,7 @@
 #include <QScreen>
 #include <QApplication>
 
-#define DEBUG 1
+#define DEBUG 0
 
 LScreenSaver::LScreenSaver() : QWidget(0,Qt::BypassWindowManagerHint | Qt::WindowStaysOnTopHint){
   starttimer = new QTimer(this);
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 943fe0a1..b31ef793 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/SSBaseWidget.cpp
@@ -25,7 +25,7 @@ SSBaseWidget::SSBaseWidget(QWidget *parent, QSettings *set) : QWidget(parent){
 SSBaseWidget::~SSBaseWidget(){
   if(ANIM!=0){ this->stopPainting(); }
 }
-	
+
 void SSBaseWidget::setPlugin(QString plug){
   plug = plug.toLower();
   if(validPlugs.contains(plug) || plug=="random"){ plugType = plug; }
@@ -38,12 +38,12 @@ void SSBaseWidget::setPlugin(QString plug){
 void SSBaseWidget::startPainting(){
   cplug = plugType;
   //free up any old animation instance
-  if(ANIM!=0){ 
+  if(ANIM!=0){
     ANIM->stop(); ANIM->clear();
-    delete ANIM; ANIM = 0; 
-  } 
+    delete ANIM; ANIM = 0;
+  }
   //If a random plugin - grab one of the known plugins
-  if(cplug=="random"){ 
+  if(cplug=="random"){
     QStringList valid = BaseAnimGroup::KnownAnimations();
     valid.removeAll("none"); //they want a screensaver - remove the "none" option from the valid list
     if(valid.isEmpty()){ cplug = "none"; } //no known plugins
@@ -67,9 +67,9 @@ void SSBaseWidget::startPainting(){
   }
   //Now start the animation(s)
   if(ANIM!=0){
-    if(ANIM->animationCount()>0){ 
+    if(ANIM->animationCount()>0){
       if(DEBUG){ qDebug() << " - Starting SS Plugin:" << cplug << ANIM->animationCount() << ANIM->duration() << ANIM->loopCount(); }
-      ANIM->start(); 
+      ANIM->start();
     }
   }
 }
diff --git a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp
index cda9797b..017eaf9f 100644
--- a/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp
+++ b/src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp
@@ -31,5 +31,5 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti
 }
 
 QStringList BaseAnimGroup::KnownAnimations(){
-  return (QStringList() << "text");
+  return (QStringList() << "fireflies" << "grav" << "text");
 }