Fix clip effect stack not updated when dropping effect in a group, nicer timeline...

[kdenlive] / src / abstractgroupitem.cpp

diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp
index 7d2cc39a1b829bc20f65ad90e05ffd20f6d8b6bf..eb3a14ed1522dd354a04dd81530041faabcd20f3 100644 (file)
--- a/src/abstractgroupitem.cpp
+++ b/src/abstractgroupitem.cpp
@@ -42,6 +42,7 @@ AbstractGroupItem::AbstractGroupItem(double /* fps */) :
     setFlag(QGraphicsItem::ItemSendsGeometryChanges, true);
 #endif
     setAcceptDrops(true);
+    m_resizeInfos = QList <ItemInfo>();
 }
 
 int AbstractGroupItem::type() const
@@ -56,14 +57,14 @@ int AbstractGroupItem::track() const
 
 void AbstractGroupItem::setItemLocked(bool locked)
 {
-    if (locked) {
+    if (locked)
         setSelected(false);
-        setFlag(QGraphicsItem::ItemIsMovable, false);
-        setFlag(QGraphicsItem::ItemIsSelectable, false);
-    } else {
-        setFlag(QGraphicsItem::ItemIsMovable, true);
-        setFlag(QGraphicsItem::ItemIsSelectable, true);
-    }
+
+    setFlag(QGraphicsItem::ItemIsMovable, !locked);
+    setFlag(QGraphicsItem::ItemIsSelectable, !locked);
+
+    foreach (QGraphicsItem *child, childItems())
+        ((AbstractClipItem *)child)->setItemLocked(locked);
 }
 
 bool AbstractGroupItem::isItemLocked() const
@@ -135,18 +136,18 @@ void AbstractGroupItem::fixItemRect()
 // virtual
 void AbstractGroupItem::paint(QPainter *p, const QStyleOptionGraphicsItem *option, QWidget *)
 {
-    const double scale = option->matrix.m11();
     QColor bgcolor(100, 100, 200, 100);
     QRectF bound = option->exposedRect.adjusted(0, 0, 1, 1);
     p->setClipRect(bound);
-    p->fillRect(option->exposedRect, bgcolor);
+    const QRectF mapped = p->worldTransform().mapRect(option->exposedRect);
+    p->setWorldMatrixEnabled(false);
+    p->setBrush(bgcolor);
     QPen pen = p->pen();
     pen.setColor(QColor(200, 90, 90));
     pen.setStyle(Qt::DashLine);
     pen.setWidthF(0.0);
-    //pen.setCosmetic(true);
     p->setPen(pen);
-    p->drawRect(boundingRect().adjusted(0, 0, - 1 / scale, 0));
+    p->drawRoundedRect(mapped, 3, 3);
 }
 
 //virtual
@@ -354,10 +355,11 @@ QVariant AbstractGroupItem::itemChange(GraphicsItemChange change, const QVariant
 //virtual
 void AbstractGroupItem::dropEvent(QGraphicsSceneDragDropEvent * event)
 {
-    QString effects = QString(event->mimeData()->data("kdenlive/effectslist"));
+    QString effects = QString::fromUtf8(event->mimeData()->data("kdenlive/effectslist"));
     QDomDocument doc;
     doc.setContent(effects, true);
     QDomElement e = doc.documentElement();
+    e.setAttribute("kdenlive_ix", 0);
     CustomTrackView *view = (CustomTrackView *) scene()->views()[0];
     if (view) view->slotAddGroupEffect(e, this);
 }
@@ -370,7 +372,7 @@ void AbstractGroupItem::dragEnterEvent(QGraphicsSceneDragDropEvent *event)
 
 void AbstractGroupItem::dragLeaveEvent(QGraphicsSceneDragDropEvent *event)
 {
-    Q_UNUSED(event);
+    Q_UNUSED(event)
 }
 
 // virtual
@@ -381,3 +383,89 @@ void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
         event->ignore();
     } else QGraphicsItem::mousePressEvent(event);
 }
+
+void AbstractGroupItem::resizeStart(int diff)
+{
+    bool info = false;
+    if (m_resizeInfos.isEmpty())
+        info = true;
+    int maximum = diff;
+    QList <QGraphicsItem *> children = childItems();
+    QList <AbstractClipItem *> items;
+    int itemcount = 0;
+    for (int i = 0; i < children.count(); ++i) {
+        AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+        if (item && item->type() == AVWIDGET) {
+            items << item;
+            if (info)
+                m_resizeInfos << item->info();
+            item->resizeStart((int)(m_resizeInfos.at(itemcount).startPos.frames(item->fps())) + diff);
+            int itemdiff = (int)(item->startPos() - m_resizeInfos.at(itemcount).startPos).frames(item->fps());
+            if (qAbs(itemdiff) < qAbs(maximum))
+                maximum = itemdiff;
+            ++itemcount;
+        }
+    }
+    
+    for (int i = 0; i < items.count(); ++i)
+        items.at(i)->resizeStart((int)(m_resizeInfos.at(i).startPos.frames(items.at(i)->fps())) + maximum);
+}
+
+void AbstractGroupItem::resizeEnd(int diff)
+{
+    bool info = false;
+    if (m_resizeInfos.isEmpty())
+        info = true;
+    int maximum = diff;
+    QList <QGraphicsItem *> children = childItems();
+    QList <AbstractClipItem *> items;
+    int itemcount = 0;
+    for (int i = 0; i < children.count(); ++i) {
+        AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+        if (item && item->type() == AVWIDGET) {
+            items << item;
+            if (info)
+                m_resizeInfos << item->info();
+            item->resizeEnd((int)(m_resizeInfos.at(itemcount).endPos.frames(item->fps())) + diff);
+            int itemdiff = (int)(item->endPos() - m_resizeInfos.at(itemcount).endPos).frames(item->fps());
+            if (qAbs(itemdiff) < qAbs(maximum))
+                maximum = itemdiff;
+            ++itemcount;
+        }
+    }
+
+    for (int i = 0; i < items.count(); ++i)
+        items.at(i)->resizeEnd((int)(m_resizeInfos.at(i).endPos.frames(items.at(i)->fps())) + maximum);
+}
+
+QList< ItemInfo > AbstractGroupItem::resizeInfos()
+{
+    return m_resizeInfos;
+}
+
+void AbstractGroupItem::clearResizeInfos()
+{
+    // m_resizeInfos.clear() will crash in some cases for unknown reasons - ttill
+    m_resizeInfos = QList <ItemInfo>();
+}
+
+GenTime AbstractGroupItem::duration()
+{
+    QList <QGraphicsItem *> children = childItems();
+    GenTime start = GenTime(-1.0);
+    GenTime end = GenTime();
+    for (int i = 0; i < children.count(); ++i) {
+        if (children.at(i)->type() != GROUPWIDGET) {
+            AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+            if (item) {
+                if (start < GenTime() || item->startPos() < start)
+                    start = item->startPos();
+                if (item->endPos() > end)
+                    end = item->endPos();
+            }
+        } else {
+            children << children.at(i)->childItems();
+        }
+    }
+    return end - start;
+}