X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcornerswidget.cpp;h=20546a7900ee994918473e6834d351af69574634;hb=29ceabd2afc227e0fb8b586c567eeaf7921b542e;hp=9744e3d628835ede8223fbb30a4d72816fc6f988;hpb=01a5a4374fb29acc71c893f84765df64ab476693;p=kdenlive

diff --git a/src/cornerswidget.cpp b/src/cornerswidget.cpp
index 9744e3d6..20546a79 100644
--- a/src/cornerswidget.cpp
+++ b/src/cornerswidget.cpp
@@ -20,13 +20,14 @@
 #include "cornerswidget.h"
 #include "monitor.h"
 #include "monitorscene.h"
-#include "monitorscenecontrolwidget.h"
+#include "monitoreditwidget.h"
 #include "onmonitoritems/onmonitorcornersitem.h"
 #include "renderer.h"
 #include "kdenlivesettings.h"
 
 #include <QGraphicsView>
 #include <QGridLayout>
+#include <QToolButton>
 
 #include <KIcon>
 
@@ -35,56 +36,44 @@ inline int lerp( const int a, const int b, double t )
     return a + (b - a) * t;
 }
 
-CornersWidget::CornersWidget(Monitor *monitor, QDomElement e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent) :
+CornersWidget::CornersWidget(Monitor *monitor, const QDomElement& e, int minFrame, int maxFrame, const Timecode &tc, int activeKeyframe, QWidget* parent) :
         KeyframeEdit(e, minFrame, maxFrame, tc, activeKeyframe, parent),
         m_monitor(monitor),
         m_showScene(true),
         m_pos(0)
 {
-    m_scene = monitor->getEffectScene();
+    MonitorEditWidget *edit = monitor->getEffectEdit();
+    m_scene = edit->getScene();
+    m_scene->cleanup();
 
-    m_item = new OnMonitorCornersItem(m_scene);
+    m_item = new OnMonitorCornersItem();
     m_scene->addItem(m_item);
 
-    m_config = new MonitorSceneControlWidget(m_scene, this);
-    QGridLayout *l = static_cast<QGridLayout *>(layout());
-    l->addWidget(m_config->getShowHideButton(), 1, 1);
-    l->addWidget(m_config, 1, 2);
-
-    QToolButton *buttonShowLines = new QToolButton(m_config);
     // TODO: Better Icons
-    buttonShowLines->setIcon(KIcon("insert-horizontal-rule"));
-    buttonShowLines->setToolTip(i18n("Show/Hide the lines connecting the corners"));
-    buttonShowLines->setCheckable(true);
-    buttonShowLines->setChecked(KdenliveSettings::onmonitoreffects_cornersshowlines());
-    connect(buttonShowLines, SIGNAL(toggled(bool)), this, SLOT(slotShowLines(bool)));
-    m_config->addWidget(buttonShowLines, 0, 2);
-    QToolButton *buttonShowControls = new QToolButton(m_config);
-    buttonShowControls->setIcon(KIcon("transform-move"));
-    buttonShowControls->setToolTip(i18n("Show additional controls"));
-    buttonShowControls->setCheckable(true);
-    buttonShowControls->setChecked(KdenliveSettings::onmonitoreffects_cornersshowcontrols());
-    connect(buttonShowControls, SIGNAL(toggled(bool)), this, SLOT(slotShowControls(bool)));
-    m_config->addWidget(buttonShowControls, 0, 3);
-
-    connect(m_config, SIGNAL(showScene(bool)), this, SLOT(slotShowScene(bool)));
-    connect(m_monitor, SIGNAL(renderPosition(int)), this, SLOT(slotCheckMonitorPosition(int)));
-    connect(m_scene, SIGNAL(actionFinished()), this, SLOT(slotUpdateProperties()));
+    edit->removeCustomControls();
+    edit->addCustomButton(KIcon("transform-move"), i18n("Show additional controls"), this, SLOT(slotShowControls(bool)),
+                          true, KdenliveSettings::onmonitoreffects_cornersshowcontrols());
+    edit->addCustomButton(KIcon("insert-horizontal-rule"), i18n("Show/Hide the lines connecting the corners"), this, SLOT(slotShowLines(bool)),
+                          true, KdenliveSettings::onmonitoreffects_cornersshowlines());
+
+    connect(m_item, SIGNAL(changed()), this, SLOT(slotUpdateProperties()));
     connect(m_scene, SIGNAL(addKeyframe()), this, SLOT(slotInsertKeyframe()));
 
-    connect(keyframe_list, SIGNAL(cellChanged(int, int)), this, SLOT(slotUpdateItem()));
+    connect(keyframe_list, SIGNAL(cellChanged(int,int)), this, SLOT(slotUpdateItem()));
+    m_scene->centerView();
 }
 
 CornersWidget::~CornersWidget()
 {
-    delete m_config;
     m_scene->removeItem(m_item);
     delete m_item;
-    if (m_monitor)
-        m_monitor->slotEffectScene(false);
+    if (m_monitor) {
+        MonitorEditWidget *edit = m_monitor->getEffectEdit();
+        edit->removeCustomControls();
+    }
 }
 
