Fix add effect to group + when deleting an effect, remove it from all selected clips:

http://kdenlive.org/mantis/view.php?id=1415

svn path=/trunk/kdenlive/; revision=4287

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 05ee6180379d4fbfa59faef63ea326fc6e0d0e9b..f7db87c0119c9bfa86c74339d0e566ab555c5dee 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -1607,14 +1607,24 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
     if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
     else effectName = i18n("effect");
     effectCommand->setText(i18n("Add %1", effectName));
-    int count = 0;
+
     if (track == -1) itemList = scene()->selectedItems();
     if (itemList.isEmpty()) {
         ClipItem *clip = getClipItemAt((int) pos.frames(m_document->fps()), track);
         if (clip) itemList.append(clip);
         else emit displayMessage(i18n("Select a clip if you want to apply an effect"), ErrorMessage);
     }
-    kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count();
+
+    //expand groups
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == GROUPWIDGET) {
+            QList<QGraphicsItem *> subitems = itemList.at(i)->childItems();
+            for (int j = 0; j < subitems.count(); j++) {
+                if (!itemList.contains(subitems.at(j))) itemList.append(subitems.at(j));
+            }
+        }
+    }
+
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
@@ -1647,17 +1657,50 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
                 effect.setAttribute("src", ladpsaFile);
             }
             new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
-            count++;
         }
     }
-    if (count > 0) {
+    if (effectCommand->childCount() > 0) {
         m_commandStack->push(effectCommand);
         setDocumentModified();
     } else delete effectCommand;
 }
 
-void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect)
+void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup)
 {
+    if (affectGroup && clip->parentItem() && clip->parentItem() == m_selectionGroup) {
+        //clip is in a group, also remove the effect in other clips of the group
+        QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+        QUndoCommand *delCommand = new QUndoCommand();
+        QString effectName;
+        QDomNode namenode = effect.elementsByTagName("name").item(0);
+        if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+        else effectName = i18n("effect");
+        delCommand->setText(i18n("Delete %1", effectName));
+
+        //expand groups
+        for (int i = 0; i < items.count(); i++) {
+            if (items.at(i)->type() == GROUPWIDGET) {
+                QList<QGraphicsItem *> subitems = items.at(i)->childItems();
+                for (int j = 0; j < subitems.count(); j++) {
+                    if (!items.contains(subitems.at(j))) items.append(subitems.at(j));
+                }
+            }
+        }
+
+        for (int i = 0; i < items.count(); i++) {
+            if (items.at(i)->type() == AVWIDGET) {
+                ClipItem *item = static_cast <ClipItem *>(items.at(i));
+                int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id"));
+                if (ix != -1) {
+                    QDomElement eff = item->effectAt(ix);
+                    new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, false, delCommand);
+                }
+            }
+        }
+        if (delCommand->childCount() > 0) m_commandStack->push(delCommand);
+        else delete delCommand;
+        return;
+    }
     AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false);
     m_commandStack->push(command);
     setDocumentModified();
@@ -3301,7 +3344,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             int start = item->cropStart().frames(m_document->fps());
             int end = item->fadeIn();
             if (end == 0) {
-                slotDeleteEffect(item, oldeffect);
+                slotDeleteEffect(item, oldeffect, false);
             } else {
                 end += start;
                 QDomElement effect = oldeffect.cloneNode().toElement();
@@ -3324,7 +3367,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             int start = item->cropStart().frames(m_document->fps());
             int end = item->fadeIn();
             if (end == 0) {
-                slotDeleteEffect(item, oldeffect);
+                slotDeleteEffect(item, oldeffect, false);
             } else {
                 end += start;
                 QDomElement effect = oldeffect.cloneNode().toElement();
@@ -3344,7 +3387,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
             int start = item->fadeOut();
             if (start == 0) {
-                slotDeleteEffect(item, oldeffect);
+                slotDeleteEffect(item, oldeffect, false);
             } else {
                 start = end - start;
                 QDomElement effect = oldeffect.cloneNode().toElement();
@@ -3369,7 +3412,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
             int start = item->fadeOut();
             if (start == 0) {
-                slotDeleteEffect(item, oldeffect);
+                slotDeleteEffect(item, oldeffect, false);
             } else {
                 start = end - start;
                 QDomElement effect = oldeffect.cloneNode().toElement();

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 8b1982a244ccdaf2d289bad95ad1cbdb364bb7ed..f0b6a7539a56d2af4c8f27e926fe73743f72073f 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -135,7 +135,7 @@ public slots:
     void setCursorPos(int pos, bool seek = true);
     void moveCursorPos(int delta);
     void updateCursorPos();
-    void slotDeleteEffect(ClipItem *clip, QDomElement effect);
+    void slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup = true);
     void slotChangeEffectState(ClipItem *clip, int effectPos, bool disable);
     void slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos);
     void slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix);