X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fslideshowclip.cpp;h=e4557ab07e2a5dd7abce223f1337d2fedc0380d9;hb=0cd6cb4be7ecc128e5c10a988d1ab072c6ffc3c3;hp=01b33b723051d72e2bf847f218e075309d84d0ac;hpb=6b6e6ac5af11fb3fd4f0eba0ba95ceea72b5f06e;p=kdenlive diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 01b33b72..e4557ab0 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -17,28 +17,38 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * ***************************************************************************/ -#include +#include "slideshowclip.h" +#include "kdenlivesettings.h" #include #include #include -#include "kdenlivesettings.h" -#include "slideshowclip.h" +#include -SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { + +SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : + QDialog(parent), + m_count(0), + m_timecode(tc), + m_thumbJob(NULL) +{ setFont(KGlobalSettings::toolBarFont()); setWindowTitle(i18n("Add Slideshow Clip")); m_view.setupUi(this); 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.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"); @@ -47,10 +57,20 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { 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.clip_duration->setInputMask(""); + m_view.clip_duration->setValidator(m_timecode.validator()); + m_view.clip_duration->setText(m_timecode.reformatSeparators(KdenliveSettings::image_duration())); + 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); // Check for Kdenlive installed luma files QStringList filters; @@ -60,7 +80,8 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { 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); } } @@ -71,16 +92,26 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { 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) { +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()); @@ -89,7 +120,24 @@ void SlideshowClip::slotEnableLuma(int state) { m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled()); } -void SlideshowClip::slotEnableLumaFile(int state) { +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; if (state == Qt::Checked) enable = true; m_view.luma_file->setEnabled(enable); @@ -97,91 +145,150 @@ void SlideshowClip::slotEnableLumaFile(int state) { m_view.label_softness->setEnabled(enable); } -void SlideshowClip::parseFolder() { +void SlideshowClip::parseFolder() +{ m_view.icon_list->clear(); QDir dir(m_view.folder_url->url().path()); - 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"; + // 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)); + 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) { - 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()); +void SlideshowClip::slotGenerateThumbs() +{ + 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(); +} + +void SlideshowClip::slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix) +{ + 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() const { + +QString SlideshowClip::selectedPath() const +{ QString extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString(); return m_view.folder_url->url().path() + extension; } -QString SlideshowClip::clipName() const { +QString SlideshowClip::clipName() const +{ return m_view.clip_name->text(); } -QString SlideshowClip::clipDuration() 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(); } -int SlideshowClip::imageCount() const { +int SlideshowClip::imageCount() const +{ return m_count; } -int SlideshowClip::softness() const { +int SlideshowClip::softness() const +{ return m_view.luma_softness->value(); } -bool SlideshowClip::loop() const { +bool SlideshowClip::loop() const +{ return m_view.slide_loop->isChecked(); } -bool SlideshowClip::fade() const { +bool SlideshowClip::fade() const +{ return m_view.slide_fade->isChecked(); } -QString SlideshowClip::lumaDuration() 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(); } -QString SlideshowClip::lumaFile() const { +QString SlideshowClip::lumaFile() const +{ if (!m_view.luma_fade->isChecked() || !m_view.luma_file->isEnabled()) return QString(); return m_view.luma_file->itemData(m_view.luma_file->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); +} + #include "slideshowclip.moc"