Allow to add image sequence through the usual "add clip" dialog

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index e4557ab07e2a5dd7abce223f1337d2fedc0380d9..46923c529fcff00f98b103cc0a7b48bd48a67ece 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -43,6 +43,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
 
     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.pattern_url, SIGNAL(textChanged(const QString &)), this, SLOT(parseFolder()));
 
     connect(m_view.show_thumbs, SIGNAL(stateChanged(int)), this, SLOT(slotEnableThumbs(int)));
     connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
@@ -60,7 +61,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
 
     m_view.clip_duration->setInputMask("");
     m_view.clip_duration->setValidator(m_timecode.validator());
-    m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::image_duration()));
+    m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::sequence_duration()));
     m_view.luma_duration->setInputMask("");
     m_view.luma_duration->setValidator(m_timecode.validator());
     m_view.luma_duration->setText(m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))));
@@ -71,6 +72,9 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     connect(m_view.clip_duration_format, SIGNAL(activated(int)), this, SLOT(slotUpdateDurationFormat(int)));
     m_view.clip_duration_frames->setHidden(true);
     m_view.luma_duration_frames->setHidden(true);
+    m_view.method_mime->setChecked(KdenliveSettings::slideshowbymime());
+    connect(m_view.method_mime, SIGNAL(toggled(bool)), this, SLOT(slotMethodChanged(bool)));
+    slotMethodChanged(m_view.method_mime->isChecked());
 
     // Check for Kdenlive installed luma files
     QStringList filters;
@@ -145,18 +149,70 @@ void SlideshowClip::slotEnableLumaFile(int state)
     m_view.label_softness->setEnabled(enable);
 }
 
+// static
+int SlideshowClip::sequenceCount(KUrl file)
+{
+    // find pattern
+    QString filter = file.fileName();
+    QString ext = filter.section('.', -1);
+    filter = filter.section('.', 0, -2);
+    bool hasDigit = false;
+    while (filter.at(filter.size() - 1).isDigit()) {
+        hasDigit = true;
+        filter.remove(filter.size() - 1, 1);
+    }
+    if (!hasDigit) return 0;
+
+    QString regexp = "^" + filter + "\\d+\\." + ext + "$";
+    QRegExp rx(regexp);
+
+    QDir dir(file.directory());
+    QStringList result = dir.entryList(QDir::Files);
+
+    int count = 0;
+    foreach(const QString &path, result) {
+        if (rx.exactMatch(path)) count ++;
+    }
+    return count;
+}
+
 void SlideshowClip::parseFolder()
 {
     m_view.icon_list->clear();
-    QDir dir(m_view.folder_url->url().path());
+    bool isMime = m_view.method_mime->isChecked();
+    QString path = isMime ? m_view.folder_url->url().path() : m_view.pattern_url->url().directory();
+    QDir dir(path);
+    if (path.isEmpty() || !dir.exists()) return;
+
     QStringList filters;
-    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";
+    QString filter;
+    if (isMime) {
+        // TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
+        filter = m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+        filters << "*." + filter;
+        dir.setNameFilters(filters);
+    }
+
+    QStringList result = dir.entryList(QDir::Files);
+
+    if (!isMime) {
+        // find pattern
+        filter = m_view.pattern_url->url().fileName();
+        QString ext = filter.section('.', -1);
+        filter = filter.section('.', 0, -2);
+
+        while (filter.at(filter.size() - 1).isDigit()) {
+            filter.remove(filter.size() - 1, 1);
+        }
+        QString regexp = "^" + filter + "\\d+\\." + ext + "$";
+        QRegExp rx(regexp);
+        QStringList entries;
+        foreach(const QString &path, result) {
+            if (rx.exactMatch(path)) entries << path;
+        }
+        result = entries;
+    }
 
-    dir.setNameFilters(filters);
-    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);
@@ -213,8 +269,26 @@ void SlideshowClip::slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix)
 
 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;
+    QString extension;
+    QString folder;
+
+    bool isMime = m_view.method_mime->isChecked();
+
+    if (isMime) {
+        folder = m_view.folder_url->url().path(KUrl::AddTrailingSlash);
+        extension = ".all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+    } else {
+        folder = m_view.pattern_url->url().directory(KUrl::AppendTrailingSlash);
+        QString filter = m_view.pattern_url->url().fileName();
+        QString ext = filter.section('.', -1);
+        filter = filter.section('.', 0, -2);
+
+        while (filter.at(filter.size() - 1).isDigit()) {
+            filter.chop(1);
+        }
+        extension = filter + "%d." + ext;
+    }
+    return  folder + extension;
 }
 
 
@@ -289,6 +363,22 @@ void SlideshowClip::slotUpdateDurationFormat(int ix)
     m_view.luma_duration->setHidden(framesFormat);
 }
 
+void SlideshowClip::slotMethodChanged(bool active)
+{
+    if (active) {
+        // User wants mimetype image sequence
+        m_view.stackedWidget->setCurrentIndex(0);
+        KdenliveSettings::setSlideshowbymime(true);
+    } else {
+        // User wants pattern image sequence
+        m_view.stackedWidget->setCurrentIndex(1);
+        KdenliveSettings::setSlideshowbymime(false);
+    }
+    parseFolder();
+}
+
+
+
 #include "slideshowclip.moc"