Allow importing of clips into project from command line:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index 82a4f29e86359c2cd18bc5b8ff0e6657f77262b4..f9043b5a6038004247c37146ff71562d83823ccb 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -170,6 +170,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
     if (name == "project") {
         m_effectScene = new MonitorScene(render);
         m_effectView = new QGraphicsView(m_effectScene, m_ui.video_frame);
+        m_effectView->setRenderHints(QFlags<QPainter::RenderHint>());
+        m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0);
         rendererBox->addWidget(m_effectView);
         m_effectView->setMouseTracking(true);
         m_effectScene->setUp();
@@ -397,7 +399,7 @@ void Monitor::mousePressEvent(QMouseEvent * event)
 void Monitor::mouseReleaseEvent(QMouseEvent * event)
 {
     if (m_dragStarted) {
-        if (m_ui.video_frame->underMouse()) {
+        if (m_ui.video_frame->underMouse() && (!m_effectView || !m_effectView->isVisible())) {
             if (isActive()) slotPlay();
             else activateMonitor();
         } else QWidget::mouseReleaseEvent(event);
@@ -780,6 +782,7 @@ void Monitor::resetProfile(const QString profile)
     if (render == NULL) return;
     render->resetProfile(profile);
     if (m_effectScene) {
+        m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0);
         m_effectScene->resetProfile();
     }
 }
@@ -849,6 +852,7 @@ void Monitor::slotEffectScene(bool show)
         m_monitorRefresh->setVisible(!show);
 #endif
         m_effectView->setVisible(show);
+        emit requestFrameForAnalysis(show);
         if (show) {
             render->doRefresh();
             m_effectScene->slotZoomFit();
@@ -861,7 +865,12 @@ MonitorScene * Monitor::getEffectScene()
     return m_effectScene;
 }
 
-MonitorRefresh::MonitorRefresh(QWidget* parent) : \
+bool Monitor::effectSceneDisplayed()
+{
+    return m_effectView->isVisible();
+}
+
+MonitorRefresh::MonitorRefresh(QWidget* parent) :
         QWidget(parent),
         m_renderer(NULL)
 {