* internal rework: switch clip id's from integer to string

[kdenlive] / src / clipproperties.cpp

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index bcb697a28a1f09ac812daa2148065bd95e7ac029..8b6c6a314c76de0ad9a44c084ee8b2f36383432c 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -28,16 +28,18 @@
 #include "kthumb.h"
 #include "markerdialog.h"
 
-#define VIDEOTAB 0
-#define AUDIOTAB 1
-#define COLORTAB 2
-#define SLIDETAB 3
-#define ADVANCEDTAB 4
-
-#define TYPE_JPEG 0
-#define TYPE_PNG 1
-#define TYPE_BMP 2
-#define TYPE_GIF 3
+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;
+
+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());
@@ -55,8 +57,18 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         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);
@@ -64,6 +76,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(IMAGETAB);
         m_view.tabWidget->removeTab(COLORTAB);
         m_view.tabWidget->removeTab(AUDIOTAB);
         m_view.tabWidget->removeTab(VIDEOTAB);
@@ -87,16 +100,16 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         profilePath += "/lumas/PAL/";
 
         QDir dir(profilePath);
-        QStringList result = dir.entryList(QDir::Files);
+        QStringList filter;
+        filter << "*.pgm";
+        const QStringList result = dir.entryList(filter, QDir::Files);
         QStringList imagefiles;
         QStringList imagenamelist;
         int current;
-        foreach(QString file, result) {
-            if (file.endsWith(".pgm")) {
-                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;
-            }
+        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()) {
@@ -106,6 +119,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
 
         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"))
@@ -121,6 +135,7 @@ ClipProperties::ClipProperties(DocClipBase *clip, Timecode tc, double fps, QWidg
         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);
@@ -164,8 +179,7 @@ void ClipProperties::slotAddMarker() {
     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()));
 }
@@ -176,8 +190,7 @@ void ClipProperties::slotEditMarker() {
     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()));
 }
@@ -186,13 +199,12 @@ void ClipProperties::slotDeleteMarker() {
     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();
 }
 
@@ -208,12 +220,20 @@ QMap <QString, QString> ClipProperties::properties() {
             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) {
         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()) {
@@ -303,7 +323,7 @@ void ClipProperties::parseFolder() {
     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);