]> git.sesse.net Git - kdenlive/blobdiff - src/customtrackview.cpp
more work on keyframe effects and thumbnail fixes
[kdenlive] / src / customtrackview.cpp
index e44e713b5a9f3f5febb775b3a66658be5fe8f426..19e94e7f407d0bf1dde25a22adbd37856e516366 100644 (file)
@@ -38,6 +38,7 @@
 #include "moveclipcommand.h"
 #include "movetransitioncommand.h"
 #include "resizeclipcommand.h"
+#include "editguidecommand.h"
 #include "addtimelineclipcommand.h"
 #include "addeffectcommand.h"
 #include "editeffectcommand.h"
@@ -65,7 +66,7 @@
 // const int duration = animate ? 1500 : 1;
 
 CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent)
-        : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL) {
+        : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL) {
     if (doc) m_commandStack = doc->commandStack();
     else m_commandStack == NULL;
     setMouseTracking(true);
@@ -81,7 +82,7 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene
     setContentsMargins(0, 0, 0, 0);
     if (projectscene) {
         m_cursorLine = projectscene->addLine(0, 0, 0, m_tracksHeight);
-        m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIgnoresTransformations);
+        m_cursorLine->setFlags(QGraphicsItem::ItemIsMovable);
         m_cursorLine->setZValue(1000);
     }
 
@@ -89,6 +90,11 @@ CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene
     m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
 }
 
+CustomTrackView::~CustomTrackView() {
+    qDeleteAll(m_guides);
+}
+
+
 void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition) {
     m_timelineContextMenu = timeline;
     m_timelineContextClipMenu = clip;
@@ -121,6 +127,13 @@ void CustomTrackView::checkTrackHeight() {
         }
     }
     m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_tracksList.count());
+
+    for (int i = 0; i < m_guides.count(); i++) {
+        QLineF l = m_guides.at(i)->line();
+        l.setP2(QPointF(l.x2(), m_tracksHeight * m_tracksList.count()));
+        m_guides.at(i)->setLine(l);
+    }
+
     setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_tracksList.count());
     verticalScrollBar()->setMaximum(m_tracksHeight * m_tracksList.count());
     update();
@@ -156,8 +169,8 @@ int CustomTrackView::getPreviousVideoTrack(int track) {
 void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
     int pos = event->x();
     emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale));
-       if (event->buttons() & Qt::MidButton) return;
-    {
+    if (event->buttons() & Qt::MidButton) return;
+    if (event->buttons() != Qt::NoButton) {
         if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) {
             // a button was pressed, delete visual tips
             if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) {
@@ -185,8 +198,18 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
             } else if (m_operationMode == FADEOUT) {
                 int pos = (int)(mapToScene(event->pos()).x() / m_scale);
                 ((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
+            } else if (m_operationMode == KEYFRAME) {
+                GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+                m_dragItem->updateKeyFramePos(keyFramePos, mapToScene(event->pos()).toPoint().y());
             }
 
+            if (m_animation) delete m_animation;
+            m_animation = NULL;
+            if (m_visualTip) delete m_visualTip;
+            m_visualTip = NULL;
+            QGraphicsView::mouseMoveEvent(event);
+            return;
+        } else if (m_operationMode == MOVEGUIDE) {
             if (m_animation) delete m_animation;
             m_animation = NULL;
             if (m_visualTip) delete m_visualTip;
@@ -194,189 +217,198 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
             QGraphicsView::mouseMoveEvent(event);
             return;
         }
+    }
+
+    if (m_tool == RAZORTOOL) {
+        setCursor(m_razorCursor);
+        QGraphicsView::mouseMoveEvent(event);
+        return;
+    }
 
-        QList<QGraphicsItem *> itemList = items(event->pos());
-        QGraphicsRectItem *item = NULL;
-        for (int i = 0; i < itemList.count(); i++) {
+    QList<QGraphicsItem *> itemList = items(event->pos());
+    QGraphicsRectItem *item = NULL;
+    OPERATIONTYPE opMode = NONE;
+
+    if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) {
+        opMode = MOVEGUIDE;
+    } else for (int i = 0; i < itemList.count(); i++) {
             if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
                 item = (QGraphicsRectItem*) itemList.at(i);
                 break;
             }
         }
