Fix crash on clip insertion redo:

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index ea7c62f0ab48815a0ee8355ad2315e5d7316f351..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());
@@ -40,15 +40,64 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) {
     m_view.icon_list->setIconSize(QSize(50, 50));
     connect(m_view.folder_url, SIGNAL(textChanged(const QString &)), this, SLOT(parseFolder()));
     connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder()));
+
+    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.clip_duration->setText("00:00:03:00");
+    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();
+    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();
 }
 
+void SlideshowClip::slotEnableLuma(int state) {
+    bool enable = false;
+    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);
+    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) {
+    bool enable = false;
+    if (state == Qt::Checked) enable = true;
+    m_view.luma_file->setEnabled(enable);
+    m_view.luma_softness->setEnabled(enable);
+    m_view.label_softness->setEnabled(enable);
+}
+
 void SlideshowClip::parseFolder() {
     m_view.icon_list->clear();
     QDir dir(m_view.folder_url->url().path());
@@ -65,17 +114,19 @@ 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);
     m_view.label_info->setText(i18n("%1 images found", m_count));
-    foreach(QString path, result) {
+    foreach(const QString &path, result) {
         QIcon icon(dir.filePath(path));
         QListWidgetItem *item = new QListWidgetItem(icon, KUrl(path).fileName());
         m_view.icon_list->addItem(item);
@@ -114,9 +165,27 @@ int SlideshowClip::imageCount() const {
     return m_count;
 }
 
+int SlideshowClip::softness() const {
+    return m_view.luma_softness->value();
+}
+
 bool SlideshowClip::loop() const {
     return m_view.slide_loop->isChecked();
 }
+
+bool SlideshowClip::fade() const {
+    return m_view.slide_fade->isChecked();
+}
+
+QString SlideshowClip::lumaDuration() const {
+    return m_view.luma_duration->text();
+}
+
+QString SlideshowClip::lumaFile() const {
+    if (!m_view.luma_fade->isChecked() || !m_view.luma_file->isEnabled()) return QString();
+    return m_view.luma_file->itemData(m_view.luma_file->currentIndex()).toString();
+}
+
 #include "slideshowclip.moc"