X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=08370c21e1a973ae3719142c5fb85391067d694e;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=58f6c3d76f8d9c489d6b4bdc086a814d9293a591;hpb=2d29ded2ead7275b92a258dcc5fd9d6f576ca257;p=kdenlive

diff --git a/src/customruler.cpp b/src/customruler.cpp
index 58f6c3d7..08370c21 100644
--- a/src/customruler.cpp
+++ b/src/customruler.cpp
@@ -17,259 +17,488 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <QMouseEvent>
-#include <QStylePainter>
+#include "customruler.h"
+#include "kdenlivesettings.h"
 
 #include <KDebug>
+#include <KIcon>
+#include <KCursor>
+#include <KGlobalSettings>
+#include <KColorScheme>
 
+#include <QApplication>
+#include <QMouseEvent>
+#include <QStylePainter>
 
-#include "customruler.h"
+static int MAX_HEIGHT;
+// Width of a frame in pixels
+static int FRAME_SIZE;
+// Height of the timecode text
+static int LABEL_SIZE;
+
+static int BIG_MARK_X;
+static int MIDDLE_MARK_X;
+static int LITTLE_MARK_X;
 
+static int littleMarkDistance;
+static int mediumMarkDistance;
+static int bigMarkDistance;
 
-#define INIT_VALUE 0
-#define INIT_MIN_VALUE 0
-#define INIT_MAX_VALUE 100
-#define INIT_TINY_MARK_DISTANCE 1
-#define INIT_LITTLE_MARK_DISTANCE 5
-#define INIT_MIDDLE_MARK_DISTANCE (INIT_LITTLE_MARK_DISTANCE * 2)
-#define INIT_BIG_MARK_DISTANCE (INIT_LITTLE_MARK_DISTANCE * 10)
-#define INIT_SHOW_TINY_MARK false
-#define INIT_SHOW_LITTLE_MARK true
-#define INIT_SHOW_MEDIUM_MARK true
-#define INIT_SHOW_BIG_MARK true
-#define INIT_SHOW_END_MARK true
-#define INIT_SHOW_POINTER true
-#define INIT_SHOW_END_LABEL true
-
-#define INIT_PIXEL_PER_MARK (double)10.0 /* distance between 2 base marks in pixel */
-#define INIT_OFFSET (-20)
-#define INIT_LENGTH_FIX true
-#define INIT_END_OFFSET 0
-
-#define FIX_WIDTH 20 /* widget width in pixel */
-#define LINE_END (FIX_WIDTH - 3)
-#define END_MARK_LENGTH (FIX_WIDTH - 6)
-#define END_MARK_X2 LINE_END
-#define END_MARK_X1 (END_MARK_X2 - END_MARK_LENGTH)
-#define BIG_MARK_LENGTH (END_MARK_LENGTH*3/4)
-#define BIG_MARK_X2 LINE_END
-#define BIG_MARK_X1 (BIG_MARK_X2 - BIG_MARK_LENGTH)
-#define MIDDLE_MARK_LENGTH (END_MARK_LENGTH/2)
-#define MIDDLE_MARK_X2 LINE_END
-#define MIDDLE_MARK_X1 (MIDDLE_MARK_X2 - MIDDLE_MARK_LENGTH)
-#define LITTLE_MARK_LENGTH (MIDDLE_MARK_LENGTH/2)
-#define LITTLE_MARK_X2 LINE_END
-#define LITTLE_MARK_X1 (LITTLE_MARK_X2 - LITTLE_MARK_LENGTH)
-#define BASE_MARK_LENGTH (LITTLE_MARK_LENGTH/2)
-#define BASE_MARK_X2 LINE_END
-#define BASE_MARK_X1 (BASE_MARK_X2 - 3) //BASE_MARK_LENGTH
-
-#define LABEL_SIZE 8
-#define END_LABEL_X 4
-#define END_LABEL_Y (END_LABEL_X + LABEL_SIZE - 2)
+#define SEEK_INACTIVE (-1)
 
 #include "definitions.h"
 