-        if (m_tool == RAZORTOOL) {
-            setCursor(m_razorCursor);
+
+    if (item && event->buttons() == Qt::NoButton) {
+        AbstractClipItem *clip = (AbstractClipItem*) item;
+        opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
+        double size = 8;
+        if (opMode == m_moveOpMode) {
             QGraphicsView::mouseMoveEvent(event);
             return;
-        }
-
-        if (item && event->buttons() == Qt::NoButton) {
-            AbstractClipItem *clip = (AbstractClipItem*) item;
-            OPERATIONTYPE opMode = opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
-            double size = 8;
-
-            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_visualTip;
-                    m_visualTip = NULL;
-                }
-            }
-            m_moveOpMode = opMode;
-            if (opMode == MOVE) {
-                setCursor(Qt::OpenHandCursor);
-            } else if (opMode == RESIZESTART) {
-                setCursor(KCursor("left_side", Qt::SizeHorCursor));
-                kDebug() << "********  RESIZE CLIP START; WIDTH: " << size;
-                if (m_visualTip == NULL) {
-                    QPolygon polygon;
-                    polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
-                    polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
-                    polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
-                    polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
-
-                    m_visualTip = new QGraphicsPolygonItem(polygon);
-                    ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
-                    ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
-                    m_visualTip->setZValue(100);
-                    m_animation = new QGraphicsItemAnimation;
-                    m_animation->setItem(m_visualTip);
-                    m_animation->setTimeLine(m_animationTimer);
-                    m_visualTip->setPos(0, 0);
-                    double scale = 2.0;
-                    m_animation->setScaleAt(.5, scale, 1);
-                    m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
-                    scale = 1.0;
-                    m_animation->setScaleAt(1, scale, 1);
-                    m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
-                    scene()->addItem(m_visualTip);
-                    m_animationTimer->start();
-                }
-            } else if (opMode == RESIZEEND) {
-                setCursor(KCursor("right_side", Qt::SizeHorCursor));
-                if (m_visualTip == NULL) {
-                    QPolygon polygon;
-                    polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
-                    polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
-                    polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
-                    polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
-
-                    m_visualTip = new QGraphicsPolygonItem(polygon);
-                    ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
-                    ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
-
-                    m_visualTip->setZValue(100);
-                    m_animation = new QGraphicsItemAnimation;
-                    m_animation->setItem(m_visualTip);
-                    m_animation->setTimeLine(m_animationTimer);
-                    m_visualTip->setPos(0, 0);
-                    double scale = 2.0;
-                    m_animation->setScaleAt(.5, scale, 1);
-                    m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0));
-                    scale = 1.0;
-                    m_animation->setScaleAt(1, scale, 1);
-                    m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
-                    scene()->addItem(m_visualTip);
-                    m_animationTimer->start();
-                }
-            } else if (opMode == FADEIN) {
-                if (m_visualTip == NULL) {
-                    ClipItem *item = (ClipItem *) clip;
-                    m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
-                    m_visualTip->setZValue(100);
-                    m_animation = new QGraphicsItemAnimation;
-                    m_animation->setItem(m_visualTip);
-                    m_animation->setTimeLine(m_animationTimer);
-                    m_visualTip->setPos(0, 0);
-                    double scale = 2.0;
-                    m_animation->setScaleAt(.5, scale, scale);
-                    m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale -  item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale));
-                    scale = 1.0;
-                    m_animation->setScaleAt(1, scale, scale);
-                    m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
-                    scene()->addItem(m_visualTip);
-                    m_animationTimer->start();
-                }
-                setCursor(Qt::PointingHandCursor);
-            } else if (opMode == FADEOUT) {
-                if (m_visualTip == NULL) {
-                    ClipItem *item = (ClipItem *) clip;
-                    m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
-                    m_visualTip->setZValue(100);
-                    m_animation = new QGraphicsItemAnimation;
-                    m_animation->setItem(m_visualTip);
-                    m_animation->setTimeLine(m_animationTimer);
-                    m_visualTip->setPos(0, 0);
-                    double scale = 2.0;
-                    m_animation->setScaleAt(.5, scale, scale);
-                    m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale));
-                    scale = 1.0;
-                    m_animation->setScaleAt(1, scale, scale);
-                    m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
-                    scene()->addItem(m_visualTip);
-                    m_animationTimer->start();
-                }
-                setCursor(Qt::PointingHandCursor);
-            } else if (opMode == TRANSITIONSTART) {
-                if (m_visualTip == NULL) {
-                    m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
-                    m_visualTip->setZValue(100);
-                    m_animation = new QGraphicsItemAnimation;
-                    m_animation->setItem(m_visualTip);
-                    m_animation->setTimeLine(m_animationTimer);
-                    m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12);
-                    double scale = 2.0;
-                    m_animation->setScaleAt(.5, scale, scale);
-                    scale = 1.0;
-                    m_animation->setScaleAt(1, scale, scale);
-                    scene()->addItem(m_visualTip);
-                    m_animationTimer->start();
-                }
-                setCursor(Qt::PointingHandCursor);
-            } else if (opMode == TRANSITIONEND) {
-                if (m_visualTip == NULL) {
-                    m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
-                    ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
-                    m_visualTip->setZValue(100);
-                    m_animation = new QGraphicsItemAnimation;
-                    m_animation->setItem(m_visualTip);
-                    m_animation->setTimeLine(m_animationTimer);
-                    m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12);
-                    double scale = 2.0;
-                    m_animation->setScaleAt(.5, scale, scale);
-                    scale = 1.0;
-                    m_animation->setScaleAt(1, scale, scale);
-                    scene()->addItem(m_visualTip);
-                    m_animationTimer->start();
-                }
-                setCursor(Qt::PointingHandCursor);
-            }
         } else {
-            m_moveOpMode = NONE;
-            if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
-                setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
-            }
             if (m_visualTip) {
                 if (m_animation) delete m_animation;
-                m_animationTimer->stop();
                 m_animation = NULL;
+                m_animationTimer->stop();
                 delete m_visualTip;
                 m_visualTip = NULL;
-
             }
