diff options
author | ZackaryWelch <welch.zackary@gmail.com> | 2017-08-04 17:00:14 -0400 |
---|---|---|
committer | ZackaryWelch <welch.zackary@gmail.com> | 2017-08-04 17:00:14 -0400 |
commit | ee494111f41ed0c5ab7b43d30f76bdb44cadfa5e (patch) | |
tree | ee54b9d089448ff593628caa342e11fb2282976c /src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp | |
parent | Merge branch 'master' of http://github.com/trueos/lumina (diff) | |
download | lumina-ee494111f41ed0c5ab7b43d30f76bdb44cadfa5e.tar.gz lumina-ee494111f41ed0c5ab7b43d30f76bdb44cadfa5e.tar.bz2 lumina-ee494111f41ed0c5ab7b43d30f76bdb44cadfa5e.zip |
Added an experimental VideoSlideshow screensaver plus fixes
Diffstat (limited to 'src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp')
-rw-r--r-- | src-qt5/core/lumina-desktop-unified/src-screensaver/animations/BaseAnimGroup.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
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 aaae8b41..7fc4eb50 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 @@ -12,6 +12,8 @@ #include "Grav.h" #include "SampleAnimation.h" #include "Text.h" +#include "ImageSlideshow.h" +#include "VideoSlideshow.h" //============================== // PLUGIN LOADING/LISTING @@ -24,6 +26,10 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti return (new GravAnimation(parent, set)); }else if(type == "text") { return (new TextAnimation(parent, set)); + }else if(type == "imageSlideshow") { + return (new ImageAnimation(parent, set)); + }else if(type == "videoSlideshow") { + return (new VideoAnimation(parent, set)); }else { //Unknown screensaver, return a blank animation group return (new BaseAnimGroup(parent, set)); @@ -31,5 +37,5 @@ BaseAnimGroup* BaseAnimGroup::NewAnimation(QString type, QWidget *parent, QSetti } QStringList BaseAnimGroup::KnownAnimations(){ - return (QStringList() << "grav"); + return (QStringList() << "videoSlideshow" /*<< "grav" << "text" << "imageSlideshow" << "fireflies"*/); } |