#include <KStandardDirs>
#include <KDebug>
#include <KFileItem>
+#include <kdeversion.h>
#include <QDir>
-SlideshowClip::SlideshowClip(Timecode tc, QWidget * parent) :
+SlideshowClip::SlideshowClip(const Timecode &tc, QWidget * parent) :
QDialog(parent),
m_count(0),
m_timecode(tc),
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.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(const QString &)), 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)));
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());
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);
SlideshowClip::~SlideshowClip()
{
- if (m_thumbJob) {
- delete m_thumbJob;
- }
+ delete m_thumbJob;
}
void SlideshowClip::slotEnableLuma(int state)
} else {
KdenliveSettings::setShowslideshowthumbs(false);
if (m_thumbJob) {
- disconnect(m_thumbJob, SIGNAL(gotPreview(const KFileItem &, const QPixmap &)), this, SLOT(slotSetPixmap(const KFileItem &, const QPixmap &)));
+ disconnect(m_thumbJob, SIGNAL(gotPreview(KFileItem,QPixmap)), this, SLOT(slotSetPixmap(KFileItem,QPixmap)));
m_thumbJob->kill();
m_thumbJob = NULL;
}
m_view.label_softness->setEnabled(enable);
}
-// static
-int SlideshowClip::sequenceCount(KUrl file)
-{
- // find pattern
- int count = 0;
- QString filter = file.fileName();
- QString ext = filter.section('.', -1);
- filter = filter.section('.', 0, -2);
- int fullSize = filter.size();
- bool hasDigit = false;
- while (filter.at(filter.size() - 1).isDigit()) {
- hasDigit = true;
- filter.remove(filter.size() - 1, 1);
- }
- if (!hasDigit) return 0;
-
-
- // Find number of digits in sequence
- int precision = fullSize - filter.size();
- QString folder = file.directory(KUrl::AppendTrailingSlash);
- // Check how many files we have
- QDir dir(folder);
- QString path;
- int gap = 0;
- for (int i = 0; gap < 100; i++) {
- path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
- if (dir.exists(path)) {
- count ++;
- gap = 0;
- } else {
- gap++;
- }
- }
- return count;
-}
-
void SlideshowClip::parseFolder()
{
m_view.icon_list->clear();
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;
+ if (path.isEmpty() || !dir.exists()) {
+ m_count = 0;
+ m_view.buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
+ m_view.label_info->setText(QString());
+ return;
+ }
KIcon unknownicon("unknown");
QStringList result;
} 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);
+ 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 = 0; gap < 100; i++) {
+ for (int i = firstFrame; gap < 100; ++i) {
path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
if (dir.exists(path)) {
result.append(path);
item->setData(Qt::UserRole, dir.filePath(path));
m_view.icon_list->addItem(item);
}
- 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_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);
delete m_thumbJob;
};
KFileItemList fileList;
- for (int i = 0; i < m_view.icon_list->count(); i++) {
+ 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();
}
}
}
- 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 &)));
+ connect(m_thumbJob, SIGNAL(gotPreview(KFileItem,QPixmap)), this, SLOT(slotSetPixmap(KFileItem,QPixmap)));
m_thumbJob->start();
}
void SlideshowClip::slotSetPixmap(const KFileItem &fileItem, const QPixmap &pix)
{
- for (int i = 0; i < m_view.icon_list->count(); i++) {
+ 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();
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();
+ kDebug()<<"// SELECTED PATH: "<<path;
return path;
-
-
}
// static
-int SlideshowClip::getFrameNumberFromPath(KUrl path)
+int SlideshowClip::getFrameNumberFromPath(const KUrl &path)
{
QString filter = path.fileName();
filter = filter.section('.', 0, -2);
}
// static
-QString SlideshowClip::selectedPath(KUrl url, bool isMime, QString extension, QStringList *list)
+QString SlideshowClip::selectedPath(const KUrl &url, bool isMime, QString extension, QStringList *list)
{
QString folder;
if (isMime) {
folder = url.path(KUrl::AddTrailingSlash);
+ // Check how many files we have
+ QDir dir(folder);
+ QStringList filters;
+ filters << "*." + extension.section('.', -1);
+ dir.setNameFilters(filters);
+ *list = dir.entryList(QDir::Files);
} else {
folder = url.directory(KUrl::AppendTrailingSlash);
QString filter = url.fileName();
QString ext = '.' + filter.section('.', -1);
filter = filter.section('.', 0, -2);
int fullSize = filter.size();
+ QString firstFrameData = filter;
while (filter.at(filter.size() - 1).isDigit()) {
filter.chop(1);
// Find number of digits in sequence
int precision = fullSize - filter.size();
+ int firstFrame = firstFrameData.right(precision).toInt();
// Check how many files we have
QDir dir(folder);
QString path;
int gap = 0;
- for (int i = 0; gap < 100; i++) {
+ for (int i = firstFrame; gap < 100; ++i) {
path = filter + QString::number(i).rightJustified(precision, '0', false) + ext;
if (dir.exists(path)) {
(*list).append(folder + path);
gap++;
}
}
- extension = filter + "%." + QString::number(precision) + "d" + ext;
+ extension = filter + "%0" + QString::number(precision) + 'd' + ext;
+ if (firstFrame > 0) extension.append(QString("?begin:%1").arg(firstFrame));
}
kDebug() << "// FOUND " << (*list).count() << " items for " << url.path();
return folder + extension;
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);
{
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);
}
{
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;
}
+
#include "slideshowclip.moc"
projects / kdenlive / blobdiff