X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=c0df9e9a7d0b7f4ba1451c81eaf78553e403144f;hb=2b46b701a1a20a5daa519e6201e051fabca198ad;hp=2bdb7f512c1af4217fb39ff7097b34ec0f6bc0fc;hpb=0053daab28e4b2010b9484cd42f2e9a0cb5bd2e8;p=kdenlive

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index 2bdb7f51..c0df9e9a 100644
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -63,6 +63,7 @@
 #include <KUrl>
 #include <KIcon>
 #include <KCursor>
+#include <KColorScheme>
 
 #include <QMouseEvent>
 #include <QStylePainter>
@@ -84,7 +85,6 @@
 CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) :
         QGraphicsView(projectscene, parent),
         m_tracksHeight(KdenliveSettings::trackheight()),
-        m_selectedTrack(0),
         m_projectDuration(0),
         m_cursorPos(0),
         m_document(doc),
@@ -98,7 +98,6 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
         m_animation(NULL),
         m_clickPoint(),
         m_autoScroll(KdenliveSettings::autoscroll()),
-        m_changeSpeedAction(NULL),
         m_pasteEffectsAction(NULL),
         m_ungroupAction(NULL),
         m_scrollOffset(0),
@@ -114,6 +113,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     else m_commandStack = NULL;
     setMouseTracking(true);
     setAcceptDrops(true);
+    KdenliveSettings::setTrackheight(m_tracksHeight);
     m_animationTimer = new QTimeLine(800);
     m_animationTimer->setFrameRange(0, 5);
     m_animationTimer->setUpdateInterval(100);
@@ -135,15 +135,21 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscen
     KIcon spacerIcon("kdenlive-spacer-tool");
     m_spacerCursor = QCursor(spacerIcon.pixmap(22, 22));
     verticalScrollBar()->setTracking(true);
-    connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides()));
+    // Line below was supposed to scroll guides label with scrollbar, not implemented yet
+    //connect(verticalScrollBar(), SIGNAL(valueChanged(int)), this, SLOT(slotRefreshGuides()));
     connect(&m_scrollTimer, SIGNAL(timeout()), this, SLOT(slotCheckMouseScrolling()));
     m_scrollTimer.setInterval(100);
     m_scrollTimer.setSingleShot(true);
+
+    connect(&m_thumbsTimer, SIGNAL(timeout()), this, SLOT(slotFetchNextThumbs()));
+    m_thumbsTimer.setInterval(500);
+    m_thumbsTimer.setSingleShot(true);
 }
 
 CustomTrackView::~CustomTrackView()
 {
     qDeleteAll(m_guides);
+    m_waitingThumbs.clear();
 }
 
 void CustomTrackView::setDocumentModified()
@@ -158,8 +164,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     m_clipTypeGroup = clipTypeGroup;
     QList <QAction *> list = m_timelineContextClipMenu->actions();
     for (int i = 0; i < list.count(); i++) {
-        if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i);
-        else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(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);
     }
 
@@ -171,6 +176,15 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
             break;
         }
     }
+
+    m_timelineContextMenu->addSeparator();
+    m_deleteGuide = new KAction(KIcon("edit-delete"), i18n("Delete Guide"), this);
+    connect(m_deleteGuide, SIGNAL(triggered()), this, SLOT(slotDeleteTimeLineGuide()));
+    m_timelineContextMenu->addAction(m_deleteGuide);
+
+    m_editGuide = new KAction(KIcon("document-properties"), i18n("Edit Guide"), this);
+    connect(m_editGuide, SIGNAL(triggered()), this, SLOT(slotEditTimeLineGuide()));
+    m_timelineContextMenu->addAction(m_editGuide);
 }
 
 void CustomTrackView::checkAutoScroll()
@@ -197,7 +211,7 @@ void CustomTrackView::checkTrackHeight()
             item = (ClipItem*) itemList.at(i);
             item->setRect(0, 0, item->rect().width(), m_tracksHeight - 1);
             item->setPos((qreal) item->startPos().frames(m_document->fps()), (qreal) item->track() * m_tracksHeight + 1);
-            item->resetThumbs();
+            item->resetThumbs(true);
         } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             transitionitem = (Transition*) itemList.at(i);
             transitionitem->setRect(0, 0, transitionitem->rect().width(), m_tracksHeight / 3 * 2 - 1);
@@ -215,7 +229,7 @@ void CustomTrackView::checkTrackHeight()
     setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
 //     verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
     KdenliveSettings::setSnaptopoints(snap);
-    update();
+    viewport()->update();
 }
 
 /** Zoom or move viewport on mousewheel
@@ -248,6 +262,18 @@ int CustomTrackView::getPreviousVideoTrack(int track)
 }
 
 
+void CustomTrackView::slotFetchNextThumbs()
+{
+    if (!m_waitingThumbs.isEmpty()) {
+        ClipItem *item = m_waitingThumbs.takeFirst();
+        while ((item == NULL) && !m_waitingThumbs.isEmpty()) {
+            item = m_waitingThumbs.takeFirst();
+        }
+        if (item) item->slotFetchThumbs();
+        if (!m_waitingThumbs.isEmpty()) m_thumbsTimer.start();
+    }
+}
+
 void CustomTrackView::slotCheckMouseScrolling()
 {
     if (m_scrollOffset == 0) {
@@ -262,15 +288,13 @@ void CustomTrackView::slotCheckPositionScrolling()
 {
     // If mouse is at a border of the view, scroll
     if (m_moveOpMode != SEEK) return;
-    int pos = cursorPos();
-    if (mapFromScene(pos, 0).x() < 7) {
+    if (mapFromScene(m_cursorPos, 0).x() < 3) {
         horizontalScrollBar()->setValue(horizontalScrollBar()->value() - 2);
-        setCursorPos(mapToScene(QPoint()).x() - 1);
         QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
-
-    } else if (viewport()->width() - 5 < mapFromScene(pos + 1, 0).x()) {
+        setCursorPos(mapToScene(QPoint(-2, 0)).x());
+    } else if (viewport()->width() - 3 < mapFromScene(m_cursorPos + 1, 0).x()) {
         horizontalScrollBar()->setValue(horizontalScrollBar()->value() + 2);
-        setCursorPos(mapToScene(viewport()->width(), 0).x() + 1);
+        setCursorPos(mapToScene(QPoint(viewport()->width(), 0)).x() + 1);
         QTimer::singleShot(200, this, SLOT(slotCheckPositionScrolling()));
     }
 }
@@ -283,8 +307,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
     int pos = event->x();
     int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5);
     emit mousePosition(mappedXPos);
+
     if (event->buttons() & Qt::MidButton) return;
-    if ((event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL) || event->modifiers() == Qt::ShiftModifier) {
+    if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) {
         QGraphicsView::mouseMoveEvent(event);
         m_moveOpMode = NONE;
         return;
@@ -325,19 +350,19 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 m_dragItem->updateKeyFramePos(keyFramePos, pos);
             }
 
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animation = NULL;
-            if (m_visualTip) delete m_visualTip;
+            delete m_visualTip;
             m_visualTip = NULL;
             return;
         } else if (m_operationMode == MOVEGUIDE) {
-            if (m_animation) delete m_animation;
+            delete m_animation;
             m_animation = NULL;
-            if (m_visualTip) delete m_visualTip;
+            delete m_visualTip;
             m_visualTip = NULL;
             QGraphicsView::mouseMoveEvent(event);
             return;
-        } else if (m_operationMode == SPACER && move) {
+        } else if (m_operationMode == SPACER && move && m_selectionGroup) {
             // spacer tool
             int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
             m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y());
@@ -372,21 +397,21 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             // razor tool over a clip, display current frame in monitor
             if (!m_blockRefresh && item->type() == AVWIDGET) {
                 //TODO: solve crash when showing frame when moving razor over clip
-                //emit showClipFrame(((ClipItem *) item)->baseClip(), mapToScene(event->pos()).x() / m_scale - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
+                //emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
             }
             event->accept();
             return;
         }
         opMode = clip->operationMode(mapToScene(event->pos()));
-        double size = 5;
+        const double size = 5;
         if (opMode == m_moveOpMode) {
             QGraphicsView::mouseMoveEvent(event);
             return;
         } else {
             if (m_visualTip) {
-                if (m_animation) delete m_animation;
-                m_animation = NULL;
                 m_animationTimer->stop();
+                delete m_animation;
+                m_animation = NULL;
                 delete m_visualTip;
                 m_visualTip = NULL;
             }
@@ -399,26 +424,22 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             if (m_visualTip == NULL) {
                 QRectF rect = clip->sceneBoundingRect();
                 QPolygon polygon;
-                polygon << QPoint(0, rect.height() / 2 - size * 2);
-                polygon << QPoint(size * 2, (int)(rect.height() / 2));
-                polygon << QPoint(0, (int)(rect.height() / 2 + size * 2));
-                polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
+                polygon << QPoint(0, - size * 2);
+                polygon << QPoint(size * 2, 0);
+                polygon << QPoint(0, size * 2);
+                polygon << QPoint(0, - size * 2);
 
                 m_visualTip = new QGraphicsPolygonItem(polygon);
                 ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
                 ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
-                m_visualTip->setPos(rect.x(), rect.y());
+                m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2);
                 m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
                 m_visualTip->setZValue(100);
                 m_animation = new QGraphicsItemAnimation;
                 m_animation->setItem(m_visualTip);
                 m_animation->setTimeLine(m_animationTimer);
-                double scale = 2.0;
-                m_animation->setScaleAt(.5, scale, 1);
-                //m_animation->setPosAt(.5, QPointF(rect.x() - rect.x() * scale, 0));
-                scale = 1.0;
-                m_animation->setScaleAt(1, scale, 1);
-                //m_animation->setPosAt(1, QPointF(rect.x() - rect.x() * scale, 0));
+                m_animation->setScaleAt(.5, 2, 1);
+                m_animation->setScaleAt(1, 1, 1);
                 scene()->addItem(m_visualTip);
                 m_animationTimer->start();
             }
@@ -427,24 +448,22 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
             if (m_visualTip == NULL) {
                 QRectF rect = clip->sceneBoundingRect();
                 QPolygon polygon;
-                polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
-                polygon << QPoint(- size * 2, (int)(rect.height() / 2));
-                polygon << QPoint(0, (int)(rect.height() / 2 + size * 2));
-                polygon << QPoint(0, (int)(rect.height() / 2 - size * 2));
+                polygon << QPoint(0, - size * 2);
+                polygon << QPoint(- size * 2, 0);
+                polygon << QPoint(0, size * 2);
+                polygon << QPoint(0, - size * 2);
 
                 m_visualTip = new QGraphicsPolygonItem(polygon);
                 ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
                 ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
                 m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
-                m_visualTip->setPos(rect.right(), rect.y());
+                m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2);
                 m_visualTip->setZValue(100);
                 m_animation = new QGraphicsItemAnimation;
                 m_animation->setItem(m_visualTip);
                 m_animation->setTimeLine(m_animationTimer);
-                double scale = 2.0;
-                m_animation->setScaleAt(.5, scale, 1);
-                scale = 1.0;
-                m_animation->setScaleAt(1, scale, 1);
+                m_animation->setScaleAt(.5, 2, 1);
+                m_animation->setScaleAt(1, 1, 1);
                 scene()->addItem(m_visualTip);
                 m_animationTimer->start();
             }
@@ -461,10 +480,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 m_animation = new QGraphicsItemAnimation;
                 m_animation->setItem(m_visualTip);
                 m_animation->setTimeLine(m_animationTimer);
-                double scale = 2.0;
-                m_animation->setScaleAt(.5, scale, scale);
-                scale = 1.0;
-                m_animation->setScaleAt(1, scale, scale);
+                m_animation->setScaleAt(.5, 2, 2);
+                m_animation->setScaleAt(1, 1, 1);
                 scene()->addItem(m_visualTip);
                 m_animationTimer->start();
             }
@@ -482,51 +499,59 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
                 m_animation = new QGraphicsItemAnimation;
                 m_animation->setItem(m_visualTip);
                 m_animation->setTimeLine(m_animationTimer);
-                double scale = 2.0;
-                m_animation->setScaleAt(.5, scale, scale);
-                scale = 1.0;
-                m_animation->setScaleAt(1, scale, scale);
+                m_animation->setScaleAt(.5, 2, 2);
+                m_animation->setScaleAt(1, 1, 1);
                 scene()->addItem(m_visualTip);
                 m_animationTimer->start();
             }
             setCursor(Qt::PointingHandCursor);
         } else if (opMode == TRANSITIONSTART) {
-            /*if (m_visualTip == NULL) {
+            if (m_visualTip == NULL) {
                 QRectF rect = clip->sceneBoundingRect();
-                m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
-                ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
-                ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+                QPolygon polygon;
+                polygon << QPoint(0, - size * 2);
+                polygon << QPoint(size * 2, 0);
+                polygon << QPoint(0, 0);
+                polygon << QPoint(0, - size * 2);
+
+                m_visualTip = new QGraphicsPolygonItem(polygon);
+                ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setPos(rect.x(), rect.bottom());
+                m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
                 m_visualTip->setZValue(100);
                 m_animation = new QGraphicsItemAnimation;
                 m_animation->setItem(m_visualTip);
                 m_animation->setTimeLine(m_animationTimer);
-                m_visualTip->setPos(rect.x() + 10, rect.y() + rect.height() / 2 + 12);
-                double scale = 2.0;
-                m_animation->setScaleAt(.5, scale, scale);
-                scale = 1.0;
-                m_animation->setScaleAt(1, scale, scale);
+                m_animation->setScaleAt(.5, 2, 2);
+                m_animation->setScaleAt(1, 1, 1);
                 scene()->addItem(m_visualTip);
                 m_animationTimer->start();
-            }*/
+            }
             setCursor(Qt::PointingHandCursor);
         } else if (opMode == TRANSITIONEND) {
-            /*if (m_visualTip == NULL) {
+            if (m_visualTip == NULL) {
                 QRectF rect = clip->sceneBoundingRect();
-                m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
-                ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
-                ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+                QPolygon polygon;
+                polygon << QPoint(0, - size * 2);
+                polygon << QPoint(- size * 2, 0);
+                polygon << QPoint(0, 0);
+                polygon << QPoint(0, - size * 2);
+
+                m_visualTip = new QGraphicsPolygonItem(polygon);
+                ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setPos(rect.right(), rect.bottom());
+                m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
                 m_visualTip->setZValue(100);
                 m_animation = new QGraphicsItemAnimation;
                 m_animation->setItem(m_visualTip);
                 m_animation->setTimeLine(m_animationTimer);
-                m_visualTip->setPos(rect.x() + rect.width() - 10 , rect.y() + rect.height() / 2 + 12);
-                double scale = 2.0;
-                m_animation->setScaleAt(.5, scale, scale);
-                scale = 1.0;
-                m_animation->setScaleAt(1, scale, scale);
+                m_animation->setScaleAt(.5, 2, 2);
+                m_animation->setScaleAt(1, 1, 1);
                 scene()->addItem(m_visualTip);
                 m_animationTimer->start();
-            }*/
+            }
             setCursor(Qt::PointingHandCursor);
         } else if (opMode == KEYFRAME) {
             setCursor(Qt::PointingHandCursor);
@@ -539,20 +564,22 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
         m_moveOpMode = opMode;
         setCursor(Qt::SplitHCursor);
     } else {
-        if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
-            m_moveOpMode = SEEK;
-            setCursorPos(mappedXPos);
-            slotCheckPositionScrolling();
-        } else m_moveOpMode = NONE;
         if (m_visualTip) {
-            if (m_animation) delete m_animation;
             m_animationTimer->stop();
+            delete m_animation;
             m_animation = NULL;
             delete m_visualTip;
             m_visualTip = NULL;
 
         }
         setCursor(Qt::ArrowCursor);
