X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=0697c375a84a8b8080d6803a0e76bcd25d2e6c35;hb=b8f6dc09b4b35cab3bebb54b3d4eec0b57fb7387;hp=cbc29dff8eb821718903eb126610d22281cd186b;hpb=27ac7e68c934a04d2922986b07ea8e5dde2cad50;p=kdenlive

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index cbc29dff..0697c375 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -62,7 +62,6 @@
 #include "tracksconfigdialog.h"
 #include "commands/configtrackscommand.h"
 #include "commands/rebuildgroupcommand.h"
-#include "commands/razorgroupcommand.h"
 #include "commands/refreshmonitorcommand.h"
 #include "profilesdialog.h"
 
@@ -110,35 +109,44 @@ bool sortGuidesList(const Guide *g1 , const Guide *g2)
 // const int duration = animate ? 1500 : 1;
 
 CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) :
-    QGraphicsView(projectscene, parent),
-    m_tracksHeight(KdenliveSettings::trackheight()),
-    m_projectDuration(0),
-    m_cursorPos(0),
-    m_document(doc),
-    m_scene(projectscene),
-    m_cursorLine(NULL),
-    m_operationMode(NONE),
-    m_moveOpMode(NONE),
-    m_dragItem(NULL),
-    m_dragGuide(NULL),
-    m_visualTip(NULL),
-    m_animation(NULL),
-    m_clickPoint(),
-    m_autoScroll(KdenliveSettings::autoscroll()),
-    m_pasteEffectsAction(NULL),
-    m_ungroupAction(NULL),
-    m_scrollOffset(0),
-    m_clipDrag(false),
-    m_findIndex(0),
-    m_tool(SELECTTOOL),
-    m_copiedItems(),
-    m_menuPosition(),
-    m_blockRefresh(false),
-    m_selectionGroup(NULL),
-    m_selectedTrack(0),
-    m_audioCorrelator(NULL),
-    m_audioAlignmentReference(NULL),
-    m_controlModifier(false)
+    QGraphicsView(projectscene, parent)
+    , m_tracksHeight(KdenliveSettings::trackheight())
+    , m_projectDuration(0)
+    , m_cursorPos(0)
+    , m_document(doc)
+    , m_scene(projectscene)
+    , m_cursorLine(NULL)
+    , m_operationMode(NONE)
+    , m_moveOpMode(NONE)
+    , m_dragItem(NULL)
+    , m_dragGuide(NULL)
+    , m_visualTip(NULL)
+    , m_animation(NULL)
+    , m_clickPoint()
+    , m_autoScroll(KdenliveSettings::autoscroll())
+    , m_timelineContextMenu(NULL)
+    , m_timelineContextClipMenu(NULL)
+    , m_timelineContextTransitionMenu(NULL)
+    , m_markerMenu(NULL)
+    , m_autoTransition(NULL)
+    , m_pasteEffectsAction(NULL)
+    , m_ungroupAction(NULL)
+    , m_editGuide(NULL)
+    , m_deleteGuide(NULL)
+    , m_clipTypeGroup(NULL)
+    , m_scrollOffset(0)
+    , m_clipDrag(false)
+    , m_findIndex(0)
+    , m_tool(SELECTTOOL)
+    , m_copiedItems()
+    , m_menuPosition()
+    , m_blockRefresh(false)
+    , m_selectionGroup(NULL)
+    , m_selectedTrack(0)
+    , m_spacerOffset(0)
+    , m_audioCorrelator(NULL)
+    , m_audioAlignmentReference(NULL)
+    , m_controlModifier(false)
 {
     if (doc) {
         m_commandStack = doc->commandStack();
@@ -231,16 +239,18 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     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 *)));
+    connect(m_markerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToMarker(QAction*)));
     QList <QAction *> list = m_timelineContextClipMenu->actions();
-    for (int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); ++i) {
         if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
         else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i);
+	else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i));
+	else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i));
     }
 
     m_timelineContextTransitionMenu = transition;
     list = m_timelineContextTransitionMenu->actions();
-    for (int i = 0; i < list.count(); i++) {
+    for (int i = 0; i < list.count(); ++i) {
         if (list.at(i)->data().toString() == "auto") {
             m_autoTransition = list.at(i);
             break;
@@ -278,7 +288,7 @@ void CustomTrackView::checkAutoScroll()
 }*/
 
 
-int CustomTrackView::getFrameWidth()
+int CustomTrackView::getFrameWidth() const
 {
     return (int) (m_tracksHeight * m_document->mltProfile().display_aspect_num / m_document->mltProfile().display_aspect_den + 0.5);
 }
@@ -288,7 +298,7 @@ void CustomTrackView::updateSceneFrameWidth()
     int frameWidth = getFrameWidth();
     QList<QGraphicsItem *> itemList = items();
     ClipItem *item;
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             item = (ClipItem*) itemList.at(i);
             item->resetFrameWidth(frameWidth);
@@ -308,7 +318,7 @@ bool CustomTrackView::checkTrackHeight()
     int frameWidth = getFrameWidth();
     bool snap = KdenliveSettings::snaptopoints();
     KdenliveSettings::setSnaptopoints(false);
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             item = (ClipItem*) itemList.at(i);
             item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1);
@@ -322,12 +332,9 @@ bool CustomTrackView::checkTrackHeight()
         }
     }
     double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22();
-    m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1);
-
-    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);
+    m_cursorLine->setLine(0, 0, 0, newHeight - 1);
+    for (int i = 0; i < m_guides.count(); ++i) {
+        m_guides.at(i)->setLine(0, 0, 0, newHeight - 1);
     }
 
     setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
@@ -360,7 +367,7 @@ int CustomTrackView::getPreviousVideoTrack(int track)
 {
     track = m_document->tracksCount() - track - 1;
     track --;
-    for (int i = track; i > -1; i--) {
+    for (int i = track; i > -1; --i) {
         if (m_document->trackInfoAt(i).type == VIDEOTRACK) return i + 1;
     }
     return 0;
@@ -415,6 +422,11 @@ void CustomTrackView::slotAlignPlayheadToMousePos()
 	seekCursorPos(mappedXPos);
 }
 
+int CustomTrackView::getMousePos() const
+{
+    return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0);
+}
+
 // virtual
 void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
 {
@@ -504,10 +516,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
 
             // Make sure there is no collision
             QList<QGraphicsItem *> children = m_selectionGroup->childItems();
-            QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+            QPainterPath shape = m_selectionGroup->clipGroupSpacerShape(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++) {
+            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++)
@@ -517,7 +529,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             }
             bool collision = false;
             int offset = 0;
-            for (int i = 0; i < collidingItems.count(); i++) {
+            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));
@@ -530,10 +542,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             }
             snappedPos += offset;
             // make sure we have no collision
-            shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+            shape = m_selectionGroup->clipGroupSpacerShape(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++) {
+            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++)
@@ -542,7 +554,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 collidingItems.removeAll(children.at(i));
             }
 
-            for (int i = 0; i < collidingItems.count(); i++) {
+            for (int i = 0; i < collidingItems.count(); ++i) {
                 if (!collidingItems.at(i)->isEnabled()) continue;
                 if (collidingItems.at(i)->type() == AVWIDGET) {
                     collision = true;
@@ -556,7 +568,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 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++) {
+                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++)
@@ -566,7 +578,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 }
                 offset = 0;
 
-                for (int i = 0; i < collidingItems.count(); i++) {
+                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
@@ -582,7 +594,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 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++) {
+                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++)
@@ -590,7 +602,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                     }
                     collidingItems.removeAll(children.at(i));
                 }
-                for (int i = 0; i < collidingItems.count(); i++) {
+                for (int i = 0; i < collidingItems.count(); ++i) {
                     if (collidingItems.at(i)->type() == TRANSITIONWIDGET) {
                         collision = true;
                         break;
@@ -617,7 +629,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
     if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) {
         opMode = MOVEGUIDE;
 	setCursor(Qt::SplitHCursor);
-    } else for (int i = 0; i < itemList.count(); i++) {
+    } else for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
             item = (QGraphicsRectItem*) itemList.at(i);
 	    break;
@@ -729,8 +741,10 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
         if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
             QGraphicsView::mouseMoveEvent(event);
             m_moveOpMode = SEEK;
-            seekCursorPos(mappedXPos);
-            slotCheckPositionScrolling();
+	    if (mappedXPos != m_document->renderer()->getCurrentSeekPosition() && mappedXPos != cursorPos()) {
+		seekCursorPos(mappedXPos);
+		slotCheckPositionScrolling();
+	    }
             return;
         } else m_moveOpMode = NONE;
     }
@@ -774,7 +788,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     m_dragGuide = NULL;
 
     if (m_tool != RAZORTOOL) activateMonitor();
-    else if (m_document->renderer()->playSpeed() != 0.0) {
+    else if (m_document->renderer()->isPlaying()) {
         m_document->renderer()->pause();
         return;
     }
@@ -790,7 +804,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 	QGraphicsView::mousePressEvent(event);
         return;
     }
-
     // if a guide and a clip were pressed, just select the guide
     for (int i = 0; i < collisionList.count(); ++i) {
         if (collisionList.at(i)->type() == GUIDEITEM) {
@@ -815,6 +828,9 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     AbstractGroupItem *dragGroup = NULL;
     AbstractClipItem *collisionClip = NULL;
     bool found = false;
+    QStringList lockedTracks;
+    double yOffset = 0;
+    m_selectionMutex.lock();
     while (!m_dragGuide && ct < collisionList.count()) {
         if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
             collisionClip = static_cast <AbstractClipItem *>(collisionList.at(ct));
@@ -829,13 +845,25 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                 m_dragItem = collisionClip;
 	    }
             found = true;
-	    
-	    m_dragItem->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y());
+	    for (int i = 0; i < m_document->tracksCount(); ++i) {
+		if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
+	    }
+	    yOffset = mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y();
+	    m_dragItem->setProperty("y_absolute", yOffset);
+	    m_dragItem->setProperty("locked_tracks", lockedTracks);
             m_dragItemInfo = m_dragItem->info();
-	    if (m_selectionGroup) m_selectionGroup->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y());
-            if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
-                dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
-		dragGroup->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y());
+	    if (m_selectionGroup) {
+		m_selectionGroup->setProperty("y_absolute", yOffset);
+		m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+	    }
+	    if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
+		QGraphicsItem *topGroup = m_dragItem->parentItem();
+		while (topGroup->parentItem() && topGroup->parentItem()->type() == GROUPWIDGET && topGroup->parentItem() != m_selectionGroup) {
+		    topGroup = topGroup->parentItem();
+		}
+                dragGroup = static_cast <AbstractGroupItem *>(topGroup);
+		dragGroup->setProperty("y_absolute", yOffset);
+		dragGroup->setProperty("locked_tracks", lockedTracks);
             }
             break;
         }
@@ -879,7 +907,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         if (!m_dragItem && !m_dragGuide) {
             // check if there is a guide close to mouse click
             QList<QGraphicsItem *> guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide
-            for (int i = 0; i < guidesCollisionList.count(); i++) {
+            for (int i = 0; i < guidesCollisionList.count(); ++i) {
                 if (guidesCollisionList.at(i)->type() == GUIDEITEM) {
                     m_dragGuide = static_cast <Guide *>(guidesCollisionList.at(i));
                     break;
@@ -894,10 +922,14 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         }
 
         m_operationMode = NONE;
+	if (dragGroup == NULL) {
+	    if (m_dragItem && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup)
+		dragGroup = static_cast<AbstractGroupItem*> (m_dragItem->parentItem());
+	}
         displayContextMenu(event->globalPos(), m_dragItem, dragGroup);
         m_menuPosition = m_clickEvent;
     }
-
+    m_selectionMutex.unlock();
     // No item under click
     if (m_dragItem == NULL || m_tool == SPACERTOOL) {
         resetSelectionGroup(false);
@@ -934,10 +966,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 
             QList <GenTime> offsetList;
             // create group to hold selected items
+	    m_selectionMutex.lock();
             m_selectionGroup = new AbstractGroupItem(m_document->fps());
             scene()->addItem(m_selectionGroup);
 
-            for (int i = 0; i < selection.count(); i++) {
+            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));
                     if (item->isItemLocked()) continue;
@@ -959,6 +992,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                 }
             }
             m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x());
+	    m_selectionMutex.unlock();
             if (!offsetList.isEmpty()) {
                 qSort(offsetList);
                 QList <GenTime> cleandOffsetList;
@@ -991,8 +1025,8 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
                 razorGroup((AbstractGroupItem *)m_dragItem->parentItem(), cutPos);
             } else {
-                AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
-                RazorClipCommand* command = new RazorClipCommand(this, clip->info(), cutPos);
+                ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+                RazorClipCommand* command = new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos);
                 m_commandStack->push(command);
             }
             setDocumentModified();
