First steps to save timeline clip groups

[kdenlive] / src / clipproperties.cpp

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 6d02576fa969d5270a14adec6f7baca37197e61f..923fdfb7037af70386914c863686692c99c2a2c8 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -17,16 +17,17 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QDir>
+
+#include "clipproperties.h"
+#include "kdenlivesettings.h"
+#include "kthumb.h"
+#include "markerdialog.h"
 
 #include <KStandardDirs>
 #include <KDebug>
 #include <KFileItem>
 
-#include "kdenlivesettings.h"
-#include "clipproperties.h"
-#include "kthumb.h"
-#include "markerdialog.h"
+#include <QDir>
 
 static const int VIDEOTAB = 0;
 static const int AUDIOTAB = 1;
@@ -34,7 +35,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 +83,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,14 +125,16 @@ 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);
         m_view.tabWidget->removeTab(VIDEOTAB);
         m_view.clip_thumb->setHidden(true);
-        m_view.clip_color->setColor(QColor("#" + props.value("colour").right(8).left(6)));
+        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);
@@ -301,7 +315,7 @@ QMap <QString, QString> ClipProperties::properties() {
             m_clipNeedsRefresh = true;
         }
     } else if (old_props.contains("force_aspect_ratio")) {
-        props["force_aspect_ratio"] = QString();
+        props["force_aspect_ratio"].clear();
         m_clipNeedsRefresh = true;
     }
 
@@ -311,7 +325,7 @@ QMap <QString, QString> ClipProperties::properties() {
             props["threads"] = QString::number(threads);
         }
     } else if (old_props.contains("threads")) {
-        props["threads"] = QString();
+        props["threads"].clear();
     }
 
     int vindex = m_view.clip_vindex->value();
@@ -320,7 +334,7 @@ QMap <QString, QString> ClipProperties::properties() {
             props["video_index"] = QString::number(vindex);
         }
     } else if (old_props.contains("video_index")) {
-        props["video_index"] = QString();
+        props["video_index"].clear();
     }
 
     int aindex = m_view.clip_aindex->value();
@@ -329,12 +343,12 @@ QMap <QString, QString> ClipProperties::properties() {
             props["audio_index"] = QString::number(aindex);
         }
     } else if (old_props.contains("audio_index")) {
-        props["audio_index"] = QString();
+        props["audio_index"].clear();
     }
 
     if (t == COLOR) {
         QString new_color = m_view.clip_color->color().name();
-        if (new_color != QString("#" + old_props.value("colour").right(8).left(6))) {
+        if (new_color != QString('#' + old_props.value("colour").right(8).left(6))) {
             m_clipNeedsRefresh = true;
             props["colour"] = "0x" + new_color.right(6) + "ff";
         }
@@ -404,8 +418,8 @@ QMap <QString, QString> ClipProperties::properties() {
                 props["luma_file"] = lumaFile;
             }
         } else {
-            if (old_props.value("luma_file") != QString()) {
-                props["luma_file"] = QString();
+            if (!old_props.value("luma_file").isEmpty()) {
+                props["luma_file"].clear();
             }
         }