+        if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
+            QGraphicsView::mouseMoveEvent(event);
+            m_moveOpMode = SEEK;
+            setCursorPos(mappedXPos);
+            slotCheckPositionScrolling();
+            return;
+        } else m_moveOpMode = NONE;
     }
     QGraphicsView::mouseMoveEvent(event);
 }
@@ -560,17 +587,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
 // virtual
 void CustomTrackView::mousePressEvent(QMouseEvent * event)
 {
-    kDebug() << "mousePressEvent STARTED";
+    //kDebug() << "mousePressEvent STARTED";
+    setFocus(Qt::MouseFocusReason);
     m_menuPosition = QPoint();
-    m_blockRefresh = true;
-    bool collision = false;
-
-    if (m_tool != RAZORTOOL) activateMonitor();
-    else if (m_document->renderer()->playSpeed() != 0.0) {
-        m_document->renderer()->pause();
-        return;
-    }
-    m_clickEvent = event->pos();
 
     // special cases (middle click button or ctrl / shift click
     if (event->button() == Qt::MidButton) {
@@ -580,18 +599,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         return;
     }
 
-    // check item under mouse
-    QList<QGraphicsItem *> collisionList = items(event->pos());
-
-    if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) {
-        setDragMode(QGraphicsView::ScrollHandDrag);
-        QGraphicsView::mousePressEvent(event);
-        m_blockRefresh = false;
-        m_operationMode = NONE;
-        return;
-    }
-
-    if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) {
+    if (event->modifiers() & Qt::ShiftModifier) {
         setDragMode(QGraphicsView::RubberBandDrag);
         if (!(event->modifiers() & Qt::ControlModifier)) {
             resetSelectionGroup();
@@ -603,31 +611,58 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         return;
     }
 
-    if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
-        // a guide item was pressed
-        collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true);
-        m_dragItem = NULL;
-        m_dragGuide = (Guide *) collisionList.at(0);
-        collision = true;
-        m_operationMode = MOVEGUIDE;
-        // deselect all clips so that only the guide will move
-        m_scene->clearSelection();
-        resetSelectionGroup();
-        updateSnapPoints(NULL);
+    m_blockRefresh = true;
+    m_dragItem = NULL;
+    m_dragGuide = NULL;
+    bool collision = false;
+
+    if (m_tool != RAZORTOOL) activateMonitor();
+    else if (m_document->renderer()->playSpeed() != 0.0) {
+        m_document->renderer()->pause();
+        return;
+    }
+    m_clickEvent = event->pos();
+
+    // check item under mouse
+    QList<QGraphicsItem *> collisionList = items(m_clickEvent);
+
+    if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) {
+        setDragMode(QGraphicsView::ScrollHandDrag);
         QGraphicsView::mousePressEvent(event);
+        m_blockRefresh = false;
+        m_operationMode = NONE;
         return;
     }
 
-    // Find first clip, transition or group under mouse
+    // 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) {
+            // a guide item was pressed
+            m_dragGuide = (Guide *) collisionList.at(i);
+            if (event->button() == Qt::LeftButton) { // move it
+                m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, true);
+                collision = true;
+                m_operationMode = MOVEGUIDE;
+                // deselect all clips so that only the guide will move
+                m_scene->clearSelection();
+                resetSelectionGroup(false);
+                updateSnapPoints(NULL);
+                QGraphicsView::mousePressEvent(event);
+                return;
+            } else // show context menu
+                break;
+        }
+    }
+
+    // Find first clip, transition or group under mouse (when no guides selected)
     int ct = 0;
-    m_dragItem = NULL;
     AbstractGroupItem *dragGroup = NULL;
-    while (ct < collisionList.count()) {
+    while (!m_dragGuide && ct < collisionList.count()) {
         if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
             m_dragItem = static_cast <AbstractClipItem *>(collisionList.at(ct));
             m_dragItemInfo = m_dragItem->info();
             if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
-                //kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect();
+                // kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect();
                 dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
             }
             break;
@@ -650,7 +685,23 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                 m_scene->clearSelection();
                 m_dragItem->setSelected(true);
             }
+        } else if (!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++) {
+                if (guidesCollisionList.at(i)->type() == GUIDEITEM) {
+                    m_dragGuide = static_cast <Guide *>(guidesCollisionList.at(i));
+                    break;
+                }
+            }
+            // keep this to support multiple guides context menu in the future (?)
+            /*if (guidesCollisionList.at(0)->type() != GUIDEITEM)
+                guidesCollisionList.removeAt(0);
+            }
+            if (!guidesCollisionList.isEmpty())
+            m_dragGuide = static_cast <Guide *>(guidesCollisionList.at(0));*/
         }
+
         m_operationMode = NONE;
         displayContextMenu(event->globalPos(), m_dragItem, dragGroup);
         m_menuPosition = m_clickEvent;