-            setCursor(Qt::ArrowCursor);
         }
+        m_moveOpMode = opMode;
+        if (opMode == MOVE) {
+            setCursor(Qt::OpenHandCursor);
+        } else if (opMode == RESIZESTART) {
+            setCursor(KCursor("left_side", Qt::SizeHorCursor));
+            if (m_visualTip == NULL) {
+                QPolygon polygon;
+                polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+                polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
+                polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
+                polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+
+                m_visualTip = new QGraphicsPolygonItem(polygon);
+                ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setZValue(100);
+                m_animation = new QGraphicsItemAnimation;
+                m_animation->setItem(m_visualTip);
+                m_animation->setTimeLine(m_animationTimer);
+                m_visualTip->setPos(0, 0);
+                double scale = 2.0;
+                m_animation->setScaleAt(.5, scale, 1);
+                m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+                scale = 1.0;
+                m_animation->setScaleAt(1, scale, 1);
+                m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+                scene()->addItem(m_visualTip);
+                m_animationTimer->start();
+            }
+        } else if (opMode == RESIZEEND) {
+            setCursor(KCursor("right_side", Qt::SizeHorCursor));
+            if (m_visualTip == NULL) {
+                QPolygon polygon;
+                polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+                polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
+                polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
+                polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+
+                m_visualTip = new QGraphicsPolygonItem(polygon);
+                ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+
+                m_visualTip->setZValue(100);
+                m_animation = new QGraphicsItemAnimation;
+                m_animation->setItem(m_visualTip);
+                m_animation->setTimeLine(m_animationTimer);
+                m_visualTip->setPos(0, 0);
+                double scale = 2.0;
+                m_animation->setScaleAt(.5, scale, 1);
+                m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0));
+                scale = 1.0;
+                m_animation->setScaleAt(1, scale, 1);
+                m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+                scene()->addItem(m_visualTip);
+                m_animationTimer->start();
+            }
+        } else if (opMode == FADEIN) {
+            if (m_visualTip == NULL) {
+                ClipItem *item = (ClipItem *) clip;
+                m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16);
+                ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setZValue(100);
+                m_animation = new QGraphicsItemAnimation;
+                m_animation->setItem(m_visualTip);
+                m_animation->setTimeLine(m_animationTimer);
+                m_visualTip->setPos(0, 0);
+                double scale = 2.0;
+                m_animation->setScaleAt(.5, scale, scale);
+                m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale -  item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale));
+                scale = 1.0;
+                m_animation->setScaleAt(1, scale, scale);
+                m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
+                scene()->addItem(m_visualTip);
+                m_animationTimer->start();
+            }
+            setCursor(Qt::PointingHandCursor);
+        } else if (opMode == FADEOUT) {
+            if (m_visualTip == NULL) {
+                ClipItem *item = (ClipItem *) clip;
+                m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16);
+                ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setZValue(100);
+                m_animation = new QGraphicsItemAnimation;
+                m_animation->setItem(m_visualTip);
+                m_animation->setTimeLine(m_animationTimer);
+                m_visualTip->setPos(0, 0);
+                double scale = 2.0;
+                m_animation->setScaleAt(.5, scale, scale);
+                m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale));
+                scale = 1.0;
+                m_animation->setScaleAt(1, scale, scale);
+                m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
+                scene()->addItem(m_visualTip);
+                m_animationTimer->start();
+            }
+            setCursor(Qt::PointingHandCursor);
+        } else if (opMode == TRANSITIONSTART) {
+            if (m_visualTip == NULL) {
+                m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
+                ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setZValue(100);
+                m_animation = new QGraphicsItemAnimation;
+                m_animation->setItem(m_visualTip);
+                m_animation->setTimeLine(m_animationTimer);
+                m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12);
+                double scale = 2.0;
+                m_animation->setScaleAt(.5, scale, scale);
+                scale = 1.0;
+                m_animation->setScaleAt(1, scale, scale);
+                scene()->addItem(m_visualTip);
+                m_animationTimer->start();
+            }
+            setCursor(Qt::PointingHandCursor);
+        } else if (opMode == TRANSITIONEND) {
+            if (m_visualTip == NULL) {
+                m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
+                ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+                ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+                m_visualTip->setZValue(100);
+                m_animation = new QGraphicsItemAnimation;
+                m_animation->setItem(m_visualTip);
+                m_animation->setTimeLine(m_animationTimer);
+                m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12);
+                double scale = 2.0;
+                m_animation->setScaleAt(.5, scale, scale);
+                scale = 1.0;
+                m_animation->setScaleAt(1, scale, scale);
+                scene()->addItem(m_visualTip);
+                m_animationTimer->start();
+            }
+            setCursor(Qt::PointingHandCursor);
+        } else if (opMode == KEYFRAME) {
+            setCursor(Qt::PointingHandCursor);
+        }
+    } // no clip under mouse
+    else if (opMode == MOVEGUIDE) {
+        m_moveOpMode = opMode;
+        setCursor(Qt::SplitHCursor);
+    } else {
+        m_moveOpMode = NONE;
+        if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
+            setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
+        }
+        if (m_visualTip) {
+            if (m_animation) delete m_animation;
+            m_animationTimer->stop();
+            m_animation = NULL;
+            delete m_visualTip;
+            m_visualTip = NULL;
+
+        }
+        setCursor(Qt::ArrowCursor);
     }
     QGraphicsView::mouseMoveEvent(event);
 }
