Cleanup & fix multi clip transcoding

[kdenlive] / src / monitoreditwidget.cpp

diff --git a/src/monitoreditwidget.cpp b/src/monitoreditwidget.cpp
index 8e5bd1d77024ae19e38ff4b615412d6dcff72b57..d09a13c4c9cdb7da9559cad9312e96d5faf1821c 100644 (file)
--- a/src/monitoreditwidget.cpp
+++ b/src/monitoreditwidget.cpp
@@ -54,6 +54,7 @@ MonitorEditWidget::MonitorEditWidget(Render* renderer, QWidget* parent) :
 
     m_visibilityAction = new QAction(KIcon("video-display"), i18n("Show/Hide edit mode"), this);
     m_visibilityAction->setCheckable(true);
+    m_visibilityAction->setChecked(KdenliveSettings::showOnMonitorScene());
     m_visibilityAction->setVisible(false);
 
     m_ui.buttonDirectUpdate->setIcon(KIcon("transform-scale"));
@@ -66,7 +67,7 @@ MonitorEditWidget::MonitorEditWidget(Render* renderer, QWidget* parent) :
     m_ui.buttonZoomOriginal->setToolTip(i18n("Original size"));
 
     connect(m_ui.sliderZoom, SIGNAL(valueChanged(int)), m_scene, SLOT(slotZoom(int)));
-    connect(m_scene, SIGNAL(zoomChanged(int)), m_ui.sliderZoom, SLOT(setValue(int)));
+    connect(m_scene, SIGNAL(zoomChanged(int)), this, SLOT(slotZoom(int)));
     connect(m_ui.buttonZoomFit,      SIGNAL(clicked()), m_scene, SLOT(slotZoomFit()));
     connect(m_ui.buttonZoomOriginal, SIGNAL(clicked()), m_scene, SLOT(slotZoomOriginal()));
     m_scene->slotZoomFit();
@@ -77,11 +78,19 @@ MonitorEditWidget::MonitorEditWidget(Render* renderer, QWidget* parent) :
 
 MonitorEditWidget::~MonitorEditWidget()
 {
+    KdenliveSettings::setShowOnMonitorScene(m_visibilityAction->isChecked());
     delete m_view;
     delete m_scene;
     delete m_visibilityAction;
 }
 
+void MonitorEditWidget::slotZoom(int value)
+{
+    m_ui.sliderZoom->blockSignals(true);
+    m_ui.sliderZoom->setValue(value);
+    m_ui.sliderZoom->blockSignals(false);
+}
+
 void MonitorEditWidget::resetProfile(Render* renderer)
 {
     m_view->scale(((double) renderer->renderWidth()) / renderer->frameRenderWidth(), 1.0);