X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fslideshowclip.cpp;h=dcdbd845c3162986f73e525704bc0a1d50a7e0c4;hb=5bac38471d4c90a8a520d6ec32b90913b6f0dbcb;hp=0169630fad7016b1e060f44729578aeef9c5bcd5;hpb=5ee798aed90c5a3a50024e6b5bd26753e03ec7cc;p=kdenlive diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 0169630f..dcdbd845 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -26,9 +26,12 @@ #include -SlideshowClip::SlideshowClip(QWidget * parent) : + +SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : QDialog(parent), - m_count(0) + m_count(0), + m_timecode(tc), + m_thumbJob(NULL) { setFont(KGlobalSettings::toolBarFont()); setWindowTitle(i18n("Add Slideshow Clip")); @@ -36,12 +39,17 @@ SlideshowClip::SlideshowClip(QWidget * parent) : m_view.clip_name->setText(i18n("Slideshow Clip")); m_view.folder_url->setMode(KFile::Directory); m_view.icon_list->setIconSize(QSize(50, 50)); + m_view.show_thumbs->setChecked(KdenliveSettings::showslideshowthumbs()); + 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))); 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"); @@ -50,10 +58,30 @@ SlideshowClip::SlideshowClip(QWidget * parent) : m_view.image_type->addItem("TGA (*.tga)", "tga"); m_view.image_type->addItem("TIFF (*.tiff)", "tiff"); m_view.image_type->addItem("Open EXR (*.exr)", "exr"); - m_view.clip_duration->setText(KdenliveSettings::image_duration()); - m_view.luma_duration->setText("00:00:00:24"); + m_view.animation->addItem(i18n("None"), QString()); + m_view.animation->addItem(i18n("Pan"), "Pan"); + m_view.animation->addItem(i18n("Pan, low-pass"), "Pan, low-pass"); + m_view.animation->addItem(i18n("Pan and zoom"), "Pan and zoom"); + m_view.animation->addItem(i18n("Pan and zoom, low-pass"), "Pan and zoom, low-pass"); + 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.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("Frames")); + 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; @@ -63,7 +91,8 @@ SlideshowClip::SlideshowClip(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); } } @@ -74,10 +103,18 @@ SlideshowClip::SlideshowClip(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(); + //adjustSize(); +} + +SlideshowClip::~SlideshowClip() +{ + if (m_thumbJob) { + delete m_thumbJob; + } } void SlideshowClip::slotEnableLuma(int state) @@ -85,6 +122,7 @@ void SlideshowClip::slotEnableLuma(int state) bool enable = false; if (state == Qt::Checked) enable = true; m_view.luma_duration->setEnabled(enable); + m_view.luma_duration_frames->setEnabled(enable); m_view.luma_fade->setEnabled(enable); if (enable) { m_view.luma_file->setEnabled(m_view.luma_fade->isChecked()); @@ -93,6 +131,22 @@ void SlideshowClip::slotEnableLuma(int state) m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled()); } +void SlideshowClip::slotEnableThumbs(int state) +{ + if (state == Qt::Checked) { + KdenliveSettings::setShowslideshowthumbs(true); + slotGenerateThumbs(); + } else { + KdenliveSettings::setShowslideshowthumbs(false); + if (m_thumbJob) { + disconnect(m_thumbJob, SIGNAL(gotPreview(const KFileItem &, const QPixmap &)), this, SLOT(slotSetPixmap(const KFileItem &, const QPixmap &))); + m_thumbJob->kill(); + m_thumbJob = NULL; + } + } + +} + void SlideshowClip::slotEnableLumaFile(int state) { bool enable = false; @@ -102,58 +156,178 @@ 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); - 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"); foreach(const QString &path, result) { i++; - if (i < 80) { - QIcon icon(dir.filePath(path)); - item = new QListWidgetItem(icon, KUrl(path).fileName()); - } else { - item = new QListWidgetItem(unknownicon, KUrl(path).fileName()); - item->setData(Qt::UserRole, dir.filePath(path)); - } + item = new QListWidgetItem(unknownicon, KUrl(path).fileName()); + item->setData(Qt::UserRole, dir.filePath(path)); m_view.icon_list->addItem(item); } - if (m_count >= 80) connect(m_view.icon_list, SIGNAL(currentRowChanged(int)), this, SLOT(slotSetItemIcon(int))); + if (m_view.show_thumbs->isChecked()) slotGenerateThumbs(); m_view.icon_list->setCurrentRow(0); } -void SlideshowClip::slotSetItemIcon(int row) +void SlideshowClip::slotGenerateThumbs() { - QListWidgetItem * item = m_view.icon_list->item(row); - if (item) { - QString path = item->data(Qt::UserRole).toString(); - if (!path.isEmpty()) { - KIcon icon(path); - item->setIcon(icon); - item->setData(Qt::UserRole, QString()); + if (m_thumbJob) { + delete m_thumbJob; + }; + KFileItemList fileList; + for (int i = 0; i < m_view.icon_list->count(); i++) { + QListWidgetItem* item = m_view.icon_list->item(i); + if (item) { + QString path = item->data(Qt::UserRole).toString(); + if (!path.isEmpty()) { + fileList.append(KFileItem(KFileItem::Unknown, KFileItem::Unknown, KUrl(path))); + } } } + m_thumbJob = new KIO::PreviewJob(fileList, 50, 0, 0, 0, true, true, 0); + m_thumbJob->setAutoDelete(false); + connect(m_thumbJob, SIGNAL(gotPreview(const KFileItem &, const QPixmap &)), this, SLOT(slotSetPixmap(const KFileItem &, const QPixmap &))); + m_thumbJob->start(); } -QString SlideshowClip::selectedPath() const +void SlideshowClip::slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix) { - QString extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(); - return m_view.folder_url->url().path() + extension; + for (int i = 0; i < m_view.icon_list->count(); i++) { + QListWidgetItem* item = m_view.icon_list->item(i); + if (item) { + QString path = item->data(Qt::UserRole).toString(); + if (path == fileItem.url().path()) { + item->setIcon(KIcon(pix)); + item->setData(Qt::UserRole, QString()); + break; + } + } + } +} + + +QString SlideshowClip::selectedPath() +{ + return selectedPath(m_view.folder_url->url(), m_view.method_mime->isChecked(), ".all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(), &m_count); + + +} +// static +QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, int *count) +{ + QString folder; + + if (isMime) { + folder = url.path(KUrl::AddTrailingSlash); + } else { + folder = url.directory(KUrl::AppendTrailingSlash); + QString filter = url.fileName(); + QString ext = '.' + filter.section('.', -1); + filter = filter.section('.', 0, -2); + + while (filter.at(filter.size() - 1).isDigit()) { + filter.chop(1); + } + // Check that the first image exists and which format it has (image1.jpg or image001.jpg, ...) + + // Find first image in sequence + QString regexp = "^" + filter + "\\d+" + ext + "$"; + QRegExp rx(regexp); + QStringList entries; + + QDir dir(folder); + QStringList result = dir.entryList(QDir::Files); + int precision = 1; + QString pathValue; + QMap sortedList; + foreach(const QString &path, result) { + if (rx.exactMatch(path)) { + pathValue = path.section('.', 0, -2); + pathValue.remove(0, filter.size()); + sortedList.insert(pathValue.toInt(), path); + } + } + *count = sortedList.size(); + if (*count == 0) kDebug() << "No IMAGE FOUND!!!!!!!"; + else { + QMapIterator i(sortedList); + i.next(); + QString result = i.value(); + result.remove(0, filter.size()); + result = result.section('.', 0, -2); + precision = result.size(); + } + extension = filter + "%." + QString::number(precision) + "d" + ext; + } + return folder + extension; } @@ -164,6 +338,10 @@ QString SlideshowClip::clipName() const QString SlideshowClip::clipDuration() const { + if (m_view.clip_duration_format->currentIndex() == 1) { + // we are in frames mode + return m_timecode.getTimecodeFromFrames(m_view.clip_duration_frames->value()); + } return m_view.clip_duration->text(); } @@ -182,6 +360,11 @@ bool SlideshowClip::loop() const return m_view.slide_loop->isChecked(); } +bool SlideshowClip::crop() const +{ + return m_view.slide_crop->isChecked(); +} + bool SlideshowClip::fade() const { return m_view.slide_fade->isChecked(); @@ -189,6 +372,10 @@ bool SlideshowClip::fade() const QString SlideshowClip::lumaDuration() const { + if (m_view.clip_duration_format->currentIndex() == 1) { + // we are in frames mode + return m_timecode.getTimecodeFromFrames(m_view.luma_duration_frames->value()); + } return m_view.luma_duration->text(); } @@ -198,6 +385,72 @@ QString SlideshowClip::lumaFile() const return m_view.luma_file->itemData(m_view.luma_file->currentIndex()).toString(); } +QString SlideshowClip::animation() const +{ + if (m_view.animation->itemData(m_view.animation->currentIndex()).isNull()) return QString(); + return m_view.animation->itemData(m_view.animation->currentIndex()).toString(); +} + +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_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); + m_view.clip_duration->setHidden(framesFormat); + m_view.luma_duration_frames->setHidden(!framesFormat); + m_view.luma_duration->setHidden(framesFormat); +} + +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.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.stackedWidget->setCurrentIndex(1); + KdenliveSettings::setSlideshowbymime(false); + } + parseFolder(); +} + +// static +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%%", + 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%%", + 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); + } + return geometry; +} + #include "slideshowclip.moc"