* Remove broken transition (where in > out) on project opening

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index 56b75b00074bbc4468f35f97800ca9c97d0bc7c6..90651110af323a57d053718edbd92f558400b985 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -26,10 +26,10 @@
 #include "kdenlivesettings.h"
 #include "slideshowclip.h"
 
-#define TYPE_JPEG 0
-#define TYPE_PNG 1
-#define TYPE_BMP 2
-#define TYPE_GIF 3
+static const int TYPE_JPEG = 0;
+static const int TYPE_PNG = 1;
+static const int TYPE_BMP = 2;
+static const int TYPE_GIF = 3;
 
 SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) {
     setFont(KGlobalSettings::toolBarFont());
@@ -53,20 +53,28 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) {
     m_view.folder_url->setUrl(QDir::homePath());
 
 
-    QString profilePath = KdenliveSettings::mltpath();
-    profilePath = profilePath.section('/', 0, -3);
-    profilePath += "/lumas/PAL/";
-
-    QDir dir(profilePath);
-    QStringList result = dir.entryList(QDir::Files);
-    QStringList imagefiles;
-    QStringList imagenamelist;
-    foreach(QString file, result) {
-        if (file.endsWith(".pgm")) {
-            m_view.luma_file->addItem(KIcon(profilePath + file), file, profilePath + file);
+    // Check for Kdenlive installed luma files
+    QStringList filters;
+    filters << "*.pgm" << "*.png";
+
+    QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas");
+    foreach(const QString &folder, customLumas) {
+        QStringList filesnames = QDir(folder).entryList(filters, QDir::Files);
+        foreach(const QString &fname, filesnames) {
+            m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname);
         }
     }
 
+    // Check for MLT lumas
+    QString profilePath = KdenliveSettings::mltpath();
+    QString folder = profilePath.section('/', 0, -3);
+    folder.append("/lumas/PAL"); // TODO: cleanup the PAL / NTSC mess in luma files
+    QDir lumafolder(folder);
+    QStringList filesnames = lumafolder.entryList(filters, QDir::Files);
+    foreach(const QString &fname, filesnames) {
+        m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname);
+    }
+
     adjustSize();
 }
 
@@ -75,8 +83,11 @@ void SlideshowClip::slotEnableLuma(int state) {
     if (state == Qt::Checked) enable = true;
     m_view.luma_duration->setEnabled(enable);
     m_view.luma_fade->setEnabled(enable);
-    if (enable) m_view.luma_file->setEnabled(m_view.luma_fade->isChecked());
-    else m_view.luma_file->setEnabled(false);
+    if (enable) {
+        m_view.luma_file->setEnabled(m_view.luma_fade->isChecked());
+    } else m_view.luma_file->setEnabled(false);
+    m_view.label_softness->setEnabled(m_view.luma_fade->isChecked() && enable);
+    m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled());
 }
 
 void SlideshowClip::slotEnableLumaFile(int state) {
@@ -103,12 +114,14 @@ void SlideshowClip::parseFolder() {
         filters << "*.gif";
         break;
     default:
-        filters << "*.jpg" << "*.jpeg";
+        filters << "*.jpg";
+        // TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
+        // << "*.jpeg";
         break;
     }
 
     dir.setNameFilters(filters);
-    QStringList result = dir.entryList(QDir::Files);
+    const QStringList result = dir.entryList(QDir::Files);
     m_count = result.count();
     if (m_count == 0) m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     else m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);