Cleanup and add mimetype for TGA images, also add EXR, TIFF and TGA to the list of...

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index 29d84b2ae441b902eab6193dbe5f5edd5a8a7cf9..01b33b723051d72e2bf847f218e075309d84d0ac 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -26,11 +26,6 @@
 #include "kdenlivesettings.h"
 #include "slideshowclip.h"
 
-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());
     setWindowTitle(i18n("Add Slideshow Clip"));
@@ -44,27 +39,39 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) {
     connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
     connect(m_view.luma_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int)));
 
-    m_view.image_type->addItem("JPG");
-    m_view.image_type->addItem("PNG");
-    m_view.image_type->addItem("BMP");
-    m_view.image_type->addItem("GIF");
+    m_view.image_type->addItem("JPG (*.jpg)", "jpg");
+    m_view.image_type->addItem("JPEG (*.jpeg)", "jpeg");
+    m_view.image_type->addItem("PNG (*.png)", "png");
+    m_view.image_type->addItem("BMP (*.bmp)", "bmp");
+    m_view.image_type->addItem("GIF (*.gif)", "gif");
+    m_view.image_type->addItem("TGA (*.tga)", "tga");
+    m_view.image_type->addItem("TIFF (*.tiff)", "tiff");
+    m_view.image_type->addItem("Open EXR (*.exr)", "exr");
     m_view.clip_duration->setText(KdenliveSettings::image_duration());
     m_view.luma_duration->setText("00:00:00:24");
     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 +82,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) {
@@ -92,22 +102,10 @@ void SlideshowClip::parseFolder() {
     QDir dir(m_view.folder_url->url().path());
 
     QStringList filters;
-    switch (m_view.image_type->currentIndex()) {
-    case TYPE_PNG:
-        filters << "*.png";
-        break;
-    case TYPE_BMP:
-        filters << "*.bmp";
-        break;
-    case TYPE_GIF:
-        filters << "*.gif";
-        break;
-    default:
-        filters << "*.jpg";
+    QString filter = m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+    filters << "*." + filter;
         // TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
         // << "*.jpeg";
-        break;
-    }
 
     dir.setNameFilters(filters);
     const QStringList result = dir.entryList(QDir::Files);
@@ -115,29 +113,38 @@ 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);
 }
 
-QString SlideshowClip::selectedPath() const {
-    QString extension;
-    switch (m_view.image_type->currentIndex()) {
-    case TYPE_PNG:
-        extension = "/.all.png";
-        break;
-    case TYPE_BMP:
-        extension = "/.all.bmp";
-        break;
-    case TYPE_GIF:
-        extension = "/.all.gif";
-        break;
-    default:
-        extension = "/.all.jpg";
-        break;
+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 {
+    QString extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
     return m_view.folder_url->url().path() + extension;
 }