-const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 725, 1500, 3000, 6000,
-                                        12000
-                                      };
-
-CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent)
-        : KRuler(parent), m_timecode(tc), m_view(parent) {
-    slotNewOffset(0);
-    setRulerMetricStyle(KRuler::Pixel);
-    setLength(1024);
-    setMaximum(1024);
-    setPixelPerMark(3);
-    setLittleMarkDistance(FRAME_SIZE);
-    setMediumMarkDistance(FRAME_SIZE * 25);
-    setBigMarkDistance(FRAME_SIZE * 25 * 60);
-    m_zoneStart = 50;
-    m_zoneEnd = 250;
+const int CustomRuler::comboScale[] = { 1, 2, 5, 10, 25, 50, 125, 250, 500, 750, 1500, 3000, 6000, 12000};
+
+CustomRuler::CustomRuler(const Timecode &tc, CustomTrackView *parent) :
+        QWidget(parent),
+        m_timecode(tc),
+        m_view(parent),
+        m_duration(0),
+        m_offset(0),
+        m_lastSeekPosition(SEEK_INACTIVE),
+        m_clickedGuide(-1),
+        m_rate(-1),
+        m_mouseMove(NO_MOVE),
+        m_cursorColor(palette().text())
+{
+    setFont(KGlobalSettings::toolBarFont());
+    QFontMetricsF fontMetrics(font());
+    // Define size variables
+    LABEL_SIZE = fontMetrics.ascent();
+    setMinimumHeight(LABEL_SIZE * 2);
+    setMaximumHeight(LABEL_SIZE * 2);
+    MAX_HEIGHT = height();
+    BIG_MARK_X = LABEL_SIZE + 1;
+    int mark_length = MAX_HEIGHT - BIG_MARK_X;
+    MIDDLE_MARK_X = BIG_MARK_X + mark_length / 2;
+    LITTLE_MARK_X = BIG_MARK_X + mark_length / 3;
+    updateFrameSize();
+    m_scale = 3;
+    m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color();
+    m_zoneColor.setAlpha(180);
+    m_zoneStart = 0;
+    m_zoneEnd = 100;
+    m_contextMenu = new QMenu(this);
+    QAction *addGuide = m_contextMenu->addAction(KIcon("document-new"), i18n("Add Guide"));
+    connect(addGuide, SIGNAL(triggered()), m_view, SLOT(slotAddGuide()));
+    m_editGuide = m_contextMenu->addAction(KIcon("document-properties"), i18n("Edit Guide"));
+    connect(m_editGuide, SIGNAL(triggered()), this, SLOT(slotEditGuide()));
+    m_deleteGuide = m_contextMenu->addAction(KIcon("edit-delete"), i18n("Delete Guide"));
+    connect(m_deleteGuide , SIGNAL(triggered()), this, SLOT(slotDeleteGuide()));
+    QAction *delAllGuides = m_contextMenu->addAction(KIcon("edit-delete"), i18n("Delete All Guides"));
+    connect(delAllGuides, SIGNAL(triggered()), m_view, SLOT(slotDeleteAllGuides()));
+    m_goMenu = m_contextMenu->addMenu(i18n("Go To"));
+    connect(m_goMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToGuide(QAction*)));
+    setMouseTracking(true);
+}
+
+void CustomRuler::updatePalette()
+{
+    m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, KSharedConfig::openConfig(KdenliveSettings::colortheme())).brush(this).color();
+    m_zoneColor.setAlpha(180);
+}
+
+void CustomRuler::updateProjectFps(const Timecode &t)
+{
+    m_timecode = t;
+    mediumMarkDistance = FRAME_SIZE * m_timecode.fps();
+    bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60;
+    update();
+}
+
+void CustomRuler::updateFrameSize()
+{
+    FRAME_SIZE = m_view->getFrameWidth();
+    littleMarkDistance = FRAME_SIZE;
+    mediumMarkDistance = FRAME_SIZE * m_timecode.fps();
+    bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60;
+    updateProjectFps(m_timecode);
+    if (m_rate > 0) setPixelPerMark(m_rate);
+}
+
+void CustomRuler::slotEditGuide()
+{
+    m_view->slotEditGuide(m_clickedGuide);
+}
+
+void CustomRuler::slotDeleteGuide()
+{
+    m_view->slotDeleteGuide(m_clickedGuide);
+}
+
+void CustomRuler::slotGoToGuide(QAction *act)
+{
+    m_view->seekCursorPos(act->data().toInt());
+    m_view->initCursorPos(act->data().toInt());
+}
+
+void CustomRuler::setZone(const QPoint &p)
+{
+    m_zoneStart = p.x();
+    m_zoneEnd = p.y();
+    update();
+}
+
+void CustomRuler::mouseReleaseEvent(QMouseEvent * /*event*/)
+{
+    if (m_moveCursor == RULER_START || m_moveCursor == RULER_END || m_moveCursor == RULER_MIDDLE) {
+        emit zoneMoved(m_zoneStart, m_zoneEnd);
+        m_view->setDocumentModified();
+    }
+    m_mouseMove = NO_MOVE;
+
 }
 
 // virtual
