X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=30a681c6202bfcc6bb7d1d64b9de44ab8db3270f;hb=d2455bcfbc60918aa52a8bc9ebe30a721148c3cf;hp=82f39716fe67499229e61b9755d572cd1698d781;hpb=9607ae20fbb379416d401877e2c05a349abdb359;p=kdenlive

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 82f39716..30a681c6 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -64,6 +64,8 @@
 #include <KIcon>
 #include <KCursor>
 #include <KColorScheme>
+#include <KMessageBox>
+#include <KIO/NetAccess>
 
 #include <QMouseEvent>
 #include <QStylePainter>
@@ -72,7 +74,7 @@
 #include <QScrollBar>
 #include <QApplication>
 #include <QInputDialog>
-#include <KMessageBox>
+
 
 #if QT_VERSION >= 0x040600
 #include <QGraphicsDropShadowEffect>
@@ -128,7 +130,9 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     setLineWidth(0);
     //setCacheMode(QGraphicsView::CacheBackground);
     //setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+    setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
 
+    pixmapCache = new KPixmapCache("kdenlive-thumbs");
     KdenliveSettings::setTrackheight(m_tracksHeight);
     m_animationTimer = new QTimeLine(800);
     m_animationTimer->setFrameRange(0, 5);
@@ -171,6 +175,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
 CustomTrackView::~CustomTrackView()
 {
     qDeleteAll(m_guides);
+    m_guides.clear();
     m_waitingThumbs.clear();
 }
 
@@ -191,11 +196,17 @@ void CustomTrackView::setDocumentModified()
     m_document->setModified(true);
 }
 
-void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup)
+void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup, QMenu *markermenu)
 {
     m_timelineContextMenu = timeline;
     m_timelineContextClipMenu = clip;
     m_clipTypeGroup = clipTypeGroup;
+    connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition()));
+
+    m_markerMenu = new QMenu(i18n("Go to marker..."), this);
+    m_markerMenu->setEnabled(false);
+    markermenu->addMenu(m_markerMenu);
+    connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *)));
     QList <QAction *> list = m_timelineContextClipMenu->actions();
     for (int i = 0; i < list.count(); i++) {
         if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
@@ -221,6 +232,17 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     m_timelineContextMenu->addAction(m_editGuide);
 }
 
+void CustomTrackView::slotDoResetMenuPosition()
+{
+    m_menuPosition = QPoint();
+}
+
+void CustomTrackView::slotResetMenuPosition()
+{
+    // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos
+    QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition()));
+}
+
 void CustomTrackView::checkAutoScroll()
 {
     m_autoScroll = KdenliveSettings::autoscroll();
@@ -252,11 +274,12 @@ void CustomTrackView::checkTrackHeight()
             transitionitem->setPos((qreal) transitionitem->startPos().frames(m_document->fps()), (qreal) transitionitem->track() * m_tracksHeight + m_tracksHeight / 3 * 2);
         }
     }
-    m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
+    double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
+    m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight);
 
     for (int i = 0; i < m_guides.count(); i++) {
         QLineF l = m_guides.at(i)->line();
-        l.setP2(QPointF(l.x2(), m_tracksHeight * m_document->tracksCount()));
+        l.setP2(QPointF(l.x2(), newHeight));
         m_guides.at(i)->setLine(l);
     }
 
@@ -404,16 +427,51 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             return;
         } else if (m_operationMode == SPACER && move && m_selectionGroup) {
             // spacer tool
+            snappedPos = getSnapPointForPos(mappedXPos + m_spacerOffset);
             if (snappedPos < 0) snappedPos = 0;
+
             // Make sure there is no collision
             QList<QGraphicsItem *> children = m_selectionGroup->childItems();
             QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
             QList<QGraphicsItem*> collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
             collidingItems.removeAll(m_selectionGroup);
             for (int i = 0; i < children.count(); i++) {
+                if (children.at(i)->type() == GROUPWIDGET) {
+                    QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+                    for (int j = 0; j < subchildren.count(); j++) {
+                        collidingItems.removeAll(subchildren.at(j));
+                    }
+                }
                 collidingItems.removeAll(children.at(i));
             }
             bool collision = false;
+            int offset = 0;
+            for (int i = 0; i < collidingItems.count(); i++) {
+                if (!collidingItems.at(i)->isEnabled()) continue;
+                if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) {
+                    AbstractClipItem *item = static_cast <AbstractClipItem *>(collidingItems.at(i));
+                    // Moving backward, determine best pos
+                    QPainterPath clipPath;
+                    clipPath.addRect(item->sceneBoundingRect());
+                    QPainterPath res = shape.intersected(clipPath);
+                    offset = qMax(offset, (int)(res.boundingRect().width() + 0.5));
+                }
+            }
+            snappedPos += offset;
+            // make sure we have no collision
+            shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+            collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
+            collidingItems.removeAll(m_selectionGroup);
+            for (int i = 0; i < children.count(); i++) {
+                if (children.at(i)->type() == GROUPWIDGET) {
+                    QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+                    for (int j = 0; j < subchildren.count(); j++) {
+                        collidingItems.removeAll(subchildren.at(j));
+                    }
+                }
+                collidingItems.removeAll(children.at(i));
+            }
+
             for (int i = 0; i < collidingItems.count(); i++) {
                 if (!collidingItems.at(i)->isEnabled()) continue;
                 if (collidingItems.at(i)->type() == AVWIDGET) {
@@ -421,12 +479,47 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                     break;
                 }
             }
