Fix monitor timecode display with NTSC profiles:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index a550944f0b6821b09e345ca44762fdb0622a6156..25e5808c513bf05482013ba9bd83f11532a91c5a 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -71,7 +71,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     if (name != "chapter") {
         toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart()));
         toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd()));
-    } else m_ruler->setZone(-3, -2);
+    } else {
+        m_ruler->setZone(-3, -2);
+    }
 
     toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind()));
     toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame()));
@@ -112,19 +114,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     QWidget *spacer = new QWidget(this);
     spacer->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding);
     toolbar->addWidget(spacer);
-    m_timePos = new KRestrictedLine(this);
-    m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
-    m_frametimecode = KdenliveSettings::frametimecode();
-    m_timePos->setInputMask("");
-    if (m_frametimecode) {
-        QIntValidator *valid = new QIntValidator(this);
-        valid->setBottom(0);
-        m_timePos->setValidator(valid);
-    } else
-        m_timePos->setValidator(m_monitorManager->timecode().validator());
-
+    m_timePos = new TimecodeDisplay(m_monitorManager->timecode(), this);
     toolbar->addWidget(m_timePos);
-
     connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
 
     layout2->addWidget(toolbar);
@@ -507,20 +498,13 @@ void Monitor::activateMonitor()
 
 void Monitor::setTimePos(const QString &pos)
 {
-    if (m_frametimecode) {
-        int frames = m_monitorManager->timecode().getFrameCount(pos);
-        m_timePos->setText(QString::number(frames));
-    } else m_timePos->setText(pos);
+    m_timePos->setValue(pos);
     slotSeek();
 }
 
 void Monitor::slotSeek()
 {
-    int frames;
-    if (m_frametimecode) frames = m_timePos->text().toInt();
-    else frames = m_monitorManager->timecode().getFrameCount(m_timePos->text());
-    //kDebug() << "// / / SEEK TO: " << frames;
-    slotSeek(frames);
+    slotSeek(m_timePos->value());
 }
 
 void Monitor::slotSeek(int pos)
@@ -536,13 +520,17 @@ void Monitor::checkOverlay()
     if (m_overlay == NULL) return;
     int pos = render->seekFramePosition();
     QPoint zone = m_ruler->zone();
-    if (pos == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
-    else if (pos == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
+    if (pos == zone.x())
+        m_overlay->setOverlayText(i18n("In Point"));
+    else if (pos == zone.y())
+        m_overlay->setOverlayText(i18n("Out Point"));
     else {
         if (m_currentClip) {
             QString markerComment = m_currentClip->markerComment(GenTime(pos, m_monitorManager->timecode().fps()));
-            if (markerComment.isEmpty()) m_overlay->setHidden(true);
-            else m_overlay->setOverlayText(markerComment, false);
+            if (markerComment.isEmpty())
+                m_overlay->setHidden(true);
+            else
+                m_overlay->setOverlayText(markerComment, false);
         } else m_overlay->setHidden(true);
     }
 }
@@ -624,8 +612,7 @@ void Monitor::seekCursor(int pos)
     activateMonitor();
     if (m_ruler->slotNewValue(pos)) {
         checkOverlay();
-        if (m_frametimecode) m_timePos->setText(QString::number(pos));
-        else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+        m_timePos->setValue(pos);
     }
 }
 
@@ -633,8 +620,7 @@ void Monitor::rendererStopped(int pos)
 {
     if (m_ruler->slotNewValue(pos)) {
         checkOverlay();
-        if (m_frametimecode) m_timePos->setText(QString::number(pos));
-        else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+        m_timePos->setValue(pos);
     }
     disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay()));
     m_playAction->setChecked(false);
@@ -778,6 +764,7 @@ void Monitor::slotSaveZone()
 
 void Monitor::resetProfile(const QString profile)
 {
+    m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
     render->resetProfile(profile);
 }
@@ -825,19 +812,7 @@ void Monitor::slotSwitchMonitorInfo(bool show)
 
 void Monitor::updateTimecodeFormat()
 {
-    m_frametimecode = KdenliveSettings::frametimecode();
-    m_timePos->setInputMask("");
-    if (m_frametimecode) {
-        int frames = m_monitorManager->timecode().getFrameCount(m_timePos->text());
-        QIntValidator *valid = new QIntValidator(this);
-        valid->setBottom(0);
-        m_timePos->setValidator(valid);
-        m_timePos->setText(QString::number(frames));
-    } else {
-        int pos = m_timePos->text().toInt();
-        m_timePos->setValidator(m_monitorManager->timecode().validator());
-        m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
-    }
+    m_timePos->slotUpdateTimeCodeFormat();
 }
 
 QStringList Monitor::getZoneInfo() const
@@ -873,26 +848,21 @@ Overlay::Overlay(QWidget* parent) :
         QLabel(parent)
 {
     setAttribute(Qt::WA_TransparentForMouseEvents);
-    setAttribute(Qt::WA_OpaquePaintEvent);
+    //setAttribute(Qt::WA_OpaquePaintEvent);
     //setAttribute(Qt::WA_NoSystemBackground);
-    setAutoFillBackground(false);
-}
-
-void Overlay::paintEvent(QPaintEvent * /*event*/)
-{
-    QPainter painter(this);
-    QColor col;
-    painter.setPen(Qt::white);
-    if (m_isZone) col = QColor(200, 0, 0);
-    else col = QColor(0, 0, 200);
-    painter.fillRect(rect(), col);
-    painter.drawText(rect(), Qt::AlignCenter, text());
+    setAutoFillBackground(true);
+    setBackgroundRole(QPalette::Base);
 }
 
 void Overlay::setOverlayText(const QString &text, bool isZone)
 {
     setHidden(true);
     m_isZone = isZone;
+    QPalette p;
+    p.setColor(QPalette::Text, Qt::white);
+    if (m_isZone) p.setColor(QPalette::Base, QColor(200, 0, 0));
+    else p.setColor(QPalette::Base, QColor(0, 0, 200));
+    setPalette(p);
     setText(' ' + text + ' ');
     setHidden(false);
     update();