Commit a52b7572 authored by Till Theato's avatar Till Theato
Browse files

Correctly connect levels monitor

svn path=/trunk/kdenlive/; revision=4624
parent 30c6bf74
......@@ -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);
}
......
......@@ -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);
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment