Get ready for typewriter effect in titles

[kdenlive] / src / slideshowclip.cpp

diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp
index 742aaefe72335769248aa12c250b3cdf6081a357..620cc4cbb6261adcac023a768a874c6d4a294524 100644 (file)
--- a/src/slideshowclip.cpp
+++ b/src/slideshowclip.cpp
@@ -43,6 +43,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
     connect(m_view.luma_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int)));
 
+    //WARNING: keep in sync with clipproperties.cpp
     m_view.image_type->addItem("JPG (*.jpg)", "jpg");
     m_view.image_type->addItem("JPEG (*.jpeg)", "jpeg");
     m_view.image_type->addItem("PNG (*.png)", "png");
@@ -69,7 +70,8 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     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);
+            QString filePath = KUrl(folder).path(KUrl::AddTrailingSlash) + fname;
+            m_view.luma_file->addItem(KIcon(filePath), fname, filePath);
         }
     }
 
@@ -80,7 +82,8 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
     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);
+        QString filePath = KUrl(folder).path(KUrl::AddTrailingSlash) + fname;
+        m_view.luma_file->addItem(KIcon(filePath), fname, filePath);
     }
 
     //adjustSize();
@@ -125,7 +128,7 @@ void SlideshowClip::parseFolder()
     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));
+    m_view.label_info->setText(i18np("1 image found", "%1 images found", m_count));
     QListWidgetItem *item;
     int i = 0;
     KIcon unknownicon("unknown");
@@ -218,8 +221,8 @@ void SlideshowClip::slotUpdateDurationFormat(int ix)
     bool framesFormat = ix == 1;
     if (framesFormat) {
         // switching to frames count, update widget
-        m_view.clip_duration_frames->setValue(m_timecode.getFrameCount(m_view.clip_duration->text(), m_timecode.fps()));
-        m_view.luma_duration_frames->setValue(m_timecode.getFrameCount(m_view.luma_duration->text(), m_timecode.fps()));
+        m_view.clip_duration_frames->setValue(m_timecode.getFrameCount(m_view.clip_duration->text()));
+        m_view.luma_duration_frames->setValue(m_timecode.getFrameCount(m_view.luma_duration->text()));
     } else {
         // switching to timecode format
         m_view.clip_duration->setText(m_timecode.getTimecodeFromFrames(m_view.clip_duration_frames->value()));