@@ -661,10 +712,10 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
 
     // No item under click
     if (m_dragItem == NULL || m_tool == SPACERTOOL) {
-        resetSelectionGroup();
+        resetSelectionGroup(false);
         setCursor(Qt::ArrowCursor);
         m_scene->clearSelection();
-        event->accept();
+        //event->accept();
         emit clipItemSelected(NULL);
         updateClipTypeActions(NULL);
         if (m_tool == SPACERTOOL) {
@@ -681,9 +732,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
                 kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" <<  1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height();
             }
 
-            resetSelectionGroup(false);
-            m_scene->clearSelection();
-
             for (int i = 0; i < selection.count(); i++) {
                 if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
                     selection.at(i)->setSelected(true);
@@ -692,6 +740,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             groupSelectedItems(true);
             m_operationMode = SPACER;
         } else setCursorPos((int)(mapToScene(event->x(), 0).x()));
+        QGraphicsView::mousePressEvent(event);
         kDebug() << "END mousePress EVENT ";
         return;
     }
@@ -713,7 +762,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()));
         m_document->renderer()->pause();
         m_commandStack->push(command);
-        m_document->setModified(true);
+        setDocumentModified();
         m_dragItem = NULL;
         event->accept();
         return;
@@ -747,12 +796,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
     if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
     else emit clipItemSelected(NULL);
 
-    if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))) {
-        // If clicked item is selected, allow move
-        if (dragGroup) dragGroup->setSelected(true);
-        //event->accept();
-        if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
-    } else {
+    bool itemSelected = false;
+    if (m_dragItem->isSelected()) itemSelected = true;
+    else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true;
+    else if (dragGroup && dragGroup->isSelected()) itemSelected = true;
+    if (event->modifiers() == Qt::ControlModifier || itemSelected == false) {
         resetSelectionGroup();
         if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
         dragGroup = NULL;
@@ -767,10 +815,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
         groupSelectedItems();
         ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
         updateClipTypeActions(dragGroup == NULL ? clip : NULL);
-        m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO);
         m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
     }
 
+    // If clicked item is selected, allow move
+    if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE/* && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))*/) QGraphicsView::mousePressEvent(event);
+
     m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
     m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
 
@@ -817,7 +867,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
             info.startPos = transitionClip->startPos();
         } else info.startPos = info.endPos - GenTime(65, m_document->fps());
         if (info.endPos == info.startPos) info.startPos = info.endPos - GenTime(65, m_document->fps());
-        QDomElement transition = MainWindow::transitions.getEffectByName("Luma").cloneNode().toElement();
+        QDomElement transition = MainWindow::transitions.getEffectByTag("luma", "dissolve").cloneNode().toElement();
         EffectsList::setParameter(transition, "reverse", "1");
 
         // Check there is no other transition at that place
@@ -964,6 +1014,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
                 EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
                 m_commandStack->push(command);
                 updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+                emit clipItemSelected(item, item->selectedEffectIndex());
             }
 
         } else  {
@@ -977,8 +1028,9 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
             EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false);
             m_commandStack->push(command);
             updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+            emit clipItemSelected(item, item->selectedEffectIndex());
         }
-    } else if (m_dragItem) {
+    } else if (m_dragItem && !m_dragItem->isItemLocked()) {
         ClipDurationDialog d(m_dragItem, m_document->timecode(), this);
         GenTime minimum;
         GenTime maximum;
@@ -987,7 +1039,7 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
         } else {
             getClipAvailableSpace(m_dragItem, minimum, maximum);
         }
-        //kDebug()<<"// GOT MOVE POS: "<<minimum.frames(25)<<" - "<<maximum.frames(25);
+        //kDebug()<<"// GOT MOVE POS: "<<minimum.frames(25)<<" - "<<maximum.frames(25);
         d.setMargins(minimum, maximum);
         if (d.exec() == QDialog::Accepted) {
             if (m_dragItem->type() == TRANSITIONWIDGET) {
@@ -1007,13 +1059,21 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
                 QUndoCommand *moveCommand = new QUndoCommand();
                 moveCommand->setText(i18n("Edit clip"));
                 ItemInfo clipInfo = m_dragItem->info();
+                if (d.duration() < m_dragItem->cropDuration() || d.cropStart() != clipInfo.cropStart) {
+                    // duration was reduced, so process it first
+                    ItemInfo startInfo = clipInfo;
+                    clipInfo.endPos = clipInfo.startPos + d.duration();
+                    clipInfo.cropStart = d.cropStart();
+                    new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand);
+                }
                 if (d.startPos() != clipInfo.startPos) {
                     ItemInfo startInfo = clipInfo;
                     clipInfo.startPos = d.startPos();
                     clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos);
                     new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
                 }
-                if (d.duration() != m_dragItem->duration() || d.cropStart() != clipInfo.cropStart) {
+                if (d.duration() > m_dragItem->cropDuration()) {
+                    // duration was increased, so process it after move
                     ItemInfo startInfo = clipInfo;
                     clipInfo.endPos = clipInfo.startPos + d.duration();
                     clipInfo.cropStart = d.cropStart();
@@ -1044,9 +1104,10 @@ void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int
 
 void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group)
 {
+    m_deleteGuide->setEnabled(m_dragGuide != NULL);
+    m_editGuide->setEnabled(m_dragGuide != NULL);
     if (clip == NULL) m_timelineContextMenu->popup(pos);
     else if (group != NULL) {
-        m_changeSpeedAction->setEnabled(false);
         m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
         m_ungroupAction->setEnabled(true);
         updateClipTypeActions(NULL);
@@ -1056,7 +1117,6 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs
         if (clip->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem*>(clip);
             updateClipTypeActions(item);
-            m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO);
             m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
             m_timelineContextClipMenu->popup(pos);
         } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
@@ -1077,13 +1137,13 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
         QPoint pos;
         DocClipBase *clip = m_document->getBaseClip(list.at(0));
-        if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
+        if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
         ItemInfo info;
         info.startPos = GenTime();
         info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
         info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
         info.track = (int)(1 / m_tracksHeight);
-        ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
+        ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1);
         m_selectionGroup->addToGroup(item);
         item->setFlags(QGraphicsItem::ItemIsSelectable);
         //TODO: check if we do not overlap another clip when first dropping in timeline
@@ -1105,24 +1165,27 @@ void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
         QList <GenTime> offsetList;
         for (int i = 0; i < ids.size(); ++i) {
             DocClipBase *clip = m_document->getBaseClip(ids.at(i));
-            if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
+            if (clip == NULL) kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
             ItemInfo info;
             info.startPos = start;
             info.endPos = info.startPos + clip->duration();
             info.track = (int)(1 / m_tracksHeight);
-            ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0);
+            ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false);
             start += clip->duration();
             offsetList.append(start);
             m_selectionGroup->addToGroup(item);
             item->setFlags(QGraphicsItem::ItemIsSelectable);
+            m_waitingThumbs.append(item);
         }
         //TODO: check if we do not overlap another clip when first dropping in timeline
         //if (insertPossible(m_selectionGroup, event->pos()))
         updateSnapPoints(NULL, offsetList);
         scene()->addItem(m_selectionGroup);
+        m_thumbsTimer.start();
         event->acceptProposedAction();
+
     } else {
-        // the drag is not a clip (may be effect, ...)
+        // the drag is not a clip (may be effect, ...)
         m_clipDrag = false;
         QGraphicsView::dragEnterEvent(event);
     }
@@ -1138,7 +1201,7 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos
             ClipItem *clip = static_cast <ClipItem *>(children.at(i));
             ItemInfo info = clip->info();
             kDebug() << " / / INSERT : " << pos.x();
-            QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->duration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
+            QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->cropDuration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
             kDebug() << " / / INSERT RECT: " << shape;
             path = path.united(QPolygonF(shape));
         }
@@ -1160,6 +1223,26 @@ bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos
 
 }
 
+
+bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos)
+{
+    QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
+    QList<QGraphicsItem*> collindingItems = scene()->items(shape, Qt::IntersectsItemShape);
+    collindingItems.removeAll(item);
+    if (collindingItems.isEmpty()) return false;
+    else {
+        for (int i = 0; i < collindingItems.count(); i++) {
+            QGraphicsItem *collision = collindingItems.at(i);
+            if (collision->type() == item->type()) {
+                // Collision
+                kDebug() << "// COLLISIION DETECTED";
+                return true;
+            }
+        }
+        return false;
+    }
+}
+
 void CustomTrackView::slotRefreshEffects(ClipItem *clip)
 {
     int track = m_document->tracksCount() - clip->track();
@@ -1180,6 +1263,22 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
 {
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
     if (clip) {
+        // Special case: speed effect
+        if (effect.attribute("id") == "speed") {
+            if (clip->clipType() != VIDEO && clip->clipType() != AV && clip->clipType() != PLAYLIST) {
+                emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
+                return;
+            }
+            ItemInfo info = clip->info();
+            double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
+            int strobe = EffectsList::parameter(effect, "strobe").toInt();
+            if (strobe == 0) strobe = 1;
+            doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId());
+            clip->addEffect(effect);
+            emit clipItemSelected(clip);
+            return;
+        }
+
         if (!m_document->renderer()->mltAddEffect(track, pos, clip->addEffect(effect)))
             emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
         emit clipItemSelected(clip);
@@ -1189,8 +1288,19 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
 void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect)
 {
     QString index = effect.attribute("kdenlive_ix");
+    // Special case: speed effect
+    if (effect.attribute("id") == "speed") {
+        ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+        if (clip) {
+            ItemInfo info = clip->info();
+            doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
+            clip->deleteEffect(index);
+            emit clipItemSelected(clip);
+            return;
+        }
+    }
     if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") {
-        kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled");
+        kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled");
         emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
         return;
     }
@@ -1213,7 +1323,15 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *
     int count = 0;
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
-            ClipItem *item = (ClipItem *)itemList.at(i);
+            ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
+            if (effect.attribute("type") == "audio") {
+                // Don't add audio effects on video clips
+                if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) continue;
+            } else if (effect.hasAttribute("type") == false) {
+                // Don't add video effect on audio clips
+                if (item->isAudioOnly() || item->clipType() == AUDIO) continue;
+            }
+
             if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
                 emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
                 continue;
@@ -1233,7 +1351,7 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *
     }
     if (count > 0) {
         m_commandStack->push(effectCommand);
-        m_document->setModified(true);
+        setDocumentModified();
     } else delete effectCommand;
 }
 
@@ -1253,10 +1371,23 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
         if (clip) itemList.append(clip);
         else emit displayMessage(i18n("Select a clip if you want to apply an effect"), ErrorMessage);
     }
