X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fsmallruler.cpp;h=d5b99032b95fa3b8b4cb6461491193260fde748a;hb=56aee6aedeeed3efd10ada8fe3c229eddc01ef05;hp=dce24f469c1299294d45ef41d24718abd556e7cb;hpb=05f4fad9a19434399f43ff76e06d1e1a5f74c0f6;p=kdenlive diff --git a/src/smallruler.cpp b/src/smallruler.cpp index dce24f46..d5b99032 100644 --- a/src/smallruler.cpp +++ b/src/smallruler.cpp @@ -23,29 +23,35 @@ #include #include -#include +#include #include #include +#define SEEK_INACTIVE (-1) -SmallRuler::SmallRuler(MonitorManager *manager, QWidget *parent) : + +SmallRuler::SmallRuler(Monitor *monitor, Render *render, QWidget *parent) : QWidget(parent) ,m_cursorFramePosition(0) - ,m_scale(1) - ,m_maxval(25) - ,m_manager(manager) - ,m_overCursor(false) + ,m_maxval(2) + ,m_monitor(monitor) + ,m_render(render) + ,m_lastSeekPosition(SEEK_INACTIVE) + ,m_cursorColor(palette().text()) { m_zoneStart = 10; m_zoneEnd = 60; KSharedConfigPtr config = KSharedConfig::openConfig(KdenliveSettings::colortheme()); - m_zoneBrush = KStatefulBrush(KColorScheme::View, KColorScheme::PositiveBackground, config); + m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, config).brush(this).color(); + m_zoneColor.setAlpha(180); setMouseTracking(true); - setMinimumHeight(10); + setMinimumHeight(QFontInfo(font()).pixelSize()); + adjustScale(m_maxval); } + void SmallRuler::adjustScale(int maximum) { m_maxval = maximum; @@ -62,10 +68,23 @@ void SmallRuler::adjustScale(int maximum) m_small = 30 * 25; m_medium = 60 * 25; } - m_cursorPosition = m_cursorFramePosition * m_scale; updatePixmap(); } +void SmallRuler::setZoneStart() +{ + int pos = m_render->requestedSeekPosition; + if (pos == SEEK_INACTIVE) pos = m_render->seekFramePosition(); + setZone(pos, -1); +} + +void SmallRuler::setZoneEnd() +{ + int pos = m_render->requestedSeekPosition; + if (pos == SEEK_INACTIVE) pos = m_render->seekFramePosition(); + setZone(-1, pos); +} + void SmallRuler::setZone(int start, int end) { if (start != -1) { @@ -89,13 +108,13 @@ void SmallRuler::setZone(int start, int end) updatePixmap(); } -void SmallRuler::setMarkers(QList < int > list) +void SmallRuler::setMarkers(const QList &list) { m_markers = list; updatePixmap(); } -QPoint SmallRuler::zone() +QPoint SmallRuler::zone() const { return QPoint(m_zoneStart, m_zoneEnd); } @@ -103,6 +122,7 @@ QPoint SmallRuler::zone() // virtual void SmallRuler::mousePressEvent(QMouseEvent * event) { + m_render->setActiveMonitor(); const int pos = event->x() / m_scale; if (event->button() == Qt::RightButton) { // Right button clicked, move selection zone @@ -111,15 +131,28 @@ void SmallRuler::mousePressEvent(QMouseEvent * event) emit zoneChanged(QPoint(m_zoneStart, m_zoneEnd)); updatePixmap(); - } else emit seekRenderer((int) pos); + } else if (pos != m_lastSeekPosition && pos != m_cursorFramePosition) { + m_render->seekToFrame(pos); + m_lastSeekPosition = pos; + update(); + } + event->accept(); +} + +// virtual +void SmallRuler::mouseReleaseEvent(QMouseEvent * event) +{ + event->accept(); } -void SmallRuler::leaveEvent( QEvent * event ) + +// virtual +void SmallRuler::leaveEvent(QEvent * event) { - Q_UNUSED(event); - if (m_overCursor) { - m_overCursor = false; - update(); + QWidget::leaveEvent(event); + if (m_cursorColor == palette().link()) { + m_cursorColor = palette().text(); + update(); } } @@ -127,50 +160,71 @@ void SmallRuler::leaveEvent( QEvent * event ) void SmallRuler::mouseMoveEvent(QMouseEvent * event) { const int pos = event->x() / m_scale; - if (event->button() == Qt::NoButton) { - if (qAbs(pos * m_scale - m_cursorPosition) < 6) { - if (!m_overCursor) { - m_overCursor = true; - update(); - } - } - else if (m_overCursor) { - m_overCursor = false; - update(); - } - } if (event->buttons() & Qt::LeftButton) { - m_overCursor = true; - emit seekRenderer((int) pos); + if (pos != m_lastSeekPosition && pos != m_cursorFramePosition) { + m_render->seekToFrame(pos); + m_lastSeekPosition = pos; + update(); + } } else { + if (m_cursorColor == palette().text() && qAbs(pos - m_cursorFramePosition) * m_scale < 7) { + // Mouse is over cursor + m_cursorColor = palette().link(); + update(); + } + else if (m_cursorColor == palette().link() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) { + m_cursorColor = palette().text(); + update(); + } if (qAbs((pos - m_zoneStart) * m_scale) < 4) { - setToolTip(i18n("Zone start: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneStart))); + setToolTip(i18n("Zone start: %1", m_monitor->getTimecodeFromFrames(m_zoneStart))); } else if (qAbs((pos - m_zoneEnd) * m_scale) < 4) { - setToolTip(i18n("Zone end: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneEnd))); - } else if (pos > m_zoneStart && pos < m_zoneEnd) { - setToolTip(i18n("Zone duration: %1", m_manager->timecode().getTimecodeFromFrames(m_zoneEnd - m_zoneStart))); - } else setToolTip(i18n("Position: %1", m_manager->timecode().getTimecodeFromFrames(pos))); + setToolTip(i18n("Zone end: %1", m_monitor->getTimecodeFromFrames(m_zoneEnd))); + } + for (int i = 0; i < m_markers.count(); ++i) { + if (qAbs((pos - m_markers.at(i).time().frames(m_monitor->fps())) * m_scale) < 4) { + // We are on a marker + QString markerxt = m_monitor->getMarkerThumb(m_markers.at(i).time()); + if (!markerxt.isEmpty()) { + markerxt.prepend("

