Allow importing of clips into project from command line:

[kdenlive] / src / monitor.cpp

diff --git a/src/monitor.cpp b/src/monitor.cpp
index b9f1ed262a33c8eb83b385476018e2a5ddbab155..f9043b5a6038004247c37146ff71562d83823ccb 100644 (file)
--- a/src/monitor.cpp
+++ b/src/monitor.cpp
@@ -56,7 +56,8 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
         m_scale(1),
         m_length(0),
         m_dragStarted(false),
-        m_delStage(false)
+        m_effectScene(NULL),
+        m_effectView(NULL)
 {
     m_ui.setupUi(this);
     QVBoxLayout *layout = new QVBoxLayout;
@@ -169,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();
@@ -180,7 +183,6 @@ Monitor::Monitor(QString name, MonitorManager *manager, QString profile, QWidget
 
 Monitor::~Monitor()
 {
-    m_delStage = true;
     delete m_ruler;
     delete m_timePos;
     delete m_overlay;
@@ -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);
@@ -779,6 +781,10 @@ void Monitor::resetProfile(const QString profile)
     m_timePos->updateTimeCode(m_monitorManager->timecode());
     if (render == NULL) return;
     render->resetProfile(profile);
+    if (m_effectScene) {
+        m_effectView->scale(((double) render->renderWidth()) / render->frameRenderWidth(), 1.0);
+        m_effectScene->resetProfile();
+    }
 }
 
 void Monitor::saveSceneList(QString path, QDomElement info)
@@ -839,11 +845,18 @@ QStringList Monitor::getZoneInfo() const
 
 void Monitor::slotEffectScene(bool show)
 {
-    if (m_name == "project" && !m_delStage) {
+    if (m_name == "project") {
+#ifdef Q_WS_MAC
+        m_glWidget->setVisible(!show);
+#else
         m_monitorRefresh->setVisible(!show);
+#endif
         m_effectView->setVisible(show);
-        if (show)
-            m_effectScene->slotUpdateBackground(true);
+        emit requestFrameForAnalysis(show);
+        if (show) {
+            render->doRefresh();
+            m_effectScene->slotZoomFit();
+        }
     }
 }
 
@@ -852,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)
 {