-    kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count();
+    kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count();
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = (ClipItem *)itemList.at(i);
+            if (effect.attribute("type") == "audio") {
+                // Don't add audio effects on video clips
+                if (item->isVideoOnly() || (item->clipType() != AUDIO && item->clipType() != AV && item->clipType() != PLAYLIST)) {
+                    emit displayMessage(i18n("Cannot add an audio effect to this clip"), ErrorMessage);
+                    continue;
+                }
+            } else if (effect.hasAttribute("type") == false) {
+                // Don't add video effect on audio clips
+                if (item->isAudioOnly() || item->clipType() == AUDIO) {
+                    emit displayMessage(i18n("Cannot add a video effect to this clip"), ErrorMessage);
+                    continue;
+                }
+            }
             if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
                 emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
                 continue;
@@ -1276,7 +1407,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track)
     }
     if (count > 0) {
         m_commandStack->push(effectCommand);
-        m_document->setModified(true);
+        setDocumentModified();
     } else delete effectCommand;
 }
 
@@ -1284,13 +1415,32 @@ void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect)
 {
     AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false);
     m_commandStack->push(command);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser)
 {
     ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
     if (clip) {
+
+
+        // Special case: speed effect
+        if (effect.attribute("id") == "speed") {
+            ItemInfo info = clip->info();
+            double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
+            int strobe = EffectsList::parameter(effect, "strobe").toInt();
+            if (strobe == 0) strobe = 1;
+            doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId());
+            clip->setEffectAt(ix, effect);
+            if (ix == clip->selectedEffectIndex()) {
+                clip->setSelectedEffect(ix);
+            }
+            return;
+        }
+
+
+
+
         EffectsParameterList effectParams = clip->getEffectArgs(effect);
         if (effect.attribute("tag") == "ladspa") {
             // Update the ladspa affect file
@@ -1299,7 +1449,6 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i
         // check if we are trying to reset a keyframe effect
         if (effectParams.hasParam("keyframes") && effectParams.paramValue("keyframes").isEmpty()) {
             clip->initEffect(effect);
-            clip->setEffectAt(ix, effect);
             effectParams = clip->getEffectArgs(effect);
         }
         if (effectParams.paramValue("disabled") == "1") {
@@ -1324,10 +1473,9 @@ void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, i
                 int pos = effectParams.paramValue("out").toInt() - effectParams.paramValue("in").toInt();
                 clip->setFadeOut(pos);
             }
-
         }
     }
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
@@ -1341,24 +1489,39 @@ void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
         clip->setEffectAt(newPos - 1, before);
         emit clipItemSelected(clip, newPos - 1);
     }
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable)
 {
     QDomElement effect = clip->effectAt(effectPos);
     QDomElement oldEffect = effect.cloneNode().toElement();
+
+    if (effect.attribute("id") == "speed") {
+        if (clip) {
+            ItemInfo info = clip->info();
+            effect.setAttribute("disabled", disable);
+            if (disable) doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
+            else {
+                double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
+                int strobe = EffectsList::parameter(effect, "strobe").toInt();
+                if (strobe == 0) strobe = 1;
+                doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId());
+            }
+            return;
+        }
+    }
     effect.setAttribute("disabled", disable);
     EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
     m_commandStack->push(command);
-    m_document->setModified(true);
+    setDocumentModified();;
 }
 
 void CustomTrackView::slotChangeEffectPosition(ClipItem *clip, int currentPos, int newPos)
 {
     MoveEffectCommand *command = new MoveEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), currentPos, newPos);
     m_commandStack->push(command);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix)
@@ -1394,13 +1557,24 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut)
         else newPos.cropStart = item->info().cropStart + (cutTime - info.startPos) * speed;
         newPos.track = info.track;
         ClipItem *dup = item->clone(newPos);
+        // remove unwanted effects (fade in) from 2nd part of cutted clip
+        int ix = dup->hasEffect(QString(), "fadein");
+        if (ix != -1) {
+            QDomElement oldeffect = item->effectAt(ix);
+            dup->deleteEffect(oldeffect.attribute("kdenlive_ix"));
+        }
+        ix = dup->hasEffect(QString(), "fade_from_black");
+        if (ix != -1) {
+            QDomElement oldeffect = item->effectAt(ix);
+            dup->deleteEffect(oldeffect.attribute("kdenlive_ix"));
+        }
         item->resizeEnd(cutPos, false);
         scene()->addItem(dup);
         if (item->checkKeyFrames()) slotRefreshEffects(item);
         if (dup->checkKeyFrames()) slotRefreshEffects(dup);
         item->baseClip()->addReference();
         m_document->updateClip(item->baseClip()->getId());
-        m_document->setModified(true);
+        setDocumentModified();
         kDebug() << "/////////  CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
         kDebug() << "//  CUTTING CLIP dONE";
     } else {
@@ -1435,7 +1609,7 @@ void CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut)
         bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos);
         if (success) {
             item->resizeEnd((int) info.endPos.frames(m_document->fps()));
-            m_document->setModified(true);
+            setDocumentModified();
         } else
             emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
 
@@ -1459,7 +1633,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition)
             ClipItem *transitionClip = NULL;
             const int transitiontrack = getPreviousVideoTrack(info.track);
             GenTime pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
-            if (pos < item->startPos() + item->duration() / 2) {
+            if (pos < item->startPos() + item->cropDuration() / 2) {
                 // add transition to clip start
                 info.startPos = item->startPos();
                 if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_document->tracksCount() - transitiontrack);
@@ -1490,6 +1664,7 @@ void CustomTrackView::slotAddTransitionToSelectedClips(QDomElement transition)
                     info.startPos = transitionClip->startPos();
                 } else info.startPos = info.endPos - GenTime(65, m_document->fps());
                 if (transition.attribute("tag") == "luma") EffectsList::setParameter(transition, "reverse", "1");
+                else if (transition.attribute("id") == "slide") EffectsList::setParameter(transition, "invert", "1");
 
                 // Check there is no other transition at that place
                 double startY = info.track * m_tracksHeight + 1 + m_tracksHeight / 2;
@@ -1544,7 +1719,7 @@ void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionI
     }
     AddTransitionCommand* command = new AddTransitionCommand(this, transitionInfo, endTrack, transition, false, true);
     m_commandStack->push(command);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params)
@@ -1553,7 +1728,7 @@ void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomE
     //kDebug() << "---- ADDING transition " << params.attribute("value");
     if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) {
         scene()->addItem(tr);
-        m_document->setModified(true);
+        setDocumentModified();
     } else {
         emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
         delete tr;
@@ -1571,15 +1746,15 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD
     if (m_dragItem == item) m_dragItem = NULL;
     delete item;
     emit transitionItemSelected(NULL);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
 {
-    kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
+    kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
     EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false);
     m_commandStack->push(command);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTransition, QDomElement transition, bool updateTransitionWidget)
@@ -1590,10 +1765,20 @@ void CustomTrackView::updateTransition(int track, GenTime pos, QDomElement oldTr
         return;
     }
     m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
-    //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
+    //kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
     item->setTransitionParameters(transition);
-    if (updateTransitionWidget) emit transitionItemSelected(item, true);
-    m_document->setModified(true);
+    if (updateTransitionWidget) {
+        ItemInfo info = item->info();
+        QPoint p;
+        ClipItem *transitionClip = getClipItemAt(info.startPos, info.track);
+        if (transitionClip && transitionClip->baseClip()) {
+            QString size = transitionClip->baseClip()->getProperty("frame_size");
+            p.setX(size.section('x', 0, 0).toInt());
+            p.setY(size.section('x', 1, 1).toInt());
+        }
+        emit transitionItemSelected(item, getPreviousVideoTrack(info.track), p, true);
+    }
+    setDocumentModified();
 }
 
 void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
@@ -1602,6 +1787,7 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
     const QPointF pos = mapToScene(event->pos());
     if (m_selectionGroup && m_clipDrag) {
         m_selectionGroup->setPos(pos.x(), pos.y());
+        emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5));
         event->setDropAction(Qt::MoveAction);
         event->acceptProposedAction();
     } else {
@@ -1612,6 +1798,8 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
 void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event)
 {
     if (m_selectionGroup && m_clipDrag) {
+        m_thumbsTimer.stop();
+        m_waitingThumbs.clear();
         QList<QGraphicsItem *> items = m_selectionGroup->childItems();
         qDeleteAll(items);
         scene()->destroyItemGroup(m_selectionGroup);
@@ -1626,6 +1814,9 @@ void CustomTrackView::dropEvent(QDropEvent * event)
         resetSelectionGroup();
         m_scene->clearSelection();
         bool hasVideoClip = false;
+        QUndoCommand *addCommand = new QUndoCommand();
+        addCommand->setText(i18n("Add timeline clip"));
+
         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;
@@ -1634,8 +1825,8 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             } else {
                 updateClipTypeActions(NULL);
             }
-            AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
-            m_commandStack->push(command);
+
+            new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, addCommand);
             item->baseClip()->addReference();
             m_document->updateClip(item->baseClip()->getId());
             ItemInfo info = item->info();
@@ -1644,25 +1835,21 @@ void CustomTrackView::dropEvent(QDropEvent * event)
             bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
             if (isLocked) item->setItemLocked(true);
 
-            if (item->baseClip()->isTransparent()) {
+            if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
                 // add transparency transition
-                int endTrack = getPreviousVideoTrack(info.track);
-                Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true);
-                if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) {
-                    scene()->addItem(tr);
-                } else {
-                    emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
-                    delete tr;
-                }
+                QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement();
+                new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
             }
             info.track = m_document->tracksCount() - item->track();
             m_document->renderer()->mltInsertClip(info, item->xml(), item->baseClip()->producer(item->track()));
             item->setSelected(true);
         }
-	m_document->setModified(true);
-        m_changeSpeedAction->setEnabled(hasVideoClip);
+        m_commandStack->push(addCommand);
+        setDocumentModified();
         m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
-        groupSelectedItems(true);
+        if (items.count() > 1) groupSelectedItems(true);
+        event->setDropAction(Qt::MoveAction);
+        event->accept();
     } else QGraphicsView::dropEvent(event);
     setFocus();
 }