-void CustomRuler::mousePressEvent(QMouseEvent * event) {
-    int pos = (event->x() + offset()) / pixelPerMark() / FRAME_SIZE;
+void CustomRuler::mousePressEvent(QMouseEvent * event)
+{
+    int pos = (int)((event->x() + offset()));
+    if (event->button() == Qt::RightButton) {
+        m_clickedGuide = m_view->hasGuide((int)(pos / m_factor), (int)(5 / m_factor + 1));
+        m_editGuide->setEnabled(m_clickedGuide > 0);
+        m_deleteGuide->setEnabled(m_clickedGuide > 0);
+        m_view->buildGuidesMenu(m_goMenu);
+        m_contextMenu->exec(event->globalPos());
+        return;
+    }
+    setFocus(Qt::MouseFocusReason);
+    m_view->activateMonitor();
     m_moveCursor = RULER_CURSOR;
     if (event->y() > 10) {
-        if (abs(pos - m_zoneStart) < 4) m_moveCursor = RULER_START;
-        else if (abs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2)) < 4) m_moveCursor = RULER_MIDDLE;
-        else if (abs(pos - m_zoneEnd) < 4) m_moveCursor = RULER_END;
+        if (qAbs(pos - m_zoneStart * m_factor) < 4) m_moveCursor = RULER_START;
+        else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2.0) * m_factor) < 4) m_moveCursor = RULER_MIDDLE;
+        else if (qAbs(pos - m_zoneEnd * m_factor) < 4) m_moveCursor = RULER_END;
+        m_view->updateSnapPoints(NULL);
+    }
+    if (m_moveCursor == RULER_CURSOR) {
+        m_view->seekCursorPos((int) pos / m_factor);
+        m_clickPoint = event->pos();
+        m_startRate = m_rate;
     }
-    if (m_moveCursor == RULER_CURSOR)
-        m_view->setCursorPos(pos);
 }
 
 // virtual
