Fix issue with monitor switching

[kdenlive] / src / initeffects.cpp

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index bfba26def1c0603d97ddc66972b3f4f7636cb44a..ae7a549026845d5273cd146562bdb20581a1edc6 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -81,13 +81,16 @@ void initEffects::refreshLumas()
     }
 
     // Check for MLT lumas
-    QString folder = KUrl(mlt_environment("MLT_DATA")).path(KUrl::AddTrailingSlash);
-    folder.append("lumas/").append(mlt_environment("MLT_NORMALISATION"));
-    QDir lumafolder(folder);
+    KUrl folder(mlt_environment("MLT_DATA"));
+    folder.addPath("lumas");
+    folder.addPath(mlt_environment("MLT_NORMALISATION"));
+    QDir lumafolder(folder.path());
     QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
     foreach(const QString &fname, filesnames) {
         imagenamelist.append(fname);
-        imagefiles.append(folder + fname);
+        KUrl path(folder);
+        path.addPath(fname);
+        imagefiles.append(path.toLocalFile());
     }
     QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
     QDomNodeList params = lumaTransition.elementsByTagName("parameter");
@@ -229,7 +232,7 @@ Mlt::Repository *initEffects::parseEffectFiles()
 // static
 void initEffects::parseCustomEffectsFile()
 {
-    MainWindow::customEffects.clear();
+    MainWindow::customEffects.clearList();
     QString path = KStandardDirs::locateLocal("appdata", "effects/", true);
     QDir directory = QDir(path);
     QStringList filter;
@@ -648,22 +651,26 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
             filters << "*.pgm" << "*.png";
 
             QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas");
-            foreach(const QString &folder, customLumas) {
+            foreach(QString folder, customLumas) {
+                if (!folder.endsWith('/')) folder.append('/');
                 QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
                 foreach(const QString &fname, filesnames) {
                     imagenamelist.append(fname);
-                    imagefiles.append(folder + '/' + fname);
+                    imagefiles.append(folder + fname);
                 }
             }
 
             // Check for MLT lumas
-            QString folder = KUrl(mlt_environment("MLT_DATA")).path(KUrl::AddTrailingSlash);
-            folder.append("lumas/").append(mlt_environment("MLT_NORMALISATION"));
-            QDir lumafolder(folder);
+            KUrl folder(mlt_environment("MLT_DATA"));
+            folder.addPath("lumas");
+            folder.addPath(mlt_environment("MLT_NORMALISATION"));
+            QDir lumafolder(folder.path());
             QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
             foreach(const QString &fname, filesnames) {
                 imagenamelist.append(fname);
-                imagefiles.append(folder + fname);
+                KUrl path(folder);
+                path.addPath(fname);
+                imagefiles.append(path.toLocalFile());
             }
 
             if (name == "luma") {
@@ -682,7 +689,7 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
                 paramList.append(quickParameterFill(ret, "Geometry", "geometry", "geometry", "0%,0%:100%x100%:100", "-500;-500;-500;-500;0", "500;500;500;500;100"));
                 paramList.append(quickParameterFill(ret, "Alpha Channel Operation", "operator", "list", "over", "", "", "over,and,or,xor", "over,and,or,xor"));
                 paramList.append(quickParameterFill(ret, "Align", "aligned", "bool", "1", "0", "1"));
-                paramList.append(quickParameterFill(ret, "Fill", "fill", "bool", "0", "0", "1"));
+                paramList.append(quickParameterFill(ret, "Fill", "fill", "bool", "1", "0", "1"));
                 paramList.append(quickParameterFill(ret, "Distort", "distort", "bool", "0", "0", "1"));
                 paramList.append(quickParameterFill(ret, "Wipe File", "luma", "list", "", "", "", imagefiles.join(","), imagenamelist.join(",")));
                 paramList.append(quickParameterFill(ret, "Wipe Softness", "softness", "double", "0", "0", "100", "", "", "100"));