@@ -1701,8 +1888,10 @@ int CustomTrackView::duration() const
 
 void CustomTrackView::addTrack(TrackInfo type, int ix)
 {
-    if (ix == -1) m_document->insertTrack(ix, type);
-    else {
+    if (ix == -1 || ix == m_document->tracksCount()) {
+        m_document->insertTrack(ix, type);
+        m_document->renderer()->mltInsertTrack(1, type.type == VIDEOTRACK);
+    } else {
         m_document->insertTrack(m_document->tracksCount() - ix, type);
         // insert track in MLT playlist
         m_document->renderer()->mltInsertTrack(m_document->tracksCount() - ix, type.type == VIDEOTRACK);
@@ -1715,9 +1904,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         m_selectionGroup = new AbstractGroupItem(m_document->fps());
         scene()->addItem(m_selectionGroup);
         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)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
                 m_selectionGroup->addToGroup(selection.at(i));
-            selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+                selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+            }
         }
         // Move graphic items
         m_selectionGroup->translate(0, m_tracksHeight);
@@ -1725,6 +1915,11 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
         // adjust track number
         QList<QGraphicsItem *> children = m_selectionGroup->childItems();
         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();
+                continue;
+            }
             AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
             item->updateItem();
             ItemInfo clipinfo = item->info();
@@ -1748,8 +1943,8 @@ void CustomTrackView::addTrack(TrackInfo type, int ix)
             }
         }
         resetSelectionGroup(false);
-
     }
+
     int maxHeight = m_tracksHeight * m_document->tracksCount();
     for (int i = 0; i < m_guides.count(); i++) {
         QLineF l = m_guides.at(i)->line();
@@ -1769,7 +1964,7 @@ void CustomTrackView::removeTrack(int ix)
     m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix);
     m_document->deleteTrack(m_document->tracksCount() - ix - 1);
 
-    double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
+    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);
 
@@ -1778,7 +1973,7 @@ void CustomTrackView::removeTrack(int ix)
     m_selectionGroup = new AbstractGroupItem(m_document->fps());
     scene()->addItem(m_selectionGroup);
     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)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
             m_selectionGroup->addToGroup(selection.at(i));
             selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
         }
@@ -1791,11 +1986,15 @@ void CustomTrackView::removeTrack(int ix)
     QList<QGraphicsItem *> children = m_selectionGroup->childItems();
     //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
     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();
+            continue;
+        }
         if (children.at(i)->type() == AVWIDGET) {
             ClipItem *clip = static_cast <ClipItem *>(children.at(i));
             clip->updateItem();
             ItemInfo clipinfo = clip->info();
-            kDebug() << "// CLIP TRK IS: " << clipinfo.track;
             // We add a move clip command so that we get the correct producer for new track number
             if (clip->clipType() == AV || clip->clipType() == AUDIO) {
                 Mlt::Producer *prod;
@@ -1842,11 +2041,11 @@ void CustomTrackView::slotSwitchTrackAudio(int ix)
 {
     /*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;
-    m_document->switchTrackAudio(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isMute);
-    kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber - 1).isMute << m_document->trackInfoAt(tracknumber - 1).isBlind;
-    m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
-    m_document->setModified(true);
+    int tracknumber = m_document->tracksCount() - ix - 1;
+    m_document->switchTrackAudio(tracknumber, !m_document->trackInfoAt(tracknumber).isMute);
+    kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isMute << m_document->trackInfoAt(tracknumber).isBlind;
+    m_document->renderer()->mltChangeTrackState(tracknumber + 1, m_document->trackInfoAt(tracknumber).isMute, m_document->trackInfoAt(tracknumber).isBlind);
+    setDocumentModified();
 }
 
 void CustomTrackView::slotSwitchTrackLock(int ix)
@@ -1862,7 +2061,7 @@ void CustomTrackView::lockTrack(int ix, bool lock)
     int tracknumber = m_document->tracksCount() - ix - 1;
     m_document->switchTrackLock(tracknumber, lock);
     emit doTrackLock(ix, lock);
-    QList<QGraphicsItem *> selection = items(0, ix * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x(), m_tracksHeight / 2 - 2);
+    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++) {
         if (selection.at(i)->type() != AVWIDGET && selection.at(i)->type() != TRANSITIONWIDGET) continue;
@@ -1874,7 +2073,7 @@ void CustomTrackView::lockTrack(int ix, bool lock)
     }
     kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked;
     viewport()->update();
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::slotSwitchTrackVideo(int ix)
@@ -1882,7 +2081,7 @@ void CustomTrackView::slotSwitchTrackVideo(int ix)
     int tracknumber = m_document->tracksCount() - ix;
     m_document->switchTrackVideo(tracknumber - 1, !m_document->trackInfoAt(tracknumber - 1).isBlind);
     m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::slotRemoveSpace()
@@ -2065,11 +2264,12 @@ void CustomTrackView::deleteClip(const QString &clipId)
 
 void CustomTrackView::setCursorPos(int pos, bool seek)
 {
+    if (pos == m_cursorPos) return;
     emit cursorMoved((int)(m_cursorPos), (int)(pos));
     m_cursorPos = pos;
-    m_cursorLine->setPos(pos, 0);
-    if (seek) m_document->renderer()->seek(GenTime(pos, m_document->fps()));
+    if (seek) m_document->renderer()->seek(GenTime(m_cursorPos, m_document->fps()));
     else if (m_autoScroll) checkScrolling();
+    m_cursorLine->setPos(m_cursorPos, 0);
 }
 
 void CustomTrackView::updateCursorPos()
@@ -2101,9 +2301,7 @@ void CustomTrackView::initCursorPos(int pos)
 
 void CustomTrackView::checkScrolling()
 {
-    int vert = verticalScrollBar()->value();
-    int hor = cursorPos();
-    ensureVisible(hor, vert + 10, 2, 2, 50, 0);
+    ensureVisible(m_cursorPos, verticalScrollBar()->value() + 10, 2, 2, 50, 0);
 }
 
 void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
@@ -2119,13 +2317,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         setCursor(Qt::ArrowCursor);
         m_operationMode = NONE;
         m_dragGuide->setFlag(QGraphicsItem::ItemIsMovable, false);
-        EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(m_dragGuide->pos().x(), m_document->fps()), m_dragGuide->label(), false);
-        m_commandStack->push(command);
-        m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps()));
+        GenTime newPos = GenTime(m_dragGuide->pos().x(), m_document->fps());
+        if (newPos != m_dragGuide->position()) {
+            EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), newPos, m_dragGuide->label(), false);
+            m_commandStack->push(command);
+            m_dragGuide->updateGuide(GenTime(m_dragGuide->pos().x(), m_document->fps()));
+            m_document->syncGuides(m_guides);
+        }
         m_dragGuide = NULL;
         m_dragItem = NULL;
         return;
-    } else if (m_operationMode == SPACER) {
+    } else if (m_operationMode == SPACER && m_selectionGroup) {
         int track;
         if (event->modifiers() != Qt::ControlModifier) {
             // We are moving all tracks
@@ -2174,13 +2376,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
             m_commandStack->push(command);
             if (track != -1) track = m_document->tracksCount() - track;
-            kDebug() << "SPACER TRACK:" << track;
+            kDebug() << "SPACER TRACK:" << track;
             m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
         }
         resetSelectionGroup(false);
         m_operationMode = NONE;
     } else if (m_operationMode == RUBBERSELECTION) {
-        kDebug() << "// END RUBBER SELECT";
+        //kDebug() << "// END RUBBER SELECT";
         resetSelectionGroup();
         groupSelectedItems();
         m_operationMode = NONE;
@@ -2205,7 +2407,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                 else if (item->isVideoOnly()) prod = item->baseClip()->videoProducer();
                 else prod = item->baseClip()->producer(m_dragItemInfo.track);
                 bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())), prod);
+
                 if (success) {
+                    kDebug() << "// get trans info";
                     int tracknumber = m_document->tracksCount() - item->track() - 1;
                     bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
                     if (isLocked) item->setItemLocked(true);
@@ -2215,6 +2419,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                     new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand);
                     // Also move automatic transitions (on lower track)
                     Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track);
+                    kDebug() << "// get trans info2";
                     if (tr && tr->isAutomatic()) {
                         ItemInfo trInfo = tr->info();
                         ItemInfo newTrInfo = trInfo;
@@ -2281,11 +2486,13 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                     m_commandStack->push(moveCommand);
                 } else {
                     // undo last move and emit error message
-                    MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true);
-                    m_commandStack->push(command);
+                    bool snap = KdenliveSettings::snaptopoints();
+                    KdenliveSettings::setSnaptopoints(false);
+                    item->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItemInfo.track * m_tracksHeight + 1));
+                    KdenliveSettings::setSnaptopoints(snap);
                     emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage);
                 }
-                m_document->setModified(true);
+                setDocumentModified();
             }
             if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
                 Transition *transition = static_cast <Transition *>(m_dragItem);
@@ -2387,12 +2594,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
                     m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
                     m_selectionGroupInfo.track = m_selectionGroup->track();
                 }
-                m_document->setModified(true);
+                setDocumentModified();
             }
         }
-
+        m_document->renderer()->doRefresh();
     } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) {
-        // resize start
+        // resize start
         if (m_dragItem->type() == AVWIDGET) {
             ItemInfo resizeinfo = m_dragItemInfo;
             resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
@@ -2453,7 +2660,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         }
         //m_document->renderer()->doRefresh();
     } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
-        // resize end
+        // resize end
         if (m_dragItem->type() == AVWIDGET) {
             ItemInfo resizeinfo = info;
             resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
@@ -2485,7 +2692,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
 
                 new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand);
                 m_commandStack->push(resizeCommand);
-                updateClipFade(static_cast <ClipItem *>(m_dragItem), true);
+                updateClipFade(static_cast <ClipItem *>(m_dragItem));
             } else {
                 m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
                 emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
@@ -2514,7 +2721,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         }
         //m_document->renderer()->doRefresh();
     } else if (m_operationMode == FADEIN) {
-        // resize fade in effect
+        // resize fade in effect
         ClipItem * item = (ClipItem *) m_dragItem;
         int ix = item->hasEffect("volume", "fadein");
         if (ix != -1) {
@@ -2553,12 +2760,12 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
             }
         }
     } else if (m_operationMode == FADEOUT) {
-        // resize fade in effect
+        // resize fade in effect
         ClipItem * item = (ClipItem *) m_dragItem;
         int ix = item->hasEffect("volume", "fadeout");
         if (ix != -1) {
             QDomElement oldeffect = item->effectAt(ix);
-            int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+            int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
             int start = item->fadeOut();
             if (start == 0) {
                 slotDeleteEffect(item, oldeffect);
@@ -2580,7 +2787,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         ix = item->hasEffect("brightness", "fade_to_black");
         if (ix != -1) {
             QDomElement oldeffect = item->effectAt(ix);
-            int end = (item->duration() + item->cropStart()).frames(m_document->fps());
+            int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
             int start = item->fadeOut();
             if (start == 0) {
                 slotDeleteEffect(item, oldeffect);
@@ -2603,16 +2810,26 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event)
         EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
         m_commandStack->push(command);
         updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
-    }
-
-    emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast <Transition *>(m_dragItem) : NULL);
-    if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true);
+        emit clipItemSelected(item, item->selectedEffectIndex());
+    }
+    if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) {
+        // A transition is selected
+        QPoint p;
+        ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track);
+        if (transitionClip && transitionClip->baseClip()) {
+            QString size = transitionClip->baseClip()->getProperty("frame_size");
+            p.setX(size.section('x', 0, 0).toInt());
+            p.setY(size.section('x', 1, 1).toInt());
+        }
+        emit transitionItemSelected(static_cast <Transition *>(m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p);
+    } else emit transitionItemSelected(NULL);
+    if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified();
     m_operationMode = NONE;
 }
 
 void CustomTrackView::deleteClip(ItemInfo info)
 {
-    ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
+    ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
 
     if (!item || m_document->renderer()->mltRemoveClip(m_document->tracksCount() - info.track, info.startPos) == false) {
         emit displayMessage(i18n("Error removing clip at %1 on track %2", m_document->timecode().getTimecodeFromFrames(info.startPos.frames(m_document->fps())), info.track), ErrorMessage);
@@ -2622,7 +2839,7 @@ void CustomTrackView::deleteClip(ItemInfo info)
     item->baseClip()->removeReference();
     m_document->updateClip(item->baseClip()->getId());
 
-    if (item->baseClip()->isTransparent()) {
+    /*if (item->baseClip()->isTransparent()) {
         // also remove automatic transition
         Transition *tr = getTransitionItemAt(info.startPos, info.track);
         if (tr && tr->isAutomatic()) {
@@ -2630,10 +2847,13 @@ void CustomTrackView::deleteClip(ItemInfo info)
             scene()->removeItem(tr);
             delete tr;
         }
-    }
+    }*/
     scene()->removeItem(item);
+    m_waitingThumbs.removeAll(item);
     if (m_dragItem == item) m_dragItem = NULL;
     delete item;
+    item = NULL;
+    setDocumentModified();
     m_document->renderer()->doRefresh();
 }
 
@@ -2673,22 +2893,22 @@ void CustomTrackView::deleteSelectedClips()
         }
     }
 