@@ -399,75 +431,87 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         return;
     } else {
         bool collision = false;
-        m_dragItem = NULL;
         QList<QGraphicsItem *> collisionList = items(event->pos());
-        for (int i = 0; i < collisionList.size(); ++i) {
-            QGraphicsItem *item = collisionList.at(i);
-            if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
-                if (m_tool == RAZORTOOL) {
-                    if (item->type() == TRANSITIONWIDGET) return;
-                    AbstractClipItem *clip = (AbstractClipItem *) item;
-                    ItemInfo info;
-                    info.startPos = clip->startPos();
-                    info.endPos = clip->endPos();
-                    info.track = clip->track();
-                    RazorClipCommand* command = new RazorClipCommand(this, info, GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()), true);
-                    m_commandStack->push(command);
-                    m_document->setModified(true);
-                    return;
-                }
-                // select item
-                if (!item->isSelected()) {
-                    QList<QGraphicsItem *> itemList = items();
-                    for (int i = 0; i < itemList.count(); i++)
-                        itemList.at(i)->setSelected(false);
-                    item->setSelected(true);
-                    update();
-                }
-
-                m_dragItem = (AbstractClipItem *) item;
-
-                m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->rect().top()));
-                m_dragItemInfo.startPos = m_dragItem->startPos();
-                m_dragItemInfo.endPos = m_dragItem->endPos();
-                m_dragItemInfo.track = m_dragItem->track();
-
-                m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
-                if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
-                if (m_operationMode == TRANSITIONSTART) {
-                    ItemInfo info;
-                    info.startPos = m_dragItem->startPos();
-                    info.track = m_dragItem->track();
-                                       int transitiontrack = getPreviousVideoTrack(info.track);
-                                       ClipItem *transitionClip = NULL;
-                                       if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack);
-                                       if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
-                                               info.endPos = transitionClip->endPos();
-                                       }
-                    else info.endPos = info.startPos + GenTime(2.5);
-                    
-                    slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
-                }
-                if (m_operationMode == TRANSITIONEND) {
-                    ItemInfo info;
-                    info.endPos = m_dragItem->endPos();
-                    info.track = m_dragItem->track();
-                    int transitiontrack = getPreviousVideoTrack(info.track);
-                                       ClipItem *transitionClip = NULL;
-                                       if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack);
-                                       if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
-                                               info.startPos = transitionClip->startPos();
-                                       }
-                    else info.startPos = info.endPos - GenTime(2.5);
-                    slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+        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
+            QList<QGraphicsItem *> clips = scene()->selectedItems();
+            for (int i = 0; i < clips.count(); ++i)
+                clips.at(i)->setSelected(false);
+            updateSnapPoints(NULL);
+            QGraphicsView::mousePressEvent(event);
+        } else for (int i = 0; i < collisionList.count(); ++i) {
+                QGraphicsItem *item = collisionList.at(i);
+                if (item->type() == AVWIDGET || item->type() == TRANSITIONWIDGET) {
+                    if (m_tool == RAZORTOOL) {
+                        if (item->type() == TRANSITIONWIDGET) return;
+                        AbstractClipItem *clip = (AbstractClipItem *) item;
+                        ItemInfo info;
+                        info.startPos = clip->startPos();
+                        info.endPos = clip->endPos();
+                        info.track = clip->track();
+                        RazorClipCommand* command = new RazorClipCommand(this, info, GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()), true);
+                        m_commandStack->push(command);
+                        m_document->setModified(true);
+                        return;
+                    }
+                    // select item
+                    if (!item->isSelected()) {
+                        QList<QGraphicsItem *> itemList = items();
+                        for (int i = 0; i < itemList.count(); i++) {
+                            itemList.at(i)->setSelected(false);
+                            itemList.at(i)->update();
+                        }
+                        item->setSelected(true);
+                        item->update();
+                    }
+
+                    m_dragItem = (AbstractClipItem *) item;
+
+                    m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps()) * m_scale), (int)(event->pos().y() - m_dragItem->rect().top()));
+                    m_dragItemInfo.startPos = m_dragItem->startPos();
+                    m_dragItemInfo.endPos = m_dragItem->endPos();
+                    m_dragItemInfo.track = m_dragItem->track();
+
+                    m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
+                    if (m_operationMode == KEYFRAME) {
+                        m_dragItem->updateSelectedKeyFrame();
+                        return;
+                    } else if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
+                    else if (m_operationMode == TRANSITIONSTART) {
+                        ItemInfo info;
+                        info.startPos = m_dragItem->startPos();
+                        info.track = m_dragItem->track();
+                        int transitiontrack = getPreviousVideoTrack(info.track);
+                        ClipItem *transitionClip = NULL;
+                        if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.startPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack);
+                        if (transitionClip && transitionClip->endPos() < m_dragItem->endPos()) {
+                            info.endPos = transitionClip->endPos();
+                        } else info.endPos = info.startPos + GenTime(2.5);
+
+                        slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+                    } else if (m_operationMode == TRANSITIONEND) {
+                        ItemInfo info;
+                        info.endPos = m_dragItem->endPos();
+                        info.track = m_dragItem->track();
+                        int transitiontrack = getPreviousVideoTrack(info.track);
+                        ClipItem *transitionClip = NULL;
+                        if (transitiontrack != 0) transitionClip = getClipItemAt((int) info.endPos.frames(m_document->fps()), m_tracksList.count() - transitiontrack);
+                        if (transitionClip && transitionClip->startPos() > m_dragItem->startPos()) {
+                            info.startPos = transitionClip->startPos();
+                        } else info.startPos = info.endPos - GenTime(2.5);
+                        slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
+                    }
+                    updateSnapPoints(m_dragItem);
+                    collision = true;
+                    break;
                 }
