Correctly connect levels monitor

svn path=/trunk/kdenlive/; revision=4624

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index b59826ed43d1340c81b2feb2a3f682df18f7d9e7..69e8ad1d74782951bd6b571600e5514c6cbbdf8d 100644 (file)
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -433,6 +433,7 @@ MainWindow::MainWindow(const QString &MltPath, const KUrl & Url, QWidget *parent
     connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_vectorscope, SLOT(slotActiveMonitorChanged(bool)));
     connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_waveform, SLOT(slotActiveMonitorChanged(bool)));
     connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_RGBParade, SLOT(slotActiveMonitorChanged(bool)));
+    connect(m_monitorManager, SIGNAL(raiseClipMonitor(bool)), m_levels, SLOT(slotActiveMonitorChanged(bool)));
     connect(m_effectList, SIGNAL(addEffect(const QDomElement)), this, SLOT(slotAddEffect(const QDomElement)));
     connect(m_effectList, SIGNAL(reloadEffects()), this, SLOT(slotReloadEffects()));
 
@@ -3621,6 +3622,7 @@ void MainWindow::slotShowTitleBars(bool show)
         m_vectorscopeDock->setTitleBarWidget(0);
         m_waveformDock->setTitleBarWidget(0);
         m_RGBParadeDock->setTitleBarWidget(0);
+        m_levelsDock->setTitleBarWidget(0);
     } else {
         if (!m_effectStackDock->isFloating()) { m_effectStackDock->setTitleBarWidget(new QWidget(this)); }
         if (!m_clipMonitorDock->isFloating()) { m_clipMonitorDock->setTitleBarWidget(new QWidget(this)); }
@@ -3635,6 +3637,7 @@ void MainWindow::slotShowTitleBars(bool show)
         if (!m_vectorscopeDock->isFloating()) { m_vectorscopeDock->setTitleBarWidget(new QWidget(this)); }
         if (!m_waveformDock->isFloating()) { m_waveformDock->setTitleBarWidget(new QWidget(this)); }
         if (!m_RGBParadeDock->isFloating()) { m_RGBParadeDock->setTitleBarWidget(new QWidget(this)); }
+        if (!m_levelsDock->isFloating()) { m_levelsDock->setTitleBarWidget(new QWidget(this)); }
     }
     KdenliveSettings::setShowtitlebars(show);
 }

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 8a4155300b5990e90bdc55d1c908e39533417282..876eb8f6385e5fa9102e2bd5d7b513337f72d980 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -520,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);
     }
 }