-
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET) {
             ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
             if (item->parentItem()) resetGroup = true;
+            //kDebug()<<"// DELETE CLP AT: "<<item->info().startPos.frames(25);
             new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected);
+            emit clipItemSelected(NULL);
         } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             Transition *item = static_cast <Transition *>(itemList.at(i));
+            //kDebug()<<"// DELETE TRANS AT: "<<item->info().startPos.frames(25);
             if (item->parentItem()) resetGroup = true;
-            ItemInfo info;
-            info.startPos = item->startPos();
-            info.endPos = item->endPos();
-            info.track = item->track();
-            new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected);
+            new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected);
+            emit transitionItemSelected(NULL);
         }
     }
+
     m_commandStack->push(deleteSelected);
 }
 
@@ -2713,7 +2933,7 @@ void CustomTrackView::changeClipSpeed()
             double speed = (double) percent / 100.0;
             if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
                 count++;
-                new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected);
+                //new ChangeSpeedCommand(this, info, item->speed(), speed, item->clipProducer(), changeSelected);
             }
         }
     }
@@ -2721,23 +2941,23 @@ void CustomTrackView::changeClipSpeed()
     else delete changeSelected;
 }
 
-void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id)
+void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, int strobe, const QString &id)
 {
     DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
-    ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
+    ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
     if (!item) {
         kDebug() << "ERROR: Cannot find clip for speed change";
         emit displayMessage(i18n("Cannot find clip for speed change"), ErrorMessage);
         return;
     }
     info.track = m_document->tracksCount() - item->track();
-    int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
+    int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, strobe, baseclip->producer());
     if (endPos >= 0) {
-        item->setSpeed(speed);
+        item->setSpeed(speed, strobe);
         item->updateRectGeometry();
         if (item->cropDuration().frames(m_document->fps()) > endPos)
             item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
-        m_document->setModified(true);
+        setDocumentModified();
     } else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
 }
 
@@ -2813,7 +3033,7 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo>
             }
             tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
         }
-        m_document->setModified(true);
+        setDocumentModified();
         return;
     }
 
@@ -2832,7 +3052,7 @@ void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo>
     }
 
     groupSelectedItems(false, true);
-    m_document->setModified(true);
+    setDocumentModified();
 }
 
 void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects)
@@ -2842,26 +3062,16 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
         emit displayMessage(i18n("No clip copied"), ErrorMessage);
         return;
     }
-    ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble());
+    ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble(), xml.attribute("strobe", "1").toInt());
     item->setEffectList(effects);
+    if (xml.hasAttribute("audio_only")) item->setAudioOnly(true);
+    else if (xml.hasAttribute("video_only")) item->setVideoOnly(true);
     scene()->addItem(item);
 
     int tracknumber = m_document->tracksCount() - info.track - 1;
     bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
     if (isLocked) item->setItemLocked(true);
 
-    if (item->baseClip()->isTransparent()) {
-        // add transparency transition
-        int endTrack = getPreviousVideoTrack(info.track);
-        Transition *tr = new Transition(info, endTrack, m_document->fps(), MainWindow::transitions.getEffectByTag("composite", "composite"), true);
-        if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML())) scene()->addItem(tr);
-        else {
-            emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
-            delete tr;
-        }
-
-    }
-
     baseclip->addReference();
     m_document->updateClip(baseclip->getId());
     info.track = m_document->tracksCount() - info.track;
@@ -2873,8 +3083,10 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
     for (int i = 0; i < item->effectsCount(); i++) {
         m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
     }
-    m_document->setModified(true);
+    setDocumentModified();
     m_document->renderer()->doRefresh();
+    m_waitingThumbs.append(item);
+    m_thumbsTimer.start();
 }
 
 void CustomTrackView::slotUpdateClip(const QString &clipId)
@@ -2885,10 +3097,11 @@ void CustomTrackView::slotUpdateClip(const QString &clipId)
         if (list.at(i)->type() == AVWIDGET) {
             clip = static_cast <ClipItem *>(list.at(i));
             if (clip->clipProducer() == clipId) {
-                clip->refreshClip();
                 ItemInfo info = clip->info();
                 info.track = m_document->tracksCount() - clip->track();
                 m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer());
+                clip->refreshClip(true);
+                clip->update();
             }
         }
     }
@@ -2995,7 +3208,7 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end)
     ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
     if (!item) {
         emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
-        kDebug() << "----------------  ERROR, CANNOT find clip to move at.. ";
+        kDebug() << "----------------  ERROR, CANNOT find clip to move at.. ";
         return;
     }
     Mlt::Producer *prod;
@@ -3027,40 +3240,36 @@ void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end)
             }
         }
         KdenliveSettings::setSnaptopoints(snap);
-        m_document->setModified(true);
+        setDocumentModified();
     } else {
         // undo last move and emit error message
         emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
     }
-    kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25);
+    m_document->renderer()->doRefresh();
+    //kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25);
 }
 
 void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> startTransition, const GenTime offset, const int trackOffset, bool reverseMove)
 {
     // Group Items
-    kDebug() << "//GRP MOVE, REVERS:" << reverseMove;
-    kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;
+    /*kDebug() << "//GRP MOVE, REVERS:" << reverseMove;
+    kDebug() << "// GROUP MOV; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;*/
     resetSelectionGroup();
     m_scene->clearSelection();
-    QList<QGraphicsItem *> itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
-        if (itemList.at(i)->type() == AVWIDGET)
-            kDebug() << "ITEM " << i << ": " << static_cast <AbstractClipItem *>(itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos();
-    }
 
     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;
         }
-        //kDebug()<<"//LKING FR CLIP AT:"<<startClip.at(i).startPos.frames(25)<<", TK:"<<startClip.at(i).track;
+        //kDebug()<<"//LKING FR CLIP AT:"<<startClip.at(i).startPos.frames(25)<<", TK:"<<startClip.at(i).track;
         ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
         if (clip) {
             clip->setItemLocked(false);
             if (clip->parentItem()) clip->parentItem()->setSelected(true);
             else clip->setSelected(true);
             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);
+        } else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25);
     }
     for (int i = 0; i < startTransition.count(); i++) {
         if (reverseMove) {
@@ -3073,14 +3282,14 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
             if (tr->parentItem()) tr->parentItem()->setSelected(true);
             else tr->setSelected(true);
             m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
-        } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25);
+        } else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25);
     }
     groupSelectedItems(true);
     if (m_selectionGroup) {
         bool snap = KdenliveSettings::snaptopoints();
         KdenliveSettings::setSnaptopoints(false);
 
-        m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset * (qreal) m_tracksHeight);
+        m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
 
         kDebug() << "%% GRP NEW POS: " << m_selectionGroup->scenePos().x();
 
@@ -3113,7 +3322,7 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
                 else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
                 else prod = clip->baseClip()->producer(info.track);
                 m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
-                kDebug() << "// inserting new clp: " << info.startPos.frames(25);
+                kDebug() << "// inserting new clp: " << info.startPos.frames(25);
             } else if (item->type() == TRANSITIONWIDGET) {
                 Transition *tr = static_cast <Transition*>(item);
                 int newTrack = tr->transitionEndTrack();
@@ -3128,14 +3337,8 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
             }
         }
         KdenliveSettings::setSnaptopoints(snap);
-    } else kDebug() << "///////// WARNING; NO GROUP TO MOVE";
-
-    kDebug() << "///////// DONE+++++++++++++";
-    itemList = items();
-    for (int i = 0; i < itemList.count(); i++) {
-        if (itemList.at(i)->type() == AVWIDGET)
-            kDebug() << "ITEM " << i << ": " << static_cast <AbstractClipItem *>(itemList.at(i))->startPos().frames(25) << ",REEL: " << itemList.at(i)->scenePos();
-    }
+        m_document->renderer()->doRefresh();
+    } else kDebug() << "///////// WARNING; NO GROUP TO MOVE";
 }
 
 void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end)
