X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmonitoreditwidget.cpp;h=0595477f87bfee4d792d3f9d88e6acb15de85bea;hb=c3302003093710ee247ad84c0fe2ef3c579d417f;hp=05cef9545907c5290d2874c5f56ac5df5d931769;hpb=f41ee253ade9dfda45752f232ea0ff35e26dce95;p=kdenlive

diff --git a/src/monitoreditwidget.cpp b/src/monitoreditwidget.cpp
index 05cef954..0595477f 100644
--- a/src/monitoreditwidget.cpp
+++ b/src/monitoreditwidget.cpp
@@ -22,13 +22,19 @@
 #include "monitorscene.h"
 #include "kdenlivesettings.h"
 
+#include "onmonitoritems/onmonitorrectitem.h"
+#include "onmonitoritems/onmonitorpathitem.h"
+
 #include <QGraphicsView>
 #include <QVBoxLayout>
 #include <QAction>
 #include <QToolButton>
+#include <QMouseEvent>
+#include <QGraphicsView>
 
 #include <KIcon>
 
+
 MonitorEditWidget::MonitorEditWidget(Render* renderer, QWidget* parent) :
         QWidget(parent)
 {
@@ -41,7 +47,7 @@ MonitorEditWidget::MonitorEditWidget(Render* renderer, QWidget* parent) :
     m_scene = new MonitorScene(renderer);
     m_view = new QGraphicsView(m_scene, m_ui.frameVideo);
     m_view->setFrameShape(QFrame::NoFrame);
-    m_view->setRenderHints(QFlags<QPainter::RenderHint>());
+    //m_view->setRenderHints(QFlags<QPainter::RenderHint>());
     m_view->scale(((double) renderer->renderWidth()) / renderer->frameRenderWidth(), 1.0);
     m_view->setMouseTracking(true);
     m_scene->setUp();
@@ -67,7 +73,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();
@@ -84,13 +90,20 @@ MonitorEditWidget::~MonitorEditWidget()
     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);
     m_scene->resetProfile();
 }
 
-MonitorScene* MonitorEditWidget::getScene()
+MonitorScene* MonitorEditWidget::getScene() const
 {
     return m_scene;
 }