* Clip Markers are now displayed over the clip monitor

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 9ad543b5f2a1a67ff2dabfb96678d352e1cd00fa..067efe3f39743f355fc87c0af9ce317e9b6fa897 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -24,13 +24,14 @@
 #include <QToolButton>
 #include <QToolBar>
 #include <QDesktopWidget>
+#include <QLabel>
 
 #include <KDebug>
 #include <KLocale>
 #include <KFileDialog>
 #include <KApplication>
+#include <KMessageBox>
 
-#include "gentime.h"
 #include "monitor.h"
 #include "renderer.h"
 #include "monitormanager.h"
@@ -109,6 +110,9 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     render = new Render(m_name, (int) m_monitorRefresh->winId(), -1, this);
     m_monitorRefresh->setRenderer(render);
 
+    m_overlay = new Overlay(m_monitorRefresh);
+    m_overlay->raise();
+    m_overlay->setHidden(true);
 
 
     connect(m_ruler, SIGNAL(seekRenderer(int)), this, SLOT(slotSeek(int)));
@@ -131,6 +135,13 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     kDebug() << "/////// BUILDING MONITOR, ID: " << ui.video_frame->winId();
 }
 
+Monitor::~Monitor() {
+    delete m_ruler;
+    delete m_timePos;
+    delete m_overlay;
+    delete m_monitorRefresh;
+}
+
 QString Monitor::name() const {
     return m_name;
 }
@@ -199,18 +210,57 @@ void Monitor::resetSize() {
     ui.video_frame->setMinimumSize(0, 0);
 }
 
+void Monitor::slotSeekToPreviousSnap() {
+    if (m_currentClip) slotSeek(getSnapForPos(true).frames(m_monitorManager->timecode().fps()));
+}
+
+void Monitor::slotSeekToNextSnap() {
+    if (m_currentClip) slotSeek(getSnapForPos(false).frames(m_monitorManager->timecode().fps()));
+}
+
+GenTime Monitor::getSnapForPos(bool previous) {
+    QList <GenTime> snaps;
+    QList < GenTime > markers = m_currentClip->snapMarkers();
+    for (int i = 0; i < markers.size(); ++i) {
+        GenTime t = markers.at(i);
+        snaps.append(t);
+    }
+    QPoint zone = m_ruler->zone();
+    snaps.append(GenTime(zone.x(), m_monitorManager->timecode().fps()));
+    snaps.append(GenTime(zone.y(), m_monitorManager->timecode().fps()));
+    snaps.append(GenTime());
+    snaps.append(m_currentClip->duration());
+    qSort(snaps);
+
+    const GenTime pos(m_position, m_monitorManager->timecode().fps());
+    for (int i = 0; i < snaps.size(); ++i) {
+        if (previous && snaps.at(i) >= pos) {
+            if (i == 0) i = 1;
+            return snaps.at(i - 1);
+        } else if (!previous && snaps.at(i) > pos) {
+            return snaps.at(i);
+        }
+    }
+    return GenTime();
+}
+
+
+
 void Monitor::slotZoneMoved(int start, int end) {
     m_ruler->setZone(start, end);
+    checkOverlay();
 }
 
 void Monitor::slotSetZoneStart() {
     m_ruler->setZone(m_position, -1);
     emit zoneUpdated(m_ruler->zone());
+    checkOverlay();
 }
 
 void Monitor::slotSetZoneEnd() {
     m_ruler->setZone(-1, m_position);
     emit zoneUpdated(m_ruler->zone());
+    checkOverlay();
 }
 
 // virtual
@@ -236,7 +286,7 @@ void Monitor::mouseReleaseEvent(QMouseEvent * event) {
 
 // virtual
 void Monitor::mouseMoveEvent(QMouseEvent *event) {
-    kDebug() << "// DRAG STARTED, MOUSE MOVED: ";
+    // kDebug() << "// DRAG STARTED, MOUSE MOVED: ";
     if (!m_dragStarted || m_currentClip == NULL) return;
 
     if ((event->pos() - m_DragStartPosition).manhattanLength()
@@ -323,7 +373,10 @@ void Monitor::slotSetThumbFrame() {
 void Monitor::slotExtractCurrentFrame() {
     QPixmap frame = render->extractFrame(m_position);
     QString outputFile = KFileDialog::getSaveFileName(KUrl(), "image/png");
-    if (!outputFile.isEmpty()) frame.save(outputFile);
+    if (!outputFile.isEmpty()) {
+        if (QFile::exists(outputFile) && KMessageBox::questionYesNo(this, i18n("File already exists.\nDo you want to overwrite it ?")) == KMessageBox::No) return;
+        frame.save(outputFile);
+    }
 }
 
 bool Monitor::isActive() const {
@@ -342,12 +395,26 @@ void Monitor::slotSeek() {
 void Monitor::slotSeek(int pos) {
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
     if (render == NULL) return;
-    render->seekToFrame(pos);
     m_position = pos;
+    checkOverlay();
+    render->seekToFrame(pos);
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
 }
 
+void Monitor::checkOverlay() {
+    QPoint zone = m_ruler->zone();
+    if (m_position == zone.x()) m_overlay->setOverlayText(i18n("In Point"));
+    else if (m_position == zone.y()) m_overlay->setOverlayText(i18n("Out Point"));
+    else {
+        if (m_currentClip) {
+            QString markerComment = m_currentClip->markerComment(GenTime(m_position, m_monitorManager->timecode().fps()));
+            if (markerComment.isEmpty()) m_overlay->setHidden(true);
+            else m_overlay->setOverlayText(markerComment, false);
+        } else m_overlay->setHidden(true);
+    }
+}
+
 void Monitor::slotStart() {
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
     render->play(0);
@@ -411,6 +478,7 @@ void Monitor::slotRewindOneFrame() {
     render->play(0);
     if (m_position < 1) return;
     m_position--;
+    checkOverlay();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
@@ -421,6 +489,7 @@ void Monitor::slotForwardOneFrame() {
     render->play(0);
     if (m_position >= m_length) return;
     m_position++;
+    checkOverlay();
     render->seekToFrame(m_position);
     emit renderPosition(m_position);
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(m_position));
@@ -429,6 +498,7 @@ void Monitor::slotForwardOneFrame() {
 void Monitor::seekCursor(int pos) {
     if (!m_isActive) m_monitorManager->activateMonitor(m_name);
     m_position = pos;
+    checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
 }
@@ -557,6 +627,13 @@ void Monitor::saveSceneList(QString path, QDomElement info) {
     render->saveSceneList(path, info);
 }
 
+QDomDocument Monitor::sceneList() {
+    if (render == NULL) return QDomDocument();
+    QDomDocument doc;
+    doc.setContent(render->sceneList());
+    return doc;
+}
+
 MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) {
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
@@ -570,4 +647,34 @@ 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_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());
+}
+
+
+
+void Overlay::setOverlayText(const QString &text, bool isZone) {
+    setHidden(true);
+    m_isZone = isZone;
+    setText(' ' + text + ' ');
+    setHidden(false);
+    update();
+}
+
+
+
 #include "monitor.moc"