corners widget: fix on-monitor controls not showing up when effect is added

svn path=/trunk/kdenlive/; revision=5305

diff --git a/src/cornerswidget.cpp b/src/cornerswidget.cpp
index f252b2c8ddf99df71546b14844192c22a19aaa1d..3368f0be828461b31f1d5cd120e475687b1dc740 100644 (file)
--- a/src/cornerswidget.cpp
+++ b/src/cornerswidget.cpp
@@ -78,14 +78,24 @@ CornersWidget::~CornersWidget()
         m_monitor->slotEffectScene(false);
 }
 
+void CornersWidget::addParameter(QDomElement e, int activeKeyframe)
+{
+    KeyframeEdit::addParameter(e, activeKeyframe);
+
+    if (!m_item->polygon().count())
+        slotUpdateItem();
+}
+
 void CornersWidget::slotUpdateItem()
 {
-    QList<QPointF> points;
+    if (keyframe_list->columnCount() < 8)
+        return;
 
     QTableWidgetItem *item = keyframe_list->currentItem();
-    if (!item || keyframe_list->columnCount() < 8)
+    if (!item)
         return;
 
+    QList<QPointF> points;
     double val;
     for (int col = 0; col < 8; col++) {
         if (!keyframe_list->item(item->row(), col))
@@ -124,9 +134,6 @@ void CornersWidget::slotUpdateProperties()
     }
 
     slotAdjustKeyframeInfo(false);
-
-    if (changed)
-        emit parameterChanged();
 }
 
 void CornersWidget::slotCheckMonitorPosition(int renderPos)

diff --git a/src/cornerswidget.h b/src/cornerswidget.h
index f4a02232d9796a0237e67523c93b103d20d5d98c..709d361f98bf93401ca6d39899660091ec4d9145 100644 (file)
--- a/src/cornerswidget.h
+++ b/src/cornerswidget.h
@@ -44,6 +44,8 @@ public:
     CornersWidget(Monitor *monitor, QDomElement e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent = 0);
     virtual ~CornersWidget();
 
+    virtual void addParameter(QDomElement e, int activeKeyframe = -1);
+
 public slots:
     /** @brief Switches from normal monitor to monitor scene according to @param show. */
     void slotShowScene(bool show = true);

diff --git a/src/keyframeedit.h b/src/keyframeedit.h
index 24377bc7238110b0fc7f29e445805ce1b85609ae..b6a0a6815cd9384542531cca24a541996e1da8a9 100644 (file)
--- a/src/keyframeedit.h
+++ b/src/keyframeedit.h
@@ -83,7 +83,7 @@ class KeyframeEdit : public QWidget, public Ui::KeyframeEditor_UI
 public:
     explicit KeyframeEdit(QDomElement e, int minFrame, int maxFrame, Timecode tc, int activeKeyframe, QWidget* parent = 0);
     virtual ~KeyframeEdit();
-    void addParameter(QDomElement e, int activeKeyframe = -1);
+    virtual void addParameter(QDomElement e, int activeKeyframe = -1);
     const QString getValue(const QString &name);
     /** @brief Updates the timecode display according to settings (frame number or hh:mm:ss:ff) */
     void updateTimecodeFormat();

diff --git a/src/widgets/cornerswidget_ui.ui b/src/widgets/cornerswidget_ui.ui
index eff89d92f609ef26af64a10434c9e20c1207a23f..45933b2dcab87817e3898c007b350eebce8867ab 100644 (file)
--- a/src/widgets/cornerswidget_ui.ui
+++ b/src/widgets/cornerswidget_ui.ui
@@ -14,7 +14,7 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="1" column="0">
     <widget class="QLabel" name="label">
      <property name="font">
       <font>
@@ -27,7 +27,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
+   <item row="1" column="1">
     <widget class="QLabel" name="label_2">
      <property name="font">
       <font>
@@ -40,7 +40,7 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="2">
+   <item row="1" column="2">
     <widget class="QLabel" name="label_3">
      <property name="font">
       <font>
@@ -53,59 +53,59 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="0">
+   <item row="2" column="0">
     <widget class="QLabel" name="label_4">
      <property name="text">
       <string>1</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <widget class="QSpinBox" name="spinX1"/>
    </item>
-   <item row="1" column="2">
+   <item row="2" column="2">
     <widget class="QSpinBox" name="spinY1"/>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <widget class="QSpinBox" name="spinX2"/>
    </item>
-   <item row="3" column="1">
+   <item row="4" column="1">
     <widget class="QSpinBox" name="spinX3"/>
    </item>
-   <item row="4" column="1">
+   <item row="5" column="1">
     <widget class="QSpinBox" name="spinX4"/>
    </item>
-   <item row="2" column="2">
+   <item row="3" column="2">
     <widget class="QSpinBox" name="spinY2"/>
    </item>
-   <item row="3" column="2">
+   <item row="4" column="2">
     <widget class="QSpinBox" name="spinY3"/>
    </item>
-   <item row="4" column="2">
+   <item row="5" column="2">
     <widget class="QSpinBox" name="spinY4"/>
    </item>
-   <item row="2" column="0">
+   <item row="3" column="0">
     <widget class="QLabel" name="label_5">
      <property name="text">
       <string>2</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0">
+   <item row="4" column="0">
     <widget class="QLabel" name="label_6">
      <property name="text">
       <string>3</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
+   <item row="5" column="0">
     <widget class="QLabel" name="label_7">
      <property name="text">
       <string>4</string>
      </property>
     </widget>
    </item>
-   <item row="1" column="3">
+   <item row="2" column="3">
     <widget class="QToolButton" name="toolReset1">
      <property name="text">
       <string>...</string>
@@ -115,7 +115,7 @@
      </property>
     </widget>
    </item>
-   <item row="2" column="3">
+   <item row="3" column="3">
     <widget class="QToolButton" name="toolReset2">
      <property name="text">
       <string>...</string>
@@ -125,7 +125,7 @@
      </property>
     </widget>
    </item>
-   <item row="3" column="3">
+   <item row="4" column="3">
     <widget class="QToolButton" name="toolReset3">
      <property name="text">
       <string>...</string>
@@ -135,7 +135,7 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="3">
+   <item row="5" column="3">
     <widget class="QToolButton" name="toolReset4">
      <property name="text">
       <string>...</string>
@@ -145,7 +145,7 @@
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="7">
+   <item row="6" column="0" colspan="7">
     <widget class="QFrame" name="frameConfig">
      <property name="frameShape">
       <enum>QFrame::NoFrame</enum>
@@ -155,7 +155,7 @@
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="7">
+   <item row="7" column="0" colspan="7">
     <spacer name="verticalSpacer">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -168,7 +168,7 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="4" rowspan="4" colspan="3">
+   <item row="1" column="4" rowspan="4" colspan="3">
     <spacer name="horizontalSpacer">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -181,7 +181,7 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="6">
+   <item row="5" column="6">
     <spacer name="horizontalSpacer_2">
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -194,9 +194,12 @@
      </property>
     </spacer>
    </item>
-   <item row="4" column="5">
+   <item row="5" column="5">
     <widget class="QWidget" name="widgetConfigButton" native="true"/>
    </item>
+   <item row="0" column="0" colspan="7">
+    <widget class="QFrame" name="frameKeyframes"/>
+   </item>
   </layout>
  </widget>
  <tabstops>