X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fslideshowclip.cpp;h=db30cfc0e4ec54b8ff77d1cfd5e6a321246b4d8c;hb=d18eaa998a96b0f8d9dd43e5b7dd2fb9574e71a1;hp=60c090c57e13e67a3750f741ee030418725c4451;hpb=f9394be680a8ac3c2ff8e39c9d8439eae5b55acc;p=kdenlive diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 60c090c5..db30cfc0 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -23,6 +23,7 @@ #include #include #include +#include #include @@ -30,6 +31,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : QDialog(parent), m_count(0), + m_patternBegin(0), m_timecode(tc), m_thumbJob(NULL) { @@ -56,6 +58,7 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : 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("TIF (*.tif)", "tif"); m_view.image_type->addItem("TIFF (*.tiff)", "tiff"); m_view.image_type->addItem("Open EXR (*.exr)", "exr"); m_view.animation->addItem(i18n("None"), QString()); @@ -66,14 +69,12 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : m_view.animation->addItem(i18n("Zoom"), "Zoom"); m_view.animation->addItem(i18n("Zoom, low-pass"), "Zoom, low-pass"); - m_view.clip_duration->setInputMask(""); - m_view.clip_duration->setValidator(m_timecode.validator()); - m_view.luma_duration->setInputMask(""); - m_view.luma_duration->setValidator(m_timecode.validator()); + m_view.clip_duration->setInputMask(m_timecode.mask()); + m_view.luma_duration->setInputMask(m_timecode.mask()); 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); @@ -157,6 +158,7 @@ void SlideshowClip::slotEnableLumaFile(int state) } // static +//TODO: sequence begin int SlideshowClip::sequenceCount(KUrl file) { // find pattern @@ -213,16 +215,17 @@ 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()) { filter.remove(filter.size() - 1, 1); } int precision = fullSize - filter.size(); + m_patternBegin = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt(); QString path; int gap = 0; - for (int i = 0; gap < 100; i++) { + for (int i = m_patternBegin; gap < 100; i++) { path = filter + QString::number(i).rightJustified(precision, '0', false) + ext; if (dir.exists(path)) { result.append(path); @@ -261,7 +264,13 @@ void SlideshowClip::slotGenerateThumbs() } } } - m_thumbJob = new KIO::PreviewJob(fileList, 50, 0, 0, 0, true, true, 0); +#if KDE_IS_VERSION(4,7,0) + m_thumbJob = new KIO::PreviewJob(fileList, QSize(50, 50)); + m_thumbJob->setScaleType(KIO::PreviewJob::Scaled); +#else + m_thumbJob = new KIO::PreviewJob(fileList, 50, 0, 0, 0, true, false, 0); +#endif + m_thumbJob->setAutoDelete(false); connect(m_thumbJob, SIGNAL(gotPreview(const KFileItem &, const QPixmap &)), this, SLOT(slotSetPixmap(const KFileItem &, const QPixmap &))); m_thumbJob->start(); @@ -286,11 +295,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 @@ -414,11 +424,7 @@ void SlideshowClip::slotUpdateDurationFormat(int ix) m_view.luma_duration_frames->setValue(m_timecode.getFrameCount(m_view.luma_duration->text())); } else { // switching to timecode format - m_view.clip_duration->setInputMask(""); - m_view.clip_duration->setValidator(m_timecode.validator()); m_view.clip_duration->setText(m_timecode.getTimecodeFromFrames(m_view.clip_duration_frames->value())); - m_view.luma_duration->setInputMask(""); - m_view.luma_duration->setValidator(m_timecode.validator()); m_view.luma_duration->setText(m_timecode.getTimecodeFromFrames(m_view.luma_duration_frames->value())); } m_view.clip_duration_frames->setHidden(!framesFormat); @@ -431,16 +437,12 @@ void SlideshowClip::slotMethodChanged(bool active) { if (active) { // User wants mimetype image sequence - if (m_view.clip_duration->text().isEmpty()) { - m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::image_duration())); - } + m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::image_duration())); m_view.stackedWidget->setCurrentIndex(0); KdenliveSettings::setSlideshowbymime(true); } else { // User wants pattern image sequence - if (m_view.clip_duration->text().isEmpty()) { - m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::sequence_duration())); - } + m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::sequence_duration())); m_view.stackedWidget->setCurrentIndex(1); KdenliveSettings::setSlideshowbymime(false); } @@ -452,19 +454,24 @@ QString SlideshowClip::animationToGeometry(const QString &animation, int &ttl) { QString geometry; if (animation.startsWith("Pan and zoom")) { - geometry = QString().sprintf("0=0,0:100%%x100%%;%d=-14%%,-14%%:120%%x120%%;%d=-5%%,-5%%:110%%x110%%;%d=0,0:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=-5%%,0:110%%x110%%", + geometry = QString().sprintf("0=0/0:100%%x100%%;%d=-14%%/-14%%:120%%x120%%;%d=-5%%/-5%%:110%%x110%%;%d=0/0:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=-5%%/0:110%%x110%%", ttl - 1, ttl, ttl * 2 - 1, ttl * 2, ttl * 3 - 1); ttl *= 3; } else if (animation.startsWith("Pan")) { - geometry = QString().sprintf("0=-5%%,-5%%:110%%x110%%;%d=0,0:110%%x110%%;%d=0,0:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=-5%%,-5%%:110%%x110%%;%d=0,-5%%:110%%x110%%;%d=-5%%,0:110%%x110%%", + geometry = QString().sprintf("0=-5%%/-5%%:110%%x110%%;%d=0/0:110%%x110%%;%d=0/0:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=-5%%/-5%%:110%%x110%%;%d=0/-5%%:110%%x110%%;%d=-5%%/0:110%%x110%%", ttl - 1, ttl, ttl * 2 - 1, ttl * 2, ttl * 3 - 1, ttl * 3, ttl * 4 - 1); ttl *= 4; } else if (animation.startsWith("Zoom")) { - geometry = QString().sprintf("0=0,0:100%%x100%%;%d=-14%%,-14%%:120%%x120%%", ttl - 1); + geometry = QString().sprintf("0=0/0:100%%x100%%;%d=-14%%/-14%%:120%%x120%%", ttl - 1); } return geometry; } +int SlideshowClip::begin() const +{ + return m_patternBegin; +} + #include "slideshowclip.moc"