-                updateSnapPoints(m_dragItem);
-                collision = true;
-                break;
             }
-        }
-        emit clipItemSelected((m_dragItem && m_dragItem->type() == AVWIDGET) ? (ClipItem*) m_dragItem : NULL);
-
         if (!collision) {
             kDebug() << "//////// NO ITEM FOUND ON CLICK";
             m_dragItem = NULL;
@@ -484,11 +528,23 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
             displayContextMenu(event->globalPos(), m_dragItem);
             m_dragItem = NULL;
         }
+        if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
+        else emit clipItemSelected(NULL);
     }
     //kDebug()<<pos;
     //QGraphicsView::mousePressEvent(event);
 }
 
+void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) {
+    if (m_dragItem && m_dragItem->hasKeyFrames()) {
+        GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+        m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
+        ClipItem * item = (ClipItem *) m_dragItem;
+        item->updateKeyframeEffect();
+        updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
+    }
+}
+
 void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
     if (clip == NULL) m_timelineContextMenu->popup(pos);
     else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos);
@@ -848,6 +904,17 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
     }
     QGraphicsView::mouseReleaseEvent(event);
     setDragMode(QGraphicsView::NoDrag);
+    if (m_operationMode == MOVEGUIDE) {
+        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_scale, m_document->fps()), m_dragGuide->label(), false);
+        m_commandStack->push(command);
+        m_dragGuide->update(GenTime(m_dragGuide->pos().x() / m_scale, m_document->fps()));
+        m_dragGuide = NULL;
+        m_dragItem = NULL;
+        return;
+    }
     if (m_dragItem == NULL) {
         emit transitionItemSelected(NULL);
         return;
@@ -952,12 +1019,16 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
             EffectsList::setParameter(effect, "out", QString::number(end));
             slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
         }
