Allow to use JScript in render profile parameter values.

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index 8a9e19f7c766994ee71aa360df2d37b7be21deb1..336b3c92467d03827ebbfa264338187fa5131081 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -74,7 +74,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     m_view.luma_duration->setText(m_timecode.getTimecodeFromFrames(int(ceil(m_timecode.fps()))));
     m_view.folder_url->setUrl(QDir::homePath());
 
-    m_view.clip_duration_format->addItem(i18n("hh:mm:ss::ff"));
+    m_view.clip_duration_format->addItem(i18n("hh:mm:ss:ff"));
     m_view.clip_duration_format->addItem(i18n("Frames"));
     connect(m_view.clip_duration_format, SIGNAL(activated(int)), this, SLOT(slotUpdateDurationFormat(int)));
     m_view.clip_duration_frames->setHidden(true);
@@ -214,7 +214,7 @@ void SlideshowClip::parseFolder()
     } else {
         // find pattern
         filter = m_view.pattern_url->url().fileName();
-        QString ext = filter.section('.', -1);
+        QString ext = '.' + filter.section('.', -1);
         filter = filter.section('.', 0, -2);
         int fullSize = filter.size();
         while (filter.at(filter.size() - 1).isDigit()) {
@@ -287,11 +287,12 @@ void SlideshowClip::slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix)
 QString SlideshowClip::selectedPath()
 {
     QStringList list;
-    QString path = selectedPath(m_view.folder_url->url(), m_view.method_mime->isChecked(), ".all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(), &list);
+    KUrl url;
+    if (m_view.method_mime->isChecked()) url = m_view.folder_url->url();
+    else url = m_view.pattern_url->url();
+    QString path = selectedPath(url, m_view.method_mime->isChecked(), ".all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(), &list);
     m_count = list.count();
     return path;
-
-
 }
 
 // static