X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fslideshowclip.cpp;h=c4c88cdaea75d6c6e84c8a23a7eb7a7a44400ac8;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=742aaefe72335769248aa12c250b3cdf6081a357;hpb=ad79c6a1b9f483905560d96bdbdd527873ccc637;p=kdenlive diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 742aaefe..c4c88cda 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -23,13 +23,16 @@ #include #include #include +#include #include -SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : - QDialog(parent), - m_count(0), - m_timecode(tc) + +SlideshowClip::SlideshowClip(const Timecode &tc, QWidget * parent) : + QDialog(parent), + m_count(0), + m_timecode(tc), + m_thumbJob(NULL) { setFont(KGlobalSettings::toolBarFont()); setWindowTitle(i18n("Add Slideshow Clip")); @@ -37,39 +40,59 @@ SlideshowClip::SlideshowClip(Timecode tc, 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)); - connect(m_view.folder_url, SIGNAL(textChanged(const QString &)), this, SLOT(parseFolder())); + m_view.show_thumbs->setChecked(KdenliveSettings::showslideshowthumbs()); + + connect(m_view.folder_url, SIGNAL(textChanged(QString)), this, SLOT(parseFolder())); connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder())); + connect(m_view.pattern_url, SIGNAL(textChanged(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"); 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.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_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); 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; filters << "*.pgm" << "*.png"; QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas"); - foreach(const QString &folder, customLumas) { + 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); + foreach(const QString & fname, filesnames) { + QString filePath = KUrl(folder).path(KUrl::AddTrailingSlash) + fname; + m_view.luma_file->addItem(KIcon(filePath), fname, filePath); } } @@ -79,13 +102,19 @@ SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : folder.append("/lumas/PAL"); // TODO: cleanup the PAL / NTSC mess in luma files 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); + foreach(const QString & fname, filesnames) { + QString filePath = KUrl(folder).path(KUrl::AddTrailingSlash) + fname; + m_view.luma_file->addItem(KIcon(filePath), fname, filePath); } //adjustSize(); } +SlideshowClip::~SlideshowClip() +{ + delete m_thumbJob; +} + void SlideshowClip::slotEnableLuma(int state) { bool enable = false; @@ -100,6 +129,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(KFileItem,QPixmap)), this, SLOT(slotSetPixmap(KFileItem,QPixmap))); + m_thumbJob->kill(); + m_thumbJob = NULL; + } + } + +} + void SlideshowClip::slotEnableLumaFile(int state) { bool enable = false; @@ -112,55 +157,175 @@ void SlideshowClip::slotEnableLumaFile(int state) 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()) { + m_count = 0; + m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false); + m_view.label_info->setText(QString()); + 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"; - - 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)); - 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)); + QStringList result; + QStringList filters; + 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); + result = dir.entryList(QDir::Files); + } else { + // find pattern + filter = m_view.pattern_url->url().fileName(); + QString ext = '.' + filter.section('.', -1); + filter = filter.section('.', 0, -2); + int fullSize = filter.size(); + while (filter.at(filter.size() - 1).isDigit()) { + filter.chop(1); } + int precision = fullSize - filter.size(); + int firstFrame = m_view.pattern_url->url().fileName().section('.', 0, -2).right(precision).toInt(); + QString path; + int gap = 0; + for (int i = firstFrame; gap < 100; ++i) { + path = filter + QString::number(i).rightJustified(precision, '0', false) + ext; + if (dir.exists(path)) { + result.append(path); + gap = 0; + } else { + gap++; + } + } + } + QListWidgetItem *item; + foreach(const QString & path, result) { + 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))); + m_count = m_view.icon_list->count(); + m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(m_count > 0); + m_view.label_info->setText(i18np("1 image found", "%1 images found", m_count)); + 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))); + } } } +#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(KFileItem,QPixmap)), this, SLOT(slotSetPixmap(KFileItem,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() +{ + QStringList 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(); + kDebug()<<"// SELECTED PATH: "< 0) extension.append(QString("?begin:%1").arg(firstFrame)); + } + kDebug() << "// FOUND " << (*list).count() << " items for " << url.path(); + return folder + extension; } @@ -193,6 +358,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(); @@ -213,13 +383,19 @@ 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_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())); @@ -231,6 +407,41 @@ 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.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::image_duration())); + m_view.stackedWidget->setCurrentIndex(0); + KdenliveSettings::setSlideshowbymime(true); + } else { + // User wants pattern image sequence + 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"