Clip cuts in project tree can now have a description

[kdenlive] / src / projectlist.h

diff --git a/src/projectlist.h b/src/projectlist.h
index 6c86843964a9b3c98b000117d8dbc7a129f6d91c..c7ef75d5d5a384c6bc67225ea4c61b56cebf04ba 100644 (file)
--- a/src/projectlist.h
+++ b/src/projectlist.h
@@ -29,15 +29,21 @@
 #include <QItemDelegate>
 #include <QUndoStack>
 #include <QTimer>
+#include <QApplication>
 
 #include <KTreeWidgetSearchLine>
 #include <KUrl>
+
+#ifdef NEPOMUK
 #include <nepomuk/kratingpainter.h>
 #include <nepomuk/resource.h>
+#endif
 
 #include "definitions.h"
 #include "timecode.h"
 #include "kdenlivesettings.h"
+#include "folderprojectitem.h"
+#include "subprojectitem.h"
 
 namespace Mlt
 {
@@ -59,36 +65,33 @@ class ItemDelegate: public QItemDelegate
 public:
     ItemDelegate(QAbstractItemView* parent = 0): QItemDelegate(parent) {
     }
-    /*
-    static_cast<ProjectItem *>( index.internalPointer() );
-
-    void expand()
-    {
-      QWidget *w = new QWidget;
-      QVBoxLayout *layout = new QVBoxLayout;
-      layout->addWidget( new KColorButton(w));
-      w->setLayout( layout );
-      extendItem(w,
-    }
-    */
-    void drawFocus(QPainter *, const QStyleOptionViewItem &, const QRect &) const {
-    }
+
+    /*void drawFocus(QPainter *, const QStyleOptionViewItem &, const QRect &) const {
+    }*/
 
     void paint(QPainter* painter, const QStyleOptionViewItem& option, const QModelIndex& index) const {
-        if (index.column() == 1) {
+        if (index.column() == 0 && !index.data(DurationRole).isNull()) {
             QRect r1 = option.rect;
             painter->save();
             if (option.state & (QStyle::State_Selected)) {
                 painter->setPen(option.palette.color(QPalette::HighlightedText));
                 painter->fillRect(r1, option.palette.highlight());
             }
+            QStyleOptionViewItemV2 opt = setOptions(index, option);
+            QPixmap pixmap = decoration(opt, index.data(Qt::DecorationRole));
+            QRect decorationRect = pixmap.rect(); //QRect(QPoint(0, 0), option.decorationSize).intersected(pixmap.rect());
+            const int textMargin = QApplication::style()->pixelMetric(QStyle::PM_FocusFrameHMargin) + 1;
+            decorationRect.moveTo(r1.topLeft() + QPoint(0, 1));
+            drawDecoration(painter, opt, decorationRect, pixmap);
+            int decoWidth = pixmap.width() + 2 * textMargin;
+
             QFont font = painter->font();
             font.setBold(true);
             painter->setFont(font);
             int mid = (int)((r1.height() / 2));
-            r1.adjust(2, 0, 0, -mid);
+            r1.adjust(decoWidth, 0, 0, -mid);
             QRect r2 = option.rect;
-            r2.adjust(2, mid, 0, 0);
+            r2.adjust(decoWidth, mid, 0, 0);
             painter->drawText(r1, Qt::AlignLeft | Qt::AlignBottom , index.data().toString());
             //painter->setPen(Qt::green);
             font.setBold(false);
@@ -99,7 +102,7 @@ public:
             if (option.state & (QStyle::State_Selected)) painter->setPen(option.palette.color(QPalette::Mid));
             painter->drawText(r2, Qt::AlignLeft | Qt::AlignVCenter , subText);
             painter->restore();
-        } else if (index.column() == 3 && KdenliveSettings::activate_nepomuk()) {
+        } else if (index.column() == 2 && KdenliveSettings::activate_nepomuk()) {
             if (index.data().toString().isEmpty()) {
                 QItemDelegate::paint(painter, option, index);
                 return;
@@ -108,7 +111,9 @@ public:
             if (option.state & (QStyle::State_Selected)) {
                 painter->fillRect(r1, option.palette.highlight());
             }
+#ifdef NEPOMUK
             KRatingPainter::paintRating(painter, r1, Qt::AlignCenter, index.data().toInt());
+#endif
         } else {
             QItemDelegate::paint(painter, option, index);
         }
@@ -136,8 +141,11 @@ public:
     void cleanup();
     void trashUnusedClips();
     QList <DocClipBase*> documentClipList() const;
-    void addClipCut(const QString &id, int in, int out);
+    void addClipCut(const QString &id, int in, int out, const QString desc);
     void removeClipCut(const QString &id, int in, int out);
+    void focusTree() const;
+    SubProjectItem *getSubItem(ProjectItem *clip, QPoint zone);
+    void doUpdateClipCut(const QString &id, const QPoint oldzone, const QPoint zone, const QString &comment);
 
 public slots:
     void setDocument(KdenliveDoc *doc);
@@ -160,6 +168,7 @@ public slots:
     void slotReloadClip(const QString &id = QString());
     void slotAddColorClip();
     void regenerateTemplate(const QString &id);
+    void slotUpdateClipCut(QPoint p);
 
 private:
     ProjectListView *m_listView;
@@ -173,7 +182,7 @@ private:
     void selectItemById(const QString &clipId);
     ProjectItem *getItemById(const QString &id);
     QTreeWidgetItem *getAnyItemById(const QString &id);
-    ProjectItem *getFolderItemById(const QString &id);
+    FolderProjectItem *getFolderItemById(const QString &id);
     QAction *m_editAction;
     QAction *m_deleteAction;
     QAction *m_openAction;
@@ -212,7 +221,7 @@ private slots:
 
 signals:
     void clipSelected(DocClipBase *, QPoint zone = QPoint());
-    void getFileProperties(const QDomElement, const QString &, bool);
+    void getFileProperties(const QDomElement, const QString &, int pixHeight, bool);
     void receivedClipDuration(const QString &);
     void showClipProperties(DocClipBase *);
     void projectModified();