+
+
             if (!collision) {
                 // Check transitions
                 shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
                 collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
                 collidingItems.removeAll(m_selectionGroup);
                 for (int i = 0; i < children.count(); i++) {
+                    if (children.at(i)->type() == GROUPWIDGET) {
+                        QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+                        for (int j = 0; j < subchildren.count(); j++) {
+                            collidingItems.removeAll(subchildren.at(j));
+                        }
+                    }
+                    collidingItems.removeAll(children.at(i));
+                }
+                offset = 0;
+
+                for (int i = 0; i < collidingItems.count(); i++) {
+                    if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) {
+                        AbstractClipItem *item = static_cast <AbstractClipItem *>(collidingItems.at(i));
+                        // Moving backward, determine best pos
+                        QPainterPath clipPath;
+                        clipPath.addRect(item->sceneBoundingRect());
+                        QPainterPath res = shape.intersected(clipPath);
+                        offset = qMax(offset, (int)(res.boundingRect().width() + 0.5));
+                    }
+                }
+
+                snappedPos += offset;
+                // make sure we have no collision
+                shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+                collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
+                collidingItems.removeAll(m_selectionGroup);
+                for (int i = 0; i < children.count(); i++) {
+                    if (children.at(i)->type() == GROUPWIDGET) {
+                        QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+                        for (int j = 0; j < subchildren.count(); j++) {
+                            collidingItems.removeAll(subchildren.at(j));
+                        }
+                    }
                     collidingItems.removeAll(children.at(i));
                 }
                 for (int i = 0; i < collidingItems.count(); i++) {
@@ -668,7 +761,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 
     // special cases (middle click button or ctrl / shift click
     if (event->button() == Qt::MidButton) {
-        m_document->renderer()->switchPlay();
+        emit playMonitor();
         m_blockRefresh = false;
         m_operationMode = NONE;
         return;
@@ -839,10 +932,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                 kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" <<  1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height();
             }
 
+            QList <GenTime> offsetList;
             // create group to hold selected items
             m_selectionGroup = new AbstractGroupItem(m_document->fps());
             scene()->addItem(m_selectionGroup);
-            QList <GenTime> offsetList;
+
             for (int i = 0; i < selection.count(); i++) {
                 if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) {
                     AbstractClipItem *item = static_cast<AbstractClipItem *>(selection.at(i));
@@ -851,7 +945,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                     offsetList.append(item->endPos());
                     m_selectionGroup->addToGroup(selection.at(i));
                     selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
-                } else if (selection.at(i)->parentItem() == 0 && selection.at(i)->type() == GROUPWIDGET) {
+                } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GROUPWIDGET) {
                     if (static_cast<AbstractGroupItem *>(selection.at(i))->isItemLocked()) continue;
                     QList<QGraphicsItem *> children = selection.at(i)->childItems();
                     for (int j = 0; j < children.count(); j++) {
@@ -861,13 +955,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                     }
                     m_selectionGroup->addToGroup(selection.at(i));
                     selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
-                } else if (selection.at(i)->parentItem()) {
+                } else if (selection.at(i)->parentItem() && !selection.contains(selection.at(i)->parentItem())) {
                     if (static_cast<AbstractGroupItem *>(selection.at(i)->parentItem())->isItemLocked()) continue;
+                    //AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(selection.at(i)->parentItem());
                     m_selectionGroup->addToGroup(selection.at(i)->parentItem());
                     selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
                 }
             }
