#include "kthumb.h"
#include "markerdialog.h"
-#define VIDEOTAB 0
-#define AUDIOTAB 1
-#define COLORTAB 2
-#define SLIDETAB 3
-#define ADVANCEDTAB 4
+static const int VIDEOTAB = 0;
+static const int AUDIOTAB = 1;
+static const int COLORTAB = 2;
+static const int SLIDETAB = 3;
+static const int IMAGETAB = 4;
+static const int MARKERTAB = 5;
+static const int ADVANCEDTAB = 6;
-#define TYPE_JPEG 0
-#define TYPE_PNG 1
-#define TYPE_BMP 2
-#define TYPE_GIF 3
+static const int TYPE_JPEG = 0;
+static const int TYPE_PNG = 1;
+static const int TYPE_BMP = 2;
+static const int TYPE_GIF = 3;
ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidget * parent): QDialog(parent), m_tc(tc), m_clip(clip), m_fps(fps), m_clipNeedsRefresh(false), m_count(0) {
setFont(KGlobalSettings::toolBarFont());
m_view.clip_path->setText(url.path());
m_view.clip_description->setText(m_clip->description());
QMap <QString, QString> props = m_clip->properties();
+ // disable advanced properties until implemented
+ m_view.tabWidget->widget(ADVANCEDTAB)->setEnabled(false);
if (props.contains("audiocodec"))
m_view.clip_acodec->setText(props.value("audiocodec"));
m_view.clip_channels->setText(props.value("channels"));
CLIPTYPE t = m_clip->clipType();
- if (t == COLOR) {
+ if (t == IMAGE) {
+ m_view.tabWidget->removeTab(SLIDETAB);
+ m_view.tabWidget->removeTab(COLORTAB);
+ m_view.tabWidget->removeTab(AUDIOTAB);
+ m_view.tabWidget->removeTab(VIDEOTAB);
+ if (props.contains("frame_size"))
+ m_view.image_size->setText(props.value("frame_size"));
+ if (props.contains("transparency"))
+ m_view.image_transparency->setChecked(props.value("transparency").toInt());
+ } else if (t == COLOR) {
m_view.clip_path->setEnabled(false);
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(AUDIOTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
m_view.clip_color->setColor(QColor("#" + props.value("colour").right(8).left(6)));
} else if (t == SLIDESHOW) {
m_view.clip_path->setText(url.directory());
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(COLORTAB);
m_view.tabWidget->removeTab(AUDIOTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
types << "JPG" << "PNG" << "BMP" << "GIF";
m_view.image_type->addItems(types);
m_view.slide_loop->setChecked(props.value("loop").toInt());
+ m_view.slide_fade->setChecked(props.value("fade").toInt());
+ m_view.luma_softness->setValue(props.value("softness").toInt());
QString path = props.value("resource");
if (path.endsWith("png")) m_view.image_type->setCurrentIndex(TYPE_PNG);
else if (path.endsWith("bmp")) m_view.image_type->setCurrentIndex(TYPE_BMP);
else if (path.endsWith("gif")) m_view.image_type->setCurrentIndex(TYPE_GIF);
m_view.slide_duration->setText(tc.getTimecodeFromFrames(props.value("ttl").toInt()));
parseFolder();
+
+ m_view.luma_duration->setText(tc.getTimecodeFromFrames(props.value("luma_duration").toInt()));
+ QString lumaFile = props.value("luma_file");
+ QString profilePath = KdenliveSettings::mltpath();
+ profilePath = profilePath.section('/', 0, -3);
+ profilePath += "/lumas/PAL/";
+
+ QDir dir(profilePath);
+ QStringList filter;
+ filter << "*.pgm";
+ const QStringList result = dir.entryList(filter, QDir::Files);
+ QStringList imagefiles;
+ QStringList imagenamelist;
+ int current;
+ foreach(const QString file, result) {
+ m_view.luma_file->addItem(KIcon(profilePath + file), file, profilePath + file);
+ if (!lumaFile.isEmpty() && lumaFile == QString(profilePath + file))
+ current = m_view.luma_file->count() - 1;
+ }
+
+ if (!lumaFile.isEmpty()) {
+ m_view.slide_luma->setChecked(true);
+ m_view.luma_file->setCurrentIndex(current);
+ }
+
connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder()));
} else if (t != AUDIO) {
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(COLORTAB);
if (props.contains("frame_size"))
m_view.clip_thumb->setPixmap(pix);
if (t == IMAGE || t == VIDEO) m_view.tabWidget->removeTab(AUDIOTAB);
} else {
+ m_view.tabWidget->removeTab(IMAGETAB);
m_view.tabWidget->removeTab(SLIDETAB);
m_view.tabWidget->removeTab(COLORTAB);
m_view.tabWidget->removeTab(VIDEOTAB);
CommentedTime marker(GenTime(), i18n("Marker"));
MarkerDialog d(m_clip, marker, m_tc, this);
if (d.exec() == QDialog::Accepted) {
- int id = m_clip->getId();
- emit addMarker(id, d.newMarker().time(), d.newMarker().comment());
+ emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment());
}
QTimer::singleShot(500, this, SLOT(slotFillMarkersList()));
}
if (pos < 0 || pos > marks.count() - 1) return;
MarkerDialog d(m_clip, marks.at(pos), m_tc, this);
if (d.exec() == QDialog::Accepted) {
- int id = m_clip->getId();
- emit addMarker(id, d.newMarker().time(), d.newMarker().comment());
+ emit addMarker(m_clip->getId(), d.newMarker().time(), d.newMarker().comment());
}
QTimer::singleShot(500, this, SLOT(slotFillMarkersList()));
}
QList < CommentedTime > marks = m_clip->commentedSnapMarkers();
int pos = m_view.markers_list->currentIndex().row();
if (pos < 0 || pos > marks.count() - 1) return;
- int id = m_clip->getId();
- emit addMarker(id, marks.at(pos).time(), QString());
+ emit addMarker(m_clip->getId(), marks.at(pos).time(), QString());
QTimer::singleShot(500, this, SLOT(slotFillMarkersList()));
}
-int ClipProperties::clipId() const {
+const QString &ClipProperties::clipId() const {
return m_clip->getId();
}
m_clipNeedsRefresh = true;
props["colour"] = "0x" + new_color.right(6) + "ff";
}
+ } else if (t == IMAGE) {
+ QMap <QString, QString> old_props = m_clip->properties();
+ if ((int) m_view.image_transparency->isChecked() != old_props.value("transparency").toInt()) {
+ props["transparency"] = QString::number((int)m_view.image_transparency->isChecked());
+ m_clipNeedsRefresh = true;
+ }
} else if (t == SLIDESHOW) {
- props["loop"] = QString::number((int) m_view.slide_loop->isChecked());
QMap <QString, QString> old_props = m_clip->properties();
+ QString value = QString::number((int) m_view.slide_loop->isChecked());
+ if (old_props.value("loop") != value) props["loop"] = value;
+ value = QString::number((int) m_view.slide_fade->isChecked());
+ if (old_props.value("fade") != value) props["fade"] = value;
+ value = QString::number((int) m_view.luma_softness->value());
+ if (old_props.value("softness") != value) props["softness"] = value;
+
QString extension;
switch (m_view.image_type->currentIndex()) {
case TYPE_PNG:
m_clipNeedsRefresh = true;
props["out"] = QString::number(duration * m_count);
}
+ if (m_view.slide_fade->isChecked()) {
+ int luma_duration = m_tc.getFrameCount(m_view.luma_duration->text(), m_fps);
+ if (luma_duration != old_props.value("luma_duration").toInt()) {
+ m_clipNeedsRefresh = true;
+ props["luma_duration"] = QString::number(luma_duration);
+ }
+ QString lumaFile;
+ if (m_view.slide_luma->isChecked())
+ lumaFile = m_view.luma_file->itemData(m_view.luma_file->currentIndex()).toString();
+ if (lumaFile != old_props.value("luma_file")) {
+ m_clipNeedsRefresh = true;
+ props["luma_file"] = lumaFile;
+ }
+ } else {
+ if (old_props.value("luma_file") != QString()) {
+ props["luma_file"] = QString();
+ }
+ }
}
return props;
extension = "/.all.gif";
break;
default:
- filters << "*.jpg" << "*.jpeg";
+ filters << "*.jpg";
+ // TODO: improve jpeg image detection with extension like jpeg, requires change in MLT image producers
+ // << "*.jpeg";
extension = "/.all.jpg";
break;
}
m_view.slide_info->setText(i18n("%1 images found", m_count));
QDomElement xml = m_clip->toXML();
xml.setAttribute("resource", m_view.clip_path->text() + extension);
- QPixmap pix = m_clip->thumbProducer()->getImage(xml, 1, 240, 180);
+ QPixmap pix = m_clip->thumbProducer()->getImage(KUrl(m_view.clip_path->text() + extension), 1, 240, 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