X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fslideshowclip.cpp;h=e0870cfa501b3590da54db75593cc0eea89cf2dd;hb=b0ad05910c0cd0bcfe7d3c4b40569e0b3eb5c998;hp=56b75b00074bbc4468f35f97800ca9c97d0bc7c6;hpb=ce3a9c15d4f1fb2d8a62e68198811cfd34f3bb7f;p=kdenlive diff --git a/src/slideshowclip.cpp b/src/slideshowclip.cpp index 56b75b00..e0870cfa 100644 --- a/src/slideshowclip.cpp +++ b/src/slideshowclip.cpp @@ -17,21 +17,20 @@ * 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" - -#define TYPE_JPEG 0 -#define TYPE_PNG 1 -#define TYPE_BMP 2 -#define TYPE_GIF 3 +#include -SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { +SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) : + QDialog(parent), + m_count(0), + m_timecode(tc) +{ setFont(KGlobalSettings::toolBarFont()); setWindowTitle(i18n("Add Slideshow Clip")); m_view.setupUi(this); @@ -44,42 +43,67 @@ SlideshowClip::SlideshowClip(QWidget * parent): QDialog(parent), m_count(0) { connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int))); connect(m_view.luma_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int))); - m_view.image_type->addItem("JPG"); - m_view.image_type->addItem("PNG"); - m_view.image_type->addItem("BMP"); - m_view.image_type->addItem("GIF"); + 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("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.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); - QString profilePath = KdenliveSettings::mltpath(); - profilePath = profilePath.section('/', 0, -3); - profilePath += "/lumas/PAL/"; - - QDir dir(profilePath); - QStringList result = dir.entryList(QDir::Files); - QStringList imagefiles; - QStringList imagenamelist; - foreach(QString file, result) { - if (file.endsWith(".pgm")) { - m_view.luma_file->addItem(KIcon(profilePath + file), file, profilePath + file); + // Check for Kdenlive installed luma files + QStringList filters; + filters << "*.pgm" << "*.png"; + + QStringList customLumas = KGlobal::dirs()->findDirs("appdata", "lumas"); + foreach(const QString &folder, customLumas) { + QStringList filesnames = QDir(folder).entryList(filters, QDir::Files); + foreach(const QString &fname, filesnames) { + QString filePath = KUrl(folder).path(KUrl::AddTrailingSlash) + fname; + m_view.luma_file->addItem(KIcon(filePath), fname, filePath); } } - adjustSize(); + // Check for MLT lumas + QString profilePath = KdenliveSettings::mltpath(); + QString folder = profilePath.section('/', 0, -3); + 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) { + QString filePath = KUrl(folder).path(KUrl::AddTrailingSlash) + fname; + m_view.luma_file->addItem(KIcon(filePath), fname, filePath); + } + + //adjustSize(); } -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()); - else m_view.luma_file->setEnabled(false); + if (enable) { + m_view.luma_file->setEnabled(m_view.luma_fade->isChecked()); + } else m_view.luma_file->setEnabled(false); + m_view.label_softness->setEnabled(m_view.luma_fade->isChecked() && enable); + m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled()); } -void SlideshowClip::slotEnableLumaFile(int state) { +void SlideshowClip::slotEnableLumaFile(int state) +{ bool enable = false; if (state == Qt::Checked) enable = true; m_view.luma_file->setEnabled(enable); @@ -87,92 +111,128 @@ 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; - switch (m_view.image_type->currentIndex()) { - case TYPE_PNG: - filters << "*.png"; - break; - case TYPE_BMP: - filters << "*.bmp"; - break; - case TYPE_GIF: - filters << "*.gif"; - break; - default: - filters << "*.jpg" << "*.jpeg"; - break; - } + 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); - QStringList result = dir.entryList(QDir::Files); + 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) { - QIcon icon(dir.filePath(path)); - QListWidgetItem *item = new QListWidgetItem(icon, KUrl(path).fileName()); + 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)); + } m_view.icon_list->addItem(item); } + if (m_count >= 80) connect(m_view.icon_list, SIGNAL(currentRowChanged(int)), this, SLOT(slotSetItemIcon(int))); + m_view.icon_list->setCurrentRow(0); } -QString SlideshowClip::selectedPath() const { - QString extension; - switch (m_view.image_type->currentIndex()) { - case TYPE_PNG: - extension = "/.all.png"; - break; - case TYPE_BMP: - extension = "/.all.bmp"; - break; - case TYPE_GIF: - extension = "/.all.gif"; - break; - default: - extension = "/.all.jpg"; - break; +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()); + } } +} + +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_timecode.fps())); + m_view.luma_duration_frames->setValue(m_timecode.getFrameCount(m_view.luma_duration->text(), m_timecode.fps())); + } else { + // switching to timecode format + m_view.clip_duration->setText(m_timecode.getTimecodeFromFrames(m_view.clip_duration_frames->value())); + 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"