Display "in" and "out" point in overlay on monitor when playing, configurable through...

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 0d055d75e0fda93a9604901c1907f937c409db09..cd2713d8dfb1ed447d5bbb24b6c32a8728cfde62 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -18,6 +18,19 @@
  ***************************************************************************/
 
 
+#include "monitor.h"
+#include "renderer.h"
+#include "monitormanager.h"
+#include "smallruler.h"
+#include "docclipbase.h"
+#include "kdenlivesettings.h"
+
+#include <KDebug>
+#include <KLocale>
+#include <KFileDialog>
+#include <KApplication>
+#include <KMessageBox>
+
 #include <QMouseEvent>
 #include <QStylePainter>
 #include <QMenu>
@@ -26,20 +39,9 @@
 #include <QDesktopWidget>
 #include <QLabel>
 
-#include <KDebug>
-#include <KLocale>
-#include <KFileDialog>
-#include <KApplication>
-#include <KMessageBox>
-
-#include "monitor.h"
-#include "renderer.h"
-#include "monitormanager.h"
-#include "smallruler.h"
-#include "docclipbase.h"
 
 Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
-        : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false), m_currentClip(NULL), m_dragStarted(false) {
+        : QWidget(parent), render(NULL), m_monitorManager(manager), m_name(name), m_isActive(false), m_currentClip(NULL), m_dragStarted(false), m_overlay(NULL) {
     ui.setupUi(this);
     m_scale = 1;
     m_ruler = new SmallRuler();
@@ -56,8 +58,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
     m_playIcon = KIcon("media-playback-start");
     m_pauseIcon = KIcon("media-playback-pause");
 
-    QAction *zoneStart = toolbar->addAction(KIcon("kdenlive-zone-start"), i18n("Set zone start"), this, SLOT(slotSetZoneStart()));
-    QAction *zoneEnd = toolbar->addAction(KIcon("kdenlive-zone-end"), i18n("Set zone end"), this, SLOT(slotSetZoneEnd()));
+    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()));
 
     toolbar->addAction(KIcon("media-seek-backward"), i18n("Rewind"), this, SLOT(slotRewind()));
     toolbar->addAction(KIcon("media-skip-backward"), i18n("Rewind 1 frame"), this, SLOT(slotRewindOneFrame()));
@@ -108,11 +110,6 @@ 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)));
     connect(render, SIGNAL(durationChanged(int)), this, SLOT(adjustRulerSize(int)));
     connect(render, SIGNAL(rendererPosition(int)), this, SLOT(seekCursor(int)));
@@ -138,7 +135,7 @@ Monitor::Monitor(QString name, MonitorManager *manager, QWidget *parent)
 Monitor::~Monitor() {
     delete m_ruler;
     delete m_timePos;
-    delete m_overlay;
+    if (m_overlay) delete m_overlay;
     delete m_monitorRefresh;
 }
 
@@ -162,7 +159,7 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
     m_contextMenu->addAction(extractFrame);
 
     if (m_name != "clip") {
-        QAction *splitView = m_contextMenu->addAction(KIcon("document-new"), i18n("Split view"), render, SLOT(slotSplitView(bool)));
+        QAction *splitView = m_contextMenu->addAction(KIcon("view-split-left-right"), i18n("Split view"), render, SLOT(slotSplitView(bool)));
         splitView->setCheckable(true);
         m_configMenu->addAction(splitView);
     } else {
@@ -170,6 +167,11 @@ void Monitor::setupMenu(QMenu *goMenu, QAction *playZone, QAction *loopZone, QMe
         m_configMenu->addAction(setThumbFrame);
     }
 
+    QAction *showTips = m_contextMenu->addAction(KIcon("help-hint"), i18n("Monitor overlay infos"), this, SLOT(slotSwitchMonitorInfo(bool)));
+    showTips->setCheckable(true);
+    slotSwitchMonitorInfo(KdenliveSettings::displayMonitorInfo());
+    m_configMenu->addAction(showTips);
+
 }
 
 void Monitor::slotSetSizeOneToOne() {
@@ -418,6 +420,7 @@ void Monitor::slotSeek(int pos) {
 }
 
 void Monitor::checkOverlay() {
+    if (m_overlay == NULL) return;
     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"));
@@ -514,6 +517,7 @@ void Monitor::slotForwardOneFrame(int diff) {
 
 void Monitor::seekCursor(int pos) {
     activateMonitor();
+    checkOverlay();
     m_position = pos;
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_ruler->slotNewValue(pos);
@@ -523,7 +527,7 @@ void Monitor::rendererStopped(int pos) {
     //int rulerPos = (int)(pos * m_scale);
     m_ruler->slotNewValue(pos);
     m_position = pos;
-    checkOverlay();
+    //checkOverlay();
     m_timePos->setText(m_monitorManager->timecode().getTimecodeFromFrames(pos));
     m_playAction->setChecked(false);
     m_playAction->setIcon(m_playIcon);
@@ -654,11 +658,9 @@ 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;
+const QString Monitor::sceneList() {
+    if (render == NULL) return QString();
+    return render->sceneList();
 }
 
 
@@ -667,6 +669,19 @@ void Monitor::setClipZone(QPoint pos) {
     m_currentClip->setZone(pos);
 }
 
+void Monitor::slotSwitchMonitorInfo(bool show) {
+    KdenliveSettings::setDisplayMonitorInfo(show);
+    if (show) {
+        if (m_overlay) return;
+        m_overlay = new Overlay(m_monitorRefresh);
+        m_overlay->raise();
+        m_overlay->setHidden(true);
+    } else {
+        delete m_overlay;
+        m_overlay = NULL;
+    }
+}
+
 MonitorRefresh::MonitorRefresh(QWidget* parent): QWidget(parent), m_renderer(NULL) {
     setAttribute(Qt::WA_PaintOnScreen);
     setAttribute(Qt::WA_OpaquePaintEvent); //setAttribute(Qt::WA_NoSystemBackground);
@@ -708,6 +723,4 @@ void Overlay::setOverlayText(const QString &text, bool isZone) {
     update();
 }
 
-
-
 #include "monitor.moc"