aboutsummaryrefslogtreecommitdiff
path: root/src-qt5/src-cpp
diff options
context:
space:
mode:
authorKen Moore <ken@ixsystems.com>2017-11-16 16:15:29 -0500
committerKen Moore <ken@ixsystems.com>2017-11-16 16:15:29 -0500
commit60559aa7165835d15e87480b3db6774f77f7a081 (patch)
tree70066c861e2b79295b0af523d480f517c279cd23 /src-qt5/src-cpp
parentGet the Iteration over objects working for Lumina 2 (wallpapers). (diff)
downloadlumina-60559aa7165835d15e87480b3db6774f77f7a081.tar.gz
lumina-60559aa7165835d15e87480b3db6774f77f7a081.tar.bz2
lumina-60559aa7165835d15e87480b3db6774f77f7a081.zip
Get more of the new QML interface working for Lumina 2.
* simple context menu is now functional (lock/logout) * Screensaver is now working again (default setting was wrong) * Unlock functionality is working again (using the more secure temporary file method)
Diffstat (limited to 'src-qt5/src-cpp')
-rw-r--r--src-qt5/src-cpp/plugins-screensaver.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/src-qt5/src-cpp/plugins-screensaver.cpp b/src-qt5/src-cpp/plugins-screensaver.cpp
index 75e93c9d..4cb90aff 100644
--- a/src-qt5/src-cpp/plugins-screensaver.cpp
+++ b/src-qt5/src-cpp/plugins-screensaver.cpp
@@ -31,6 +31,7 @@ void SSPlugin::loadFile(QString path){
QFile file(path);
if(!file.exists() || !file.open(QIODevice::ReadOnly)){ return; }
data = QJsonDocument::fromJson(file.readAll()).object();
+ qDebug() << "Loaded ScreenSaver Data:" << currentfile << data;
file.close();
}
@@ -102,7 +103,7 @@ QString SSPlugin::translatedDescription(){
QUrl SSPlugin::scriptURL(){
QString exec = data.value("qml").toObject().value("exec").toString();
- //qDebug() << "got exec:" << exec;
+ qDebug() << "got exec:" << exec << data;
if(!exec.startsWith("/")){ exec.prepend( currentfile.section("/",0,-2)+"/" ); }
return QUrl::fromLocalFile(exec);
}
@@ -111,6 +112,7 @@ QUrl SSPlugin::scriptURL(){
// SS PLUGIN SYSTEM
// ===================
SSPlugin SSPluginSystem::findPlugin(QString name){
+ //qDebug() << "FindPlugin:" << name;
SSPlugin SSP;
if(name.startsWith("/") && QFile::exists(name)){ SSP.loadFile(name); return SSP;} //absolute path give - just load that one
//Cleanup the input name and ensure it has the right suffix
bgstack15