Correctly use thumbs settings from new project dialog:

[kdenlive] / src / transition.cpp

diff --git a/src/transition.cpp b/src/transition.cpp
index fce62db6cb54af2470649f1f3e8eba747e98ff34..70f552b93cbdf064fd8b6dc41e33bd081bb0ffd6 100644 (file)
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -15,24 +15,22 @@
  *                                                                         *
  ***************************************************************************/
 
-#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"
 
+#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));
@@ -124,7 +122,7 @@ QPixmap Transition::transitionPixmap() const {
 }
 
 
-void Transition::setTransitionDirection(bool inv) {
+void Transition::setTransitionDirection(bool /*inv*/) {
     //m_parameters.setAttribute("reverse", inv);
 }
 
@@ -147,7 +145,7 @@ 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);
@@ -156,13 +154,13 @@ void Transition::paint(QPainter *painter,
 
     painter->fillRect(exposed, brush());
 
-    int top = (int)(br.y() + br.height() / 2 - 7);
+    //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("|>");
-    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));
@@ -303,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;
+}
+