small cleanup

svn path=/branches/KDE4/; revision=2208

diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp
index 5ed0a7008d710217381ba14308228cff09e695d4..9e0e203bc70a66b9e60d7692b1e773f1b17b28f8 100644 (file)
--- 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 c1c9fe64ce80a7ff98b5bcbfbe3041a5ec689905..6e1cc1df966989643d1f5a8f40f9eabe9d095cc7 100644 (file)
--- 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 9cf740992765905d0b2411aa004b715fbb518ed0..ec34d03e42eb29ea0443545f640ff10fc62c64fd 100644 (file)
--- 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 f38cb52e1e53c7cd14700ed38116f5abe224dd4a..86a68d102316f19a72da850e3120094dc93ca4ce 100644 (file)
--- 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()) {