X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomruler.cpp;h=71d31310191f9e31013f25567ee0e1b0a1800e00;hb=d2ff2454974b3651eb354c84306875f303aa5194;hp=4c02217a83fb59e355b2eadabfe4e80b9ecfd512;hpb=1fbb8258f8389fa02aed16a1f7877d32240f52ab;p=kdenlive diff --git a/src/customruler.cpp b/src/customruler.cpp index 4c02217a..71d31310 100644 --- a/src/customruler.cpp +++ b/src/customruler.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -40,7 +41,7 @@ static const int LITTLE_MARK_LENGTH = (MIDDLE_MARK_LENGTH / 2); static const int LITTLE_MARK_X2 = LINE_END; static const int LITTLE_MARK_X1 = (LITTLE_MARK_X2 - LITTLE_MARK_LENGTH); -static const int LABEL_SIZE = 9; +static int LABEL_SIZE; static const int END_LABEL_X = 4; static const int END_LABEL_Y = (END_LABEL_X + LABEL_SIZE - 2); @@ -58,9 +59,12 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : m_view(parent), m_duration(0), m_offset(0), - m_clickedGuide(-1) + m_clickedGuide(-1), + m_mouseMove(NO_MOVE) { setFont(KGlobalSettings::toolBarFont()); + QFontMetricsF fontMetrics(font()); + LABEL_SIZE = fontMetrics.ascent() - 2; m_scale = 3; m_zoneColor = QColor(133, 255, 143); littleMarkDistance = FRAME_SIZE; @@ -81,6 +85,14 @@ CustomRuler::CustomRuler(Timecode tc, CustomTrackView *parent) : setMinimumHeight(20); } +void CustomRuler::updateProjectFps(Timecode t) +{ + m_timecode = t; + mediumMarkDistance = FRAME_SIZE * m_timecode.fps(); + bigMarkDistance = FRAME_SIZE * m_timecode.fps() * 60; + update(); +} + void CustomRuler::slotEditGuide() { m_view->slotEditGuide(m_clickedGuide); @@ -100,6 +112,11 @@ void CustomRuler::setZone(QPoint p) update(min * m_factor - 2, 0, (max - min) * m_factor + 4, height()); } +void CustomRuler::mouseReleaseEvent(QMouseEvent * /*event*/) +{ + m_mouseMove = NO_MOVE; +} + // virtual void CustomRuler::mousePressEvent(QMouseEvent * event) { @@ -111,6 +128,7 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) m_contextMenu->exec(event->globalPos()); return; } + setFocus(Qt::MouseFocusReason); m_view->activateMonitor(); m_moveCursor = RULER_CURSOR; if (event->y() > 10) { @@ -118,8 +136,11 @@ void CustomRuler::mousePressEvent(QMouseEvent * event) else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) m_moveCursor = RULER_MIDDLE; else if (qAbs(pos - m_zoneEnd * m_factor) < 4) m_moveCursor = RULER_END; } - if (m_moveCursor == RULER_CURSOR) + if (m_moveCursor == RULER_CURSOR) { m_view->setCursorPos((int) pos / m_factor); + m_clickPoint = event->pos(); + m_startRate = m_rate; + } } // virtual @@ -131,8 +152,21 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) int zoneEnd = m_zoneEnd; if (pos < 0) pos = 0; if (m_moveCursor == RULER_CURSOR) { - m_view->setCursorPos(pos); - m_view->slotCheckPositionScrolling(); + QPoint diff = event->pos() - m_clickPoint; + if (m_mouseMove == NO_MOVE) { + if (qAbs(diff.x()) >= QApplication::startDragDistance()) { + m_mouseMove = HORIZONTAL_MOVE; + } else if (qAbs(diff.y()) >= QApplication::startDragDistance()) { + m_mouseMove = VERTICAL_MOVE; + } else return; + } + if (m_mouseMove == HORIZONTAL_MOVE) { + m_view->setCursorPos(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 = pos; else if (m_moveCursor == RULER_END) m_zoneEnd = pos; @@ -152,10 +186,19 @@ void CustomRuler::mouseMoveEvent(QMouseEvent * event) } else { int pos = (int)((event->x() + offset())); if (event->y() <= 10) setCursor(Qt::ArrowCursor); - else if (qAbs(pos - m_zoneStart * m_factor) < 4) setCursor(KCursor("left_side", Qt::SizeHorCursor)); - else if (qAbs(pos - m_zoneEnd * m_factor) < 4) setCursor(KCursor("right_side", Qt::SizeHorCursor)); - else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) setCursor(Qt::SizeHorCursor); - else setCursor(Qt::ArrowCursor); + else if (qAbs(pos - m_zoneStart * m_factor) < 4) { + setCursor(KCursor("left_side", Qt::SizeHorCursor)); + 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)); + setToolTip(i18n("Zone end: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd))); + } else if (qAbs(pos - (m_zoneStart + (m_zoneEnd - m_zoneStart) / 2) * m_factor) < 4) { + setCursor(Qt::SizeHorCursor); + setToolTip(i18n("Zone duration: %1", m_timecode.getTimecodeFromFrames(m_zoneEnd - m_zoneStart))); + } else { + setCursor(Qt::ArrowCursor); + setToolTip(i18n("Position: %1", m_timecode.getTimecodeFromFrames(pos / m_factor))); + } } } @@ -198,9 +241,10 @@ void CustomRuler::slotCursorMoved(int oldpos, int newpos) } else update(qMin(oldpos, newpos) * m_factor - offset() - 6, 0, qAbs(oldpos - newpos) * m_factor + 17, height()); } -void CustomRuler::setPixelPerMark(double rate) +void CustomRuler::setPixelPerMark(int rate) { - int scale = comboScale[(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; @@ -217,7 +261,7 @@ void CustomRuler::setPixelPerMark(double rate) mediumMarkDistance = (double) FRAME_SIZE * m_timecode.fps(); bigMarkDistance = (double) FRAME_SIZE * m_timecode.fps() * 60; } - switch ((int) rate) { + switch (rate) { case 0: m_textSpacing = fend; break; @@ -292,7 +336,6 @@ void CustomRuler::paintEvent(QPaintEvent *e) offsetmin = offsetmin * m_textSpacing; for (f = offsetmin; f < offsetmax; f += m_textSpacing) { QString lab = m_timecode.getTimecodeFromFrames((int)(f / m_factor + 0.5)); - p.drawText(f - m_offset + 2, LABEL_SIZE, lab); } @@ -326,8 +369,10 @@ void CustomRuler::paintEvent(QPaintEvent *e) } if (zoneEnd > 0) { + QColor center(Qt::white); + center.setAlpha(150); QRect rec(zoneStart - off + (zoneEnd - zoneStart) / 2 - 4, 9, 8, 9); - p.fillRect(rec, QColor(255, 255, 255, 150)); + p.fillRect(rec, center); p.drawRect(rec); QPolygon pa(4);