@@ -3143,13 +3346,13 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end)
     Transition *item = getTransitionItemAt(start.startPos, start.track);
     if (!item) {
         emit displayMessage(i18n("Cannot move transition at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
-        kDebug() << "----------------  ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
+        kDebug() << "----------------  ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
         return;
     }
-    //kDebug() << "----------------  Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack;
+    //kDebug() << "----------------  Move TRANSITION FROM: " << startPos.x() << ", END:" << endPos.x() << ",TRACKS: " << oldtrack << " TO " << newtrack;
     bool snap = KdenliveSettings::snaptopoints();
     KdenliveSettings::setSnaptopoints(false);
-    //kDebug()<<"///  RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<<endPos.x()<<"x"<< endPos.y()<<")";
+    //kDebug()<<"///  RESIZE TRANS START: ("<< startPos.x()<<"x"<< startPos.y()<<") / ("<<endPos.x()<<"x"<< endPos.y()<<")";
     if (end.endPos - end.startPos == start.endPos - start.startPos) {
         // Transition was moved
         item->setPos((int) end.startPos.frames(m_document->fps()), (end.track) * m_tracksHeight + 1);
@@ -3169,7 +3372,17 @@ void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end)
     KdenliveSettings::setSnaptopoints(snap);
     item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
     m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
-    if (m_dragItem && m_dragItem == item) emit transitionItemSelected(item);
+    if (m_dragItem && m_dragItem == item) {
+        QPoint p;
+        ClipItem *transitionClip = getClipItemAt(item->startPos(), item->track());
+        if (transitionClip && transitionClip->baseClip()) {
+            QString size = transitionClip->baseClip()->getProperty("frame_size");
+            p.setX(size.section('x', 0, 0).toInt());
+            p.setY(size.section('x', 1, 1).toInt());
+        }
+        emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p);
+    }
+    m_document->renderer()->doRefresh();
 }
 
 void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
@@ -3181,7 +3394,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
     ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track);
     if (!item) {
         emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
-        kDebug() << "----------------  ERROR, CANNOT find clip to resize at... "; // << startPos;
+        kDebug() << "----------------  ERROR, CANNOT find clip to resize at... "; // << startPos;
         return;
     }
     if (item->parentItem()) {
@@ -3205,7 +3418,7 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
         bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos);
         if (success) {
             item->resizeEnd((int) end.endPos.frames(m_document->fps()));
-            updateClipFade(item, true);
+            updateClipFade(item);
         } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
     }
     if (end.cropStart != start.cropStart) {
@@ -3215,92 +3428,93 @@ void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
         bool success = m_document->renderer()->mltResizeClipCrop(clipinfo, end.cropStart - start.cropStart);
         if (success) {
             item->setCropStart(end.cropStart);
-            item->resetThumbs();
+            item->resetThumbs(true);
         }
     }
     m_document->renderer()->doRefresh();
     KdenliveSettings::setSnaptopoints(snap);
 }
 
-void CustomTrackView::updateClipFade(ClipItem * item, bool updateFadeOut)
-{
-    if (!updateFadeOut) {
-        int end = item->fadeIn();
-        if (end != 0) {
-            // there is a fade in effect
-            int effectPos = item->hasEffect("volume", "fadein");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int start = item->cropStart().frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeIn(max);
-                    end = item->fadeIn();
-                }
-                end += start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+void CustomTrackView::updateClipFade(ClipItem * item)
+{
+    int end = item->fadeIn();
+    if (end != 0) {
+        // there is a fade in effect
+        int effectPos = item->hasEffect("volume", "fadein");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int start = item->cropStart().frames(m_document->fps());
+            int max = item->cropDuration().frames(m_document->fps());
+            if (end > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeIn(max);
+                end = item->fadeIn();
             }
-            effectPos = item->hasEffect("brightness", "fade_from_black");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int start = item->cropStart().frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeIn(max);
-                    end = item->fadeIn();
-                }
-                end += start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+            end += start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+        }
+        effectPos = item->hasEffect("brightness", "fade_from_black");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int start = item->cropStart().frames(m_document->fps());
+            int max = item->cropDuration().frames(m_document->fps());
+            if (end > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeIn(max);
+                end = item->fadeIn();
             }
-        }
-    } else {
-        int start = item->fadeOut();
-        if (start != 0) {
-            // there is a fade in effect
-            int effectPos = item->hasEffect("volume", "fadeout");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int end = (item->duration() - item->cropStart()).frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeOut(max);
-                    start = item->fadeOut();
-                }
-                start = end - start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+            end += start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+        }
+    }
+    int start = item->fadeOut();
+    if (start != 0) {
+        // there is a fade out effect
+        int effectPos = item->hasEffect("volume", "fadeout");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int max = item->cropDuration().frames(m_document->fps());
+            int end = max + item->cropStart().frames(m_document->fps());
+            if (start > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeOut(max);
+                start = item->fadeOut();
             }
-            effectPos = item->hasEffect("brightness", "fade_to_black");
-            if (effectPos != -1) {
-                QDomElement oldeffect = item->effectAt(effectPos);
-                int end = (item->duration() - item->cropStart()).frames(m_document->fps());
-                int max = item->cropDuration().frames(m_document->fps());
-                if (end > max) {
-                    item->setFadeOut(max);
-                    start = item->fadeOut();
-                }
-                start = end - start;
-                EffectsList::setParameter(oldeffect, "in", QString::number(start));
-                EffectsList::setParameter(oldeffect, "out", QString::number(end));
-                if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
-                    emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
-                // if fade effect is displayed, update the effect edit widget with new clip duration
-                if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+            start = end - start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
+        }
+        effectPos = item->hasEffect("brightness", "fade_to_black");
+        if (effectPos != -1) {
+            QDomElement oldeffect = item->effectAt(effectPos);
+            int max = item->cropDuration().frames(m_document->fps());
+            int end = max + item->cropStart().frames(m_document->fps());
+            if (start > max) {
+                // Make sure the fade effect is not longer than the clip
+                item->setFadeOut(max);
+                start = item->fadeOut();
             }
+            start = end - start;
+            EffectsList::setParameter(oldeffect, "in", QString::number(start));
+            EffectsList::setParameter(oldeffect, "out", QString::number(end));
+            if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
+                emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+            // if fade effect is displayed, update the effect edit widget with new clip duration
+            if (item->isSelected() && effectPos == item->selectedEffectIndex()) emit clipItemSelected(item, effectPos);
         }
     }
 }
@@ -3313,7 +3527,7 @@ double CustomTrackView::getSnapPointForPos(double pos)
 void CustomTrackView::updateSnapPoints(AbstractClipItem *selected, QList <GenTime> offsetList, bool skipSelectedItems)
 {
     QList <GenTime> snaps;
-    if (selected && offsetList.isEmpty()) offsetList.append(selected->duration());
+    if (selected && offsetList.isEmpty()) offsetList.append(selected->cropDuration());
     QList<QGraphicsItem *> itemList = items();
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i) == selected) continue;
@@ -3451,7 +3665,7 @@ void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QSt
     DocClipBase *base = m_document->clipManager()->getClipById(id);
     if (!comment.isEmpty()) base->addSnapMarker(pos, comment);
     else base->deleteSnapMarker(pos);
-    m_document->setModified(true);
+    setDocumentModified();
     viewport()->update();
 }
 
@@ -3460,6 +3674,16 @@ bool sortGuidesList(const Guide *g1 , const Guide *g2)
     return (*g1).position() < (*g2).position();
 }
 
+int CustomTrackView::hasGuide(int pos, int offset)
+{
+    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;
+    }
+    return -1;
+}
+
 void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment)
 {
     if (oldPos > GenTime() && pos > GenTime()) {
@@ -3477,8 +3701,7 @@ void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const Q
         bool found = false;
         for (int i = 0; i < m_guides.count(); i++) {
             if (m_guides.at(i)->position() == oldPos) {
-                Guide *item = m_guides.takeAt(i);
-                delete item;
+                delete m_guides.takeAt(i);
                 found = true;
                 break;
             }
@@ -3516,9 +3739,11 @@ void CustomTrackView::slotAddGuide()
     }
 }
 
-void CustomTrackView::slotEditGuide()
+void CustomTrackView::slotEditGuide(int guidePos)
 {
-    GenTime pos = GenTime(m_cursorPos, m_document->fps());
+    GenTime pos;
+    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++) {
         if (m_guides.at(i)->position() == pos) {
@@ -3540,9 +3765,22 @@ void CustomTrackView::slotEditGuide(CommentedTime guide)
 }
 
 
-void CustomTrackView::slotDeleteGuide()
+void CustomTrackView::slotEditTimeLineGuide()
 {
-    GenTime pos = GenTime(m_cursorPos, m_document->fps());
+    if (m_dragGuide == NULL) return;
+    CommentedTime guide = m_dragGuide->info();
+    MarkerDialog d(NULL, guide, m_document->timecode(), i18n("Edit Guide"), this);
+    if (d.exec() == QDialog::Accepted) {
+        EditGuideCommand *command = new EditGuideCommand(this, guide.time(), guide.comment(), d.newMarker().time(), d.newMarker().comment(), true);
+        m_commandStack->push(command);
+    }
+}
+
+void CustomTrackView::slotDeleteGuide(int guidePos)
+{
+    GenTime pos;
+    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++) {
         if (m_guides.at(i)->position() == pos) {
@@ -3555,6 +3793,15 @@ void CustomTrackView::slotDeleteGuide()
     if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage);
 }
 
+
+void CustomTrackView::slotDeleteTimeLineGuide()
+{
+    if (m_dragGuide == NULL) return;
+    EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(), QString(), true);
+    m_commandStack->push(command);
+}
+
+
 void CustomTrackView::slotDeleteAllGuides()
 {
     QUndoCommand *deleteAll = new QUndoCommand();
@@ -3570,32 +3817,24 @@ void CustomTrackView::setTool(PROJECTTOOL tool)
     m_tool = tool;
 }
 
-void CustomTrackView::setScale(double scaleFactor)
+void CustomTrackView::setScale(double scaleFactor, double verticalScale)
 {
     QMatrix matrix;
-    matrix = matrix.scale(scaleFactor, 1);
-    m_scene->setScale(scaleFactor);
-    //scale(scaleFactor, 1);
+    matrix = matrix.scale(scaleFactor, verticalScale);
+    m_scene->setScale(scaleFactor, verticalScale);
     m_animationTimer->stop();
-    if (m_visualTip) {
-        delete m_visualTip;
-        m_visualTip = NULL;
-    }
-    if (m_animation) {
-        delete m_animation;
-        m_animation = NULL;
-    }
-
-    //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height());
+    delete m_visualTip;
+    m_visualTip = NULL;
+    delete m_animation;
+    m_animation = NULL;
+    double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
     setMatrix(matrix);
     int diff = sceneRect().width() - m_projectDuration;
     if (diff * matrix.m11() < 50) {
         if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height());
         else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
     }
-
-    centerOn(QPointF(cursorPos(), m_tracksHeight));
-    //verticalScrollBar()->setValue(vert);*/
+    centerOn(QPointF(cursorPos(), verticalPos));
 }
 
 void CustomTrackView::slotRefreshGuides()