+    } else if (m_operationMode == KEYFRAME) {
+        // update the MLT effect
+        ClipItem * item = (ClipItem *) m_dragItem;
+        item->updateKeyframeEffect();
+        updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
     }
 
     emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
     m_document->setModified(true);
     m_operationMode = NONE;
-    m_dragItem = NULL;
 }
 
 void CustomTrackView::deleteClip(ItemInfo info) {
@@ -1207,6 +1278,18 @@ void CustomTrackView::updateSnapPoints(AbstractClipItem *selected) {
             }
         }
     }
+
+    // add cursor position
+    GenTime pos = GenTime(m_cursorPos, m_document->fps());
+    m_snapPoints.append(pos);
+    if (offset != GenTime()) m_snapPoints.append(pos - offset);
+
+    // add guides
+    for (int i = 0; i < m_guides.count(); i++) {
+        m_snapPoints.append(m_guides.at(i)->position());
+        if (offset != GenTime()) m_snapPoints.append(m_guides.at(i)->position() - offset);
+    }
+
     qSort(m_snapPoints);
     //for (int i = 0; i < m_snapPoints.size(); ++i)
     //    kDebug() << "SNAP POINT: " << m_snapPoints.at(i).frames(25);
@@ -1325,27 +1408,92 @@ void CustomTrackView::addMarker(const int id, const GenTime &pos, const QString
     viewport()->update();
 }
 