-
+            m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x());
             if (!offsetList.isEmpty()) {
                 qSort(offsetList);
                 QList <GenTime> cleandOffsetList;
@@ -985,8 +1080,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         return;
     } else if (m_operationMode == MOVE) {
         setCursor(Qt::ClosedHandCursor);
-        if (m_dragItem) m_dragItem->setZValue(10);
-        if (m_selectionGroup) m_selectionGroup->setZValue(10);
     } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) {
         ItemInfo info;
         info.startPos = m_dragItem->startPos();
@@ -1166,8 +1259,9 @@ void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup)
 void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
 {
     if (m_dragItem && m_dragItem->hasKeyFrames()) {
-        if (m_moveOpMode == KEYFRAME) {
+        /*if (m_moveOpMode == KEYFRAME) {
             // user double clicked on a keyframe, open edit dialog
+            //TODO: update for effects with several values per keyframe
             QDialog d(parentWidget());
             Ui::KeyFrameDialog_UI view;
             view.setupUi(&d);
@@ -1187,49 +1281,81 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
                 emit clipItemSelected(item, item->selectedEffectIndex());
             }
 
-        } else  {
+        } else*/  {
             // add keyframe
             GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
-            m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
+            int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
             ClipItem * item = static_cast <ClipItem *>(m_dragItem);
-            QString previous = item->keyframes(item->selectedEffectIndex());
-            item->updateKeyframeEffect();
-            QString next = item->keyframes(item->selectedEffectIndex());
-            EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false);
+            //QString previous = item->keyframes(item->selectedEffectIndex());
+            QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
+            item->insertKeyframe(item->getEffectAt(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val);
+            //item->updateKeyframeEffect();
+            //QString next = item->keyframes(item->selectedEffectIndex());
+            QDomElement newEffect = item->selectedEffect().cloneNode().toElement();
+            EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), oldEffect, newEffect, item->selectedEffectIndex(), false);
+            //EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false);
             m_commandStack->push(command);
             updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
             emit clipItemSelected(item, item->selectedEffectIndex());
         }
     } else if (m_dragItem && !m_dragItem->isItemLocked()) {
-        ClipDurationDialog d(m_dragItem, m_document->timecode(), this);
+        editItemDuration();
+    } else {
+        QList<QGraphicsItem *> collisionList = items(event->pos());
+        if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
+            Guide *editGuide = (Guide *) collisionList.at(0);
+            if (editGuide) slotEditGuide(editGuide->info());
+        }
+    }
+}
+
+void CustomTrackView::editItemDuration()
+{
+    AbstractClipItem *item;
+    if (m_dragItem) {
+        item = m_dragItem;
+    } else {
+        if (m_scene->selectedItems().count() == 1) {
+            item = static_cast <AbstractClipItem *>(m_scene->selectedItems().at(0));
+        } else {
+            if (m_scene->selectedItems().empty()) {
+                emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage);
+            } else {
+                emit displayMessage(i18n("Cannot edit the duration of multiple items"), ErrorMessage);
+            }
+            return;
+        }
+    }
+
+    if (!item->isItemLocked()) {
         GenTime minimum;
         GenTime maximum;
-        if (m_dragItem->type() == TRANSITIONWIDGET) {
-            getTransitionAvailableSpace(m_dragItem, minimum, maximum);
+        if (item->type() == TRANSITIONWIDGET) {
+            getTransitionAvailableSpace(item, minimum, maximum);
         } else {
-            getClipAvailableSpace(m_dragItem, minimum, maximum);
+            getClipAvailableSpace(item, minimum, maximum);
         }
         //kDebug()<<"// GOT MOVE POS: "<<minimum.frames(25)<<" - "<<maximum.frames(25);
-        d.setMargins(minimum, maximum);
+        ClipDurationDialog d(item, m_document->timecode(), minimum, maximum, this);
         if (d.exec() == QDialog::Accepted) {
-            if (m_dragItem->type() == TRANSITIONWIDGET) {
+            if (item->type() == TRANSITIONWIDGET) {
                 // move & resize transition
                 ItemInfo startInfo;
-                startInfo.startPos = m_dragItem->startPos();
-                startInfo.endPos = m_dragItem->endPos();
-                startInfo.track = m_dragItem->track();
+                startInfo.startPos = item->startPos();
+                startInfo.endPos = item->endPos();
+                startInfo.track = item->track();
                 ItemInfo endInfo;
                 endInfo.startPos = d.startPos();
                 endInfo.endPos = endInfo.startPos + d.duration();
-                endInfo.track = m_dragItem->track();
+                endInfo.track = item->track();
                 MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true);
                 m_commandStack->push(command);
             } else {
                 // move and resize clip
                 QUndoCommand *moveCommand = new QUndoCommand();
                 moveCommand->setText(i18n("Edit clip"));
-                ItemInfo clipInfo = m_dragItem->info();
-                if (d.duration() < m_dragItem->cropDuration() || d.cropStart() != clipInfo.cropStart) {
+                ItemInfo clipInfo = item->info();
+                if (d.duration() < item->cropDuration() || d.cropStart() != clipInfo.cropStart) {
                     // duration was reduced, so process it first
                     ItemInfo startInfo = clipInfo;
                     clipInfo.endPos = clipInfo.startPos + d.duration();
@@ -1239,10 +1365,10 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
                 if (d.startPos() != clipInfo.startPos) {
                     ItemInfo startInfo = clipInfo;
                     clipInfo.startPos = d.startPos();
-                    clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos);
+                    clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos);
                     new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
                 }
-                if (d.duration() > m_dragItem->cropDuration()) {
+                if (d.duration() > item->cropDuration()) {
                     // duration was increased, so process it after move
                     ItemInfo startInfo = clipInfo;
                     clipInfo.endPos = clipInfo.startPos + d.duration();
@@ -1252,16 +1378,9 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
                 m_commandStack->push(moveCommand);
             }
         }
-    } else {
-        QList<QGraphicsItem *> collisionList = items(event->pos());
-        if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
-            Guide *editGuide = (Guide *) collisionList.at(0);
-            if (editGuide) slotEditGuide(editGuide->info());
-        }
-    }
+    } else emit displayMessage(i18n("Item is locked"), ErrorMessage);
 }
 
-
 void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes)
 {
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
@@ -1276,8 +1395,11 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs
 {
     m_deleteGuide->setEnabled(m_dragGuide != NULL);
     m_editGuide->setEnabled(m_dragGuide != NULL);
-    if (clip == NULL) m_timelineContextMenu->popup(pos);
-    else if (group != NULL) {
+    m_markerMenu->clear();
+    m_markerMenu->setEnabled(false);
+    if (clip == NULL) {
+        m_timelineContextMenu->popup(pos);
+    } else if (group != NULL) {
         m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
         m_ungroupAction->setEnabled(true);
         updateClipTypeActions(NULL);
@@ -1286,10 +1408,26 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs
         m_ungroupAction->setEnabled(false);
         if (clip->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem*>(clip);
+            //build go to marker menu
+            if (item->baseClip()) {
+                QList <CommentedTime> markers = item->baseClip()->commentedSnapMarkers();
+                int offset = item->startPos().frames(m_document->fps());
+                if (!markers.isEmpty()) {
+                    for (int i = 0; i < markers.count(); i++) {
+                        int pos = (int) markers.at(i).time().frames(m_document->timecode().fps());
+                        QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment();
+                        QAction *go = m_markerMenu->addAction(position);
+                        go->setData(pos + offset);
+                    }
+                }
+                m_markerMenu->setEnabled(!m_markerMenu->isEmpty());
+            }
             updateClipTypeActions(item);
             m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
             m_timelineContextClipMenu->popup(pos);
-        } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+        } else if (clip->type() == TRANSITIONWIDGET) {
+            m_timelineContextTransitionMenu->popup(pos);
+        }
     }
 }
 
@@ -1298,11 +1436,36 @@ void CustomTrackView::activateMonitor()
     emit activateDocumentMonitor();
 }
 
