Fix display of clip duration in project tree + some cleanup + indent fixes

[kdenlive] / src / projectitem.cpp

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index fe25876e06be04a49dfe879cb8114e1e89f21d9d..3968c0d4d06769bda738be26e4b9d421af8b8243 100644 (file)
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -18,21 +18,16 @@
  ***************************************************************************/
 
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QLabel>
-#include <QLayout>
+#include "projectitem.h"
+#include "timecode.h"
+#include "kdenlivesettings.h"
+#include "docclipbase.h"
 
 #include <KDebug>
 #include <KLocale>
 #include <KIcon>
 
 
-#include "projectitem.h"
-#include "timecode.h"
-#include "kdenlivesettings.h"
-#include "docclipbase.h"
-
 const int NameRole = Qt::UserRole;
 const int DurationRole = NameRole + 1;
 const int UsageRole = NameRole + 2;
@@ -44,7 +39,7 @@ ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, cons
     setSizeHint(0, QSize(65, 45));
     setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     setIcon(0, KIcon("folder"));
-    setToolTip(1, "<qt><b>" + i18n("Folder"));
+    setToolTip(1, "<b>" + i18n("Folder"));
     //kDebug() << "Constructed as folder, with clipId: " << m_clipId << ", and groupname: " << m_groupname;
 }
 
@@ -61,6 +56,8 @@ ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip)
     setText(1, name);
     setText(2, m_clip->description());
     if ((m_clip->clipType() == AV || m_clip->clipType() == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->askForAudioThumbs();
+    GenTime duration = m_clip->duration();
+    if (duration != GenTime()) setData(1, DurationRole, Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()));
     //setFlags(Qt::NoItemFlags);
     //kDebug() << "Constructed with clipId: " << m_clipId;
 }
@@ -77,6 +74,8 @@ ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip)
     setText(1, name);
     setText(2, m_clip->description());
     if ((m_clip->clipType() == AV || m_clip->clipType() == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->askForAudioThumbs();
+    GenTime duration = m_clip->duration();
+    if (duration != GenTime()) setData(1, DurationRole, Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()));
     //setFlags(Qt::NoItemFlags);
     //kDebug() << "Constructed with clipId: " << m_clipId;
 }
@@ -162,7 +161,7 @@ DocClipBase *ProjectItem::referencedClip() {
 }
 
 void ProjectItem::slotSetToolTip() {
-    QString tip = "<qt><b>";
+    QString tip = "<b>";
     switch (m_clipType) {
     case AUDIO:
         tip.append(i18n("Audio clip") + "</b><br />" + clipUrl().path());
@@ -204,9 +203,7 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con
     if (m_clip == NULL) return;
     //setFlags(Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled);
     if (attributes.contains("duration")) {
-        //if (m_clipType == AUDIO || m_clipType == VIDEO || m_clipType == AV)
-        //m_clip->setProperty("duration", attributes["duration"]);
-        GenTime duration = GenTime(attributes["duration"].toInt(), KdenliveSettings::project_fps());
+        GenTime duration = GenTime(attributes.value("duration").toInt(), KdenliveSettings::project_fps());
         setData(1, DurationRole, Timecode::getEasyTimecode(duration, KdenliveSettings::project_fps()));
         m_clip->setDuration(duration);
         //kDebug() << "//// LOADED CLIP, DURATIONÂ SET TO: " << duration.frames(KdenliveSettings::project_fps());
@@ -218,31 +215,26 @@ void ProjectItem::setProperties(const QMap < QString, QString > &attributes, con
     //extend attributes -reh
 
     if (m_clipType == UNKNOWN) {
-        if (attributes.contains("type")) {
-            if (attributes["type"] == "audio")
-                m_clipType = AUDIO;
-            else if (attributes["type"] == "video")
-                m_clipType = VIDEO;
-            else if (attributes["type"] == "av")
-                m_clipType = AV;
-            else if (attributes["type"] == "playlist")
-                m_clipType = PLAYLIST;
-        } else {
-            m_clipType = AV;
-        }
+        QString cliptype = attributes.value("type");
+        if (cliptype == "audio") m_clipType = AUDIO;
+        else if (cliptype == "video") m_clipType = VIDEO;
+        else if (cliptype == "av") m_clipType = AV;
+        else if (cliptype == "playlist") m_clipType = PLAYLIST;
+        else m_clipType = AV;
+
         m_clip->setClipType(m_clipType);
         slotSetToolTip();
     }
     m_clip->setProperties(attributes);
-
+    m_clip->setMetadata(metadata);
     if ((m_clipType == AV || m_clipType == AUDIO) && KdenliveSettings::audiothumbnails()) m_clip->askForAudioThumbs();
 
     if (m_clip->description().isEmpty()) {
         if (metadata.contains("description")) {
-            m_clip->setProperty("description", metadata["description"]);
+            m_clip->setProperty("description", metadata.value("description"));
             setText(2, m_clip->description());
         } else if (metadata.contains("comment")) {
-            m_clip->setProperty("description", metadata["comment"]);
+            m_clip->setProperty("description", metadata.value("comment"));
             setText(2, m_clip->description());
         }
     }