+
+
+void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment) {
+    if (oldPos != GenTime() && pos != GenTime()) {
+        // move guide
+        for (int i = 0; i < m_guides.count(); i++) {
+            kDebug() << "// LOOKING FOR GUIDE (" << i << "): " << m_guides.at(i)->position().frames(25) << ", LOOK: " << oldPos.frames(25) << "x" << pos.frames(25);
+            if (m_guides.at(i)->position() == oldPos) {
+                Guide *item = m_guides.at(i);
+                item->update(pos, comment);
+                item->updatePosition(m_scale);
+                break;
+            }
+        }
+    } else if (pos != GenTime()) addGuide(pos, comment);
+    else {
+        // remove guide
+        for (int i = 0; i < m_guides.count(); i++) {
+            if (m_guides.at(i)->position() == oldPos) {
+                Guide *item = m_guides.takeAt(i);
+                delete item;
+                break;
+            }
+        }
+
+    }
+}
+
+void CustomTrackView::addGuide(const GenTime pos, const QString &comment) {
+    Guide *g = new Guide(this, pos, comment, m_scale, m_document->fps(), m_tracksHeight * m_tracksList.count());
+    scene()->addItem(g);
+    m_guides.append(g);
+}
+
+void CustomTrackView::slotAddGuide() {
+    addGuide(GenTime(m_cursorPos, m_document->fps()), i18n("guide"));
+    EditGuideCommand *command = new EditGuideCommand(this, GenTime(), QString(), GenTime(m_cursorPos, m_document->fps()), i18n("guide"), false);
+    m_commandStack->push(command);
+
+}
+
+void CustomTrackView::slotDeleteGuide() {
+    GenTime pos = GenTime(m_cursorPos, m_document->fps());
+    for (int i = 0; i < m_guides.count(); i++) {
+        if (m_guides.at(i)->position() == pos) {
+            EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true);
+            m_commandStack->push(command);
+            break;
+        }
+    }
+}
+
 void CustomTrackView::setTool(PROJECTTOOL tool) {
     m_tool = tool;
 }
 
 void CustomTrackView::setScale(double scaleFactor) {
     //scale(scaleFactor, scaleFactor);
+    m_animationTimer->stop();
+    if (m_visualTip) {
+        delete m_visualTip;
+        m_visualTip = NULL;
+    }
+    if (m_animation) {
+        delete m_animation;
+        m_animation = NULL;
+    }
     double pos = cursorPos() / m_scale;
     m_scale = scaleFactor;
     int vert = verticalScrollBar()->value();
     kDebug() << " HHHHHHHH  SCALING: " << m_scale;
     QList<QGraphicsItem *> itemList = items();
-
     for (int i = 0; i < itemList.count(); i++) {
         if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
             AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i);
             clip->setRect(clip->startPos().frames(m_document->fps()) * m_scale, clip->rect().y(), clip->duration().frames(m_document->fps()) * m_scale, clip->rect().height());
         }
     }
+
+    for (int i = 0; i < m_guides.count(); i++) {
+        m_guides.at(i)->updatePosition(m_scale);
+    }
+
+    setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
     updateCursorPos();
     centerOn(QPointF(cursorPos(), m_tracksHeight));
-    setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
     verticalScrollBar()->setValue(vert);
 }
 
@@ -1366,6 +1514,20 @@ void CustomTrackView::drawBackground(QPainter * painter, const QRectF & rect) {
     if (height() > lowerLimit)
         painter->fillRect(QRectF(rectInView.left(), lowerLimit, rectInView.width(), height() - lowerLimit), QBrush(base));
 }
+
+QDomElement CustomTrackView::xmlInfo() {
+    QDomDocument doc;
+    QDomElement e;
+    QDomElement guides = doc.createElement("guides");
+    for (int i = 0; i < m_guides.count(); i++) {
+        e = doc.createElement("guide");
+        e.setAttribute("time", m_guides.at(i)->position().ms() / 1000);
+        e.setAttribute("comment", m_guides.at(i)->label());
+        guides.appendChild(e);
+    }
+    return guides;
+}
+
 /*
 void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect )
 {