+void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out)
+{
+    resetSelectionGroup();
+    ItemInfo info;
+    info.startPos = GenTime();
+    info.cropStart = GenTime(in, m_document->fps());
+    info.endPos = GenTime(out - in, m_document->fps());
+    info.cropDuration = info.endPos - info.startPos;
+    info.track = 0;
+
+    // Check if clip can be inserted at that position
+    ItemInfo pasteInfo = info;
+    pasteInfo.startPos = GenTime(m_cursorPos, m_document->fps());
+    pasteInfo.endPos = pasteInfo.startPos + info.endPos;
+    pasteInfo.track = selectedTrack();
+    if (!canBePastedTo(pasteInfo, AVWIDGET)) {
+        emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
+        return;
+    }
+
+    AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false);
+    m_commandStack->push(command);
+}
+
 bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
 {
     if (data->hasFormat("kdenlive/clip")) {
         m_clipDrag = true;
-        resetSelectionGroup();
+        m_scene->clearSelection();
+        resetSelectionGroup(false);
         QStringList list = QString(data->data("kdenlive/clip")).split(';');
         DocClipBase *clip = m_document->getBaseClip(list.at(0));
         if (clip == NULL) {
@@ -1337,7 +1500,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
         updateSnapPoints(NULL, offsetList);
         m_selectionGroup->setPos(framePos);
         scene()->addItem(m_selectionGroup);
-        m_selectionGroup->setZValue(10);
+        m_selectionGroup->setSelected(true);
         return true;
     } else if (data->hasFormat("kdenlive/producerslist")) {
         m_clipDrag = true;
@@ -1383,16 +1546,15 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
             start += info.cropDuration;
             offsetList.append(start);
             ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false);
-            item->setZValue(10);
             item->setFlag(QGraphicsItem::ItemIsMovable, false);
             m_selectionGroup->addToGroup(item);
-            m_waitingThumbs.append(item);
+            if (!clip->isPlaceHolder()) m_waitingThumbs.append(item);
         }
 
         updateSnapPoints(NULL, offsetList);
         m_selectionGroup->setPos(framePos);
         scene()->addItem(m_selectionGroup);
-        m_selectionGroup->setZValue(10);
+        //m_selectionGroup->setZValue(10);
         m_thumbsTimer.start();
         return true;
 
@@ -1467,11 +1629,6 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
             return;
         }
         EffectsParameterList params = clip->addEffect(effect);
-        if (effect.attribute("disabled") == "1") {
-            // Effect is disabled, don't add it to MLT playlist
-            if (clip->isSelected()) emit clipItemSelected(clip);
-            return;
-        }
         if (!m_document->renderer()->mltAddEffect(track, pos, params))
             emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
         if (clip->isSelected()) emit clipItemSelected(clip);
@@ -1492,8 +1649,8 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
             return;
         }
     }
-    if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") {
-        kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled");
+    if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) {
+        kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable");
         emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
         return;
     }
@@ -1557,14 +1714,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));
@@ -1597,17 +1764,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();
@@ -1624,7 +1824,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE
     if (clip) {
         // Special case: speed effect
         if (effect.attribute("id") == "speed") {
-            if (effect.attribute("disabled") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
+            if (effect.attribute("disable") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
             else {
                 double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
                 int strobe = EffectsList::parameter(effect, "strobe").toInt();
@@ -1649,11 +1849,7 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedE
             clip->initEffect(effect);
             effectParams = clip->getEffectArgs(effect);
         }
-        if (effectParams.paramValue("disabled") == "1") {
-            if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) {
-                kDebug() << "//////  DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex();
-            } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
-        } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
+        if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
             emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
 
         clip->setEffectAt(ix, effect);
@@ -1700,7 +1896,7 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool
     QDomElement effect = clip->effectAt(effectPos);
     QDomElement oldEffect = effect.cloneNode().toElement();
 
-    effect.setAttribute("disabled", (int) disable);
+    effect.setAttribute("disable", (int) disable);
     EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
     m_commandStack->push(command);
     setDocumentModified();;
@@ -1726,7 +1922,8 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
         ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
         if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) {
             emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage);
-            kDebug() << "/////////  ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
+            if (item) kDebug() << "/////////  ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
+            else kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track;
             m_blockRefresh = false;
             return NULL;
         }
@@ -1955,7 +2152,12 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD
 void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
 {
     //kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
-    EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false);
+    QDomElement xml = tr->toXML();
+    if (old.isNull() || xml.isNull()) {
+        emit displayMessage(i18n("Cannot update transition"), ErrorMessage);
+        return;
+    }
+    EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false);
     m_commandStack->push(command);
     setDocumentModified();
 }
@@ -1967,7 +2169,9 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
         kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
         return;
     }