@@ -1022,18 +1056,27 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         } else {
 	    resetSelectionGroup();
 	}
-        dragGroup = NULL;
-        if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
-            dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
-        }
+        /*if () {
+	    dragGroup = NULL;
+	    if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
+		dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+	    }
+	}*/
 
         bool selected = !m_dragItem->isSelected();
+	m_dragItem->setZValue(99);
+	if (m_dragItem->parentItem()) m_dragItem->parentItem()->setZValue(99);
 	QGraphicsView::mousePressEvent(event);
-	  
+	
         if (dragGroup) {
             dragGroup->setSelected(selected);
-	    if (dragGroup->parentItem())
+	    QList<QGraphicsItem *> children = dragGroup->childItems();
+	    for (int i = 0; i < children.count(); ++i) {
+		children.at(i)->setSelected(selected);
+	    }
+	    if (dragGroup->parentItem()) {
 		dragGroup->parentItem()->setSelected(selected);
+	    }
 	}
         else
             m_dragItem->setSelected(selected);
@@ -1041,6 +1084,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 	    m_dragItem = NULL;
 	}
         groupSelectedItems(QList <QGraphicsItem*>(), false, true);
+	m_selectionMutex.lock();
+	if (m_selectionGroup) {
+	    m_selectionGroup->setProperty("y_absolute", yOffset);
+	    m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+	}
+	m_selectionMutex.unlock();
 	if (m_dragItem) { 
 	    ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
 	    updateClipTypeActions(dragGroup == NULL ? clip : NULL);
@@ -1050,17 +1099,20 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     }
     else {
 	QGraphicsView::mousePressEvent(event);
+	m_selectionMutex.lock();
 	if (m_selectionGroup) {
 	    QList<QGraphicsItem *> children = m_selectionGroup->childItems();
-	    for (int i = 0; i < children.count(); i++) {
+	    for (int i = 0; i < children.count(); ++i) {
 		children.at(i)->setSelected(itemSelected);
 	    }
             m_selectionGroup->setSelected(itemSelected);
 	    
 	}
-	if (dragGroup)
+	if (dragGroup) {
             dragGroup->setSelected(itemSelected);
+	}
 	m_dragItem->setSelected(itemSelected);
+	m_selectionMutex.unlock();
     }
 
     if (collisionClip != NULL || m_dragItem == NULL) {
@@ -1098,9 +1150,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         else
             updateSnapPoints(m_dragItem);
     } else {
+	m_selectionMutex.lock();
         QList <GenTime> offsetList;
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
-        for (int i = 0; i < children.count(); i++) {
+        for (int i = 0; i < children.count(); ++i) {
             if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
                 AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
                 offsetList.append(item->startPos());
@@ -1119,6 +1172,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             }
             updateSnapPoints(NULL, cleandOffsetList, true);
         }
+        m_selectionMutex.unlock();
     }
 
     if (m_operationMode == KEYFRAME) {
@@ -1149,7 +1203,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
         QList<QGraphicsItem *> selection = m_scene->items(r);
         bool transitionAccepted = true;
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
             if (selection.at(i)->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast <Transition *>(selection.at(i));
                 if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) {
@@ -1182,7 +1236,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
         QList<QGraphicsItem *> selection = m_scene->items(r);
         bool transitionAccepted = true;
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
             if (selection.at(i)->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast <Transition *>(selection.at(i));
                 if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) {
@@ -1200,12 +1254,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     m_blockRefresh = false;
 }
 
-void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos)
+void CustomTrackView::rebuildGroup(int childTrack, const GenTime &childPos)
 {
     const QPointF p((int)childPos.frames(m_document->fps()), childTrack * m_tracksHeight + m_tracksHeight / 2);
     QList<QGraphicsItem *> list = scene()->items(p);
     AbstractGroupItem *group = NULL;
-    for (int i = 0; i < list.size(); i++) {
+    for (int i = 0; i < list.size(); ++i) {
         if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == GROUPWIDGET) {
             group = static_cast <AbstractGroupItem *>(list.at(i));
@@ -1218,18 +1272,22 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos)
 void CustomTrackView::rebuildGroup(AbstractGroupItem *group)
 {
     if (group) {
+	m_selectionMutex.lock();
+	if (group == m_selectionGroup) m_selectionGroup = NULL;
         QList <QGraphicsItem *> children = group->childItems();
         m_document->clipManager()->removeGroup(group);
-	/*for (int i = 0; i < children.count(); i++) {
+	for (int i = 0; i < children.count(); ++i) {
 	    group->removeFromGroup(children.at(i));
-	}*/
+	}
 	scene()->destroyItemGroup(group);
-        groupSelectedItems(children, true, true);
+	m_selectionMutex.unlock();
+        groupSelectedItems(children, group != m_selectionGroup, true);
     }
 }
 
 void CustomTrackView::resetSelectionGroup(bool selectItems)
 {
+    QMutexLocker lock(&m_selectionMutex);
     if (m_selectionGroup) {
         // delete selection group
         bool snap = KdenliveSettings::snaptopoints();
@@ -1238,15 +1296,17 @@ void CustomTrackView::resetSelectionGroup(bool selectItems)
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
         scene()->destroyItemGroup(m_selectionGroup);
 	m_selectionGroup = NULL;
-        for (int i = 0; i < children.count(); i++) {
-            if (children.at(i)->parentItem() == 0 && (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) {
-                if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
-                    children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
-                    children.at(i)->setSelected(selectItems);
-                }
-            } else if (children.at(i)->type() == GROUPWIDGET) {
-                children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
-                children.at(i)->setSelected(selectItems);
+        for (int i = 0; i < children.count(); ++i) {
+            if (children.at(i)->parentItem() == 0) {
+		if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) {
+		    if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+			children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
+			children.at(i)->setSelected(selectItems);
+		    }
+		} else if (children.at(i)->type() == GROUPWIDGET) {
+		    children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
+		    children.at(i)->setSelected(selectItems);
+		}
             }
         }
         KdenliveSettings::setSnaptopoints(snap);
@@ -1255,6 +1315,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems)
 
 void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool createNewGroup, bool selectNewGroup)
 {
+    QMutexLocker lock(&m_selectionMutex);
     if (m_selectionGroup) {
         kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
         return;
@@ -1264,17 +1325,30 @@ void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool
     QSet <QGraphicsItemGroup *> groupsList;
     QSet <QGraphicsItem *> itemsList;
 
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
+	if (selectNewGroup) selection.at(i)->setSelected(true);
 	if (selection.at(i)->type() == GROUPWIDGET) {
-	    groupsList.insert(static_cast<AbstractGroupItem*> (selection.at(i)));
+	    AbstractGroupItem *it = static_cast <AbstractGroupItem *> (selection.at(i));
+	    while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) {
+		it = static_cast <AbstractGroupItem *>(it->parentItem());
+	    }
+	    if (!it || it->isItemLocked()) continue;
+	    groupsList.insert(it);
 	}
     }
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
 	if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
 	    if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) {
-		groupsList.insert(static_cast <QGraphicsItemGroup *> (selection.at(i)->parentItem()));
+		AbstractGroupItem *it = static_cast <AbstractGroupItem *> (selection.at(i)->parentItem());
+		while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) {
+		    it = static_cast <AbstractGroupItem *>(it->parentItem());
+		}
+		if (!it || it->isItemLocked()) continue;
+		groupsList.insert(it);
 	    }
 	    else {
+		AbstractClipItem *it = static_cast<AbstractClipItem *> (selection.at(i));
+		if (!it || it->isItemLocked()) continue;
 		itemsList.insert(selection.at(i));
 	    }
 	}
@@ -1305,22 +1379,27 @@ void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool
         newGroup->translate(-diff.x(), -diff.y());
         //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1);
 
-        scene()->addItem(newGroup);
         // Check if we are trying to include a group in a group
+	foreach (QGraphicsItemGroup *value, groupsList) {
+	    newGroup->addItem(value);
+        }
+	
 	foreach (QGraphicsItemGroup *value, groupsList) {
 	    QList<QGraphicsItem *> children = value->childItems();
-	    for (int i = 0; i < children.count(); i++) {
+	    for (int i = 0; i < children.count(); ++i) {
 		if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)
 		    itemsList.insert(children.at(i));
 	    }
 	    AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(value);
 	    m_document->clipManager()->removeGroup(grp);
+	    if (grp == m_selectionGroup) m_selectionGroup = NULL;
 	    scene()->destroyItemGroup(grp);
 	}
 
 	foreach (QGraphicsItem *value, itemsList) {
 	    newGroup->addItem(value);
         }
+        scene()->addItem(newGroup);
         KdenliveSettings::setSnaptopoints(snap);
 	if (selectNewGroup) newGroup->setSelected(true);
     } else {
@@ -1374,10 +1453,14 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
         } else*/  {
             // add keyframe
             GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+	    int single = m_dragItem->checkForSingleKeyframe();
             int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
             ClipItem * item = static_cast <ClipItem *>(m_dragItem);
+	    QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
+	    if (single > -1) {
+		item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1, single);
+	    }
             //QString previous = item->keyframes(item->selectedEffectIndex());
-            QDomElement oldEffect = item->selectedEffect().cloneNode().toElement();
             item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val);
             //item->updateKeyframeEffect();
             //QString next = item->keyframes(item->selectedEffectIndex());
@@ -1521,9 +1604,9 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs
             //build go to marker menu
             if (item->baseClip()) {
                 QList <CommentedTime> markers = item->baseClip()->commentedSnapMarkers();
-                int offset = item->startPos().frames(m_document->fps());
+                int offset = (item->startPos()- item->cropStart()).frames(m_document->fps());
                 if (!markers.isEmpty()) {
-                    for (int i = 0; i < markers.count(); i++) {
+                    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);
@@ -1574,9 +1657,15 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out)
         return;
     }
 
-    AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false);
-    updateTrackDuration(pasteInfo.track, command);
-    m_commandStack->push(command);
+    // Add refresh command for undo
+    QUndoCommand *addCommand = new QUndoCommand();
+    addCommand->setText(i18n("Add timeline clip"));
+    new RefreshMonitorCommand(this, false, true, addCommand);
+    new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, addCommand);
+    new RefreshMonitorCommand(this, true, false, addCommand);
+    updateTrackDuration(pasteInfo.track, addCommand);
+    
+    m_commandStack->push(addCommand);
 
     selectClip(true, false);
     // Automatic audio split
@@ -1586,10 +1675,17 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out)
 
 bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos)
 {
-    if (data->hasFormat("kdenlive/clip")) {
-        m_clipDrag = true;
-        m_scene->clearSelection();
-        resetSelectionGroup(false);
+    QPointF framePos = mapToScene(pos);
+    int track = framePos.y() / KdenliveSettings::trackheight();
+    m_clipDrag = data->hasFormat("kdenlive/clip") || data->hasFormat("kdenlive/producerslist");
+    // This is not a clip drag, maybe effect or other...
+    if (!m_clipDrag) return false;
+    m_scene->clearSelection();
+    m_dragItem = NULL;
+    resetSelectionGroup(false);
+    QMutexLocker lock(&m_selectionMutex);
+    if (track < 0 || track > m_document->tracksCount() - 1 || m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) return true;
+    if (data->hasFormat("kdenlive/clip")) {    
         QStringList list = QString(data->data("kdenlive/clip")).split(';');
         DocClipBase *clip = m_document->getBaseClip(list.at(0));
         if (clip == NULL) {
@@ -1600,7 +1696,6 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos)
             emit displayMessage(i18n("Clip not ready"), ErrorMessage);
             return false;
         }
-        QPointF framePos = mapToScene(pos);
         ItemInfo info;
         info.startPos = GenTime();
         info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
@@ -1625,19 +1720,19 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos)
         QList <GenTime> offsetList;
         offsetList.append(info.endPos);
         updateSnapPoints(NULL, offsetList);
+	QStringList lockedTracks;
+	for (int i = 0; i < m_document->tracksCount(); ++i) {
+	    if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
+	}
+	m_selectionGroup->setProperty("locked_tracks", lockedTracks);
         m_selectionGroup->setPos(framePos);
         scene()->addItem(m_selectionGroup);
         m_selectionGroup->setSelected(true);
-        return true;
     } else if (data->hasFormat("kdenlive/producerslist")) {
-        m_clipDrag = true;
         QStringList ids = QString(data->data("kdenlive/producerslist")).split(';');
-        m_scene->clearSelection();
-        resetSelectionGroup(false);
 
         QList <GenTime> offsetList;
         QList <ItemInfo> infoList;
-        QPointF framePos = mapToScene(pos);
         GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps());
         int track = (int)(framePos.y() / m_tracksHeight);
         framePos.setX((int)(framePos.x() + 0.5));
