simplify monitor overlay info

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index c5490a7f29c98560ddafe8425e1e7f7ba7147f70..5a88b826acad97c5c5001da66f02bacd876592b2 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -115,10 +115,14 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     m_timePos = new KRestrictedLine(this);
     m_timePos->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::MinimumExpanding);
     m_frametimecode = KdenliveSettings::frametimecode();
+    m_timePos->setInputMask("");
     if (m_frametimecode) {
-        m_timePos->setInputMask(QString());
-        m_timePos->setValidator(new QIntValidator(this));
-    } else m_timePos->setInputMask("99:99:99:99");
+        QIntValidator *valid = new QIntValidator(this);
+        valid->setBottom(0);
+        m_timePos->setValidator(valid);
+    } else
+        m_timePos->setValidator(m_monitorManager->timecode().validator());
+
     toolbar->addWidget(m_timePos);
 
     connect(m_timePos, SIGNAL(editingFinished()), this, SLOT(slotSeek()));
@@ -152,9 +156,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
 
     connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
     connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int)));
-    connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
     connect(render, SIGNAL(rendererStopped(int)), this, SLOT(rendererStopped(int)));
-    connect(render, SIGNAL(blockMonitors()), this, SIGNAL(blockMonitors()));
 
     //render->createVideoXWindow(m_ui.video_frame->winId(), -1);
 
@@ -347,8 +349,6 @@ GenTime Monitor::getSnapForPos(bool previous)
     return GenTime();
 }
 
-
-
 void Monitor::slotZoneMoved(int start, int end)
 {
     m_ruler->setZone(start, end);
@@ -395,7 +395,6 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event)
     }
 }
 
-
 // virtual
 void Monitor::mouseMoveEvent(QMouseEvent *event)
 {
@@ -454,16 +453,7 @@ QStringList Monitor::mimeTypes() const
     return qstrList;
 }
 
-
 // virtual
-/** Move to other position on mousewheel
- *
- * Moves towards end of clip/timeline on mousewheel down/back,
- * opposite for mousewheel up/forward.
- *
- * Ctrl+wheel moves single frame, without Ctrl moves a second.
- *
- * See also http://www.kdenlive.org/mantis/view.php?id=265 */
 void Monitor::wheelEvent(QWheelEvent * event)
 {
     if (event->modifiers() == Qt::ControlModifier) {
@@ -510,7 +500,9 @@ bool Monitor::isActive() const
 
 void Monitor::activateMonitor()
 {
-    if (!m_isActive) m_monitorManager->switchMonitors(); //m_monitorManager->activateMonitor(m_name);
+    if (!m_isActive) {
+        m_monitorManager->slotSwitchMonitors(m_name == "clip");
+    }
 }
 
 void Monitor::setTimePos(const QString &pos)
@@ -560,7 +552,7 @@ void Monitor::slotStart()
     activateMonitor();
     render->play(0);
     render->seekToFrame(0);
-    emit renderPosition(0);
+    //emit renderPosition(0);
 }
 
 void Monitor::slotEnd()
@@ -568,7 +560,7 @@ void Monitor::slotEnd()
     activateMonitor();
     render->play(0);
     render->seekToFrame(render->getLength());
-    emit renderPosition(render->seekFramePosition());
+    //emit renderPosition(render->seekFramePosition());
 }
 
 void Monitor::slotZoneStart()
@@ -630,26 +622,23 @@ void Monitor::slotForwardOneFrame(int diff)
 void Monitor::seekCursor(int pos)
 {
     activateMonitor();
-    checkOverlay();
-    if (m_frametimecode) m_timePos->setText(QString::number(pos));
-    else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
-    m_ruler->slotNewValue(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));
+    }
 }
 
 void Monitor::rendererStopped(int pos)
 {
-    if (m_currentClip != NULL && m_playAction->isChecked()) {
-        // Clip monitor
-        if (pos >= m_length - 1) {
-            slotStart();
-            return;
-        }
+    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_ruler->slotNewValue(pos);
-    checkOverlay();
-    if (m_frametimecode) m_timePos->setText(QString::number(pos));
-    else m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
+    disconnect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay()));
     m_playAction->setChecked(false);
+    connect(m_playAction, SIGNAL(triggered()), this, SLOT(slotPlay()));
     m_playAction->setIcon(m_playIcon);
 }
 
@@ -679,20 +668,20 @@ void Monitor::adjustRulerSize(int length)
 void Monitor::stop()
 {
     m_isActive = false;
+    disconnect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
     if (render) render->stop();
-    //kDebug()<<"/// MONITOR RENDER STOP";
 }
 
 void Monitor::start()
 {
     m_isActive = true;
     if (render) render->start();
-    //kDebug()<<"/// MONITOR RENDER START";
+    connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
 }
 
 void Monitor::refreshMonitor(bool visible)
 {
-    if (visible && render) {
+    if (visible && render && !m_isActive) {
         activateMonitor();
         render->doRefresh(); //askForRefresh();
     }
@@ -744,18 +733,19 @@ void Monitor::slotLoopZone()
 void Monitor::slotSetXml(DocClipBase *clip, QPoint zone, const int position)
 {
     if (render == NULL) return;
-    activateMonitor();
     if (clip == NULL && m_currentClip != NULL) {
         m_currentClip = NULL;
+        m_length = -1;
         render->setProducer(NULL, -1);
         return;
     }
+    if (m_currentClip != NULL) activateMonitor();
     if (clip != m_currentClip) {
         m_currentClip = clip;
         updateMarkers(clip);
         if (render->setProducer(clip->producer(), position) == -1) {
             // MLT CONSUMER is broken
-            emit blockMonitors();
+            kDebug(QtWarningMsg) << "ERROR, Cannot start monitor";
         }
     } else if (position != -1) render->seek(GenTime(position, m_monitorManager->timecode().fps()));
     if (!zone.isNull()) {
@@ -786,7 +776,6 @@ void Monitor::slotSaveZone()
     //render->setSceneList(doc, 0);
 }
 
-
 void Monitor::resetProfile(const QString profile)
 {
     if (render == NULL) return;
@@ -805,7 +794,6 @@ const QString Monitor::sceneList()
     return render->sceneList();
 }
 
-
 void Monitor::setClipZone(QPoint pos)
 {
     if (m_currentClip == NULL) return;
@@ -838,15 +826,16 @@ 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());
-        m_timePos->setValidator(new QIntValidator(this));
-        m_timePos->setInputMask(QString());
+        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(0);
-        m_timePos->setInputMask("99:99:99:99");
+        m_timePos->setValidator(m_monitorManager->timecode().validator());
         m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     }
 }
@@ -861,7 +850,6 @@ QStringList Monitor::getZoneInfo() const
     return result;
 }
 
-
 MonitorRefresh::MonitorRefresh(QWidget* parent) : \
         QWidget(parent),
         m_renderer(NULL)
@@ -881,33 +869,25 @@ void MonitorRefresh::paintEvent(QPaintEvent * /*event*/)
     if (m_renderer) m_renderer->doRefresh();
 }
 
-
 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();