-    m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
+    bool force = false;
+    if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true;
+    m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force);
     //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
     item->setTransitionParameters(transition);
     if (updateTransitionWidget) {
@@ -1977,6 +2181,7 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
             double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            if (factor == 0) factor = 1.0;
             p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
@@ -2024,6 +2229,7 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         bool hasVideoClip = false;
         QUndoCommand *addCommand = new QUndoCommand();
         addCommand->setText(i18n("Add timeline clip"));
+        QList <ClipItem *> brokenClips;
 
         for (int i = 0; i < items.count(); i++) {
             ClipItem *item = static_cast <ClipItem *>(items.at(i));
@@ -2036,7 +2242,7 @@ void CustomTrackView::dropEvent(QDropEvent * event)
 
             //TODO: take care of edit mode for undo
             item->baseClip()->addReference();
-            item->setZValue(item->defaultZValue());
+            //item->setZValue(item->defaultZValue());
             m_document->updateClip(item->baseClip()->getId());
             ItemInfo info = item->info();
 
@@ -2047,6 +2253,8 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             clipInfo.track = m_document->tracksCount() - item->track();
             if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT) == -1) {
                 emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
+                brokenClips.append(item);
+                continue;
             }
             adjustTimelineClips(m_scene->editMode(), item, ItemInfo(), addCommand);
 
@@ -2059,7 +2267,10 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             }
             item->setSelected(true);
         }
