Remove problematic character in ui file

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index 2269319013cbdd8e7e376b471291614ca2305855..5cacc0e4387d64026a6bc2f912d45191333cbcce 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,18 +53,26 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) {
     m_view.folder_url->setUrl(QDir::homePath());
 
 
+    // 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();
-    profilePath = profilePath.section('/', 0, -3);
-    profilePath += "/lumas/PAL/";
-
-    QDir dir(profilePath);
-    QStringList filter;
-    filter << "*.pgm";
-    const QStringList result = dir.entryList(filter, QDir::Files);
-    QStringList imagefiles;
-    QStringList imagenamelist;
-    foreach(const QString file, result) {
-        m_view.luma_file->addItem(KIcon(profilePath + file), file, profilePath + file);
+    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,7 +114,9 @@ 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;
     }
 
@@ -113,11 +126,34 @@ void SlideshowClip::parseFolder() {
     if (m_count == 0) m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
     else m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(true);
     m_view.label_info->setText(i18n("%1 images found", m_count));
+    QListWidgetItem *item;
+    int i = 0;
+    KIcon unknownicon("unknown");
     foreach(const QString &path, result) {
-        QIcon icon(dir.filePath(path));
-        QListWidgetItem *item = new QListWidgetItem(icon, KUrl(path).fileName());
+        i++;
+        if (i < 80) {
+            QIcon icon(dir.filePath(path));
+            item = new QListWidgetItem(icon, KUrl(path).fileName());
+        } else {
+            item = new QListWidgetItem(unknownicon, KUrl(path).fileName());
+            item->setData(Qt::UserRole, dir.filePath(path));
+        }
         m_view.icon_list->addItem(item);
     }
+    if (m_count >= 80) connect(m_view.icon_list, SIGNAL(currentRowChanged(int)), this, SLOT(slotSetItemIcon(int)));
+    m_view.icon_list->setCurrentRow(0);
+}
+
+void SlideshowClip::slotSetItemIcon(int row) {
+    QListWidgetItem * item = m_view.icon_list->item(row);
+    if (item) {
+        QString path = item->data(Qt::UserRole).toString();
+        if (!path.isEmpty()) {
+            KIcon icon(path);
+            item->setIcon(icon);
+            item->setData(Qt::UserRole, QString());
+        }
+    }
 }
 
 QString SlideshowClip::selectedPath() const {