X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fprojectitem.cpp;h=7efcef3da411f362bd81a8fa5aec803709384325;hb=6f8f092f36ef2a23f4d4cf44f75a48f219fcecc6;hp=55467170b2cbb1cf01e7e3f731a6cd28040949be;hpb=d9df79256acce77ddf748676bc95d159cd4ea75f;p=kdenlive

diff --git a/src/projectitem.cpp b/src/projectitem.cpp
index 55467170..7efcef3d 100644
--- a/src/projectitem.cpp
+++ b/src/projectitem.cpp
@@ -18,73 +18,35 @@
  ***************************************************************************/
 
 
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QLabel>
-#include <QLayout>
-
-#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;
-
-
-ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, QDomElement xml, int clipId)
-        : QTreeWidgetItem(parent, strings, QTreeWidgetItem::UserType), m_clipType(UNKNOWN), m_clipId(clipId) {
-    QDomElement element = xml.cloneNode().toElement();
-    setSizeHint(0, QSize(65, 45));
-    setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
-    if (!element.isNull()) {
-        element.setAttribute("id", clipId);
-        QString cType = element.attribute("type", QString::null);
-        if (!cType.isEmpty()) {
-            m_clipType = (CLIPTYPE) cType.toInt();
-            slotSetToolTip();
-        }
-
-        if (m_clipType == COLOR || m_clipType == IMAGE || m_clipType == SLIDESHOW || m_clipType == TEXT)
-            element.setAttribute("duration", MAXCLIPDURATION);
-        else if (element.attribute("duration").isEmpty() && !element.attribute("out").isEmpty()) {
-            element.setAttribute("duration", element.attribute("out").toInt() - element.attribute("in").toInt());
-        }
-    }
-}
+#include <KDebug>
+#include <KLocale>
+#include <KIcon>
 
-ProjectItem::ProjectItem(QTreeWidgetItem * parent, const QStringList & strings, QDomElement xml, int clipId)
-        : QTreeWidgetItem(parent, strings, QTreeWidgetItem::UserType), m_clipType(UNKNOWN), m_clipId(clipId) {
-    QDomElement element = xml.cloneNode().toElement();
-    setSizeHint(0, QSize(65, 45));
-    setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
-    if (!element.isNull()) {
-        element.setAttribute("id", clipId);
-        QString cType = element.attribute("type", QString::null);
-        if (!cType.isEmpty()) {
-            m_clipType = (CLIPTYPE) cType.toInt();
-            slotSetToolTip();
-        }
-    }
-}
+const int DurationRole = Qt::UserRole + 1;
 
 // folder
-ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, int clipId)
-        : QTreeWidgetItem(parent, strings), m_clipType(FOLDER), m_groupName(strings.at(1)), m_clipId(clipId), m_clip(NULL) {
+ProjectItem::ProjectItem(QTreeWidget * parent, const QStringList & strings, const QString &clipId) :
+        QTreeWidgetItem(parent, strings),
+        m_groupname(strings.at(1)),
+        m_clipType(FOLDER),
+        m_clipId(clipId),
+        m_clip(NULL)
+{
     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;
 }
 
-ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip)
-        : QTreeWidgetItem(parent) {
+ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip) :
+        QTreeWidgetItem(parent)
+{
     setSizeHint(0, QSize(65, 45));
     setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     m_clip = clip;
@@ -92,12 +54,19 @@ ProjectItem::ProjectItem(QTreeWidget * parent, DocClipBase *clip)
     QString name = m_clip->getProperty("name");
     if (name.isEmpty()) name = KUrl(m_clip->getProperty("resource")).fileName();
     m_clipType = (CLIPTYPE) m_clip->getProperty("type").toInt();
+    if (m_clipType != UNKNOWN) slotSetToolTip();
     setText(1, name);
-    kDebug() << "PROJECT ITE;. ADDING LCIP: " << m_clipId;
+    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;
 }
 
-ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip)
-        : QTreeWidgetItem(parent) {
+ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip) :
+        QTreeWidgetItem(parent)
+{
     setSizeHint(0, QSize(65, 45));
     setFlags(Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsEnabled | Qt::ItemIsEditable);
     m_clip = clip;
@@ -106,43 +75,47 @@ ProjectItem::ProjectItem(QTreeWidgetItem * parent, DocClipBase *clip)
     if (name.isEmpty()) name = KUrl(m_clip->getProperty("resource")).fileName();
     m_clipType = (CLIPTYPE) m_clip->getProperty("type").toInt();
     setText(1, name);
-    kDebug() << "PROJECT ITE;. ADDING LCIP: " << m_clipId;
+    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;
 }
 
 
