Use "None" string when no luma file is selected in a transition instead of empty...

svn path=/trunk/kdenlive/; revision=3160

diff --git a/src/effectstackedit.cpp b/src/effectstackedit.cpp
index 8c2142db09ad99627e7f086750023aa2b86ad08d..7196cd1d12f135cf35674f4dd0c199666ff10e20 100644 (file)
--- a/src/effectstackedit.cpp
+++ b/src/effectstackedit.cpp
@@ -135,7 +135,7 @@ void EffectStackEdit::transferParamDesc(const QDomElement& d, int in, int out) {
                     lsval->list->setItemIcon(i, QPixmap::fromImage(iconCache[entry]));
                 }
             }
-            lsval->list->setCurrentIndex(listitems.indexOf(value));
+            if (!value.isEmpty()) lsval->list->setCurrentIndex(listitems.indexOf(value));
 
             connect(lsval->list, SIGNAL(currentIndexChanged(int)) , this, SLOT(collectAllParameters()));
             lsval->title->setTitle(paramName);

diff --git a/src/initeffects.cpp b/src/initeffects.cpp
index 02f9c4ea62762206f70d5a9e98c94f5a7e612e0e..f4d798d18777e1a1004bbbe0bdafe4bb03a8117f 100644 (file)
--- a/src/initeffects.cpp
+++ b/src/initeffects.cpp
@@ -69,9 +69,9 @@ initEffects::~initEffects() {
 // static
 void initEffects::refreshLumas() {
 
-    // Check for Kdenlive installed luma files
-    QStringList imagenamelist;
-    QStringList imagefiles;
+    // Check for Kdenlive installed luma files, add empty string at start for no luma
+    QStringList imagenamelist = QStringList() << i18n("None");
+    QStringList imagefiles = QStringList() << QString();
     QStringList filters;
     filters << "*.pgm" << "*.png";
 
@@ -610,9 +610,9 @@ void initEffects::fillTransitionsList(Mlt::Repository * repository, EffectsList*
 
             //kDebug() << ret.toString();
         } else {
-            // Check for Kdenlive installed luma files
-            QStringList imagenamelist;
-            QStringList imagefiles;
+            // Check for Kdenlive installed luma files, add empty string at start for no luma
+            QStringList imagenamelist = QStringList() << i18n("None");
+            QStringList imagefiles = QStringList() << QString();
             QStringList filters;
             filters << "*.pgm" << "*.png";