Resize from start applies to all items in a group:

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

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

diff --git a/src/abstractgroupitem.cpp b/src/abstractgroupitem.cpp
index e4286b6592123dfcd596aad0af21cd554656ac7c..d8f2527f248a025ba77b2629573ba052f9954e6a 100644 (file)
--- a/src/abstractgroupitem.cpp
+++ b/src/abstractgroupitem.cpp
@@ -383,6 +383,33 @@ void AbstractGroupItem::mousePressEvent(QGraphicsSceneMouseEvent * event)
     } 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;

diff --git a/src/abstractgroupitem.h b/src/abstractgroupitem.h
index 23bf850ce54e7ad880b31b5ed54198fa24baff09..2c8c90f7a715bd9be193cc9f6ba661bf67d597ab 100644 (file)
--- a/src/abstractgroupitem.h
+++ b/src/abstractgroupitem.h
@@ -44,14 +44,18 @@ public:
     void setItemLocked(bool locked);
     bool isItemLocked() const;
     //    ItemInfo info() const;
-    /** @brief Resizes all clips in this group from the end.
+
+    /** @brief Resizes all clips in this group from start.
+    *@param diff Difference to startPos stored in m_resizeInfos */
+    void resizeStart(int diff);
+    /** @brief Resizes all clips in this group from end.
     * @param diff Difference to endPos stored in m_resizeInfos */
     void resizeEnd(int diff);
-    void resizeStart(int diff);
     /** @brief Gets m_resizeInfos */
     QList <ItemInfo> resizeInfos();
     /** @brief Clears m_resizeInfos */
     void clearResizeInfos();
+
     /** @brief Gets the duration (length) of the group. */
     GenTime duration();
 

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 25d2b87f17cc2580258ecf291ce2beb787d47e9c..75fc7f2b52503fe0c4c191a3b363560e032348e4 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -387,11 +387,18 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 } else if (viewport()->width() - pos < 10) {
                     m_scrollOffset = 30;
                     m_scrollTimer.start();
-                } else if (m_scrollTimer.isActive()) m_scrollTimer.stop();
-
+                } else if (m_scrollTimer.isActive()) {
+                    m_scrollTimer.stop();
+                }
             } else if (m_operationMode == RESIZESTART && move) {
                 m_document->renderer()->pause();
-                m_dragItem->resizeStart((int)(snappedPos));
+                if (m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+                    AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+                    if (parent)
+                        parent->resizeStart((int)(snappedPos) - m_dragItemInfo.startPos.frames(m_document->fps()));
+                } else {
+                    m_dragItem->resizeStart((int)(snappedPos));
+                }
             } else if (m_operationMode == RESIZEEND && move) {
                 m_document->renderer()->pause();
                 if (m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
@@ -3215,7 +3222,28 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         m_document->renderer()->doRefresh();
     } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) {
         // resize start
-        prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps()));
+        if (m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+            AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+            if (parent) {
+                QUndoCommand *resizeCommand = new QUndoCommand();
+                resizeCommand->setText(i18n("Resize group"));
+                QList <QGraphicsItem *> items = parent->childItems();
+                QList <ItemInfo> infos = parent->resizeInfos();
+                parent->clearResizeInfos();
+                int itemcount = 0;
+                for (int i = 0; i < items.count(); ++i) {
+                    AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
+                    if (item && item->type() == AVWIDGET) {
+                        ItemInfo info = infos.at(itemcount);
+                        prepareResizeClipStart(item, info, item->startPos().frames(m_document->fps()), false, resizeCommand);
+                        ++itemcount;
+                    }
+                }
+                m_commandStack->push(resizeCommand);
+            }
+        } else {
+            prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps()));
+        }
     } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
         // resize end
         if (m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
@@ -4075,7 +4103,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol
 
     // do this here, too, because otherwise undo won't update the group
     if (item->parentItem() && item->parentItem() != m_selectionGroup)
-        new RebuildGroupCommand(this, item->info().track, item->info().startPos, command);
+        new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command);
 
     ItemInfo info = item->info();
     if (item->type() == AVWIDGET) {
@@ -4170,7 +4198,7 @@ void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo ol
 
     }
     if (item->parentItem() && item->parentItem() != m_selectionGroup)
-        new RebuildGroupCommand(this, item->info().track, item->info().startPos, command);
+        new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command);
 }
 
 void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check, QUndoCommand *command)
@@ -4192,7 +4220,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI
 
     // do this here, too, because otherwise undo won't update the group
     if (item->parentItem() && item->parentItem() != m_selectionGroup)
-        new RebuildGroupCommand(this, item->info().track, item->info().startPos, command);
+        new RebuildGroupCommand(this, item->info().track, item->startPos(), command);
 
     ItemInfo info = item->info();
     if (item->type() == AVWIDGET) {
@@ -4287,7 +4315,7 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI
         }
     }
     if (item->parentItem() && item->parentItem() != m_selectionGroup)
-        new RebuildGroupCommand(this, item->info().track, item->info().startPos, command);
+        new RebuildGroupCommand(this, item->info().track, item->startPos(), command);
 }
 
 void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info)