Fix recent change that broke rescale on rendering

[kdenlive] / src / clipproperties.cpp

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 03f686b69ea3f9388f93b7bd28ab920f95f340dc..dc187f28f5769414e98148ef552eb6bbe4846ba4 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -34,7 +34,8 @@ 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;
+static const int METATAB = 6;
+static const int ADVANCEDTAB = 7;
 
 static const int TYPE_JPEG = 0;
 static const int TYPE_PNG = 1;
@@ -81,6 +82,16 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         m_view.clip_vindex->setMaximum(props.value("video_max").toInt());
     }
 
+    // Check for Metadata
+    QMap<QString, QString> meta = m_clip->metadata();
+    QMap<QString, QString>::const_iterator i = meta.constBegin();
+    while (i != meta.constEnd()) {
+        QTreeWidgetItem *metaitem = new QTreeWidgetItem(m_view.metadata_list);
+        metaitem->setText(0, i.key()); //i18n(i.key().section('.', 2, 3).toUtf8().data()));
+        metaitem->setText(1, i.value());
+        ++i;
+    }
+
     connect(m_view.clip_force_ar, SIGNAL(toggled(bool)), m_view.clip_ar, SLOT(setEnabled(bool)));
     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)));
@@ -113,6 +124,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
             m_view.image_transparency->setChecked(props.value("transparency").toInt());
     } else if (t == COLOR) {
         m_view.clip_path->setEnabled(false);
+        m_view.tabWidget->removeTab(METATAB);
         m_view.tabWidget->removeTab(IMAGETAB);
         m_view.tabWidget->removeTab(SLIDETAB);
         m_view.tabWidget->removeTab(AUDIOTAB);
@@ -121,6 +133,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         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(METATAB);
         m_view.tabWidget->removeTab(IMAGETAB);
         m_view.tabWidget->removeTab(COLORTAB);
         m_view.tabWidget->removeTab(AUDIOTAB);
@@ -140,27 +153,38 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
 
         m_view.luma_duration->setText(tc.getTimecodeFromFrames(props.value("luma_duration").toInt()));
         QString lumaFile = props.value("luma_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) {
+                m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname);
+            }
+        }
+
+        // Check for MLT lumas
         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;
+        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) {
+            m_view.luma_file->addItem(KIcon(folder + '/' + fname), fname, folder + '/' + fname);
         }
 
+        slotEnableLuma(m_view.slide_fade->isChecked());
+        slotEnableLumaFile(m_view.slide_luma->isChecked());
+
         if (!lumaFile.isEmpty()) {
             m_view.slide_luma->setChecked(true);
-            m_view.luma_file->setCurrentIndex(current);
-        }
+            m_view.luma_file->setCurrentIndex(m_view.luma_file->findData(lumaFile));
+        } else m_view.luma_file->setEnabled(false);
+        connect(m_view.slide_fade, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLuma(int)));
+        connect(m_view.slide_luma, SIGNAL(stateChanged(int)), this, SLOT(slotEnableLumaFile(int)));
 
         connect(m_view.image_type, SIGNAL(currentIndexChanged(int)), this, SLOT(parseFolder()));
     } else if (t != AUDIO) {
@@ -210,6 +234,26 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
     adjustSize();
 }
 
+void ClipProperties::slotEnableLuma(int state) {
+    bool enable = false;
+    if (state == Qt::Checked) enable = true;
+    m_view.luma_duration->setEnabled(enable);
+    m_view.slide_luma->setEnabled(enable);
+    if (enable) {
+        m_view.luma_file->setEnabled(m_view.slide_luma->isChecked());
+    } else m_view.luma_file->setEnabled(false);
+    m_view.label_softness->setEnabled(m_view.slide_luma->isChecked() && enable);
+    m_view.luma_softness->setEnabled(m_view.label_softness->isEnabled());
+}
+
+void ClipProperties::slotEnableLumaFile(int state) {
+    bool enable = false;
+    if (state == Qt::Checked) enable = true;
+    m_view.luma_file->setEnabled(enable);
+    m_view.luma_softness->setEnabled(enable);
+    m_view.label_softness->setEnabled(enable);
+}
+
 void ClipProperties::slotFillMarkersList() {
     m_view.markers_list->clear();
     QList < CommentedTime > marks = m_clip->commentedSnapMarkers();
@@ -427,7 +471,7 @@ void ClipProperties::parseFolder() {
 void ClipProperties::slotCheckMaxLength() {
     int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
     if (duration > m_clip->maxDuration().frames(m_fps)) {
-       m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration(), m_fps));
+        m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration(), m_fps));
     }
 }