"); + } + markerxt.append(m_markers.at(i).comment()); + setToolTip(markerxt); + event->accept(); + return; + } + } + if (pos > m_zoneStart && pos < m_zoneEnd) { + setToolTip(i18n("Zone duration: %1", m_monitor->getTimecodeFromFrames(m_zoneEnd - m_zoneStart))); + } + else setToolTip(i18n("Position: %1", m_monitor->getTimecodeFromFrames(pos))); } + event->accept(); +} + +void SmallRuler::refreshRuler() +{ + m_lastSeekPosition = SEEK_INACTIVE; + update(); } bool SmallRuler::slotNewValue(int value) { if (value == m_cursorFramePosition) return false; + if (value == m_lastSeekPosition) m_lastSeekPosition = SEEK_INACTIVE; m_cursorFramePosition = value; - int oldPos = m_cursorPosition; + /*int oldPos = m_cursorPosition; m_cursorPosition = value * m_scale; const int offset = 6; const int x = qMin(oldPos, m_cursorPosition); const int w = qAbs(oldPos - m_cursorPosition); - update(x - offset, 4, w + 2 * offset, 6); + update(x - offset, 0, w + 2 * offset, height());*/ + update(); return true; } -int SmallRuler::position() const -{ - return m_cursorFramePosition; -} //virtual void SmallRuler::resizeEvent(QResizeEvent *) @@ -182,17 +236,19 @@ void SmallRuler::updatePixmap() { m_pixmap = QPixmap(width(), height()); m_pixmap.fill(palette().window().color()); + m_lastSeekPosition = SEEK_INACTIVE; QPainter p(&m_pixmap); double f, fend; const int zoneStart = (int)(m_zoneStart * m_scale); const int zoneEnd = (int)(m_zoneEnd * m_scale); - p.setPen(Qt::NoPen); - p.setBrush(m_zoneBrush.brush(this)); - p.drawRect(zoneStart, height() / 2 - 1, zoneEnd - zoneStart, height() / 2); + p.fillRect(zoneStart, 0, zoneEnd - zoneStart, height(), QBrush(m_zoneColor)); // draw ruler - p.setPen(palette().text().color()); + p.setPen(palette().midlight().color()); + //p.drawLine(0, 0, width(), 0); + p.drawLine(0, height() - 1, width(), height() - 1); + p.setPen(palette().dark().color()); // draw the little marks fend = m_scale * m_small; if (fend > 2) for (f = 0; f < width(); f += fend) { @@ -206,9 +262,10 @@ void SmallRuler::updatePixmap() } // draw markers if (!m_markers.isEmpty()) { - p.setPen(Qt::red); - for (int i = 0; i < m_markers.count(); i++) { - p.drawLine(m_markers.at(i) * m_scale, 0, m_markers.at(i) * m_scale, 9); + for (int i = 0; i < m_markers.count(); ++i) { + int pos = m_markers.at(i).time().frames(m_monitor->fps()) * m_scale; + p.setPen(CommentedTime::markerColor(m_markers.at(i).markerType())); + p.drawLine(pos, 0, pos, 9); } } p.end(); @@ -223,14 +280,30 @@ void SmallRuler::paintEvent(QPaintEvent *e) QRect r = e->rect(); p.setClipRect(r); p.drawPixmap(QPointF(), m_pixmap); + p.setPen(palette().shadow().color()); + //p.setRenderHint(QPainter::Antialiasing, true); + //p.drawRoundedRect(rect().adjusted(1,1,-2,-2), 3, 3); + int cursorPos = m_cursorFramePosition * m_scale; // draw pointer QPolygon pa(3); - pa.setPoints(3, m_cursorPosition - 6, 10, m_cursorPosition + 6, 10, m_cursorPosition/*+0*/, 4); - if (m_overCursor) p.setBrush(palette().highlight()); - else p.setBrush(palette().text().color()); + pa.setPoints(3, cursorPos - 6, height() - 1, cursorPos + 6, height() - 1, cursorPos/*+0*/, height() - 8); + p.setBrush(m_cursorColor); p.setPen(Qt::NoPen); p.drawPolygon(pa); + + // Draw seeking pointer + if (m_lastSeekPosition != SEEK_INACTIVE && m_lastSeekPosition != m_cursorFramePosition) { + p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().linkVisited()); + } +} + +void SmallRuler::updatePalette() +{ + KSharedConfigPtr config = KSharedConfig::openConfig(KdenliveSettings::colortheme()); + m_zoneColor = KStatefulBrush(KColorScheme::View, KColorScheme::FocusColor, config).brush(this).color(); + m_zoneColor.setAlpha(180); + updatePixmap(); } #include "smallruler.moc"