-void CornersWidget::addParameter(QDomElement e, int activeKeyframe)
+void CornersWidget::addParameter(const QDomElement &e, int activeKeyframe)
 {
     KeyframeEdit::addParameter(e, activeKeyframe);
 
@@ -98,7 +87,7 @@ void CornersWidget::slotUpdateItem()
         return;
 
     QTableWidgetItem *keyframe, *keyframeOld;
-    keyframe = keyframe_list->item(0, 0);
+    keyframe = keyframeOld = keyframe_list->item(0, 0);
     for (int row = 0; row < keyframe_list->rowCount(); ++row) {
         keyframeOld = keyframe;
         keyframe = keyframe_list->item(row, 0);
@@ -174,20 +163,6 @@ QList<QPointF> CornersWidget::getPoints(QTableWidgetItem* keyframe)
     return points;
 }
 
-void CornersWidget::slotCheckMonitorPosition(int renderPos)
-{
-    if (m_showScene)
-        emit checkMonitorPosition(renderPos);
-}
-
-void CornersWidget::slotShowScene(bool show)
-{
-    m_showScene = show;
-    if (!m_showScene)
-        m_monitor->slotEffectScene(false);
-    else
-        slotCheckMonitorPosition(m_monitor->render->seekFramePosition());
-}
 
 void CornersWidget::slotShowLines(bool show)
 {
@@ -205,8 +180,8 @@ void CornersWidget::slotSyncPosition(int relTimelinePos)
 {
     if (keyframe_list->rowCount()) {
         relTimelinePos = qBound(0, relTimelinePos, m_max);
-        if (relTimelinePos != m_pos) {
-            m_pos = relTimelinePos;
+        if (relTimelinePos != m_pos - m_min) {
+            m_pos = relTimelinePos + m_min;
             slotUpdateItem();
         }
     }
@@ -218,7 +193,7 @@ void CornersWidget::slotInsertKeyframe()
 
     int row;
     QTableWidgetItem *keyframe, *keyframeOld;
-    keyframe = keyframe_list->item(0, 0);
+    keyframe = keyframeOld = keyframe_list->item(0, 0);
     for (row = 0; row < keyframe_list->rowCount(); ++row) {
         keyframeOld = keyframe;
         keyframe = keyframe_list->item(row, 0);
@@ -248,7 +223,7 @@ void CornersWidget::slotInsertKeyframe()
 
     QPolygonF pol = m_item->polygon();
     double val;
-    for (int i = 0; i < keyframe_list->columnCount(); i++) {
+    for (int i = 0; i < keyframe_list->columnCount(); ++i) {
         if (i < 8) {
             if (i % 2 == 0)
                 val = pol.at(i / 2).x() / (double)m_monitor->render->frameRenderWidth();
@@ -271,4 +246,5 @@ void CornersWidget::slotInsertKeyframe()
     keyframe_list->selectRow(row);
 }
 
+
 #include "cornerswidget.moc"