From 6670e120267759367164e3f14ac292f3afaaeab0 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Mardelle <jb@kdenlive.org>
Date: Sun, 1 Jun 2008 00:36:02 +0000
Subject: [PATCH] small cleanup

svn path=/branches/KDE4/; revision=2208
---
 src/abstractclipitem.cpp |  2 +-
 src/abstractclipitem.h   |  3 ++-
 src/clipitem.cpp         | 12 +++++++-----
 src/transition.cpp       |  3 +--
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 5ed0a700..9e0e203b 100644
--- a/src/abstractclipitem.cpp
+++ b/src/abstractclipitem.cpp
@@ -4,7 +4,7 @@
 #include <QGraphicsView>
 #include <QScrollBar>
 
-AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect): QGraphicsRectItem(rect), m_startFade(0), m_endFade(0), m_track(0) {
+AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps): QGraphicsRectItem(rect), m_startFade(0), m_endFade(0), m_track(0), m_fps(fps) {
     setFlags(QGraphicsItem::ItemClipsToShape | QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
     setTrack(info.track);
     m_startPos = info.startPos;
diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h
index c1c9fe64..6e1cc1df 100644
--- a/src/abstractclipitem.h
+++ b/src/abstractclipitem.h
@@ -8,7 +8,7 @@
 class AbstractClipItem : public QObject , public QGraphicsRectItem {
     Q_OBJECT
 public:
-    AbstractClipItem(const ItemInfo info, const QRectF& rect);
+    AbstractClipItem(const ItemInfo info, const QRectF& rect, double fps);
     virtual  OPERATIONTYPE operationMode(QPointF pos, double scale) = 0;
     virtual GenTime startPos() const ;
     virtual void setTrack(int track);
@@ -26,6 +26,7 @@ public:
     virtual int fadeOut() const;
     virtual GenTime maxDuration() const;
     virtual void setCropStart(GenTime pos);
+
 protected:
     int m_track;
     GenTime m_cropStart;
diff --git a/src/clipitem.cpp b/src/clipitem.cpp
index 9cf74099..ec34d03e 100644
--- a/src/clipitem.cpp
+++ b/src/clipitem.cpp
@@ -40,11 +40,10 @@
 #include "kthumb.h"
 
 ClipItem::ClipItem(DocClipBase *clip, ItemInfo info, GenTime cropStart, double scale, double fps)
-        : AbstractClipItem(info, QRectF()), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_hover(false) {
+        : AbstractClipItem(info, QRectF(), fps), m_clip(clip), m_resizeMode(NONE), m_grabPoint(0), m_maxTrack(0), m_hasThumbs(false), startThumbTimer(NULL), endThumbTimer(NULL), m_effectsCounter(1), audioThumbWasDrawn(false), m_opacity(1.0), m_timeLine(0), m_thumbsRequested(0), m_hover(false) {
     QRectF rect((double) info.startPos.frames(fps) * scale, (double)(info.track * KdenliveSettings::trackheight() + 1), (double)(info.endPos - info.startPos).frames(fps) * scale, (double)(KdenliveSettings::trackheight() - 1));
     setRect(rect);
-    //kDebug() << "/////  NEW CLIP RECT: " << rect;
-    m_fps = fps;
+
     m_clipName = clip->name();
     m_producer = clip->getId();
     m_clipType = clip->clipType();
@@ -358,9 +357,12 @@ void ClipItem::paint(QPainter *painter,
 
     // Draw clip name
     QRectF txtBounding = painter->boundingRect(br, Qt::AlignHCenter | Qt::AlignTop, " " + m_clipName + " ");
-    painter->fillRect(txtBounding, QBrush(QColor(255, 255, 255, 150)));
+    //painter->fillRect(txtBounding, QBrush(QColor(255, 255, 255, 150)));
+    painter->setPen(QColor(0, 0, 0, 180));
+    painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
+    txtBounding.translate(QPointF(1, 1));
+    painter->setPen(QColor(255, 255, 255, 255));
     painter->drawText(txtBounding, Qt::AlignCenter, m_clipName);
-
     // draw frame around clip
     if (isSelected()) {
         pen.setColor(Qt::red);
diff --git a/src/transition.cpp b/src/transition.cpp
index f38cb52e..86a68d10 100644
--- a/src/transition.cpp
+++ b/src/transition.cpp
@@ -32,12 +32,11 @@
 #include "kdenlivesettings.h"
 #include "mainwindow.h"
 
-Transition::Transition(const ItemInfo info, int transitiontrack, double scale, double fps, QDomElement params) : AbstractClipItem(info, QRectF(info.startPos.frames(fps) *scale , info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 2, (info.endPos - info.startPos).frames(fps) * scale , KdenliveSettings::trackheight() - 1)) {
+Transition::Transition(const ItemInfo info, int transitiontrack, double scale, double fps, QDomElement params) : AbstractClipItem(info, QRectF(info.startPos.frames(fps) *scale , info.track * KdenliveSettings::trackheight() + KdenliveSettings::trackheight() / 2, (info.endPos - info.startPos).frames(fps) * scale , KdenliveSettings::trackheight() - 1), fps) {
     m_singleClip = true;
     m_transitionTrack = transitiontrack;
     m_secondClip = NULL;
     m_cropStart = GenTime();
-    m_fps = fps;
     m_maxDuration = GenTime(10000, fps);
     //m_referenceClip = clipa;
     if (params.isNull()) {
-- 
2.39.5