#include <KDebug>
#include <KColorScheme>
-#include <KLocale>
+#include <KLocalizedString>
#include <QMouseEvent>
#include <QStylePainter>
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(8);
+ setMinimumHeight(QFontInfo(font()).pixelSize());
adjustScale(m_maxval);
}
updatePixmap();
}
-void SmallRuler::setMarkers(QList < CommentedTime > list)
+void SmallRuler::setMarkers(const QList<CommentedTime> &list)
{
m_markers = list;
updatePixmap();
}
-QPoint SmallRuler::zone()
+QPoint SmallRuler::zone() const
{
return QPoint(m_zoneStart, m_zoneEnd);
}
// 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
void SmallRuler::leaveEvent(QEvent * event)
{
QWidget::leaveEvent(event);
- if (m_cursorColor == palette().highlight()) {
+ if (m_cursorColor == palette().link()) {
m_cursorColor = palette().text();
update();
}
else {
if (m_cursorColor == palette().text() && qAbs(pos - m_cursorFramePosition) * m_scale < 7) {
// Mouse is over cursor
- m_cursorColor = palette().highlight();
+ m_cursorColor = palette().link();
update();
}
- else if (m_cursorColor == palette().highlight() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
+ else if (m_cursorColor == palette().link() && qAbs(pos - m_cursorFramePosition) * m_scale >= 7) {
m_cursorColor = palette().text();
update();
}
} else if (qAbs((pos - m_zoneEnd) * m_scale) < 4) {
setToolTip(i18n("Zone end: %1", m_monitor->getTimecodeFromFrames(m_zoneEnd)));
}
- for (int i = 0; i < m_markers.count(); i++) {
+ 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());
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, 0, zoneEnd - zoneStart, height());
+ p.fillRect(zoneStart, 0, zoneEnd - zoneStart, height(), QBrush(m_zoneColor));
// draw ruler
p.setPen(palette().midlight().color());
}
// draw markers
if (!m_markers.isEmpty()) {
- for (int i = 0; i < m_markers.count(); i++) {
+ 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);
int cursorPos = m_cursorFramePosition * m_scale;
// draw pointer
QPolygon pa(3);
- pa.setPoints(3, cursorPos - 6, 7, cursorPos + 6, 7, cursorPos/*+0*/, 0);
+ 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().highlight());
+ p.fillRect(m_lastSeekPosition * m_scale - 1, 0, 3, height(), palette().linkVisited());
}
}
void SmallRuler::updatePalette()
{
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);
updatePixmap();
}