-        m_commandStack->push(addCommand);
+        qDeleteAll(brokenClips);
+        brokenClips.clear();
+        if (addCommand->childCount() > 0) m_commandStack->push(addCommand);
+        else delete addCommand;
         setDocumentModified();
 
         /*
@@ -2127,7 +2338,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command);
                         clip->resizeEnd(info.startPos.frames(m_document->fps()));
                     }
-                } else if (clip->endPos() < info.endPos) {
+                } else if (clip->endPos() <= info.endPos) {
                     new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, false, false, true, command);
                     scene()->removeItem(clip);
                     delete clip;
@@ -2160,7 +2371,9 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         dupInfo.cropStart += diff;
                         dupInfo.cropDuration = clipInfo.endPos - info.startPos;
                         new RazorClipCommand(this, clipInfo, info.startPos, false, command);
-                        ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+                        // Commented out; variable dup unused. --granjow
+                        //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+                        cutClip(clipInfo, info.startPos, true, false);
                     }
                 }
                 // TODO: add insertspacecommand
@@ -2245,7 +2458,7 @@ int CustomTrackView::duration() const
 void CustomTrackView::addTrack(TrackInfo type, int ix)
 {
     if (ix == -1 || ix == m_document->tracksCount()) {
-        m_document->insertTrack(ix, type);
+        m_document->insertTrack(0, type);
         m_document->renderer()->mltInsertTrack(1, type.type == VIDEOTRACK);
     } else {
         m_document->insertTrack(m_document->tracksCount() - ix, type);
@@ -2281,6 +2494,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
             ItemInfo clipinfo = item->info();
             if (item->type() == AVWIDGET) {
                 ClipItem *clip = static_cast <ClipItem *>(item);
+                // slowmotion clips are not track dependant, so no need to update them
+                if (clip->speed() != 1.0) continue;
                 // We add a move clip command so that we get the correct producer for new track number
                 if (clip->clipType() == AV || clip->clipType() == AUDIO) {
                     Mlt::Producer *prod;
@@ -2303,14 +2518,14 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         resetSelectionGroup(false);
     }
 
-    int maxHeight = m_tracksHeight * m_document->tracksCount();
+    int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
     for (int i = 0; i < m_guides.count(); i++) {
         QLineF l = m_guides.at(i)->line();
         l.setP2(QPointF(l.x2(), maxHeight));
         m_guides.at(i)->setLine(l);
     }
     m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
-    setSceneRect(0, 0, sceneRect().width(), maxHeight);
+    setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
     viewport()->update();
     emit tracksChanged();
     //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
@@ -2376,14 +2591,14 @@ void CustomTrackView::removeTrack(int ix)
     }
     resetSelectionGroup(false);
 
-    int maxHeight = m_tracksHeight * m_document->tracksCount();
+    int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
     for (int i = 0; i < m_guides.count(); i++) {
         QLineF l = m_guides.at(i)->line();
         l.setP2(QPointF(l.x2(), maxHeight));
         m_guides.at(i)->setLine(l);
     }
     m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
-    setSceneRect(0, 0, sceneRect().width(), maxHeight);
+    setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
 
     m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1);
     viewport()->update();
@@ -2489,7 +2704,7 @@ void CustomTrackView::slotRemoveSpace()
     int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true);
     //kDebug() << "// GOT LENGT; " << length;
     if (length <= 0) {
-        emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
+        emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
         return;
     }
 
@@ -2533,7 +2748,7 @@ void CustomTrackView::slotInsertSpace()
         pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
         track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
     }
-    SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this);
+    SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount() + 1, this);
     if (d.exec() != QDialog::Accepted) return;
     GenTime spaceDuration = d.selectedDuration();
     track = d.selectedTrack();
@@ -2803,8 +3018,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
 
     if (m_operationMode == MOVE) {
         setCursor(Qt::OpenHandCursor);
-        if (m_dragItem) m_dragItem->setZValue(m_dragItem->defaultZValue());
-        if (m_selectionGroup) m_selectionGroup->setZValue(1);
         if (m_dragItem->parentItem() == 0) {
             // we are moving one clip, easy
             if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
@@ -3246,7 +3459,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();
@@ -3269,7 +3482,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();
@@ -3289,7 +3502,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();
@@ -3314,7 +3527,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();
@@ -3328,10 +3541,26 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
     } else if (m_operationMode == KEYFRAME) {
         // update the MLT effect
         ClipItem * item = static_cast <ClipItem *>(m_dragItem);
-        QString previous = item->keyframes(item->selectedEffectIndex());
-        item->updateKeyframeEffect();
-        QString next = item->keyframes(item->selectedEffectIndex());
-        EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
+        QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
+
+        // check if we want to remove keyframe
+        double val = mapToScene(event->pos()).toPoint().y();
+        QRectF br = item->sceneBoundingRect();
+        double maxh = 100.0 / br.height();
+        val = (br.bottom() - val) * maxh;
+        int start = item->cropStart().frames(m_document->fps());
+        int end = (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1;
+        if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) {
+            //delete keyframe
+            kDebug() << "// DELETE KFR: " << item->editedKeyFramePos();
+            item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0);
+        } else item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue());
+        QDomElement newEffect = item->selectedEffect().cloneNode().toElement();
+        //item->updateKeyframeEffect();
+        //QString next = item->keyframes(item->selectedEffectIndex());
+        //EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
+        EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), oldEffect, newEffect, item->selectedEffectIndex(), false);
+
         m_commandStack->push(command);
         updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
         emit clipItemSelected(item, item->selectedEffectIndex());
@@ -3343,6 +3572,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
             double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            if (factor == 0) factor = 1.0;
             p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
@@ -3499,7 +3729,10 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant
         return;
     }
     info.track = m_document->tracksCount() - item->track();
-    int endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer());
+    int endPos;
+    if (item->isVideoOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->videoProducer());
+    else if (item->isAudioOnly()) endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->audioProducer(item->track()));
+    else endPos = m_document->renderer()->mltChangeClipSpeed(info, speedIndependantInfo, speed, oldspeed, strobe, baseclip->producer());
     if (endPos >= 0) {
         item->setSpeed(speed, strobe);
         item->updateRectGeometry();
@@ -3635,7 +3868,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
     }
     setDocumentModified();
     if (refresh) m_document->renderer()->doRefresh();
-    m_waitingThumbs.append(item);
+    if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item);
     m_thumbsTimer.start();
 }
 
@@ -3951,13 +4184,14 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, b
     //item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
     KdenliveSettings::setSnaptopoints(snap);
     item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
-    m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
+    m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - item->track(), item->transitionEndTrack(), start.startPos, start.endPos, item->startPos(), item->endPos());
     if (m_dragItem && m_dragItem == item) {
         QPoint p;
         ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track());
         if (transitionClip && transitionClip->baseClip()) {
             QString size = transitionClip->baseClip()->getProperty("frame_size");
             double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+            if (factor == 0) factor = 1.0;
             p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
             p.setY(size.section('x', 1, 1).toInt());
         }
@@ -4276,6 +4510,18 @@ int CustomTrackView::hasGuide(int pos, int offset)
     return -1;
 }
 
+void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
+{
+    QAction *act;
+    goMenu->clear();
+    double fps = m_document->fps();
+    for (int i = 0; i < m_guides.count(); i++) {
+        act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
+        act->setData(m_guides.at(i)->position().frames(m_document->fps()));
+    }
+    goMenu->setEnabled(!m_guides.isEmpty());
+}
+
 void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment)
 {
     if (oldPos > GenTime() && pos > GenTime()) {
@@ -4312,7 +4558,7 @@ bool CustomTrackView::addGuide(const GenTime pos, const QString &comment)
             return false;
         }
     }
-    Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount());
+    Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount() * matrix().m22());
     scene()->addItem(g);
     m_guides.append(g);
     qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
@@ -4411,8 +4657,8 @@ void CustomTrackView::setTool(PROJECTTOOL tool)
 
 void CustomTrackView::setScale(double scaleFactor, double verticalScale)
 {
-    QMatrix matrix;
-    matrix = matrix.scale(scaleFactor, verticalScale);
+    QMatrix newmatrix;
+    newmatrix = newmatrix.scale(scaleFactor, verticalScale);
     m_scene->setScale(scaleFactor, verticalScale);
     if (m_visualTip) {
         scene()->removeItem(m_visualTip);
@@ -4423,11 +4669,23 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale)
         m_visualTip = NULL;
     }
     double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
-    setMatrix(matrix);
-    m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount() * verticalScale);
+    bool adjust = false;
+    if (verticalScale != matrix().m22()) adjust = true;
+    setMatrix(newmatrix);
+    if (adjust) {
+        double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
+        m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight);
+        for (int i = 0; i < m_guides.count(); i++) {
+            QLineF l = m_guides.at(i)->line();
+            l.setP2(QPointF(l.x2(), newHeight));
+            m_guides.at(i)->setLine(l);
+        }
+        setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
+    }
+
     int diff = sceneRect().width() - m_projectDuration;
-    if (diff * matrix.m11() < 50) {
-        if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height());
+    if (diff * newmatrix.m11() < 50) {
+        if (newmatrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height());
         else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
     }
     centerOn(QPointF(cursorPos(), verticalPos));
@@ -4490,6 +4748,16 @@ bool CustomTrackView::findString(const QString &text)
     return false;
 }
 
+void CustomTrackView::selectFound(QString track, QString pos)
+{
+    setCursorPos(m_document->timecode().getFrameCount(pos), true);
+    slotSelectTrack(track.toInt());
+    selectClip(true);
+    int vert = verticalScrollBar()->value();
+    int hor = cursorPos();
+    ensureVisible(hor, vert + 10, 2, 2, 50, 0);
+}
+
 bool CustomTrackView::findNextString(const QString &text)
 {
     QString marker;
@@ -4539,6 +4807,21 @@ void CustomTrackView::clearSearchStrings()
     m_findIndex = 0;
 }
 
+QList<ItemInfo> CustomTrackView::findId(const QString &clipId)
+{
+    QList<ItemInfo> matchingInfo;
+    QList<QGraphicsItem *> itemList = items();
+    for (int i = 0; i < itemList.count(); i++) {
+        if (itemList.at(i)->type() == AVWIDGET) {
+            ClipItem *item = (ClipItem *)itemList.at(i);
+            if (item->clipProducer() == clipId) {
+                matchingInfo << item->info();
+            }
+        }
+    }
+    return matchingInfo;
+}
+
 void CustomTrackView::copyClip()
 {
     qDeleteAll(m_copiedItems);
@@ -4627,6 +4910,7 @@ bool CustomTrackView::canBeMoved(QList<AbstractClipItem *> items, GenTime offset
     return true;
 }
 
+
 void CustomTrackView::pasteClip()
 {
     if (m_copiedItems.count() == 0) {
@@ -4636,18 +4920,29 @@ void CustomTrackView::pasteClip()
     QPoint position;
     if (m_menuPosition.isNull()) {
         position = mapFromGlobal(QCursor::pos());
-        if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) {
+        if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) {
             emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
             return;
         }
     } else position = m_menuPosition;
+
     GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps());
-    int track = (int)(position.y() / m_tracksHeight);
-    ItemInfo first = m_copiedItems.at(0)->info();
+    int track = (int)(mapToScene(position).y() / m_tracksHeight);
+
+    GenTime leftPos = m_copiedItems.at(0)->startPos();
+    int lowerTrack = m_copiedItems.at(0)->track();
+    int upperTrack = m_copiedItems.at(0)->track();
+    for (int i = 1; i < m_copiedItems.count(); i++) {
+        if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos();
+        if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track();
+        if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track();
+    }
 
-    GenTime offset = pos - first.startPos;
-    int trackOffset = track - first.track;
+    GenTime offset = pos - leftPos;
+    int trackOffset = track - lowerTrack;
 
+    if (lowerTrack + trackOffset < 0) trackOffset = 0 - lowerTrack;
+    if (upperTrack + trackOffset > m_document->tracksCount() - 1) trackOffset = m_document->tracksCount() - upperTrack - 1;
     if (!canBePasted(m_copiedItems, offset, trackOffset)) {
         emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
         return;
@@ -4697,27 +4992,73 @@ void CustomTrackView::pasteClipEffects()
     paste->setText("Paste effects");
 
     QList<QGraphicsItem *> clips = scene()->selectedItems();
+
+    // expand groups
+    for (int i = 0; i < clips.count(); ++i) {
+        if (clips.at(i)->type() == GROUPWIDGET) {
+            QList<QGraphicsItem *> children = clips.at(i)->childItems();
+            for (int j = 0; j < children.count(); j++) {
+                if (children.at(j)->type() == AVWIDGET && !clips.contains(children.at(j))) {
+                    clips.append(children.at(j));
+                }
+            }
+        }
+    }
+
+
     for (int i = 0; i < clips.count(); ++i) {
         if (clips.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast < ClipItem *>(clips.at(i));
             for (int j = 0; j < clip->effectsCount(); j++) {
                 QDomElement eff = clip->effectAt(j);
                 if (eff.attribute("unique", "0") == "0" || item->hasEffect(eff.attribute("tag"), eff.attribute("id")) == -1) {
+                    adjustKeyfames(clip->cropStart(), item->cropStart(), item->cropDuration(), eff);
                     new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, true, paste);
                 }
             }
         }
     }
-    m_commandStack->push(paste);
+    if (paste->childCount() > 0) m_commandStack->push(paste);
+    else delete paste;
 
-    // adjust effects (fades, ...)
+    //adjust effects (fades, ...)
     for (int i = 0; i < clips.count(); ++i) {
-        ClipItem *item = static_cast < ClipItem *>(clips.at(i));
-        updatePositionEffects(item, item->info());
+        if (clips.at(i)->type() == AVWIDGET) {
+            ClipItem *item = static_cast < ClipItem *>(clips.at(i));
+            updatePositionEffects(item, item->info());
+        }
     }
 }
 
 
+void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime duration, QDomElement xml)
+{
+    // parse parameters to check if we need to adjust to the new crop start
+    int diff = (newstart - oldstart).frames(m_document->fps());
+    int max = (newstart + duration).frames(m_document->fps());
+    QDomNodeList params = xml.elementsByTagName("parameter");
+    for (int i = 0; i < params.count(); i++) {
+        QDomElement e = params.item(i).toElement();
+        if (!e.isNull() && (e.attribute("type") == "keyframe" || e.attribute("type") == "simplekeyframe")) {
+            QString def = e.attribute("default");
+            // Effect has a keyframe type parameter, we need to adjust the values
+            QStringList keys = e.attribute("keyframes").split(";", QString::SkipEmptyParts);
+            QStringList newKeyFrames;
+            foreach(const QString &str, keys) {
+                int pos = str.section(':', 0, 0).toInt();
+                double val = str.section(':', 1, 1).toDouble();
+                pos += diff;
+                if (pos > max) {
+                    newKeyFrames.append(QString::number(max) + ':' + QString::number(val));
+                    break;
+                } else newKeyFrames.append(QString::number(pos) + ':' + QString::number(val));
+            }
+            //kDebug()<<"ORIGIN: "<<keys<<", FIXED: "<<newKeyFrames;
+            e.setAttribute("keyframes", newKeyFrames.join(";"));
+        }
+    }
+}
+
 ClipItem *CustomTrackView::getClipUnderCursor() const
 {
     QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount()));
@@ -4839,6 +5180,7 @@ void CustomTrackView::setOutPoint()
 
 void CustomTrackView::slotUpdateAllThumbs()
 {
+    if (!isEnabled()) return;
     QList<QGraphicsItem *> itemList = items();
     //if (itemList.isEmpty()) return;
     ClipItem *item;
@@ -4852,6 +5194,7 @@ void CustomTrackView::slotUpdateAllThumbs()
                     QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png";
                     if (QFile::exists(thumb)) {
                         QPixmap pix(thumb);
+                        if (pix.isNull()) KIO::NetAccess::del(KUrl(thumb), this);
                         item->slotSetStartThumb(pix);
                     }
                 } else {
@@ -4861,16 +5204,18 @@ void CustomTrackView::slotUpdateAllThumbs()
                     endThumb.append(QString::number((item->speedIndependantCropStart() + item->speedIndependantCropDuration()).frames(m_document->fps()) - 1) + ".png");
                     if (QFile::exists(startThumb)) {
                         QPixmap pix(startThumb);
+                        if (pix.isNull()) KIO::NetAccess::del(KUrl(startThumb), this);
                         item->slotSetStartThumb(pix);
                     }
                     if (QFile::exists(endThumb)) {
                         QPixmap pix(endThumb);
+                        if (pix.isNull()) KIO::NetAccess::del(KUrl(endThumb), this);
                         item->slotSetEndThumb(pix);
                     }
                 }
             }
             item->refreshClip(false);
-            qApp->processEvents();
+            //qApp->processEvents();
         }
     }
     viewport()->update();
@@ -4975,7 +5320,8 @@ void CustomTrackView::slotChangeTrack(int ix)
     d.slotUpdateName(ix);
     d.setWindowTitle(i18n("Change Track Type"));
 
-    if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK)
+    TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
+    if (oldInfo.type == VIDEOTRACK)
         d.video_track->setChecked(true);
     else
         d.audio_track->setChecked(true);
@@ -4984,6 +5330,7 @@ void CustomTrackView::slotChangeTrack(int ix)
         TrackInfo info;
         info.isLocked = false;
         info.isMute = false;
+        info.trackName = oldInfo.trackName;
         ix = d.track_nb->value();
 
         if (d.video_track->isChecked()) {
@@ -5364,6 +5711,12 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip)
     }
 }
 
+void CustomTrackView::slotGoToMarker(QAction *action)
+{
+    int pos = action->data().toInt();
+    setCursorPos(pos, true);
+}
+
 void CustomTrackView::reloadTransitionLumas()
 {
     QString lumaNames;
@@ -5468,8 +5821,8 @@ void CustomTrackView::slotTrackDown()
     if (m_selectedTrack > m_document->tracksCount() - 2) m_selectedTrack = 0;
     else m_selectedTrack++;
     emit updateTrackHeaders();
-    QRectF rect(mapToScene(QPoint()).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight);
-    ensureVisible(rect);
+    QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight);
+    ensureVisible(rect, 0, 0);
     viewport()->update();
 }
 
@@ -5478,8 +5831,8 @@ void CustomTrackView::slotTrackUp()
     if (m_selectedTrack > 0) m_selectedTrack--;
     else m_selectedTrack = m_document->tracksCount() - 1;
     emit updateTrackHeaders();
-    QRectF rect(mapToScene(QPoint()).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight);
-    ensureVisible(rect);
+    QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight);
+    ensureVisible(rect, 0, 0);
     viewport()->update();
 }
 
@@ -5488,13 +5841,38 @@ int CustomTrackView::selectedTrack() const
     return m_selectedTrack;
 }
 
+QStringList CustomTrackView::selectedClips() const
+{
+    QStringList clipIds;
+    QList<QGraphicsItem *> selection = m_scene->selectedItems();
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            ClipItem *item = (ClipItem *)selection.at(i);
+            clipIds << item->clipProducer();
+        }
+    }
+    return clipIds;
+}
+
+QList<ClipItem *> CustomTrackView::selectedClipItems() const
+{
+    QList<ClipItem *> clips;
+    QList<QGraphicsItem *> selection = m_scene->selectedItems();
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            clips.append((ClipItem *)selection.at(i));
+        }
+    }
+    return clips;
+}
+
 void CustomTrackView::slotSelectTrack(int ix)
 {
     m_selectedTrack = qMax(0, ix);
     m_selectedTrack = qMin(ix, m_document->tracksCount() - 1);
     emit updateTrackHeaders();
-    QRectF rect(mapToScene(QPoint()).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight);
-    ensureVisible(rect);
+    QRectF rect(mapToScene(QPoint(10, 0)).x(), m_selectedTrack * m_tracksHeight, 10, m_tracksHeight);
+    ensureVisible(rect, 0, 0);
     viewport()->update();
 }
 
@@ -5574,6 +5952,7 @@ void CustomTrackView::checkTrackSequence(int track)
 
 void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
 {
+    if (data.isEmpty()) return;
     DocClipBase *clip = m_document->getBaseClip(data.at(0));
     ItemInfo info;
     info.startPos = GenTime(in, m_document->fps());
@@ -5587,3 +5966,12 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
     new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand);
     m_commandStack->push(addCommand);
 }
+
+void CustomTrackView::clearSelection()
+{
+    resetSelectionGroup();
+    scene()->clearSelection();
+    m_dragItem = NULL;
+    emit clipItemSelected(NULL);
+}
+