Fix Dvd wizard monitor layout and loading issues

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index a43a8ce8c1beff1c1db562020c4bbc6cc07f61de..7fb3ca6b903c11a1162ddcbeac760cb95b9421fd 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -29,8 +29,9 @@
 #include <QDomElement>
 #include <QPainter>
 #include <QStyleOptionGraphicsItem>
+#if QT_VERSION >= 0x040600
 #include <QPropertyAnimation>
-
+#endif
 
 Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) :
         AbstractClipItem(info, QRectF(), fps),
@@ -51,8 +52,8 @@ Transition::Transition(const ItemInfo &info, int transitiontrack, double fps, QD
     else {
         QPropertyAnimation *startAnimation = new QPropertyAnimation(this, "rect");
         startAnimation->setDuration(200);
-        QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
-        QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
+        const QRectF r(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal) itemHeight() / 2);
+        const QRectF r2(0, 0, m_info.cropDuration.frames(fps) - 0.02, (qreal)itemHeight());
         startAnimation->setStartValue(r);
         startAnimation->setEndValue(r2);
         startAnimation->setEasingCurve(QEasingCurve::OutQuad);
@@ -135,17 +136,6 @@ void Transition::setTransitionParameters(const QDomElement params)
     update();
 }
 
-
-bool Transition::invertedTransition() const
-{
-    return false; //m_parameters.attribute("reverse").toInt();
-}
-
-void Transition::setTransitionDirection(bool /*inv*/)
-{
-    //m_parameters.setAttribute("reverse", inv);
-}
-
 int Transition::transitionEndTrack() const
 {
     return m_transitionTrack;
@@ -171,22 +161,27 @@ void Transition::paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
                        QWidget */*widget*/)
 {
-    const QRectF exposed = option->exposedRect;
-    painter->setClipRect(exposed);
+    const QRectF exposed = painter->worldTransform().mapRect(option->exposedRect);
     const QRectF br = rect();
     QPen framePen;
+    framePen.setWidthF(1.2);
     const QRectF mapped = painter->worldTransform().mapRect(br);
 
-    painter->fillRect(exposed, brush());
-
     QPointF p1(br.x(), br.y() + br.height() / 2 - 7);
     painter->setWorldMatrixEnabled(false);
+    QPainterPath p;
+    p.addRect(exposed);
+    
+    QPainterPath q;
+    q.addRoundedRect(mapped, 3, 3);
+    painter->setClipPath(p.intersected(q));
+    painter->fillRect(exposed, brush());
     const QString text = m_name + (m_forceTransitionTrack ? "|>" : QString());
 
     // Draw clip name
     if (isSelected() || (parentItem() && parentItem()->isSelected())) {
-        framePen.setColor(Qt::red);
-        framePen.setWidthF(2.0);
+        framePen.setColor(scene()->palette().highlight().color());
+       framePen.setColor(Qt::red);
     }
     else {
         framePen.setColor(brush().color().darker());
@@ -194,7 +189,7 @@ void Transition::paint(QPainter *painter,
 
     const QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' ');
     painter->setBrush(framePen.color());
-    painter->setPen(Qt::NoPen);
+    painter->setPen(framePen.color());
     painter->drawRoundedRect(txtBounding, 3, 3);
     painter->setBrush(QBrush(Qt::NoBrush));
 
@@ -204,7 +199,8 @@ void Transition::paint(QPainter *painter,
     // Draw frame
     painter->setPen(framePen);
     painter->setClipping(false);
-    painter->drawRect(mapped.adjusted(0, 0, -0.5, -0.5));
+    painter->setRenderHint(QPainter::Antialiasing, true);
+    painter->drawRoundedRect(mapped.adjusted(0, 0, -0.5, -0.5), 3, 3);
 }
 
 int Transition::type() const
@@ -228,6 +224,11 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
         int newTrack = newPos.y() / KdenliveSettings::trackheight();
         newTrack = qMin(newTrack, projectScene()->tracksCount() - 1);
         newTrack = qMax(newTrack, 0);
+       QStringList lockedTracks = property("locked_tracks").toStringList();
+       if (lockedTracks.contains(QString::number(newTrack))) {
+           // Trying to move to a locked track
+           return pos();
+       }
         newPos.setY((int)(newTrack * KdenliveSettings::trackheight() + itemOffset() + 1));
         // Only one clip is moving
         QRectF sceneShape = rect();
@@ -305,11 +306,13 @@ OPERATIONTYPE Transition::operationMode(QPointF pos)
     return MOVE;
 }
 
+//static
 int Transition::itemHeight()
 {
     return (int) (KdenliveSettings::trackheight() / 3 * 2 - 1);
 }
 
+//static
 int Transition::itemOffset()
 {
     return (int) (KdenliveSettings::trackheight() / 3 * 2);
@@ -332,16 +335,6 @@ Transition *Transition::clone() {
     return new Transition::Transition(rect(), m_referenceClip, toXML() , m_fps);
 }*/
 
-/*
-Transition *Transition::reparent(ClipItem * clip) {
-    return new Transition::Transition(rect(), clip, toXML(), m_fps, m_referenceClip->startPos());
-}*/
-
-bool Transition::isValid() const
-{
-    return true; //(m_transitionDuration != GenTime());
-}
-
 const ClipItem *Transition::referencedClip() const
 {
     return m_referenceClip;
@@ -395,7 +388,7 @@ bool Transition::updateKeyframes()
     }
     if (keyframes.isEmpty()) return false;
     int duration = cropDuration().frames(m_fps) - 1;
-    QStringList values = keyframes.split(";");
+    QStringList values = keyframes.split(';');
     int frame;
     int i = 0;
     foreach(const QString &pos, values) {