-ProjectItem::~ProjectItem() {
+ProjectItem::~ProjectItem()
+{
 }
 
-int ProjectItem::numReferences() const {
+int ProjectItem::numReferences() const
+{
     if (!m_clip) return 0;
     return m_clip->numReferences();
 }
 
-int ProjectItem::clipId() const {
+const QString &ProjectItem::clipId() const
+{
     return m_clipId;
 }
 
-CLIPTYPE ProjectItem::clipType() const {
+CLIPTYPE ProjectItem::clipType() const
+{
     return m_clipType;
 }
 
-int ProjectItem::clipMaxDuration() const {
+int ProjectItem::clipMaxDuration() const
+{
     return m_clip->getProperty("duration").toInt();
 }
 
-bool ProjectItem::isGroup() const {
+bool ProjectItem::isGroup() const
+{
     return m_clipType == FOLDER;
 }
 
-const QString ProjectItem::groupName() const {
-    return m_groupName;
-}
-
-void ProjectItem::setGroupName(const QString name) {
-    m_groupName = name;
-}
-
-QStringList ProjectItem::names() const {
+QStringList ProjectItem::names() const
+{
     QStringList result;
     result.append(text(0));
     result.append(text(1));
@@ -150,57 +123,93 @@ QStringList ProjectItem::names() const {
     return result;
 }
 
-QDomElement ProjectItem::toXml() const {
+QDomElement ProjectItem::toXml() const
+{
     return m_clip->toXML();
 }
 
-const KUrl ProjectItem::clipUrl() const {
+const KUrl ProjectItem::clipUrl() const
+{
     if (m_clipType != COLOR && m_clipType != VIRTUAL && m_clipType != UNKNOWN && m_clipType != FOLDER)
         return KUrl(m_clip->getProperty("resource"));
     else return KUrl();
 }
 
-void ProjectItem::changeDuration(int frames) {
+void ProjectItem::changeDuration(int frames)
+{
     setData(1, DurationRole, Timecode::getEasyTimecode(GenTime(frames, KdenliveSettings::project_fps()), KdenliveSettings::project_fps()));
 }
 
-void ProjectItem::setProperties(QMap <QString, QString> props) {
+void ProjectItem::setProperties(QMap <QString, QString> props)
+{
+    if (m_clip == NULL) return;
     m_clip->setProperties(props);
 }
 
-DocClipBase *ProjectItem::referencedClip() {
+QString ProjectItem::getClipHash() const
+{
+    if (m_clip == NULL) return QString();
+    return m_clip->getClipHash();
+}
+
+void ProjectItem::setProperty(const QString &key, const QString &value)
+{
+    if (m_clip == NULL) return;
+    m_clip->setProperty(key, value);
+}
+
+void ProjectItem::clearProperty(const QString &key)
+{
+    if (m_clip == NULL) return;
+    m_clip->clearProperty(key);
+}
+
+const QString ProjectItem::groupName() const
+{
+    return m_groupname;
+}
+
+void ProjectItem::setGroupName(const QString name)
+{
+    m_groupname = name;
+    setText(1, name);
+}
+
+DocClipBase *ProjectItem::referencedClip()
+{
     return m_clip;
 }
 
-void ProjectItem::slotSetToolTip() {
-    QString tip = "<qt><b>";
+void ProjectItem::slotSetToolTip()
+{
+    QString tip = "<b>";
     switch (m_clipType) {
-    case 1:
+    case AUDIO:
         tip.append(i18n("Audio clip") + "</b><br />" + clipUrl().path());
         break;
-    case 2:
+    case VIDEO:
         tip.append(i18n("Mute video clip") + "</b><br />" + clipUrl().path());
         break;
-    case 3:
+    case AV:
         tip.append(i18n("Video clip") + "</b><br />" + clipUrl().path());
         break;
-    case 4:
+    case COLOR:
         tip.append(i18n("Color clip"));
-        setData(1, DurationRole, Timecode::getEasyTimecode(GenTime(m_clip->getProperty("out").toInt(), 25), 25));
         break;
-    case 5:
+    case IMAGE:
         tip.append(i18n("Image clip") + "</b><br />" + clipUrl().path());
         break;
-    case 6:
-        tip.append(i18n("Text clip"));
+    case TEXT:
+        if (!clipUrl().isEmpty() && m_clip->getProperty("xmldata").isEmpty()) tip.append(i18n("Template text clip") + "</b><br />" + clipUrl().path());
+        else tip.append(i18n("Text clip") + "</b><br />" + clipUrl().path());
         break;
-    case 7:
-        tip.append(i18n("Slideshow clip"));
+    case SLIDESHOW:
+        tip.append(i18n("Slideshow clip") + "</b><br />" + clipUrl().directory());
         break;
-    case 8:
+    case VIRTUAL:
         tip.append(i18n("Virtual clip"));
         break;
-    case 9:
+    case PLAYLIST:
         tip.append(i18n("Playlist clip") + "</b><br />" + clipUrl().path());
         break;
     default:
@@ -212,14 +221,14 @@ void ProjectItem::slotSetToolTip() {
 }
 
 
-void ProjectItem::setProperties(const QMap < QString, QString > &attributes, const QMap < QString, QString > &metadata) {
+void ProjectItem::setProperties(const QMap < QString, QString > &attributes, const QMap < QString, QString > &metadata)
+{
+    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());
     } else  {
         // No duration known, use an arbitrary one until it is.
     }
@@ -228,35 +237,28 @@ 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();
     }
-    slotSetToolTip();
-    if (KdenliveSettings::audiothumbnails()) m_clip->slotRequestAudioThumbs();
-
     m_clip->setProperties(attributes);
-    /*
-         m_metadata = metadata;
-
-         if (m_metadata.contains("description")) {
-             setDescription (m_metadata["description"]);
-         }
-         else if (m_metadata.contains("comment")) {
-             setDescription (m_metadata["comment"]);
-         }
-    */
-
+    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.value("description"));
+            setText(2, m_clip->description());
+        } else if (metadata.contains("comment")) {
+            m_clip->setProperty("description", metadata.value("comment"));
+            setText(2, m_clip->description());
+        }
+    }
 }
 
-#include "projectitem.moc"