@@ -3608,18 +3847,21 @@ void CustomTrackView::slotRefreshGuides()
     }
 }
 
-void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect)
+void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect)
 {
-    QColor base = palette().button().color();
     QRectF r = rect;
     r.setWidth(r.width() + 1);
     painter->setClipRect(r);
     painter->drawLine(r.left(), 0, r.right(), 0);
     uint max = m_document->tracksCount();
-    for (uint i = 0; i < max;i++) {
-        if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(250, 250, 100)));
-        else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(QColor(240, 240, 255)));
-        painter->drawLine(r.left(), m_tracksHeight * (i + 1), r.right(), m_tracksHeight * (i + 1));
+    KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
+    QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color();
+    QColor audioColor = palette().alternateBase().color();
+    QColor base = scheme.background(KColorScheme::NormalBackground).color();
+    for (uint i = 0; i < max; i++) {
+        if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(lockedColor));
+        else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(audioColor));
+        painter->drawLine(r.left(), m_tracksHeight *(i + 1), r.right(), m_tracksHeight *(i + 1));
     }
     int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1;
     if (height() > lowerLimit)
@@ -3694,9 +3936,8 @@ void CustomTrackView::clearSearchStrings()
 
 void CustomTrackView::copyClip()
 {
-    while (m_copiedItems.count() > 0) {
-        delete m_copiedItems.takeFirst();
-    }
+    qDeleteAll(m_copiedItems);
+    m_copiedItems.clear();
     QList<QGraphicsItem *> itemList = scene()->selectedItems();
     if (itemList.count() == 0) {
         emit displayMessage(i18n("Select a clip before copying"), ErrorMessage);
@@ -3898,10 +4139,14 @@ ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) con
 
 void CustomTrackView::setInPoint()
 {
-    ClipItem *clip = getActiveClipUnderCursor(true);
+    AbstractClipItem *clip = getActiveClipUnderCursor(true);
     if (clip == NULL) {
-        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
-        return;
+        if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
+            clip = m_dragItem;
+        } else {
+            emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+            return;
+        }
     }
     ItemInfo startInfo = clip->info();
     ItemInfo endInfo = startInfo;
@@ -3912,21 +4157,27 @@ void CustomTrackView::setInPoint()
         return;
     } else if (endInfo.startPos < startInfo.startPos) {
         int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false);
-        if (length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps())) {
+        if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (
+                    (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) {
             emit displayMessage(i18n("Invalid action"), ErrorMessage);
             return;
         }
     }
-    ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
-    m_commandStack->push(command);
+    if (clip->type() == TRANSITIONWIDGET) {
+        m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
+    } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true));
 }
 
 void CustomTrackView::setOutPoint()
 {
-    ClipItem *clip = getActiveClipUnderCursor(true);
+    AbstractClipItem *clip = getActiveClipUnderCursor(true);
     if (clip == NULL) {
-        emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
-        return;
+        if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
+            clip = m_dragItem;
+        } else {
+            emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+            return;
+        }
     }
     ItemInfo startInfo = clip->info();
     ItemInfo endInfo = clip->info();
@@ -3937,16 +4188,16 @@ void CustomTrackView::setOutPoint()
         return;
     } else if (endInfo.endPos > startInfo.endPos) {
         int length = m_document->renderer()->mltGetSpaceLength(endInfo.endPos, m_document->tracksCount() - startInfo.track, false);
-        if (length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps())) {
+        if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) {
             emit displayMessage(i18n("Invalid action"), ErrorMessage);
             return;
         }
     }
 
 
-
-    ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
-    m_commandStack->push(command);
+    if (clip->type() == TRANSITIONWIDGET) {
+        m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
+    } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true));
 }
 
 void CustomTrackView::slotUpdateAllThumbs()
@@ -3954,18 +4205,17 @@ void CustomTrackView::slotUpdateAllThumbs()
     QList<QGraphicsItem *> itemList = items();
     //if (itemList.isEmpty()) return;
     ClipItem *item;
-    QString thumbBase = m_document->projectFolder().path() + "/thumbs/";
+    const QString thumbBase = m_document->projectFolder().path() + "/thumbs/";
     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) {
+            if (item->clipType() != COLOR && item->clipType() != AUDIO) {
                 // Check if we have a cached thumbnail
-                if (item->clipType() == IMAGE || item->clipType() == TEXT || item->clipType() == AUDIO) {
+                if (item->clipType() == IMAGE || item->clipType() == TEXT) {
                     QString thumb = thumbBase + item->baseClip()->getClipHash() + "_0.png";
                     if (QFile::exists(thumb)) {
                         QPixmap pix(thumb);
                         item->slotSetStartThumb(pix);
-                        item->slotSetEndThumb(pix);
                     }
                 } else {
                     QString startThumb = thumbBase + item->baseClip()->getClipHash() + '_';
@@ -3982,7 +4232,7 @@ void CustomTrackView::slotUpdateAllThumbs()
                     }
                 }
             }
-            item->refreshClip();
+            item->refreshClip(false);
             qApp->processEvents();
         }
     }
@@ -4054,7 +4304,7 @@ void CustomTrackView::slotInsertTrack(int ix)
         }
         AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true);
         m_commandStack->push(addTrack);
-        m_document->setModified(true);
+        setDocumentModified();
     }
 }
 
@@ -4065,7 +4315,7 @@ void CustomTrackView::slotDeleteTrack(int ix)
     if (ok) {
         TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
         deleteTimelineTrack(ix, info);
-        m_document->setModified(true);
+        setDocumentModified();
         /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, false);
         m_commandStack->push(command);*/
     }
@@ -4082,6 +4332,11 @@ void CustomTrackView::slotChangeTrack(int ix)
     view.track_nb->setValue(ix);
     d.setWindowTitle(i18n("Change Track Type"));
 
+    if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK)
+        view.video_track->setChecked(true);
+    else
+        view.audio_track->setChecked(true);
+
     if (d.exec() == QDialog::Accepted) {
         TrackInfo info;
         info.isLocked = false;
@@ -4096,7 +4351,7 @@ void CustomTrackView::slotChangeTrack(int ix)
             info.isBlind = true;
         }
         changeTimelineTrack(ix, info);
-        m_document->setModified(true);
+        setDocumentModified();
     }
 }
 
@@ -4126,6 +4381,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
         }
     }
 
+    selection = m_scene->items();
     new AddTrackCommand(this, ix, trackinfo, false, deleteTrack);
     m_commandStack->push(deleteTrack);
 }
@@ -4278,7 +4534,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
             kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
             if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) {
                 kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
-                if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->duration().frames(m_document->fps())) {
+                if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) {
                     kDebug() << "FOUND SPACE ON TRK: " << freetrack;
                     break;
                 }
@@ -4309,13 +4565,13 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
     } else {
         // unsplit clip: remove audio part and change video part to normal clip
         if (clip->parentItem() == NULL || clip->parentItem()->type() != GROUPWIDGET) {
-            kDebug() << "//CANNOT FIND CLP GRP";
+            kDebug() << "//CANNOT FIND CLP GRP";
             return;
         }
         AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(clip->parentItem());
         QList<QGraphicsItem *> children = grp->childItems();
         if (children.count() != 2) {
-            kDebug() << "//SOMETHING IS WRONG WITH CLP GRP";
+            kDebug() << "//SOMETHING IS WRONG WITH CLP GRP";
             return;
         }
         for (int i = 0; i < children.count(); i++) {
@@ -4328,6 +4584,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
                 break;
             }
         }
+        clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
         m_document->clipManager()->removeGroup(grp);
         scene()->destroyItemGroup(grp);
     }
@@ -4432,6 +4689,7 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video
         m_document->renderer()->mltUpdateClipProducer(m_document->tracksCount() - track, start, clip->baseClip()->producer(track));
     }
     clip->update();
+    setDocumentModified();
 }
 
 void CustomTrackView::updateClipTypeActions(ClipItem *clip)
@@ -4454,4 +4712,53 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip)
     }
 }
 
+void CustomTrackView::reloadTransitionLumas()
+{
+    QString lumaNames;
+    QString lumaFiles;
+    QDomElement lumaTransition = MainWindow::transitions.getEffectByTag("luma", "luma");
+    QDomNodeList params = lumaTransition.elementsByTagName("parameter");
+    for (int i = 0; i < params.count(); i++) {
+        QDomElement e = params.item(i).toElement();
+        if (e.attribute("tag") == "resource") {
+            lumaNames = e.attribute("paramlistdisplay");
+            lumaFiles = e.attribute("paramlist");
+            break;
+        }
+    }
+
+    QList<QGraphicsItem *> itemList = items();
+    Transition *transitionitem;
+    QDomElement transitionXml;
+    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++) {
+                    QDomElement e = params.item(i).toElement();
+                    if (e.attribute("tag") == "resource") {
+                        e.setAttribute("paramlistdisplay", lumaNames);
+                        e.setAttribute("paramlist", lumaFiles);
+                        break;
+                    }
+                }
+            }
+            if (transitionXml.attribute("id") == "composite" && transitionXml.attribute("tag") == "composite") {
+                QDomNodeList params = transitionXml.elementsByTagName("parameter");
+                for (int i = 0; i < params.count(); i++) {
+                    QDomElement e = params.item(i).toElement();
+                    if (e.attribute("tag") == "luma") {
+                        e.setAttribute("paramlistdisplay", lumaNames);
+                        e.setAttribute("paramlist", lumaFiles);
+                        break;
+                    }
+                }
+            }
+        }
+    }
+    emit transitionItemSelected(NULL);
+}
+
 #include "customtrackview.moc"