-void CustomRuler::mouseMoveEvent(QMouseEvent * event) {
-    int pos = (event->x() + offset()) / pixelPerMark() / FRAME_SIZE;
-    if (m_moveCursor == RULER_CURSOR) {
-        m_view->setCursorPos(pos);
-        return;
-    } else if (m_moveCursor == RULER_START) m_zoneStart = pos;
-    else if (m_moveCursor == RULER_END) m_zoneEnd = pos;
-    else if (m_moveCursor == RULER_MIDDLE) {
-        int move = pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2);
-        m_zoneStart += move;
-        m_zoneEnd += move;
+void CustomRuler::mouseMoveEvent(QMouseEvent * event)
+{
+    int mappedXPos = (int)((event->x() + offset()) / m_factor);
+    emit mousePosition(mappedXPos);
+    if (event->buttons() == Qt::LeftButton) {
+        int pos;
+        if (m_moveCursor == RULER_START || m_moveCursor == RULER_END) {
+            pos = m_view->getSnapPointForPos(mappedXPos);
+        } else pos = mappedXPos;
+        int zoneStart = m_zoneStart;
+        int zoneEnd = m_zoneEnd;
+        if (pos < 0) pos = 0;
+        if (m_moveCursor == RULER_CURSOR) {
+            QPoint diff = event->pos() - m_clickPoint;
+            if (m_mouseMove == NO_MOVE) {
+                if (qAbs(diff.x()) >= QApplication::startDragDistance()) {
+                    m_mouseMove = HORIZONTAL_MOVE;
+                } else if (KdenliveSettings::verticalzoom() && qAbs(diff.y()) >= QApplication::startDragDistance()) {
+                    m_mouseMove = VERTICAL_MOVE;
+                } else return;
+            }
+            if (m_mouseMove == HORIZONTAL_MOVE) {
+		if (pos != m_lastSeekPosition && pos != m_view->cursorPos()) {
+		    m_view->seekCursorPos(pos);
+		    m_view->slotCheckPositionScrolling();
+		}
+            } else {
+                int verticalDiff = m_startRate - (diff.y()) / 7;
+                if (verticalDiff != m_rate) emit adjustZoom(verticalDiff);
+            }
+            return;
+        } else if (m_moveCursor == RULER_START) m_zoneStart = qMin(pos, m_zoneEnd - 1);
+        else if (m_moveCursor == RULER_END) m_zoneEnd = qMax(pos, m_zoneStart + 1);
+        else if (m_moveCursor == RULER_MIDDLE) {
+            int move = pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2);
+            if (move + m_zoneStart < 0) move = - m_zoneStart;
+            m_zoneStart += move;
+            m_zoneEnd += move;
+        }
+        int min = qMin(m_zoneStart, zoneStart);
+        int max = qMax(m_zoneEnd, zoneEnd);
+        update(min * m_factor - m_offset - 2, 0, (max - min) * m_factor + 4, height());
+
+    } else {
+        int pos = (int)((event->x() + m_offset));
+	if (m_cursorColor == palette().text() && qAbs(pos - m_view->cursorPos() * m_factor) < 7) {
+	    // Mouse is over cursor
+	    m_cursorColor = palette().link();
+	    update(m_view->cursorPos() * m_factor - m_offset - 10, LABEL_SIZE + 2, 20, MAX_HEIGHT - LABEL_SIZE - 2);
+	}
+	else if (m_cursorColor == palette().link() && qAbs(pos - m_view->cursorPos() * m_factor) >= 7) {
+	    m_cursorColor = palette().text();
+	    update(m_view->cursorPos() * m_factor - m_offset - 10, LABEL_SIZE + 2, 20, MAX_HEIGHT - LABEL_SIZE - 2);
+	}
+	
+        if (event->y() <= 10) setCursor(Qt::ArrowCursor);
+        else if (qAbs(pos - m_zoneStart * m_factor) < 4) {
+            setCursor(KCursor("left_side", Qt::SizeHorCursor));
+            if (KdenliveSettings::frametimecode()) setToolTip(i18n("Zone start: %1", m_zoneStart));
+            else setToolTip(i18n("Zone start: %1", m_timecode.getTimecodeFromFrames(m_zoneStart)));
+        } else if (qAbs(pos - m_zoneEnd * m_factor) < 4) {
+            setCursor(KCursor("right_side", Qt::SizeHorCursor));
+            if (KdenliveSettings::frametimecode()) setToolTip(i18n("Zone end: %1", m_zoneEnd));
+            else setToolTip(i18n("Zone end: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd)));
+        } else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2.0) * m_factor) < 4) {
+            setCursor(Qt::SizeHorCursor);
+            if (KdenliveSettings::frametimecode()) setToolTip(i18n("Zone duration: %1", m_zoneEnd - m_zoneStart));
+            else setToolTip(i18n("Zone duration: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd - m_zoneStart)));
+        } else {
+            setCursor(Qt::ArrowCursor);
+            if (KdenliveSettings::frametimecode()) setToolTip(i18n("Position: %1", (int)(pos / m_factor)));
+            else setToolTip(i18n("Position: %1", m_timecode.getTimecodeFromFrames(pos / m_factor)));
+        }
     }
-    update();
 }
 
-int CustomRuler::inPoint() {
+
+// virtual
+void CustomRuler::leaveEvent(QEvent * event)
+{
+    QWidget::leaveEvent(event);
+    if (m_cursorColor == palette().link()) {
+        m_cursorColor = palette().text();
+        update();
+    }
+}
+
+// virtual
+void CustomRuler::wheelEvent(QWheelEvent * e)
+{
+    int delta = 1;
+    m_view->activateMonitor();
+    if (e->modifiers() == Qt::ControlModifier) delta = m_timecode.fps();
+    if (e->delta() < 0) delta = 0 - delta;
+    m_view->moveCursorPos(delta);
+}
+
+int CustomRuler::inPoint() const
+{
     return m_zoneStart;
 }
 
-int CustomRuler::outPoint() {
+int CustomRuler::outPoint() const
+{
     return m_zoneEnd;
 }
 
-void CustomRuler::slotMoveRuler(int newPos) {
-    KRuler::slotNewOffset(newPos);
+void CustomRuler::slotMoveRuler(int newPos)
+{
+    if (m_offset != newPos) {
+        m_offset = newPos;
+        update();
+    }
+}
+
+int CustomRuler::offset() const
+{
+    return m_offset;
+}
+
+void CustomRuler::slotCursorMoved(int oldpos, int newpos)
+{
+    int min = qMin(oldpos, newpos);
+    int max = qMax(oldpos, newpos);
+    if (m_lastSeekPosition != SEEK_INACTIVE) {
+	if (m_lastSeekPosition == newpos) {
+	    m_lastSeekPosition = SEEK_INACTIVE;
+	}
+	else {
+	    min = qMin(min, m_lastSeekPosition);
+	    max = qMax(max, m_lastSeekPosition);
+	}
+    }
+    update(min * m_factor - m_offset - 6, BIG_MARK_X, (max - min) * m_factor + 14, MAX_HEIGHT - BIG_MARK_X);
 }
 
-void CustomRuler::slotCursorMoved(int oldpos, int newpos) {
-    //TODO: optimize (redraw only around cursor positions
+void CustomRuler::updateRuler()
+{
+    // Update requested seek position
+    int min = SEEK_INACTIVE;
+    int max = SEEK_INACTIVE;
+    if (m_lastSeekPosition != SEEK_INACTIVE) {
+	min = max = m_lastSeekPosition;
+    }
+    m_lastSeekPosition = m_view->seekPosition();
+    if (m_lastSeekPosition != SEEK_INACTIVE) {
+	if (min == SEEK_INACTIVE) {
+	    min = max = m_lastSeekPosition;
+	}
+	else {
+	    min = qMin(min, m_lastSeekPosition);
+	    max = qMax(max, m_lastSeekPosition);
+	}
+    }
+    if (min != SEEK_INACTIVE) {
+	update(min * m_factor - offset() - 3, BIG_MARK_X, (max - min) * m_factor + 6, MAX_HEIGHT - BIG_MARK_X);
+    }
+}
+
+void CustomRuler::setPixelPerMark(int rate)
+{
+    int scale = comboScale[rate];
+    m_rate = rate;
+    m_factor = 1.0 / (double) scale * FRAME_SIZE;
+    m_scale = 1.0 / (double) scale;
+    double fend = m_scale * littleMarkDistance;
+    if (rate > 8) {
+        mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60;
+        bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 300;
+    } else if (rate > 6) {
+        mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 10;
+        bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 30;
+    } else if (rate > 3) {
+        mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps();
+        bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 5;
+    } else {
+        mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps();
+        bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60;
+    }
+    switch (rate) {
+    case 0:
+        m_textSpacing = fend;
+        break;
+    case 1:
+        m_textSpacing = fend * 5;
+        break;
+    case 2:
+    case 3:
+    case 4:
+        m_textSpacing = fend * m_timecode.fps();
+        break;
+    case 5:
+        m_textSpacing = fend * m_timecode.fps() * 5;
+        break;
+    case 6:
+        m_textSpacing = fend * m_timecode.fps() * 10;
+        break;
+    case 7:
+        m_textSpacing = fend * m_timecode.fps() * 30;
+        break;
+    case 8:
+    case 9:
+        m_textSpacing = fend * m_timecode.fps() * 40;
+        break;
+    case 10:
+        m_textSpacing = fend * m_timecode.fps() * 80;
+        break;
+    case 11:
+    case 12:
+        m_textSpacing = fend * m_timecode.fps() * 400;
+        break;
+    case 13:
+        m_textSpacing = fend * m_timecode.fps() * 800;
+        break;
+    }
     update();
 }
 
-void CustomRuler::setPixelPerMark(double rate) {
-    int scale = comboScale[(int) rate];
-    KRuler::setPixelPerMark(1.0 / scale);
+void CustomRuler::setDuration(int d)
+{
+    int oldduration = m_duration;
+    m_duration = d;
+    update(qMin(oldduration, m_duration) * m_factor - 1 - offset(), 0, qAbs(oldduration - m_duration) * m_factor + 2, height());
 }
 
 // virtual
-void CustomRuler::paintEvent(QPaintEvent *e) {
-    //  debug ("KRuler::drawContents, %s",(horizontal==dir)?"horizontal":"vertical");
-
+void CustomRuler::paintEvent(QPaintEvent *e)
+{
     QStylePainter p(this);
-    p.setClipRect(e->rect());
-    p.fillRect(e->rect(), QBrush(QColor(255, 255, 255, 80)));
-    //kDebug()<<"RULER ZONE: "<<m_zoneStart<<", OFF: "<<offset()<<", END: "<<m_zoneEnd<<", FACTOR: "<<pixelPerMark() * FRAME_SIZE;
-    int zoneStart = (m_zoneStart) * pixelPerMark() * FRAME_SIZE;
-    int zoneEnd = (m_zoneEnd) * pixelPerMark() * FRAME_SIZE;
-    p.fillRect(QRect(zoneStart - offset(), e->rect().y() + e->rect().height() / 2, zoneEnd - zoneStart, e->rect().height() / 2), QBrush(QColor(133, 255, 143)));
-
-    int value  = m_view->cursorPos() - offset() + 4;
-    int minval = minimum();
-    int maxval = maximum() + offset() - endOffset();
-
-    //ioffsetval = value-offset;
-    //    pixelpm = (int)ppm;
-    //    left  = clip.left(),
-    //    right = clip.right();
-    double f, fend,
-    offsetmin = (double)(minval - offset()),
-                offsetmax = (double)(maxval - offset()),
-                            fontOffset = (((double)minval) > offsetmin) ? (double)minval : offsetmin;
-    QRect bg = QRect(offsetmin, 0, offsetmax, height());
-
-    QPalette palette;
-    //p.fillRect(bg, palette.light());
-    // draw labels
-    QFont font = p.font();
-    font.setPointSize(LABEL_SIZE);
-    p.setFont(font);
-    p.setPen(palette.dark().color());
-    // draw littlemarklabel
-
-    // draw mediummarklabel
-
-    // draw bigmarklabel
-
-    // draw endlabel
-    /*if (d->showEndL) {
-      if (d->dir == Qt::Horizontal) {
-        p.translate( fontOffset, 0 );
-        p.drawText( END_LABEL_X, END_LABEL_Y, d->endlabel );
-      }*/
-
-    // draw the tiny marks
-    //if (showTinyMarks())
-    /*{
-      fend =   pixelPerMark()*tinyMarkDistance();
-      if (fend > 5) for ( f=offsetmin; f<offsetmax; f+=fend ) {
-          p.drawLine((int)f, BASE_MARK_X1, (int)f, BASE_MARK_X2);
-      }
-    }*/
-    if (showLittleMarks()) {
-        // draw the little marks
-        fend = pixelPerMark() * littleMarkDistance();
-        if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) {
-                p.drawLine((int)f, LITTLE_MARK_X1, (int)f, LITTLE_MARK_X2);
-                if (fend > 60) {
-                    QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5));
-                    p.drawText((int)f + 2, LABEL_SIZE, lab);
-                }
-            }
+    const QRect &paintRect = e->rect();
+    p.setClipRect(paintRect);
+
+    // Draw zone background
+    const int zoneStart = (int)(m_zoneStart * m_factor);
+    const int zoneEnd = (int)(m_zoneEnd * m_factor);
+    p.fillRect(zoneStart - m_offset, LABEL_SIZE + 2, zoneEnd - zoneStart, MAX_HEIGHT - LABEL_SIZE - 2, m_zoneColor);
+    
+    int minval = (paintRect.left() + m_offset) / FRAME_SIZE - 1;
+    const int maxval = (paintRect.right() + m_offset) / FRAME_SIZE + 1;
+    if (minval < 0)
+        minval = 0;
+
+    double f, fend;
+    const int offsetmax = maxval * FRAME_SIZE;
+    int offsetmin;
+
+    p.setPen(palette().text().color());
+
+    // draw time labels
+    if (paintRect.y() < LABEL_SIZE) {
+        offsetmin = (paintRect.left() + m_offset) / m_textSpacing;
+        offsetmin = offsetmin * m_textSpacing;
+        for (f = offsetmin; f < offsetmax; f += m_textSpacing) {
+            QString lab;
+            if (KdenliveSettings::frametimecode())
+                lab = QString::number((int)(f / m_factor + 0.5));
+            else
+                lab = m_timecode.getTimecodeFromFrames((int)(f / m_factor + 0.5));
+            p.drawText(f - m_offset + 2, LABEL_SIZE, lab);
+        }
     }
-    if (showMediumMarks()) {
-        // draw medium marks
-        fend = pixelPerMark() * mediumMarkDistance();
-        if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) {
-                p.drawLine((int)f, MIDDLE_MARK_X1, (int)f, MIDDLE_MARK_X2);
-                if (fend > 60) {
-                    QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5));
-                    p.drawText((int)f + 2, LABEL_SIZE, lab);
-                }
-            }
+    p.setPen(palette().dark().color());
+    offsetmin = (paintRect.left() + m_offset) / littleMarkDistance;
+    offsetmin = offsetmin * littleMarkDistance;
+    // draw the little marks
+    fend = m_scale * littleMarkDistance;
+    if (fend > 5) {
+        for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend)
+            p.drawLine((int)f, LITTLE_MARK_X, (int)f, MAX_HEIGHT);
     }
-    if (showBigMarks()) {
-        // draw big marks
-        fend = pixelPerMark() * bigMarkDistance();
-        if (fend > 5) for (f = offsetmin; f < offsetmax; f += fend) {
-                p.drawLine((int)f, BIG_MARK_X1, (int)f, BIG_MARK_X2);
-                if (fend > 60) {
-                    QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5));
-                    p.drawText((int)f + 2, LABEL_SIZE, lab);
-                } else if (((int)(f - offsetmin)) % ((int)(fend * 5)) == 0) {
-                    QString lab = m_timecode.getTimecodeFromFrames((int)((f - offsetmin) / pixelPerMark() / FRAME_SIZE + 0.5));
-                    p.drawText((int)f + 2, LABEL_SIZE, lab);
-                }
-            }
+
+    offsetmin = (paintRect.left() + m_offset) / mediumMarkDistance;
+    offsetmin = offsetmin * mediumMarkDistance;
+    // draw medium marks
+    fend = m_scale * mediumMarkDistance;
+    if (fend > 5) {
+        for (f = offsetmin - m_offset - fend; f < offsetmax - m_offset + fend; f += fend)
+            p.drawLine((int)f, MIDDLE_MARK_X, (int)f, MAX_HEIGHT);
     }
-    /*   if (d->showem) {
-         // draw end marks
-         if (d->dir == Qt::Horizontal) {
-           p.drawLine(minval-d->offset, END_MARK_X1, minval-d->offset, END_MARK_X2);
-           p.drawLine(maxval-d->offset, END_MARK_X1, maxval-d->offset, END_MARK_X2);
-         }
-         else {
-           p.drawLine(END_MARK_X1, minval-d->offset, END_MARK_X2, minval-d->offset);
-           p.drawLine(END_MARK_X1, maxval-d->offset, END_MARK_X2, maxval-d->offset);
-         }
-       }*/
 
+    offsetmin = (paintRect.left() + m_offset) / bigMarkDistance;
+    offsetmin = offsetmin * bigMarkDistance;
+    // draw big marks
+    fend = m_scale * bigMarkDistance;
+    if (fend > 5) {
+        for (f = offsetmin - m_offset; f < offsetmax - m_offset; f += fend)
+            p.drawLine((int)f, BIG_MARK_X, (int)f, MAX_HEIGHT);
+    }
 
     // draw zone cursors
-    int off = offset();
     if (zoneStart > 0) {
         QPolygon pa(4);
-        pa.setPoints(4, zoneStart - off + 3, 9, zoneStart - off, 9, zoneStart - off, 18, zoneStart - off + 3, 18);
+        pa.setPoints(4, zoneStart - m_offset + 3, LABEL_SIZE + 2, zoneStart - m_offset, LABEL_SIZE + 2, zoneStart - m_offset, MAX_HEIGHT - 1, zoneStart - m_offset + 3, MAX_HEIGHT - 1);
         p.drawPolyline(pa);
     }
 
     if (zoneEnd > 0) {
-        QRect rec(zoneStart - off + (zoneEnd - zoneStart) / 2 - 4, 9, 8, 9);
-        p.fillRect(rec, QColor(255, 255, 255, 150));
+        QColor center(Qt::white);
+        center.setAlpha(150);
+        QRect rec(zoneStart - m_offset + (zoneEnd - zoneStart) / 2 - 4, LABEL_SIZE + 2, 8, MAX_HEIGHT - LABEL_SIZE - 3);
+        p.fillRect(rec, center);
         p.drawRect(rec);
 
         QPolygon pa(4);
-        pa.setPoints(4, zoneEnd - off - 3, 9, zoneEnd - off, 9, zoneEnd - off, 18, zoneEnd - off - 3, 18);
+        pa.setPoints(4, zoneEnd - m_offset - 3, LABEL_SIZE + 2, zoneEnd - m_offset, LABEL_SIZE + 2, zoneEnd - m_offset, MAX_HEIGHT - 1, zoneEnd - m_offset - 3, MAX_HEIGHT - 1);
         p.drawPolyline(pa);
     }
-
+    
     // draw pointer
-    if (showPointer() && value > 0) {
-        QPolygon pa(3);
-        pa.setPoints(3, value - 6, 7, value + 6, 7, value, 16);
-        p.setBrush(QBrush(Qt::yellow));
-        p.drawPolygon(pa);
+    const int value  =  m_view->cursorPos() * m_factor - m_offset;
+    QPolygon pa(3);
+    pa.setPoints(3, value - 6, LABEL_SIZE + 3, value + 6, LABEL_SIZE + 3, value, MAX_HEIGHT);
+    p.setBrush(m_cursorColor);
+    p.setPen(Qt::NoPen);
+    p.drawPolygon(pa);
+    
+    if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_view->cursorPos()) {
+	p.fillRect(m_lastSeekPosition * m_factor - m_offset - 1, BIG_MARK_X + 1, 3, MAX_HEIGHT - BIG_MARK_X - 1, palette().linkVisited());
     }
 
-
-
 }
 
 #include "customruler.moc"