@@ -1675,7 +1770,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos)
         if (!canBePastedTo(infoList, AVWIDGET)) {
             return true;
         }
-        m_selectionGroup = new AbstractGroupItem(m_document->fps());
+        if (ids.size() > 1) m_selectionGroup = new AbstractGroupItem(m_document->fps());
         start = GenTime();
         for (int i = 0; i < ids.size(); ++i) {
             QString clipData = ids.at(i);
@@ -1697,22 +1792,32 @@ 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, getFrameWidth(), false);
-            m_selectionGroup->addItem(item);
+            if (ids.size() > 1) m_selectionGroup->addItem(item);
+	    else m_dragItem = item;
+	    item->setSelected(true);
             if (!clip->isPlaceHolder()) m_waitingThumbs.append(item);
         }
 
         updateSnapPoints(NULL, offsetList);
-        m_selectionGroup->setPos(framePos);
-        scene()->addItem(m_selectionGroup);
+	QStringList lockedTracks;
+	for (int i = 0; i < m_document->tracksCount(); ++i) {
+	    if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1);
+	}   
+	    
+        if (m_selectionGroup) {
+	    m_selectionGroup->setProperty("locked_tracks", lockedTracks);
+	    m_selectionGroup->setPos(framePos);
+	    scene()->addItem(m_selectionGroup);
+	}
+	else if (m_dragItem) {
+	    m_dragItem->setProperty("locked_tracks", lockedTracks);
+	    m_dragItem->setPos(framePos);
+	    scene()->addItem(m_dragItem);
+	}
         //m_selectionGroup->setZValue(10);
         m_thumbsTimer.start();
-        return true;
-
-    } else {
-        // the drag is not a clip (may be effect, ...)
-        m_clipDrag = false;
-        return false;
     }
+    return true;
 }
 
 
@@ -1737,7 +1842,7 @@ bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos)
     collindingItems.removeAll(item);
     if (collindingItems.isEmpty()) return false;
     else {
-        for (int i = 0; i < collindingItems.count(); i++) {
+        for (int i = 0; i < collindingItems.count(); ++i) {
             QGraphicsItem *collision = collindingItems.at(i);
             if (collision->type() == item->type()) {
                 // Collision
@@ -1758,7 +1863,7 @@ void CustomTrackView::slotRefreshEffects(ClipItem *clip)
         return;
     }
     bool success = true;
-    for (int i = 0; i < clip->effectsCount(); i++) {
+    for (int i = 0; i < clip->effectsCount(); ++i) {
         if (!m_document->renderer()->mltAddEffect(track, pos, getEffectArgs(clip->effect(i)), false)) success = false;
     }
     if (!success) emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
@@ -1799,10 +1904,12 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
             return;
         }
         EffectsParameterList params = clip->addEffect(effect);
-        if (!m_document->renderer()->mltAddEffect(track, pos, params))
+        if (!m_document->renderer()->mltAddEffect(track, pos, params)) {
             emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
-	clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt());
-        if (clip->isSelected()) emit clipItemSelected(clip);
+	    clip->deleteEffect(params.paramValue("kdenlive_ix"));
+	}
+	else clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt());
+        if (clip->isMainSelectedClip()) emit clipItemSelected(clip);
     } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage);
 }
 
@@ -1837,8 +1944,8 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
     }
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
     if (clip) {
-        clip->deleteEffect(index);
-        emit clipItemSelected(clip);
+	clip->deleteEffect(index);
+        if (clip->isMainSelectedClip()) emit clipItemSelected(clip);
     }
 }
 
@@ -1852,7 +1959,10 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *
     if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
     else effectName = i18n("effect");
     effectCommand->setText(i18n("Add %1", effectName));
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
+	if (itemList.at(i)->type() == GROUPWIDGET) {
+	    itemList << itemList.at(i)->childItems();
+	}
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
             if (effect.tagName() == "effectgroup") {
@@ -1894,12 +2004,27 @@ void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect)
     if (clip) slotAddEffect(effect, clip->startPos(), clip->track());
 }
 
+void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track)
+{
+    if (clip == NULL) return;
+    slotAddEffect(effect, pos, track);
+    if (clip->parentItem()) {
+	// Clip is in a group, should not happen
+	kDebug()<<"/// DROPPED ON ITEM IN GRP";
+    }
+    else if (clip != m_dragItem) {
+	clearSelection(false);
+	m_dragItem = clip;
+	clip->setSelected(true);
+	emit clipItemSelected(clip);
+    }
+}
+
 void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
 {
     QList<QGraphicsItem *> itemList;
     QUndoCommand *effectCommand = new QUndoCommand();
     QString effectName;
-    
     int offset = effect.attribute("clipstart").toInt();
     if (effect.tagName() == "effectgroup") {
 	effectName = effect.attribute("name");
@@ -1918,7 +2043,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
     }
 
     //expand groups
-    for (int i = 0; i < itemList.count(); i++) {
+    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++) {
@@ -1927,7 +2052,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
         }
     }
 
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
 	    if (effect.tagName() == "effectgroup") {
@@ -1953,24 +2078,25 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
     if (effectCommand->childCount() > 0) {
         m_commandStack->push(effectCommand);
         setDocumentModified();
-	if (effectCommand->childCount() == 1) {
+	/*if (effectCommand->childCount() == 1) {
 	    // Display newly added clip effect
-	    for (int i = 0; i < itemList.count(); i++) {
+	    for (int i = 0; i < itemList.count(); ++i) {
 		if (itemList.at(i)->type() == AVWIDGET) {
 		    ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
 		    clip->setSelectedEffect(clip->effectsCount());
-		    if (!clip->isSelected()) {
+		    if (!clip->isSelected() && (!m_dragItem || !itemList.contains(m_dragItem))) {
+			kDebug()<<"// CLIP WAS NO SELECTED, DRG: "<<(m_dragItem == NULL);
 			clearSelection(false);
 			clip->setSelected(true);
 			m_dragItem = clip;
+			emit clipItemSelected(clip);
+			break;
 		    }
-		    emit clipItemSelected(clip);
-		    break;
 		}
 	    }
 	}
 	else {
-	    for (int i = 0; i < itemList.count(); i++) {
+	    for (int i = 0; i < itemList.count(); ++i) {
 		if (itemList.at(i)->type() == AVWIDGET) {
 		    ClipItem *clip = static_cast<ClipItem *>(itemList.at(i));
 		    if (clip->isMainSelectedClip()) {
@@ -1979,7 +2105,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
 		    }
 		}
 	    }
-	}
+	}*/
     } else delete effectCommand;
 }
 
@@ -2040,7 +2166,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef
         delCommand->setText(i18n("Delete %1", effectName));
 
         //expand groups
-        for (int i = 0; i < items.count(); i++) {
+        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++) {
@@ -2049,7 +2175,7 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, int track, QDomElement ef
             }
         }
 
