m_view.clip_description->setText(m_clip->description());
QMap <QString, QString> props = m_clip->properties();
+ m_view.clip_force_out->setHidden(true);
+ m_view.clip_out->setHidden(true);
+
if (props.contains("force_aspect_ratio") && props.value("force_aspect_ratio").toDouble() > 0) {
m_view.clip_force_ar->setChecked(true);
m_view.clip_ar->setEnabled(true);
m_view.clip_thumb->setHidden(true);
m_view.clip_color->setColor(QColor('#' + props.value("colour").right(8).left(6)));
} else if (t == SLIDESHOW) {
- m_view.clip_path->setText(url.directory());
+ bool isMime = true;
+ if (url.fileName().startsWith(".all.")) {
+ // the image sequence is defined by mimetype
+ m_view.clip_path->setText(url.directory());
+ } else {
+ // the image sequence is defined by pattern
+ m_view.slide_type_label->setHidden(true);
+ m_view.image_type->setHidden(true);
+ m_view.clip_path->setText(url.path());
+ isMime = false;
+ }
+
m_view.tabWidget->removeTab(METATAB);
m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(COLORTAB);
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.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.slide_loop->setChecked(props.value("loop").toInt());
+ m_view.slide_crop->setChecked(props.value("crop").toInt());
m_view.slide_fade->setChecked(props.value("fade").toInt());
m_view.luma_softness->setValue(props.value("softness").toInt());
+ if (!props.value("animation").isEmpty())
+ m_view.animation->setCurrentItem(props.value("animation"));
+ else
+ m_view.animation->setCurrentIndex(0);
QString path = props.value("resource");
QString ext = path.section('.', -1);
for (int i = 0; i < m_view.image_type->count(); i++) {
m_view.clip_thumb->setHidden(true);
}
- KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true);
- m_view.clip_filesize->setText(KIO::convertSize(f.size()));
+ if (t != SLIDESHOW && t != COLOR) {
+ KFileItem f(KFileItem::Unknown, KFileItem::Unknown, url, true);
+ m_view.clip_filesize->setText(KIO::convertSize(f.size()));
+ } else {
+ m_view.clip_filesize->setHidden(true);
+ m_view.label_size->setHidden(true);
+ }
+ m_view.clip_duration->setInputMask("");
+ m_view.clip_duration->setValidator(tc.validator());
m_view.clip_duration->setText(tc.getTimecode(m_clip->duration()));
if (t != IMAGE && t != COLOR && t != TEXT) m_view.clip_duration->setReadOnly(true);
else connect(m_view.clip_duration, SIGNAL(editingFinished()), this, SLOT(slotCheckMaxLength()));
// Used for multiple clips editing
-ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, QMap <QString, QString> commonproperties, QWidget * parent) :
+ClipProperties::ClipProperties(QList <DocClipBase *>cliplist, Timecode tc, QMap <QString, QString> commonproperties, QWidget * parent) :
QDialog(parent),
m_clip(NULL),
+ m_tc(tc),
m_fps(0),
m_count(0),
m_clipNeedsRefresh(false),
connect(m_view.clip_force_threads, SIGNAL(toggled(bool)), m_view.clip_threads, SLOT(setEnabled(bool)));
connect(m_view.clip_force_vindex, SIGNAL(toggled(bool)), m_view.clip_vindex, SLOT(setEnabled(bool)));
connect(m_view.clip_force_aindex, SIGNAL(toggled(bool)), m_view.clip_aindex, SLOT(setEnabled(bool)));
+ connect(m_view.clip_force_out, SIGNAL(toggled(bool)), m_view.clip_out, SLOT(setEnabled(bool)));
m_view.tabWidget->removeTab(METATAB);
m_view.tabWidget->removeTab(MARKERTAB);
m_view.clip_path->setHidden(true);
m_view.label_path->setHidden(true);
m_view.label_description->setHidden(true);
- m_view.label_duration->setHidden(true);
m_view.label_size->setHidden(true);
m_view.clip_filesize->setHidden(true);
m_view.clip_filesize->setHidden(true);
- m_view.clip_duration->setHidden(true);
m_view.clip_path->setHidden(true);
m_view.clip_description->setHidden(true);
+ m_view.clip_thumb->setHidden(true);
+ m_view.label_duration->setHidden(true);
+ m_view.clip_duration->setHidden(true);
+
+ if (commonproperties.contains("out")) {
+ if (commonproperties.value("out").toInt() > 0) {
+ m_view.clip_force_out->setChecked(true);
+ m_view.clip_out->setText(m_tc.getTimecodeFromFrames(commonproperties.value("out").toInt()));
+ } else m_view.clip_out->setText(KdenliveSettings::image_duration());
+ } else {
+ m_view.clip_force_out->setHidden(true);
+ m_view.clip_out->setHidden(true);
+ }
}
QMap <QString, QString> ClipProperties::properties()
{
QMap <QString, QString> props;
- CLIPTYPE t;
+ CLIPTYPE t = UNKNOWN;
if (m_clip != NULL) {
t = m_clip->clipType();
m_old_props = m_clip->properties();
}
// If we adjust several clips, return now
- if (m_clip == NULL) return props;
+ if (m_clip == NULL) {
+ if (m_view.clip_out->isEnabled()) {
+ int duration = m_tc.getFrameCount(m_view.clip_out->text());
+ if (duration != m_old_props.value("out").toInt()) {
+ props["out"] = QString::number(duration - 1);
+ }
+ }
+ return props;
+ }
if (m_old_props.value("description") != m_view.clip_description->text())
props["description"] = m_view.clip_description->text();
}
int duration = m_tc.getFrameCount(m_view.clip_duration->text());
if (duration != m_clip->duration().frames(m_fps)) {
- props["out"] = QString::number(duration);
+ props["out"] = QString::number(duration - 1);
}
} else if (t == IMAGE) {
if ((int) m_view.image_transparency->isChecked() != m_old_props.value("transparency").toInt()) {
}
int duration = m_tc.getFrameCount(m_view.clip_duration->text());
if (duration != m_clip->duration().frames(m_fps)) {
- props["out"] = QString::number(duration);
+ props["out"] = QString::number(duration - 1);
}
} else if (t == SLIDESHOW) {
QString value = QString::number((int) m_view.slide_loop->isChecked());
if (m_old_props.value("loop") != value) props["loop"] = value;
+ value = QString::number((int) m_view.slide_crop->isChecked());
+ if (m_old_props.value("crop") != value) props["crop"] = value;
value = QString::number((int) m_view.slide_fade->isChecked());
if (m_old_props.value("fade") != value) props["fade"] = value;
value = QString::number((int) m_view.luma_softness->value());
if (m_old_props.value("softness") != value) props["softness"] = value;
-
- QString extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
- QString new_path = m_view.clip_path->text() + extension;
- if (new_path != m_old_props.value("resource")) {
- m_clipNeedsReLoad = true;
- props["resource"] = new_path;
- kDebug() << "//// SLIDE EDIT, NEW:" << new_path << ", OLD; " << m_old_props.value("resource");
- }
+
+ bool isMime = !(m_view.clip_path->text().contains('%'));
+ if (isMime) {
+ QString extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+ QString new_path = m_view.clip_path->text() + extension;
+ if (new_path != m_old_props.value("resource")) {
+ m_clipNeedsReLoad = true;
+ props["resource"] = new_path;
+ kDebug() << "//// SLIDE EDIT, NEW:" << new_path << ", OLD; " << m_old_props.value("resource");
+ }
+ }
int duration;
if (m_view.slide_duration_format->currentIndex() == 1) {
// we are in frames mode
props["ttl"] = QString::number(duration);
props["out"] = QString::number(duration * m_count);
}
- if (duration * m_count != m_old_props.value("out").toInt()) {
+
+ if (duration * m_count - 1 != m_old_props.value("out").toInt()) {
m_clipNeedsRefresh = true;
- props["out"] = QString::number(duration * m_count);
+ props["out"] = QString::number(duration * m_count - 1);
}
if (m_view.slide_fade->isChecked()) {
int luma_duration;
}
}
+ QString animation = m_view.animation->itemData(m_view.animation->currentIndex()).toString();
+ if (animation != m_old_props.value("animation")) {
+ if (animation.isEmpty()) {
+ props["animation"].clear();
+ } else {
+ props["animation"] = animation;
+ }
+ m_clipNeedsRefresh = true;
+ }
}
return props;
}
return m_clipNeedsReLoad;
}
+
void ClipProperties::parseFolder()
{
+ QString path = m_view.clip_path->text();
+ bool isMime = !(path.contains('%'));
+ if (!isMime) path = KUrl(path).directory();
+ QDir dir(path);
- QDir dir(m_view.clip_path->text());
QStringList filters;
- filters << "*." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
- QString extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+ QString extension;
+
+ if (isMime) {
+ // TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
+ filters << "*." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+ extension = "/.all." + m_view.image_type->itemData(m_view.image_type->currentIndex()).toString();
+ dir.setNameFilters(filters);
+ }
- dir.setNameFilters(filters);
QStringList result = dir.entryList(QDir::Files);
+
+ if (!isMime) {
+ // find pattern
+ QString filter = KUrl(m_view.clip_path->text()).fileName();
+ QString ext = filter.section('.', -1);
+ filter = filter.section('%', 0, -2);
+ QString regexp = "^" + filter + "\\d+\\." + ext + "$";
+ QRegExp rx(regexp);
+ QStringList entries;
+ foreach(const QString &path, result) {
+ if (rx.exactMatch(path)) entries << path;
+ }
+ result = entries;
+ }
+
m_count = result.count();
if (m_count == 0) {
// no images, do not accept that
xml.setAttribute("resource", m_view.clip_path->text() + extension);
int width = 180.0 * KdenliveSettings::project_display_ratio();
if (width % 2 == 1) width++;
- QPixmap pix = m_clip->thumbProducer()->getImage(KUrl(m_view.clip_path->text() + extension), 1, width, 180);
+ QString filePath = m_view.clip_path->text();
+ if (isMime) filePath.append(extension);
+ QPixmap pix = m_clip->thumbProducer()->getImage(KUrl(filePath), 1, width, 180);
QMap <QString, QString> props = m_clip->properties();
m_view.clip_duration->setText(m_tc.getTimecodeFromFrames(props.value("ttl").toInt() * m_count));
m_view.clip_thumb->setPixmap(pix);
projects / kdenlive / blobdiff