Correctly use thumbs settings from new project dialog:

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index e2314e8c1bcfee2aa6ecfd306310342e7cfb4a40..70f552b93cbdf064fd8b6dc41e33bd081bb0ffd6 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -15,25 +15,23 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <QBrush>
-#include <QDomElement>
-#include <QPainter>
-#include <QGraphicsScene>
-#include <QGraphicsView>
-#include <QScrollBar>
-#include <QStyleOptionGraphicsItem>
-
-#include <kdebug.h>
-#include <KIcon>
-#include <klocale.h>
-
 #include "transition.h"
 #include "clipitem.h"
 #include "kdenlivesettings.h"
 #include "customtrackscene.h"
 #include "mainwindow.h"
 
-Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_gradient(QLinearGradient(0, 0, 0, 0)), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) {
+#include <kdebug.h>
+#include <KIcon>
+#include <klocale.h>
+
+#include <QBrush>
+#include <QDomElement>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+
+
+Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDomElement params, bool automaticTransition) : AbstractClipItem(info, QRectF(), fps), m_automaticTransition(automaticTransition), m_forceTransitionTrack(false) {
     setZValue(2);
     setRect(0, 0, (info.endPos - info.startPos).frames(fps) - 0.02, (qreal)(KdenliveSettings::trackheight() / 3 * 2 - 1));
     setPos(info.startPos.frames(fps), (qreal)(info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 3 * 2));
@@ -44,8 +42,8 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double fps, QDo
     m_cropStart = GenTime();
     m_maxDuration = GenTime(10000, fps);
 
-    m_gradient.setColorAt(0, QColor(200, 200, 0, 150));
-    m_gradient.setColorAt(1, QColor(200, 200, 200, 120));
+    if (m_automaticTransition) setBrush(QColor(200, 200, 50, 100));
+    else setBrush(QColor(200, 100, 50, 100));
 
     //m_referenceClip = clipa;
     if (params.isNull()) {
@@ -86,8 +84,13 @@ bool Transition::isAutomatic() const {
 
 void Transition::setAutomatic(bool automatic) {
     m_automaticTransition = automatic;
-    if (automatic) m_parameters.setAttribute("automatic", 1);
-    else m_parameters.removeAttribute("automatic");
+    if (automatic) {
+        m_parameters.setAttribute("automatic", 1);
+        setBrush(QColor(200, 200, 50, 150));
+    } else {
+        m_parameters.removeAttribute("automatic");
+        setBrush(QColor(200, 50, 50, 150));
+    }
     update();
 }
 
@@ -119,7 +122,7 @@ QPixmap Transition::transitionPixmap() const {
 }
 
 
-void Transition::setTransitionDirection(bool inv) {
+void Transition::setTransitionDirection(bool /*inv*/) {
     //m_parameters.setAttribute("reverse", inv);
 }
 
@@ -142,24 +145,22 @@ bool Transition::forcedTrack() const {
 
 void Transition::paint(QPainter *painter,
                        const QStyleOptionGraphicsItem *option,
-                       QWidget *widget) {
+                       QWidget */*widget*/) {
     const double scale = option->matrix.m11();
     QRectF exposed = option->exposedRect;
     painter->setClipRect(exposed);
     QRectF br = rect();
     QRectF mapped = painter->matrix().mapRect(br);
-    m_gradient.setStart(0, br.y());
-    m_gradient.setFinalStop(0, br.bottom());
-    painter->fillRect(br, m_gradient);
 
-    int top = (int)(br.y() + br.height() / 2 - 7);
+    painter->fillRect(exposed, brush());
+
+    //int top = (int)(br.y() + br.height() / 2 - 7);
     QPointF p1(br.x(), br.y() + br.height() / 2 - 7);
     painter->setMatrixEnabled(false);
     //painter->drawPixmap(painter->matrix().map(p1) + QPointF(5, 0), transitionPixmap());
     QString text = transitionName();
     if (m_forceTransitionTrack) text.append("|>");
-    if (m_automaticTransition) text.prepend('+');
-    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, " " + text + " ");
+    QRectF txtBounding = painter->boundingRect(mapped, Qt::AlignHCenter | Qt::AlignVCenter, ' ' + text + ' ');
     painter->fillRect(txtBounding, QBrush(QColor(50, 50, 0, 150)));
     txtBounding.translate(QPointF(1, 1));
     painter->setPen(QColor(255, 255, 255, 255));
@@ -244,6 +245,8 @@ QVariant Transition::itemChange(GraphicsItemChange change, const QVariant &value
 
 
 OPERATIONTYPE Transition::operationMode(QPointF pos) {
+    if (isItemLocked()) return NONE;
+
     const double scale = projectScene()->scale();
     double maximumOffset = 6 / scale;
 
@@ -298,3 +301,12 @@ QDomElement Transition::toXML() {
     return m_parameters;
 }
 
+bool Transition::hasGeometry() {
+    QDomNodeList namenode = m_parameters.elementsByTagName("parameter");
+    for (int i = 0;i < namenode.count() ;i++) {
+        QDomElement pa = namenode.item(i).toElement();
+        if (pa.attribute("type") == "geometry") return true;
+    }
+    return false;
+}
+