-        for (int i = 0; i < items.count(); i++) {
+        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"));
@@ -2200,7 +2326,7 @@ void CustomTrackView::moveEffect(int track, GenTime pos, QList <int> oldPos, QLi
 	    new_position = max;
 	}
 	int old_position = oldPos.at(0);
-	for (int i = 0; i < newPos.count(); i++) {
+	for (int i = 0; i < newPos.count(); ++i) {
 	    QDomElement act = m_document->getTrackEffect(documentTrack, new_position);
 	    if (old_position > new_position) {
 		// Moving up, we need to adjust index
@@ -2223,7 +2349,7 @@ void CustomTrackView::moveEffect(int track, GenTime pos, QList <int> oldPos, QLi
 	    new_position = clip->effectsCount();
 	}
 	int old_position = oldPos.at(0);
-	for (int i = 0; i < newPos.count(); i++) {
+	for (int i = 0; i < newPos.count(); ++i) {
 	    QDomElement act = clip->effectAtIndex(new_position);
 	    if (old_position > new_position) {
 		// Moving up, we need to adjust index
@@ -2258,7 +2384,7 @@ void CustomTrackView::slotChangeEffectState(ClipItem *clip, int track, QList <in
     } else {
 	// Check if we have a speed effect, disabling / enabling it needs a special procedure since it is a pseudoo effect
 	QList <int> speedEffectIndexes;
-	for (int i = 0; i < effectIndexes.count(); i++) {
+	for (int i = 0; i < effectIndexes.count(); ++i) {
 	    QDomElement effect = clip->effectAtIndex(effectIndexes.at(i));
 	    if (effect.attribute("id") == "speed") {
 		// speed effect
@@ -2306,7 +2432,7 @@ void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString regio
     m_commandStack->push(command);
 }
 
-ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute)
+ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack, bool execute)
 {
     if (cut) {
         // cut clip
@@ -2367,17 +2493,23 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
 
         item->resizeEnd(cutPos);
         scene()->addItem(dup);
-        if (item->checkKeyFrames())
+	    
+        if (item->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps())))
             slotRefreshEffects(item);
-        if (dup->checkKeyFrames())
+
+        if (dup->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()), cutTime.frames(m_document->fps())))
             slotRefreshEffects(dup);
 
         item->baseClip()->addReference();
         m_document->updateClip(item->baseClip()->getId());
         setDocumentModified();
         KdenliveSettings::setSnaptopoints(snap);
-        if (execute && item->isSelected())
-            emit clipItemSelected(item);
+        if (execute && item->isSelected()) {
+	    m_scene->clearSelection();
+	    dup->setSelected(true);
+	    m_dragItem = dup;
+            emit clipItemSelected(dup);
+	}
         return dup;
     } else {
         // uncut clip
@@ -2398,18 +2530,6 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
 
-        // join fade effects again
-        int ix = dup->hasEffect(QString(), "fadeout");
-        if (ix != -1) {
-            QDomElement effect = dup->effectAtIndex(ix);
-            item->addEffect(effect);
-        }
-        ix = dup->hasEffect(QString(), "fade_to_black");
-        if (ix != -1) {
-            QDomElement effect = dup->effectAtIndex(ix);
-            item->addEffect(effect);
-        }
-
         m_waitingThumbs.removeAll(dup);
         bool selected = item->isSelected();
         if (dup->isSelected()) {
@@ -2425,9 +2545,10 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo
 
         ItemInfo clipinfo = item->info();
         clipinfo.track = m_document->tracksCount() - clipinfo.track;
-        bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos);
+        bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos, false);
         if (success) {
             item->resizeEnd((int) info.endPos.frames(m_document->fps()));
+	    item->setEffectList(oldStack);
             setDocumentModified();
         } else {
             emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
@@ -2468,7 +2589,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition)
                 QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
                 QList<QGraphicsItem *> selection = m_scene->items(r);
                 bool transitionAccepted = true;
-                for (int i = 0; i < selection.count(); i++) {
+                for (int i = 0; i < selection.count(); ++i) {
                     if (selection.at(i)->type() == TRANSITIONWIDGET) {
                         Transition *tr = static_cast <Transition *>(selection.at(i));
                         if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) {
@@ -2494,7 +2615,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition)
                 QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
                 QList<QGraphicsItem *> selection = m_scene->items(r);
                 bool transitionAccepted = true;
-                for (int i = 0; i < selection.count(); i++) {
+                for (int i = 0; i < selection.count(); ++i) {
                     if (selection.at(i)->type() == TRANSITIONWIDGET) {
                         Transition *tr = static_cast <Transition *>(selection.at(i));
                         if (info.endPos - tr->endPos() > GenTime(5, m_document->fps())) {
@@ -2506,7 +2627,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition)
                 else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
             }
         }
-    } else for (int i = 0; i < itemList.count(); i++) {
+    } else for (int i = 0; i < itemList.count(); ++i) {
             if (itemList.at(i)->type() == AVWIDGET) {
                 ClipItem *item = (ClipItem *) itemList.at(i);
                 ItemInfo info;
@@ -2519,7 +2640,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition)
                 QRectF r(info.startPos.frames(m_document->fps()), startY, (info.endPos - info.startPos).frames(m_document->fps()), m_tracksHeight / 2);
                 QList<QGraphicsItem *> selection = m_scene->items(r);
                 bool transitionAccepted = true;
-                for (int i = 0; i < selection.count(); i++) {
+                for (int i = 0; i < selection.count(); ++i) {
                     if (selection.at(i)->type() == TRANSITIONWIDGET) {
                         Transition *tr = static_cast <Transition *>(selection.at(i));
                         if (tr->startPos() - info.startPos > GenTime(5, m_document->fps())) {
@@ -2630,7 +2751,11 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
             m_selectionGroup->setPos(pos);
             emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5));
             event->acceptProposedAction();
-        } else {
+        } else if (m_dragItem) {
+	    m_dragItem->setPos(pos);
+            emit mousePosition((int)(m_dragItem->scenePos().x() + 0.5));
+            event->acceptProposedAction();
+	} else {
             // Drag enter was not possible, try again at mouse position
             insertDropClips(event->mimeData(), event->pos());
             event->accept();
@@ -2642,20 +2767,27 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
 
 void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event)
 {
-    if (m_selectionGroup && m_clipDrag) {
+    if ((m_selectionGroup || m_dragItem) && m_clipDrag) {
         m_thumbsTimer.stop();
         m_waitingThumbs.clear();
-        QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+        QList<QGraphicsItem *> items;
+	QMutexLocker lock(&m_selectionMutex);
+	if (m_selectionGroup) items = m_selectionGroup->childItems();
+	else if (m_dragItem) items.append(m_dragItem);
         qDeleteAll(items);
-        scene()->destroyItemGroup(m_selectionGroup);
+        if (m_selectionGroup) scene()->destroyItemGroup(m_selectionGroup);
         m_selectionGroup = NULL;
+	m_dragItem = NULL;
+	event->accept();
     } else QGraphicsView::dragLeaveEvent(event);
 }
 
 void CustomTrackView::dropEvent(QDropEvent * event)
 {
-    if (m_selectionGroup && m_clipDrag) {
-        QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+    if ((m_selectionGroup || m_dragItem) && m_clipDrag) {
+        QList<QGraphicsItem *> items;
+	if (m_selectionGroup) items = m_selectionGroup->childItems();
+	else if (m_dragItem) items.append(m_dragItem);
         resetSelectionGroup();
 	m_dragItem = NULL;
         m_scene->clearSelection();
@@ -2663,8 +2795,11 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         QUndoCommand *addCommand = new QUndoCommand();
         addCommand->setText(i18n("Add timeline clip"));
         QList <ClipItem *> brokenClips;
+	
+	// Add refresh command for undo
+	new RefreshMonitorCommand(this, false, true, addCommand);
 
-        for (int i = 0; i < items.count(); i++) {
+        for (int i = 0; i < items.count(); ++i) {
             ClipItem *item = static_cast <ClipItem *>(items.at(i));
             if (!hasVideoClip && (item->clipType() == AV || item->clipType() == VIDEO)) hasVideoClip = true;
             if (items.count() == 1) {
@@ -2697,12 +2832,17 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             updateTrackDuration(info.track, addCommand);
 
             if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
-                // add transparency transition
-                QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement();
-                new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
+                // add transparency transition if space is available
+		if (canBePastedTo(info, TRANSITIONWIDGET)) {
+		    QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement();
+		    new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
+		}
             }
             item->setSelected(true);
         }
+        // Add refresh command for redo
+	new RefreshMonitorCommand(this, false, false, addCommand);
+	
         qDeleteAll(brokenClips);
         brokenClips.clear();
         if (addCommand->childCount() > 0) m_commandStack->push(addCommand);
@@ -2720,7 +2860,7 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         QStringList timelineList;
 
         kDebug()<<"// ITEMS on TRACK: "<<selection.count();
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
                if (selection.at(i)->type() == AVWIDGET) {
                    ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
                    int start = clip->startPos().frames(m_document->fps());
@@ -2761,7 +2901,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
         QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
         QList<QGraphicsItem *> selection = m_scene->items(rect);
         if (item) selection.removeAll(item);
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
             if (!selection.at(i)->isEnabled()) continue;
             if (selection.at(i)->type() == AVWIDGET) {
                 ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
@@ -2778,9 +2918,9 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         newdupInfo.startPos = info.endPos;
                         newdupInfo.cropStart += diff2;
                         newdupInfo.cropDuration = clipInfo.endPos - info.endPos;
-                        new RazorClipCommand(this, clipInfo, info.startPos, false, command);
+                        new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, false, command);
                         new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command);
-                        ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+                        ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false);
                         if (dup) {
 			    dup->resizeStart(info.endPos.frames(m_document->fps()));
 			}
@@ -2812,7 +2952,7 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
         QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
         QList<QGraphicsItem *> selection = m_scene->items(rect);
         if (item) selection.removeAll(item);
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
             if (selection.at(i)->type() == AVWIDGET) {
                 ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
                 if (clip->startPos() < info.startPos) {
@@ -2823,10 +2963,10 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf
                         dupInfo.startPos = info.startPos;
                         dupInfo.cropStart += diff;
                         dupInfo.cropDuration = clipInfo.endPos - info.startPos;
-                        new RazorClipCommand(this, clipInfo, info.startPos, false, command);
+                        new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, true, command);
                         // Commented out; variable dup unused. --granjow
                         //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
-                        cutClip(clipInfo, info.startPos, true, false);
+                        //cutClip(clipInfo, info.startPos, true, false);
                     }
                 }
                 // TODO: add insertspacecommand
@@ -2848,7 +2988,7 @@ void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item,
         QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
         QList<QGraphicsItem *> selection = m_scene->items(rect);
         selection.removeAll(item);
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
             if (!selection.at(i)->isEnabled()) continue;
             if (selection.at(i)->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast<Transition *>(selection.at(i));
@@ -2895,6 +3035,7 @@ Qt::DropActions CustomTrackView::supportedDropActions() const
 
 void CustomTrackView::setDuration(int duration)
 {
+    if (m_projectDuration == duration) return;
     int diff = qAbs(duration - sceneRect().width());
     if (diff * matrix().m11() > -50) {
         if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height());
@@ -2923,10 +3064,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
         QList<QGraphicsItem *> selection = m_scene->items(r);
         resetSelectionGroup();
-
+	m_selectionMutex.lock();
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
         scene()->addItem(m_selectionGroup);
-        for (int i = 0; i < selection.count(); i++) {
+        for (int i = 0; i < selection.count(); ++i) {
             if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
                 m_selectionGroup->addItem(selection.at(i));
             }
@@ -2937,7 +3078,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         // adjust track number
         Mlt::Tractor *tractor = m_document->renderer()->lockService();
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
-        for (int i = 0; i < children.count(); i++) {
+        for (int i = 0; i < children.count(); ++i) {
             if (children.at(i)->type() == GROUPWIDGET) {
                 AbstractGroupItem *grp = static_cast<AbstractGroupItem*>(children.at(i));
                 children << grp->childItems();
@@ -2969,25 +3110,23 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         // Sync transition tracks with MLT playlist
         Transition *tr;        
 	TransitionInfo info;
-	for (int i = 0; i < transitionInfos.count(); i++) {
+	for (int i = 0; i < transitionInfos.count(); ++i) {
 	    info = transitionInfos.at(i);
 	    tr = getTransitionItem(info);
 	    if (tr) tr->setForcedTrack(info.forceTrack, info.a_track);
 	    else kDebug()<<"// Cannot update TRANSITION AT: "<<info.b_track<<" / "<<info.startPos.frames(m_document->fps()); 
 	}
-	
+	m_selectionMutex.unlock();
         resetSelectionGroup(false);
         m_document->renderer()->unlockService(tractor);
     }
 
     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);
+    for (int i = 0; i < m_guides.count(); ++i) {
+        m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1);
     }
 
-    m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1);
+    m_cursorLine->setLine(0, 0, 0, maxHeight - 1);
     setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
     viewport()->update();
     //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
@@ -2998,6 +3137,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
 
 void CustomTrackView::removeTrack(int ix)
 {
+    // Clear effect stack
+    clearSelection();
+    emit transitionItemSelected(NULL);
+
     // Delete track in MLT playlist
     m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix);
     m_document->deleteTrack(m_document->tracksCount() - ix - 1);
@@ -3005,13 +3148,11 @@ void CustomTrackView::removeTrack(int ix)
     double startY = ix * (m_tracksHeight + 1) + m_tracksHeight / 2;
     QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
     QList<QGraphicsItem *> selection = m_scene->items(r);
-
-    resetSelectionGroup();
-
+    m_selectionMutex.lock();
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
-    for (int i = 0; i < selection.count(); i++) {
-        if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
+    for (int i = 0; i < selection.count(); ++i) {
+        if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
             m_selectionGroup->addItem(selection.at(i));
         }
     }
@@ -3023,7 +3164,7 @@ void CustomTrackView::removeTrack(int ix)
     // adjust track number
     QList<QGraphicsItem *> children = m_selectionGroup->childItems();
     //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
-    for (int i = 0; i < children.count(); i++) {
+    for (int i = 0; i < children.count(); ++i) {
         if (children.at(i)->type() == GROUPWIDGET) {
             AbstractGroupItem *grp = static_cast<AbstractGroupItem*>(children.at(i));
             children << grp->childItems();
@@ -3050,16 +3191,15 @@ void CustomTrackView::removeTrack(int ix)
             }
         }
     }
+    m_selectionMutex.unlock();
     resetSelectionGroup(false);
     m_document->renderer()->unlockService(tractor);
 
     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);
+    for (int i = 0; i < m_guides.count(); ++i) {
+        m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1);
     }
-    m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1);
+    m_cursorLine->setLine(0, 0, 0, maxHeight - 1);
     setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
 
     m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1);
@@ -3083,7 +3223,7 @@ void CustomTrackView::configTracks(QList < TrackInfo > trackInfos)
 
 void CustomTrackView::slotSwitchTrackAudio(int ix)
 {
-    /*for (int i = 0; i < m_document->tracksCount(); i++)
+    /*for (int i = 0; i < m_document->tracksCount(); ++i)
         kDebug() << "TRK " << i << " STATE: " << m_document->trackInfoAt(i).isMute << m_document->trackInfoAt(i).isBlind;*/
     int tracknumber = m_document->tracksCount() - ix - 1;
     m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute);
@@ -3109,7 +3249,7 @@ void CustomTrackView::lockTrack(int ix, bool lock, bool requestUpdate)
     AbstractClipItem *clip = NULL;
     QList<QGraphicsItem *> selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2);
 
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == GROUPWIDGET && (AbstractGroupItem *)selection.at(i) != m_selectionGroup) {
             if (selection.at(i)->parentItem() && m_selectionGroup) {
                 selection.removeAll((QGraphicsItem*)m_selectionGroup);
@@ -3185,7 +3325,7 @@ QList<QGraphicsItem *> CustomTrackView::checkForGroups(const QRectF &rect, bool
     QList<QGraphicsItem *> selection = scene()->items(rect);
     *ok = true;
     int maxHeight = m_tracksHeight * 1.5;
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         // Check that we don't try to move a group with clips on other tracks
         if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) {
             *ok = false;
@@ -3253,7 +3393,7 @@ void CustomTrackView::slotRemoveSpace()
     QList<ItemInfo> clipsToMove;
     QList<ItemInfo> transitionsToMove;
 
-    for (int i = 0; i < items.count(); i++) {
+    for (int i = 0; i < items.count(); ++i) {
         if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
             AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
             ItemInfo info = item->info();
@@ -3269,14 +3409,14 @@ void CustomTrackView::slotRemoveSpace()
         // Make sure that by moving the items, we don't get a transition collision
         // Find first transition
         ItemInfo info = transitionsToMove.at(0);
-        for (int i = 1; i < transitionsToMove.count(); i++)
+        for (int i = 1; i < transitionsToMove.count(); ++i)
             if (transitionsToMove.at(i).startPos < info.startPos) info = transitionsToMove.at(i);
 
         // make sure there are no transitions on the way
         QRectF rect(info.startPos.frames(m_document->fps()) - length, track * m_tracksHeight + m_tracksHeight / 2, length - 1, m_tracksHeight / 2 - 2);
         items = scene()->items(rect);
         int transitionCorrection = -1;
-        for (int i = 0; i < items.count(); i++) {
+        for (int i = 0; i < items.count(); ++i) {
             if (items.at(i)->type() == TRANSITIONWIDGET) {
                 // There is a transition on the way
                 AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
@@ -3349,7 +3489,7 @@ void CustomTrackView::slotInsertSpace()
     QList<ItemInfo> clipsToMove;
     QList<ItemInfo> transitionsToMove;
 
-    for (int i = 0; i < items.count(); i++) {
+    for (int i = 0; i < items.count(); ++i) {
         if (items.at(i)->type() == AVWIDGET || items.at(i)->type() == TRANSITIONWIDGET) {
             AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
             ItemInfo info = item->info();
@@ -3371,6 +3511,7 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
 {
     int diff = duration.frames(m_document->fps());
     resetSelectionGroup();
+    m_selectionMutex.lock();
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
     ClipItem *clip;
@@ -3380,12 +3521,12 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
     QMap <int, int> trackClipStartList;
     QMap <int, int> trackTransitionStartList;
 
-    for (int i = 1; i < m_document->tracksCount() + 1; i++) {
+    for (int i = 1; i < m_document->tracksCount() + 1; ++i) {
         trackClipStartList[i] = -1;
         trackTransitionStartList[i] = -1;
     }
 
-    if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); i++) {
+    if (!clipsToMove.isEmpty()) for (int i = 0; i < clipsToMove.count(); ++i) {
             clip = getClipItemAtStart(clipsToMove.at(i).startPos + offset, clipsToMove.at(i).track);
             if (clip) {
                 if (clip->parentItem()) {
@@ -3399,7 +3540,7 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
                     displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage);
                 }
             }
-    if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) {
+    if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); ++i) {
             transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track);
             if (transition) {
                 if (transition->parentItem()) {
@@ -3416,7 +3557,7 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
     // update items coordinates
     QList<QGraphicsItem *> itemList = m_selectionGroup->childItems();
 
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
             static_cast < AbstractClipItem *>(itemList.at(i))->updateItem();
         } else if (itemList.at(i)->type() == GROUPWIDGET) {
@@ -3427,6 +3568,7 @@ void CustomTrackView::insertSpace(QList<ItemInfo> clipsToMove, QList<ItemInfo> t
             }
         }
     }
+    m_selectionMutex.unlock();
     resetSelectionGroup(false);
     if (track != -1)
         track = m_document->tracksCount() - track;
@@ -3440,7 +3582,7 @@ void CustomTrackView::deleteClip(const QString &clipId)
     QUndoCommand *deleteCommand = new QUndoCommand();
     new RefreshMonitorCommand(this, false, true, deleteCommand);
     int count = 0;
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = (ClipItem *)itemList.at(i);
             if (item->clipProducer() == clipId) {
@@ -3562,6 +3704,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         }
         m_dragGuide = NULL;
         m_dragItem = NULL;
+	QGraphicsView::mouseReleaseEvent(event);
         return;
     } else if (m_operationMode == SPACER && m_selectionGroup) {
         int track;
@@ -3582,12 +3725,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             QMap <int, int> trackClipStartList;
             QMap <int, int> trackTransitionStartList;
 
-            for (int i = 1; i < m_document->tracksCount() + 1; i++) {
+            for (int i = 1; i < m_document->tracksCount() + 1; ++i) {
                 trackClipStartList[i] = -1;
                 trackTransitionStartList[i] = -1;
             }
 
-            for (int i = 0; i < items.count(); i++) {
+            for (int i = 0; i < items.count(); ++i) {
                 if (items.at(i)->type() == GROUPWIDGET) {
 		    AbstractGroupItem* group = (AbstractGroupItem*)items.at(i);
 		    if (!groups.contains(group)) groups.append(group);
@@ -3595,7 +3738,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
 		}
             }
 
-            for (int i = 0; i < items.count(); i++) {
+            for (int i = 0; i < items.count(); ++i) {
                 if (items.at(i)->type() == AVWIDGET) {
                     AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
                     ItemInfo info = item->info();
@@ -3622,7 +3765,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             }
         }
         resetSelectionGroup();
-        for (int i = 0; i < groups.count(); i++) {
+        for (int i = 0; i < groups.count(); ++i) {
 	    rebuildGroup(groups.at(i));
 	}
 
@@ -3827,13 +3970,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
 
                 // Expand groups
                 int max = items.count();
-                for (int i = 0; i < max; i++) {
+                for (int i = 0; i < max; ++i) {
                     if (items.at(i)->type() == GROUPWIDGET) {
                         items += items.at(i)->childItems();
                     }
                 }
                 m_document->renderer()->blockSignals(true);
-                for (int i = 0; i < items.count(); i++) {
+                for (int i = 0; i < items.count(); ++i) {
                     if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
                     AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
                     ItemInfo info = item->info();
@@ -3851,7 +3994,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                     }
                 }
                 m_document->renderer()->blockSignals(false);
-                for (int i = 0; i < items.count(); i++) {
+                for (int i = 0; i < items.count(); ++i) {
                     // re-add items in correct place
                     if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
                     AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
@@ -3870,7 +4013,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                         info.track = m_document->tracksCount() - info.track;
                         adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), moveGroup);
                         m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
-                        for (int i = 0; i < clip->effectsCount(); i++) {
+                        for (int i = 0; i < clip->effectsCount(); ++i) {
                             m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false);
                         }
                     } else {
@@ -4179,8 +4322,8 @@ void CustomTrackView::deleteSelectedClips()
     int groupCount = 0;
     int clipCount = 0;
     int transitionCount = 0;
-    // expand & destroy groups
-    for (int i = 0; i < itemList.count(); i++) {
+    // expand & destroy groups    
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == GROUPWIDGET) {
             groupCount++;
             QList<QGraphicsItem *> children = itemList.at(i)->childItems();
@@ -4206,20 +4349,19 @@ void CustomTrackView::deleteSelectedClips()
         } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET)
             itemList.insert(i + 1, itemList.at(i)->parentItem());
     }
-
-    for (int i = 0; i < itemList.count(); i++) {
+    emit clipItemSelected(NULL);
+    emit transitionItemSelected(NULL);
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             clipCount++;
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
             //kDebug()<<"// DELETE CLP AT: "<<item->info().startPos.frames(25);
             new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected);
-            emit clipItemSelected(NULL);
         } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             transitionCount++;
             Transition *item = static_cast <Transition *>(itemList.at(i));
             //kDebug()<<"// DELETE TRANS AT: "<<item->info().startPos.frames(25);
             new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected);
-            emit transitionItemSelected(NULL);
         }
     }
     if (groupCount > 0 && clipCount == 0 && transitionCount == 0)
@@ -4253,7 +4395,7 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant
         item->updateRectGeometry();
         if (item->cropDuration().frames(m_document->fps()) != endPos)
             item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1);
-        updatePositionEffects(item, info);
+        updatePositionEffects(item, info, false);
         setDocumentModified();
     } else {
         emit displayMessage(i18n("Invalid clip"), ErrorMessage);
@@ -4275,7 +4417,7 @@ void CustomTrackView::cutSelectedClips()
                 if (!groups.contains(group))
                     groups << group;
             } else if (currentPos > item->startPos() && currentPos < item->endPos()) {
-                RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos);
+                RazorClipCommand *command = new RazorClipCommand(this, item->info(), item->effectList(), currentPos);
                 m_commandStack->push(command);
             }
         } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) {
@@ -4293,9 +4435,15 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos)
 {
     if (group) {
         QList <QGraphicsItem *> children = group->childItems();
+	QUndoCommand *command = new QUndoCommand;
+	command->setText(i18n("Cut Group"));
+	groupClips(false, children, command);
         QList <ItemInfo> clips1, transitions1;
-        QList <ItemInfo> clipsCut, transitionsCut;
+        QList <ItemInfo> transitionsCut;
         QList <ItemInfo> clips2, transitions2;
+	QList <QGraphicsItem *> clipsToCut;
+	
+	// Collect info
         for (int i = 0; i < children.count(); ++i) {
             children.at(i)->setSelected(false);
             AbstractClipItem *child = static_cast <AbstractClipItem *>(children.at(i));
@@ -4304,83 +4452,54 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos)
                     clips1 << child->info();
                 else if (cutPos < child->startPos())
                     clips2 << child->info();
-                else
-                    clipsCut << child->info();
+                else {
+		    clipsToCut << child;
+		}
             } else {
                 if (cutPos > child->endPos())
                     transitions1 << child->info();
                 else if (cutPos < child->startPos())
                     transitions2 << child->info();
-                else
-                    transitionsCut << child->info();
+                else {
+                    //transitionsCut << child->info();
+		    // Transition cut not implemented, leave it in first group...
+		    transitions1 << child->info();
+		}
             }
         }
-        if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty())))
+        if (clipsToCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) {
+	    delete command;
             return;
-        RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos);
+	}
+	// Process the cut
+	for (int i = 0; i < clipsToCut.count(); ++i) {
+	    ClipItem *clip = static_cast<ClipItem *>(clipsToCut.at(i));
+	    new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos, false, command);
+	    ClipItem *secondClip = cutClip(clip->info(), cutPos, true);
+	    clips1 << clip->info();
+	    clips2 << secondClip->info();
+	}
+	new GroupClipsCommand(this, clips1, transitions1, true, command);
+	new GroupClipsCommand(this, clips2, transitions2, true, command);
         m_commandStack->push(command);
     }
 }
 
-void CustomTrackView::slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> transitions2, GenTime cutPos, bool cut)
-{
-    if (cut) {
-        for (int i = 0; i < clipsCut.count(); ++i) {
-            ClipItem *clip = getClipItemAt(clipsCut.at(i).startPos.frames(m_document->fps()), clipsCut.at(i).track);
-            if (clip) {
-                ClipItem *clipBehind = cutClip(clipsCut.at(i), cutPos, true);
-                clips1 << clip->info();
-                if (clipBehind != NULL)
-                    clips2 << clipBehind->info();
-            }
-        }
-        /* TODO: cut transitionsCut
-         * For now just append them to group1 */
-        transitions1 << transitionsCut;
-        doGroupClips(clips1, transitions1, true);
-        doGroupClips(clips2, transitions2, true);
-    } else {
-        /* we might also just use clipsCut.at(0)->parentItem().
-         * Do this loop just in case something went wrong during cut */
-        for (int i = 0; i < clipsCut.count(); ++i) {
-            ClipItem *clip = getClipItemAt(cutPos.frames(m_document->fps()), clipsCut.at(i).track);
-            if (clip && clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
-                AbstractGroupItem *group = static_cast <AbstractGroupItem *>(clip->parentItem());
-                QList <QGraphicsItem *> children = group->childItems();
-                QList <ItemInfo> groupClips;
-                QList <ItemInfo> groupTrans;
-                for (int j = 0; j < children.count(); ++j) {
-                    if (children.at(j)->type() == AVWIDGET)
-                        groupClips << ((AbstractClipItem *)children.at(j))->info();
-                    else if (children.at(j)->type() == TRANSITIONWIDGET)
-                        groupTrans << ((AbstractClipItem *)children.at(j))->info();
-                }
-                doGroupClips(groupClips, groupTrans, false);
-                break;
-            }
-        }
-        for (int i = 0; i < clipsCut.count(); ++i)
-            cutClip(clipsCut.at(i), cutPos, false);
-        // TODO: uncut transitonsCut
-        doGroupClips(QList <ItemInfo>() << clips1 << clipsCut << clips2, QList <ItemInfo>() << transitions1 << transitionsCut << transitions2, true);
-    }
-}
-
-void CustomTrackView::groupClips(bool group)
+void CustomTrackView::groupClips(bool group, QList<QGraphicsItem *> itemList, QUndoCommand *command)
 {
-    QList<QGraphicsItem *> itemList = scene()->selectedItems();
+    if (itemList.isEmpty()) itemList = scene()->selectedItems();
     QList <ItemInfo> clipInfos;
     QList <ItemInfo> transitionInfos;
 
     // Expand groups
     int max = itemList.count();
-    for (int i = 0; i < max; i++) {
+    for (int i = 0; i < max; ++i) {
         if (itemList.at(i)->type() == GROUPWIDGET) {
             itemList += itemList.at(i)->childItems();
         }
     }
 
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
             if (!clip->isItemLocked()) clipInfos.append(clip->info());
@@ -4390,8 +4509,12 @@ void CustomTrackView::groupClips(bool group)
         }
     }
     if (clipInfos.count() > 0) {
-        GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
-        m_commandStack->push(command);
+	if (command) {
+	    new GroupClipsCommand(this, clipInfos, transitionInfos, group, command);
+	} else {
+	    GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group);
+	    m_commandStack->push(command);
+	}
     }
 }
 
@@ -4400,23 +4523,27 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo>
     resetSelectionGroup();
     m_scene->clearSelection();
     if (!group) {
-        for (int i = 0; i < clipInfos.count(); i++) {
+	// ungroup, find main group to destroy it...
+	for (int i = 0; i < clipInfos.count(); ++i) {
             ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
             if (clip == NULL) continue;
             if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
                 AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(clip->parentItem());
                 m_document->clipManager()->removeGroup(grp);
+		if (grp == m_selectionGroup) m_selectionGroup = NULL;
                 scene()->destroyItemGroup(grp);
             }
             clip->setFlag(QGraphicsItem::ItemIsMovable, true);
         }
-        for (int i = 0; i < transitionInfos.count(); i++) {
+        for (int i = 0; i < transitionInfos.count(); ++i) {
             Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
             if (tr == NULL) continue;
             if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) {
                 AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(tr->parentItem());
                 m_document->clipManager()->removeGroup(grp);
+		if (grp == m_selectionGroup) m_selectionGroup = NULL;
                 scene()->destroyItemGroup(grp);
+		grp = NULL;
             }
             tr->setFlag(QGraphicsItem::ItemIsMovable, true);
         }
@@ -4424,14 +4551,14 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo>
         return;
     }
     QList <QGraphicsItem *>list;
-    for (int i = 0; i < clipInfos.count(); i++) {
+    for (int i = 0; i < clipInfos.count(); ++i) {
         ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
         if (clip) {
 	    list.append(clip);
             //clip->setSelected(true);
         }
     }
-    for (int i = 0; i < transitionInfos.count(); i++) {
+    for (int i = 0; i < transitionInfos.count(); ++i) {
         Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
         if (clip) {
 	    list.append(clip);
@@ -4456,7 +4583,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
         emit displayMessage(i18n("Waiting for clip..."), InformationMessage);
         emit forceClipProcessing(clipId);
         qApp->processEvents();
-        for (int i = 0; i < 10; i++) {
+        for (int i = 0; i < 10; ++i) {
             if (baseclip->getProducer() == NULL) {
                 qApp->processEvents();
                 m_producerNotReady.wait(&m_mutex, 200);
@@ -4486,7 +4613,7 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
     m_document->updateClip(baseclip->getId());
     info.track = m_document->tracksCount() - info.track;
     m_document->renderer()->mltInsertClip(info, xml, item->getProducer(producerTrack), overwrite, push);
-    for (int i = 0; i < item->effectsCount(); i++) {
+    for (int i = 0; i < item->effectsCount(); ++i) {
         m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false);
     }
     setDocumentModified();
@@ -4525,7 +4652,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload)
             }
         }
     }
-    for (int i = 0; i < clipList.count(); i++)
+    for (int i = 0; i < clipList.count(); ++i)
         clipList.at(i)->refreshClip(true, true);
     m_document->renderer()->unlockService(tractor);
 }
@@ -4535,7 +4662,7 @@ ClipItem *CustomTrackView::getClipItemAtEnd(GenTime pos, int track)
     int framepos = (int)(pos.frames(m_document->fps()));
     QList<QGraphicsItem *> list = scene()->items(QPointF(framepos - 1, track * m_tracksHeight + m_tracksHeight / 2));
     ClipItem *clip = NULL;
-    for (int i = 0; i < list.size(); i++) {
+    for (int i = 0; i < list.size(); ++i) {
         if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == AVWIDGET) {
             ClipItem *test = static_cast <ClipItem *>(list.at(i));
@@ -4550,7 +4677,7 @@ ClipItem *CustomTrackView::getClipItemAtStart(GenTime pos, int track)
 {
     QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2));
     ClipItem *clip = NULL;
-    for (int i = 0; i < list.size(); i++) {
+    for (int i = 0; i < list.size(); ++i) {
         if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == AVWIDGET) {
             ClipItem *test = static_cast <ClipItem *>(list.at(i));
@@ -4566,7 +4693,7 @@ ClipItem *CustomTrackView::getClipItemAt(int pos, int track)
     const QPointF p(pos, track * m_tracksHeight + m_tracksHeight / 2);
     QList<QGraphicsItem *> list = scene()->items(p);
     ClipItem *clip = NULL;
-    for (int i = 0; i < list.size(); i++) {
+    for (int i = 0; i < list.size(); ++i) {
         if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == AVWIDGET) {
             clip = static_cast <ClipItem *>(list.at(i));
@@ -4594,7 +4721,7 @@ Transition *CustomTrackView::getTransitionItemAt(int pos, int track)
     const QPointF p(pos, track * m_tracksHeight + Transition::itemOffset() + 1);
     QList<QGraphicsItem *> list = scene()->items(p);
     Transition *clip = NULL;
-    for (int i = 0; i < list.size(); i++) {
+    for (int i = 0; i < list.size(); ++i) {
         if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == TRANSITIONWIDGET) {
             clip = static_cast <Transition *>(list.at(i));
@@ -4615,7 +4742,7 @@ Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track)
     const QPointF p(framepos - 1, track * m_tracksHeight + Transition::itemOffset() + 1);
     QList<QGraphicsItem *> list = scene()->items(p);
     Transition *clip = NULL;
-    for (int i = 0; i < list.size(); i++) {
+    for (int i = 0; i < list.size(); ++i) {
         if (!list.at(i)->isEnabled()) continue;
         if (list.at(i)->type() == TRANSITIONWIDGET) {
             Transition *test = static_cast <Transition *>(list.at(i));
@@ -4708,12 +4835,12 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
     // Group Items
     resetSelectionGroup();
     m_scene->clearSelection();
-
+    m_selectionMutex.lock();
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
 
     m_document->renderer()->blockSignals(true);
-    for (int i = 0; i < startClip.count(); i++) {
+    for (int i = 0; i < startClip.count(); ++i) {
         if (reverseMove) {
             startClip[i].startPos = startClip.at(i).startPos - offset;
             startClip[i].track = startClip.at(i).track - trackOffset;
@@ -4729,7 +4856,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
             m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
         } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25);
     }
-    for (int i = 0; i < startTransition.count(); i++) {
+    for (int i = 0; i < startTransition.count(); ++i) {
         if (reverseMove) {
             startTransition[i].startPos = startTransition.at(i).startPos - offset;
             startTransition[i].track = startTransition.at(i).track - trackOffset;
@@ -4758,7 +4885,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
 	QList <AbstractGroupItem*> groupList;
         // Expand groups
         int max = children.count();
-        for (int i = 0; i < max; i++) {
+        for (int i = 0; i < max; ++i) {
             if (children.at(i)->type() == GROUPWIDGET) {
                 children += children.at(i)->childItems();
                 //AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(children.at(i));
@@ -4768,11 +4895,11 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
 		AbstractGroupItem *group = (AbstractGroupItem*) children.at(i);
 		if (!groupList.contains(group)) groupList.append(group);
                 children.removeAll(children.at(i));
-                i--;
+                --i;
             }
         }
 
-        for (int i = 0; i < children.count(); i++) {
+        for (int i = 0; i < children.count(); ++i) {
             // re-add items in correct place
             if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue;
             AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
@@ -4790,7 +4917,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
                 int trackProducer = info.track;
                 info.track = m_document->tracksCount() - info.track;
                 m_document->renderer()->mltInsertClip(info, clip->xml(), clip->getProducer(trackProducer));
-                for (int i = 0; i < clip->effectsCount(); i++) {
+                for (int i = 0; i < clip->effectsCount(); ++i) {
                     m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(clip->effect(i)), false);
                 }
             } else if (item->type() == TRANSITIONWIDGET) {
@@ -4806,9 +4933,9 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
                 m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
             }
         }
-
+	m_selectionMutex.unlock();
         resetSelectionGroup(false);
-	for (int i = 0; i < groupList.count(); i++) {
+	for (int i = 0; i < groupList.count(); ++i) {
 	    rebuildGroup(groupList.at(i));
 	}
 
@@ -5094,11 +5221,22 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI
         } else {
             // Check transition keyframes
             QDomElement old = transition->toXML();
-            if (transition->updateKeyframes()) {
+            if (transition->updateKeyframes(oldInfo.cropDuration.frames(m_document->fps()) - 1)) {
                 QDomElement xml = transition->toXML();
                 m_document->renderer()->mltUpdateTransition(xml.attribute("tag"), xml.attribute("tag"), xml.attribute("transition_btrack").toInt(), m_document->tracksCount() - xml.attribute("transition_atrack").toInt(), transition->startPos(), transition->endPos(), xml);
                 new EditTransitionCommand(this, transition->track(), transition->startPos(), old, xml, false, command);
             }
+            ItemInfo info = transition->info();
+	    QPoint p;
+	    ClipItem *transitionClip = getClipItemAt(info.startPos, info.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());
+	    }
+	    emit transitionItemSelected(transition, getPreviousVideoTrack(info.track), p, true);
             new MoveTransitionCommand(this, oldInfo, info, false, command);
         }
     }
@@ -5167,7 +5305,7 @@ void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool
         if (effectPos != -1) {
             QDomElement effect = item->getEffectAtIndex(effectPos);
             int max = item->cropDuration().frames(m_document->fps());
-            int end = max + item->cropStart().frames(m_document->fps());
+            int end = max + item->cropStart().frames(m_document->fps()) - 1;
             if (start > max) {
                 // Make sure the fade effect is not longer than the clip
                 item->setFadeOut(max);
@@ -5188,7 +5326,7 @@ void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool
         if (effectPos != -1) {
             QDomElement effect = item->getEffectAtIndex(effectPos);
             int max = item->cropDuration().frames(m_document->fps());
-            int end = max + item->cropStart().frames(m_document->fps());
+            int end = max + item->cropStart().frames(m_document->fps()) - 1;
             if (start > max) {
                 // Make sure the fade effect is not longer than the clip
                 item->setFadeOut(max);
@@ -5234,7 +5372,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList <GenTim
     QList <GenTime> snaps;
     if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration());
     QList<QGraphicsItem *> itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i) == selected) continue;
         if (skipSelectedItems && itemList.at(i)->isSelected()) continue;
         if (itemList.at(i)->type() == AVWIDGET) {
@@ -5285,7 +5423,7 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList <GenTim
     }
 
     // add guides
-    for (int i = 0; i < m_guides.count(); i++) {
+    for (int i = 0; i < m_guides.count(); ++i) {
         snaps.append(m_guides.at(i)->position());
         if (!offsetList.isEmpty()) {
             for (int j = 0; j < offsetList.size(); j++) {
@@ -5351,13 +5489,15 @@ void CustomTrackView::slotAddClipExtraData(const QString &id, const QString &key
 
 void CustomTrackView::slotAddClipMarker(const QString &id, QList <CommentedTime> newMarkers, QUndoCommand *groupCommand)
 {
-    QUndoCommand *subCommand = NULL;
+    DocClipBase *base = m_document->clipManager()->getClipById(id);
+    if (!base) return;
+    QUndoCommand *subCommand = NULL;    
     if (newMarkers.count() > 1 && groupCommand == NULL) {
 	subCommand = new QUndoCommand;
 	subCommand->setText("Add markers");
     }
-    for (int i = 0; i < newMarkers.count(); i++) {
-	CommentedTime oldMarker = m_document->clipManager()->getClipById(id)->markerAt(newMarkers.at(i).time());
+    for (int i = 0; i < newMarkers.count(); ++i) {
+	CommentedTime oldMarker = base->markerAt(newMarkers.at(i).time());
 	if (oldMarker == CommentedTime()) {
 	    oldMarker = newMarkers.at(i);
 	    oldMarker.setMarkerType(-1);
@@ -5388,6 +5528,7 @@ void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString
 void CustomTrackView::slotDeleteAllClipMarkers(const QString &id)
 {
     DocClipBase *base = m_document->clipManager()->getClipById(id);
+    if (!base) return;
     QList <CommentedTime> markers = base->commentedSnapMarkers();
 
     if (markers.isEmpty()) {
@@ -5397,7 +5538,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id)
     QUndoCommand *deleteMarkers = new QUndoCommand();
     deleteMarkers->setText("Delete clip markers");
 
-    for (int i = 0; i < markers.size(); i++) {
+    for (int i = 0; i < markers.size(); ++i) {
 	CommentedTime oldMarker = markers.at(i);
 	CommentedTime marker = oldMarker;
 	marker.setMarkerType(-1);
@@ -5409,6 +5550,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id)
 void CustomTrackView::slotSaveClipMarkers(const QString &id)
 {
     DocClipBase *base = m_document->clipManager()->getClipById(id);
+    if (!base) return;
     QList < CommentedTime > markers = base->commentedSnapMarkers();
     if (!markers.isEmpty()) {
 	// Set  up categories
@@ -5422,14 +5564,14 @@ void CustomTrackView::slotSaveClipMarkers(const QString &id)
 	KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
 	fd.setMode(KFile::File);
 	fd.setOperationMode(KFileDialog::Saving);
-	fd.exec();
+	if (fd.exec() != QDialog::Accepted) return;
 	QString url = fd.selectedFile();
 	//QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers"));
 	if (url.isEmpty()) return;
 
 	QString data;
 	int category = cbox->currentIndex() - 1;
-	for (int i = 0; i < markers.count(); i++) {
+	for (int i = 0; i < markers.count(); ++i) {
 	    if (category >= 0) {
 		// Save only the markers in selected category
 		if (markers.at(i).markerType() != category) continue;
@@ -5464,7 +5606,7 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id)
     KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox);
     fd.setMode(KFile::File);
     fd.setOperationMode(KFileDialog::Opening);
-    fd.exec();
+    if (fd.exec() != QDialog::Accepted) return;
     QString url = fd.selectedFile();
 	
     //KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Load marker file"));
@@ -5527,7 +5669,7 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id)
     else delete command;
 }
 
-void CustomTrackView::addMarker(const QString &id, const CommentedTime marker)
+void CustomTrackView::addMarker(const QString &id, const CommentedTime &marker)
 {
     DocClipBase *base = m_document->clipManager()->getClipById(id);
     if (base == NULL) return;
@@ -5550,7 +5692,7 @@ void CustomTrackView::addData(const QString &id, const QString &key, const QStri
 
 int CustomTrackView::hasGuide(int pos, int offset)
 {
-    for (int i = 0; i < m_guides.count(); i++) {
+    for (int i = 0; i < m_guides.count(); ++i) {
         int guidePos = m_guides.at(i)->position().frames(m_document->fps());
         if (qAbs(guidePos - pos) <= offset) return guidePos;
         else if (guidePos > pos) return -1;
@@ -5563,7 +5705,7 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
     QAction *act;
     goMenu->clear();
     double fps = m_document->fps();
-    for (int i = 0; i < m_guides.count(); i++) {
+    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()));
     }
@@ -5572,20 +5714,10 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
 
 void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const QString &comment)
 {
-    if (oldPos > GenTime() && pos > GenTime()) {
-        // move guide
-        for (int i = 0; i < m_guides.count(); i++) {
-            if (m_guides.at(i)->position() == oldPos) {
-                Guide *item = m_guides.at(i);
-                item->updateGuide(pos, comment);
-                break;
-            }
-        }
-    } else if (pos > GenTime()) addGuide(pos, comment);
-    else {
-        // remove guide
-        bool found = false;
-        for (int i = 0; i < m_guides.count(); i++) {
+    if (comment.isEmpty() && pos < GenTime()) {
+	// Delete guide
+	bool found = false;
+        for (int i = 0; i < m_guides.count(); ++i) {
             if (m_guides.at(i)->position() == oldPos) {
                 delete m_guides.takeAt(i);
                 found = true;
@@ -5594,13 +5726,24 @@ void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const
         }
         if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage);
     }
+    
+    else if (oldPos >= GenTime()) {
+        // move guide
+        for (int i = 0; i < m_guides.count(); ++i) {
+            if (m_guides.at(i)->position() == oldPos) {
+                Guide *item = m_guides.at(i);
+                item->updateGuide(pos, comment);
+                break;
+            }
+        }
+    } else addGuide(pos, comment);
     qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
     m_document->syncGuides(m_guides);
 }
 
 bool CustomTrackView::addGuide(const GenTime &pos, const QString &comment)
 {
-    for (int i = 0; i < m_guides.count(); i++) {
+    for (int i = 0; i < m_guides.count(); ++i) {
         if (m_guides.at(i)->position() == pos) {
             emit displayMessage(i18n("A guide already exists at position %1", m_document->timecode().getTimecodeFromFrames(pos.frames(m_document->fps()))), ErrorMessage);
             return false;
@@ -5641,7 +5784,7 @@ void CustomTrackView::slotEditGuide(int guidePos)
     if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps());
     else pos = GenTime(guidePos, m_document->fps());
     bool found = false;
-    for (int i = 0; i < m_guides.count(); i++) {
+    for (int i = 0; i < m_guides.count(); ++i) {
         if (m_guides.at(i)->position() == pos) {
             slotEditGuide(m_guides.at(i)->info());
             found = true;
@@ -5681,9 +5824,9 @@ void CustomTrackView::slotDeleteGuide(int guidePos)
     if (guidePos == -1) pos = GenTime(m_cursorPos, m_document->fps());
     else pos = GenTime(guidePos, m_document->fps());
     bool found = false;
-    for (int i = 0; i < m_guides.count(); i++) {
+    for (int i = 0; i < m_guides.count(); ++i) {
         if (m_guides.at(i)->position() == pos) {
-            EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true);
+            EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true);
             m_commandStack->push(command);
             found = true;
             break;
@@ -5696,7 +5839,7 @@ void CustomTrackView::slotDeleteGuide(int guidePos)
 void CustomTrackView::slotDeleteTimeLineGuide()
 {
     if (m_dragGuide == NULL) return;
-    EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(), QString(), true);
+    EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(-1), QString(), true);
     m_commandStack->push(command);
 }
 
@@ -5705,8 +5848,8 @@ void CustomTrackView::slotDeleteAllGuides()
 {
     QUndoCommand *deleteAll = new QUndoCommand();
     deleteAll->setText("Delete all guides");
-    for (int i = 0; i < m_guides.count(); i++) {
-        new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll);
+    for (int i = 0; i < m_guides.count(); ++i) {
+        new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true, deleteAll);
     }
     m_commandStack->push(deleteAll);
 }
@@ -5737,11 +5880,9 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale)
     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 - 1);
-        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);
+	m_cursorLine->setLine(0, 0, 0, newHeight - 1);
+        for (int i = 0; i < m_guides.count(); ++i) {
+            m_guides.at(i)->setLine(0, 0, 0, newHeight - 1);
         }
         setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
     }
@@ -5760,7 +5901,7 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale)
 void CustomTrackView::slotRefreshGuides()
 {
     if (KdenliveSettings::showmarkers()) {
-        for (int i = 0; i < m_guides.count(); i++)
+        for (int i = 0; i < m_guides.count(); ++i)
             m_guides.at(i)->update();
     }
 }
@@ -5779,7 +5920,7 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect)
     int maxTrack = m_document->tracksCount();
     QColor lockedColor = palette().button().color();
     QColor audioColor = palette().alternateBase().color();
-    for (int i = 0; i < maxTrack; i++) {
+    for (int i = 0; i < maxTrack; ++i) {
         TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1);
         if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) {
             const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1);
@@ -5841,7 +5982,7 @@ void CustomTrackView::initSearchStrings()
 {
     m_searchPoints.clear();
     QList<QGraphicsItem *> itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         // parse all clip names
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
@@ -5855,7 +5996,7 @@ void CustomTrackView::initSearchStrings()
     }
 
     // add guides
-    for (int i = 0; i < m_guides.count(); i++)
+    for (int i = 0; i < m_guides.count(); ++i)
         m_searchPoints.append(m_guides.at(i)->info());
 
     qSort(m_searchPoints);
@@ -5871,7 +6012,7 @@ QList<ItemInfo> CustomTrackView::findId(const QString &clipId)
 {
     QList<ItemInfo> matchingInfo;
     QList<QGraphicsItem *> itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = (ClipItem *)itemList.at(i);
             if (item->clipProducer() == clipId)
@@ -5890,7 +6031,7 @@ void CustomTrackView::copyClip()
         emit displayMessage(i18n("Select a clip before copying"), ErrorMessage);
         return;
     }
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(itemList.at(i));
             ClipItem *clone = clip->clone(clip->info());
@@ -5920,7 +6061,7 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const
     }
     QRectF rect((double) info.startPos.frames(m_document->fps()), (double)(info.track * m_tracksHeight + 1 + offset), (double)(info.endPos - info.startPos).frames(m_document->fps()), (double) height);
     QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
-    for (int i = 0; i < collisions.count(); i++) {
+    for (int i = 0; i < collisions.count(); ++i) {
         if (collisions.at(i)->type() == type) {
             return false;
         }
@@ -5931,12 +6072,12 @@ bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const
 bool CustomTrackView::canBePastedTo(QList <ItemInfo> infoList, int type) const
 {
     QPainterPath path;
-    for (int i = 0; i < infoList.count(); i++) {
+    for (int i = 0; i < infoList.count(); ++i) {
         const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1));
         path.addRect(rect);
     }
     QList<QGraphicsItem *> collisions = scene()->items(path);
-    for (int i = 0; i < collisions.count(); i++) {
+    for (int i = 0; i < collisions.count(); ++i) {
         if (collisions.at(i)->type() == type) return false;
     }
     return true;
@@ -5944,7 +6085,7 @@ bool CustomTrackView::canBePastedTo(QList <ItemInfo> infoList, int type) const
 
 bool CustomTrackView::canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const
 {
-    for (int i = 0; i < items.count(); i++) {
+    for (int i = 0; i < items.count(); ++i) {
         ItemInfo info = items.at(i)->info();
         info.startPos += offset;
         info.endPos += offset;
@@ -5959,7 +6100,7 @@ bool CustomTrackView::canBeMoved(QList<AbstractClipItem *> items, GenTime offset
     QPainterPath movePath;
     movePath.moveTo(0, 0);
 
-    for (int i = 0; i < items.count(); i++) {
+    for (int i = 0; i < items.count(); ++i) {
         ItemInfo info = items.at(i)->info();
         info.startPos = info.startPos + offset;
         info.endPos = info.endPos + offset;
@@ -5972,7 +6113,7 @@ bool CustomTrackView::canBeMoved(QList<AbstractClipItem *> items, GenTime offset
         movePath.addRect(rect);
     }
     QList<QGraphicsItem *> collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect);
-    for (int i = 0; i < collisions.count(); i++) {
+    for (int i = 0; i < collisions.count(); ++i) {
         if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast <AbstractClipItem *>(collisions.at(i)))) {
             kDebug() << "  ////////////   CLIP COLLISION, MOVE NOT ALLOWED";
             return false;
@@ -6011,7 +6152,7 @@ void CustomTrackView::pasteClip()
     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++) {
+    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();
@@ -6030,7 +6171,7 @@ void CustomTrackView::pasteClip()
     pasteClips->setText("Paste clips");
     new RefreshMonitorCommand(this, false, true, pasteClips);
 
-    for (int i = 0; i < m_copiedItems.count(); i++) {
+    for (int i = 0; i < m_copiedItems.count(); ++i) {
         // parse all clip names
         if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(m_copiedItems.at(i));
@@ -6119,7 +6260,7 @@ void CustomTrackView::adjustKeyfames(GenTime oldstart, GenTime newstart, GenTime
     int max = (newstart + duration).frames(m_document->fps());
     QLocale locale;
     QDomNodeList params = xml.elementsByTagName("parameter");
-    for (int i = 0; i < params.count(); i++) {
+    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");
@@ -6145,7 +6286,7 @@ ClipItem *CustomTrackView::getClipUnderCursor() const
 {
     QRectF rect((double) m_cursorPos, 0.0, 1.0, (double)(m_tracksHeight * m_document->tracksCount()));
     QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
-    for (int i = 0; i < collisions.count(); i++) {
+    for (int i = 0; i < collisions.count(); ++i) {
         if (collisions.at(i)->type() == AVWIDGET) {
 	    ClipItem *clip = static_cast < ClipItem *>(collisions.at(i));
 	    if (!clip->isItemLocked()) return clip;
@@ -6182,7 +6323,7 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con
         // remove all items in the list that are not clips
         for (int i = 0; i < clips.count();) {
             if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i);
-            else i++;
+            else ++i;
         }
         if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0));
         for (int i = 0; i < clips.count(); ++i) {
@@ -6268,7 +6409,7 @@ void CustomTrackView::slotUpdateAllThumbs()
     //if (itemList.isEmpty()) return;
     ClipItem *item;
     const QString thumbBase = m_document->projectFolder().path() + "/thumbs/";
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             item = static_cast <ClipItem *>(itemList.at(i));
             if (item && item->isEnabled() && item->clipType() != COLOR && item->clipType() != AUDIO) {
@@ -6308,7 +6449,7 @@ void CustomTrackView::saveThumbnails()
     QList<QGraphicsItem *> itemList = items();
     ClipItem *item;
     QString thumbBase = m_document->projectFolder().path() + "/thumbs/";
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == AVWIDGET) {
             item = static_cast <ClipItem *>(itemList.at(i));
             if (item->clipType() != COLOR) {
@@ -6410,14 +6551,19 @@ void CustomTrackView::slotConfigTracks(int ix)
 void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
 {
     if (m_document->tracksCount() < 2) return;
-    double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
+    // Clear effect stack
+    clearSelection();
+    emit transitionItemSelected(NULL);
+    
+    double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;    
     QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1);
     QList<QGraphicsItem *> selection = m_scene->items(r);
     QUndoCommand *deleteTrack = new QUndoCommand();
     deleteTrack->setText("Delete track");
+    new RefreshMonitorCommand(this, false, true, deleteTrack);
 
     // Delete all clips in selected track
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *item =  static_cast <ClipItem *>(selection.at(i));
             new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, false, true, deleteTrack);
@@ -6435,6 +6581,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
     }
 
     new AddTrackCommand(this, ix, trackinfo, false, deleteTrack);
+    new RefreshMonitorCommand(this, true, false, deleteTrack);
     m_commandStack->push(deleteTrack);
 }
 
@@ -6474,7 +6621,7 @@ void CustomTrackView::getClipAvailableSpace(AbstractClipItem *item, GenTime &min
     QList<QGraphicsItem *> selection;
     selection = m_scene->items(0, item->track() * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2);
     selection.removeAll(item);
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         AbstractClipItem *clip = static_cast <AbstractClipItem *>(selection.at(i));
         if (clip && clip->type() == AVWIDGET) {
             if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos();
@@ -6490,7 +6637,7 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim
     QList<QGraphicsItem *> selection;
     selection = m_scene->items(0, (item->track() + 1) * m_tracksHeight, sceneRect().width(), 2);
     selection.removeAll(item);
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         AbstractClipItem *clip = static_cast <AbstractClipItem *>(selection.at(i));
         if (clip && clip->type() == TRANSITIONWIDGET) {
             if (clip->endPos() <= item->startPos() && clip->endPos() > minimum) minimum = clip->endPos();
@@ -6501,7 +6648,7 @@ void CustomTrackView::getTransitionAvailableSpace(AbstractClipItem *item, GenTim
 
 void CustomTrackView::loadGroups(const QDomNodeList &groups)
 {
-    for (int i = 0; i < groups.count(); i++) {
+    for (int i = 0; i < groups.count(); ++i) {
         QDomNodeList children = groups.at(i).childNodes();
         scene()->clearSelection();
 	QList <QGraphicsItem*>list;
@@ -6531,7 +6678,7 @@ void CustomTrackView::splitAudio()
     }
     QUndoCommand *splitCommand = new QUndoCommand();
     splitCommand->setText(i18n("Split audio"));
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
             if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
@@ -6761,7 +6908,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef
             kDebug() << "//SOMETHING IS WRONG WITH CLP GRP";
             return;
         }
-        for (int i = 0; i < children.count(); i++) {
+        for (int i = 0; i < children.count(); ++i) {
             if (children.at(i) != clip) {
                 ClipItem *clp = static_cast <ClipItem *>(children.at(i));
                 ItemInfo info = clip->info();
@@ -6792,6 +6939,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef
         }
         clip->setFlag(QGraphicsItem::ItemIsMovable, true);
         m_document->clipManager()->removeGroup(grp);
+	if (grp == m_selectionGroup) m_selectionGroup = NULL;
         scene()->destroyItemGroup(grp);
     }
 }
@@ -6806,7 +6954,7 @@ void CustomTrackView::setVideoOnly()
     }
     QUndoCommand *videoCommand = new QUndoCommand();
     videoCommand->setText(i18n("Video only"));
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
             if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
@@ -6831,7 +6979,7 @@ void CustomTrackView::setAudioOnly()
     }
     QUndoCommand *videoCommand = new QUndoCommand();
     videoCommand->setText(i18n("Audio only"));
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
             if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
@@ -6856,7 +7004,7 @@ void CustomTrackView::setAudioAndVideo()
     }
     QUndoCommand *videoCommand = new QUndoCommand();
     videoCommand->setText(i18n("Audio and Video"));
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
             if (clip->clipType() == AV || clip->clipType() == PLAYLIST) {
@@ -6913,22 +7061,47 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video
 
 void CustomTrackView::updateClipTypeActions(ClipItem *clip)
 {
+    bool hasAudio;
+    bool hasAV;
     if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) {
         m_clipTypeGroup->setEnabled(false);
+	hasAudio = clip != NULL && clip->clipType() == AUDIO;
+	hasAV = false;
     } else {
+	switch (clip->clipType()) {
+	  case AV:
+	  case PLAYLIST:
+	      hasAudio = true;
+	      hasAV = true;
+	      break;
+	  case AUDIO:
+	      hasAudio = true;
+	      hasAV = false;
+	      break;
+	  default:
+	      hasAudio = false;
+	      hasAV = false;
+	}
         m_clipTypeGroup->setEnabled(true);
         QList <QAction *> actions = m_clipTypeGroup->actions();
         QString lookup;
         if (clip->isAudioOnly()) lookup = "clip_audio_only";
         else if (clip->isVideoOnly()) lookup = "clip_video_only";
         else  lookup = "clip_audio_and_video";
-        for (int i = 0; i < actions.count(); i++) {
+        for (int i = 0; i < actions.count(); ++i) {
             if (actions.at(i)->data().toString() == lookup) {
                 actions.at(i)->setChecked(true);
                 break;
             }
         }
     }
+    
+    for (int i = 0; i < m_audioActions.count(); ++i) {
+	m_audioActions.at(i)->setEnabled(hasAudio);
+    }
+    for (int i = 0; i < m_avActions.count(); ++i) {
+	m_avActions.at(i)->setEnabled(hasAV);
+    }
 }
 
 void CustomTrackView::slotGoToMarker(QAction *action)
@@ -6943,7 +7116,7 @@ void CustomTrackView::reloadTransitionLumas()
     QString lumaFiles;
     QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
     QDomNodeList params = lumaTransition.elementsByTagName("parameter");
-    for (int i = 0; i < params.count(); i++) {
+    for (int i = 0; i < params.count(); ++i) {
         QDomElement e = params.item(i).toElement();
         if (e.attribute("tag") == "resource") {
             lumaNames = e.attribute("paramlistdisplay");
@@ -6955,13 +7128,13 @@ void CustomTrackView::reloadTransitionLumas()
     QList<QGraphicsItem *> itemList = items();
     Transition *transitionitem;
     QDomElement transitionXml;
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             transitionitem = static_cast <Transition*>(itemList.at(i));
             transitionXml = transitionitem->toXML();
             if (transitionXml.attribute("id") == "luma" && transitionXml.attribute("tag") == "luma") {
                 QDomNodeList params = transitionXml.elementsByTagName("parameter");
-                for (int i = 0; i < params.count(); i++) {
+                for (int i = 0; i < params.count(); ++i) {
                     QDomElement e = params.item(i).toElement();
                     if (e.attribute("tag") == "resource") {
                         e.setAttribute("paramlistdisplay", lumaNames);
@@ -6972,7 +7145,7 @@ void CustomTrackView::reloadTransitionLumas()
             }
             if (transitionXml.attribute("id") == "composite" && transitionXml.attribute("tag") == "composite") {
                 QDomNodeList params = transitionXml.elementsByTagName("parameter");
-                for (int i = 0; i < params.count(); i++) {
+                for (int i = 0; i < params.count(); ++i) {
                     QDomElement e = params.item(i).toElement();
                     if (e.attribute("tag") == "luma") {
                         e.setAttribute("paramlistdisplay", lumaNames);
@@ -6998,11 +7171,11 @@ void CustomTrackView::updateProjectFps()
     scene()->clearSelection();
     m_dragItem = NULL;
     QList<QGraphicsItem *> itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         // remove all items and re-add them one by one
         if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i));
     }
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) {
             AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
             clip->updateFps(m_document->fps());
@@ -7019,6 +7192,7 @@ void CustomTrackView::updateProjectFps()
             }
             m_document->clipManager()->removeGroup(grp);
             m_scene->addItem(grp);
+	    if (grp == m_selectionGroup) m_selectionGroup = NULL;
             scene()->destroyItemGroup(grp);
             scene()->clearSelection();
             /*for (int j = 0; j < children.count(); j++) {
@@ -7066,7 +7240,7 @@ QStringList CustomTrackView::selectedClips() const
 {
     QStringList clipIds;
     QList<QGraphicsItem *> selection = m_scene->selectedItems();
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *item = (ClipItem *)selection.at(i);
             clipIds << item->clipProducer();
@@ -7079,7 +7253,7 @@ QList<ClipItem *> CustomTrackView::selectedClipItems() const
 {
     QList<ClipItem *> clips;
     QList<QGraphicsItem *> selection = m_scene->selectedItems();
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             clips.append((ClipItem *)selection.at(i));
         }
@@ -7104,7 +7278,7 @@ void CustomTrackView::slotSelectClipsInTrack()
     QList<QGraphicsItem *> selection = m_scene->items(rect);
     m_scene->clearSelection();
     QList<QGraphicsItem *> list;
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
 	    list.append(selection.at(i));
         }
@@ -7129,7 +7303,7 @@ void CustomTrackView::selectClip(bool add, bool group, int track, int pos)
     QList<QGraphicsItem *> selection = m_scene->items(rect);
     resetSelectionGroup(group);
     if (!group) m_scene->clearSelection();
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             selection.at(i)->setSelected(add);
             break;
@@ -7144,7 +7318,7 @@ void CustomTrackView::selectTransition(bool add, bool group)
     QList<QGraphicsItem *> selection = m_scene->items(rect);
     resetSelectionGroup(group);
     if (!group) m_scene->clearSelection();
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == TRANSITIONWIDGET) {
             selection.at(i)->setSelected(add);
             break;
@@ -7159,7 +7333,7 @@ QStringList CustomTrackView::extractTransitionsLumas()
     QList<QGraphicsItem *> itemList = items();
     Transition *transitionitem;
     QDomElement transitionXml;
-    for (int i = 0; i < itemList.count(); i++) {
+    for (int i = 0; i < itemList.count(); ++i) {
         if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             transitionitem = static_cast <Transition*>(itemList.at(i));
             transitionXml = transitionitem->toXML();
@@ -7186,7 +7360,7 @@ void CustomTrackView::checkTrackSequence(int track)
     QList<QGraphicsItem *> selection = m_scene->items(rect);
     QList <int> timelineList;
     timelineList.append(0);
-    for (int i = 0; i < selection.count(); i++) {
+    for (int i = 0; i < selection.count(); ++i) {
         if (selection.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
             int start = clip->startPos().frames(m_document->fps());
@@ -7225,6 +7399,7 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
 
 void CustomTrackView::clearSelection(bool emitInfo)
 {
+    if (m_dragItem) m_dragItem->setSelected(false);
     resetSelectionGroup();
     scene()->clearSelection();
     m_dragItem = NULL;
@@ -7333,7 +7508,7 @@ bool CustomTrackView::hasAudio(int track) const
     QRectF rect(0, (double)(track * m_tracksHeight + 1), (double) sceneRect().width(), (double)(m_tracksHeight - 1));
     QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
     QGraphicsItem *item;
-    for (int i = 0; i < collisions.count(); i++) {
+    for (int i = 0; i < collisions.count(); ++i) {
         item = collisions.at(i);
         if (!item->isEnabled()) continue;
         if (item->type() == AVWIDGET) {
@@ -7400,7 +7575,7 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect)
     if (effect.hasAttribute("out")) parameters.addParam("out", effect.attribute("out"));
     if (effect.attribute("id") == "region") {
 	QDomNodeList subeffects = effect.elementsByTagName("effect");
-	for (int i = 0; i < subeffects.count(); i++) {
+	for (int i = 0; i < subeffects.count(); ++i) {
 	    QDomElement subeffect = subeffects.at(i).toElement();
 	    int subeffectix = subeffect.attribute("region_ix").toInt();
 	    parameters.addParam(QString("filter%1").arg(subeffectix), subeffect.attribute("id"));
@@ -7421,7 +7596,7 @@ EffectsParameterList CustomTrackView::getEffectArgs(const QDomElement &effect)
 void CustomTrackView::adjustEffectParameters(EffectsParameterList &parameters, QDomNodeList params, MltVideoProfile profile, const QString &prefix)
 {
   QLocale locale;
-  for (int i = 0; i < params.count(); i++) {
+  for (int i = 0; i < params.count(); ++i) {
         QDomElement e = params.item(i).toElement();
 	QString paramname = prefix + e.attribute("name");
         if (e.attribute("type") == "geometry" && !e.hasAttribute("fixed")) {
@@ -7460,7 +7635,7 @@ void CustomTrackView::adjustEffectParameters(EffectsParameterList &parameters, Q
             QTextStream txtNeu(&neu);
             if (values.size() > 0)
                 txtNeu << (int)values[0].toDouble();
-            for (int i = 0; i < separators.size() && i + 1 < values.size(); i++) {
+            for (int i = 0; i < separators.size() && i + 1 < values.size(); ++i) {
                 txtNeu << separators[i];
                 txtNeu << (int)(values[i+1].toDouble());
             }
@@ -7569,7 +7744,7 @@ void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoComma
 {
     QMap<int, QDomElement> effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo);
 
-    if (effects.count()) {
+    if (!effects.isEmpty()) {
         QMap<int, QDomElement>::const_iterator i = effects.constBegin();
         while (i != effects.constEnd()) {
             new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effect(i.key()), i.value().attribute("kdenlive_ix").toInt(), true, true, command);
@@ -7614,7 +7789,7 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type)
 	}
 	// Make sure there is no collision
 	QList<QGraphicsItem *> children = m_selectionGroup->childItems();
-	for (int i = 0; i < children.count(); i++) {
+	for (int i = 0; i < children.count(); ++i) {
 	    if (children.at(i)->type() == AVWIDGET) {
 		item = (ClipItem*) children.at(i);
 		break;
@@ -7697,3 +7872,5 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type)
     delete d;
 }
 
+
+#include "customtrackview.moc"