Fix crash on clip deletion, fix issues with placeholder clips

[kdenlive] / src / effectstackview.cpp

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index d0847c00a3c90bbe638b35648a623c7afdea4554..c2990c57a04fdb0d5f991cfc1ed4ab7bfb8655fe 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -20,6 +20,7 @@
 #include "effectslist.h"
 #include "clipitem.h"
 #include "mainwindow.h"
+#include "docclipbase.h"
 #include "kdenlivesettings.h"
 
 #include <KDebug>
@@ -37,7 +38,12 @@ EffectStackView::EffectStackView(QWidget *parent) :
         QWidget(parent)
 {
     m_ui.setupUi(this);
+    QVBoxLayout *vbox1 = new QVBoxLayout(m_ui.frame);
     m_effectedit = new EffectStackEdit(m_ui.frame);
+    vbox1->setContentsMargins(0, 0, 0, 0);
+    vbox1->setSpacing(0);
+    vbox1->addWidget(m_effectedit);
+    m_ui.frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum));
     //m_ui.effectlist->horizontalHeader()->setVisible(false);
     //m_ui.effectlist->verticalHeader()->setVisible(false);
     m_clipref = NULL;
@@ -65,7 +71,7 @@ EffectStackView::EffectStackView(QWidget *parent) :
     connect(m_ui.buttonDel, SIGNAL(clicked()), this, SLOT(slotItemDel()));
     connect(m_ui.buttonSave, SIGNAL(clicked()), this, SLOT(slotSaveEffect()));
     connect(m_ui.buttonReset, SIGNAL(clicked()), this, SLOT(slotResetEffect()));
-    connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&)));
+    connect(m_effectedit, SIGNAL(parameterChanged(const QDomElement, const QDomElement)), this , SLOT(slotUpdateEffectParams(const QDomElement, const QDomElement)));
     m_effectLists["audio"] = &MainWindow::audioEffects;
     m_effectLists["video"] = &MainWindow::videoEffects;
     m_effectLists["custom"] = &MainWindow::customEffects;
@@ -74,6 +80,12 @@ EffectStackView::EffectStackView(QWidget *parent) :
     setEnabled(false);
 }
 
+EffectStackView::~EffectStackView()
+{
+    m_effectLists.clear();
+    delete m_effectedit;
+}
+
 void EffectStackView::setMenu(QMenu *menu)
 {
     m_ui.buttonNew->setMenu(menu);
@@ -120,7 +132,7 @@ void EffectStackView::slotSaveEffect()
     emit reloadEffects();
 }
 
-void EffectStackView::slotUpdateEffectParams(const QDomElement& old, const QDomElement& e)
+void EffectStackView::slotUpdateEffectParams(const QDomElement old, const QDomElement e)
 {
     if (m_clipref)
         emit updateClipEffect(m_clipref, old, e, m_ui.effectlist->currentRow());
@@ -128,16 +140,25 @@ void EffectStackView::slotUpdateEffectParams(const QDomElement& old, const QDomE
 
 void EffectStackView::slotClipItemSelected(ClipItem* c, int ix)
 {
+    if (c && !c->isEnabled()) return;
     if (c && c == m_clipref) {
         if (ix == -1) ix = m_ui.effectlist->currentRow();
     } else {
         m_clipref = c;
-        if (c) ix = c->selectedEffectIndex();
-        else ix = 0;
+        if (c) {
+            ix = c->selectedEffectIndex();
+            QString size = c->baseClip()->getProperty("frame_size");
+            double factor = c->baseClip()->getProperty("aspect_ratio").toDouble();
+            QPoint p((int)(size.section('x', 0, 0).toInt() * factor + 0.5), size.section('x', 1, 1).toInt());
+            m_effectedit->setFrameSize(p);
+            m_effectedit->setFrameSize(p);
+        } else ix = 0;
     }
     if (m_clipref == NULL) {
+        m_ui.effectlist->blockSignals(true);
         m_ui.effectlist->clear();
         m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+        m_ui.effectlist->blockSignals(false);
         setEnabled(false);
         return;
     }
@@ -153,6 +174,7 @@ void EffectStackView::slotItemChanged(QListWidgetItem *item)
     m_ui.buttonReset->setEnabled(!disable);
     int activeRow = m_ui.effectlist->currentRow();
     if (activeRow >= 0) {
+        m_effectedit->updateParameter("disabled", QString::number((int) disable));
         emit changeEffectState(m_clipref, activeRow, disable);
     }
 }
@@ -160,15 +182,25 @@ void EffectStackView::slotItemChanged(QListWidgetItem *item)
 
 void EffectStackView::setupListView(int ix)
 {
+    m_ui.effectlist->blockSignals(true);
     m_ui.effectlist->clear();
 
     // Issue 238: Add icons for effect type in effectstack.
     KIcon videoIcon("kdenlive-show-video");
     KIcon audioIcon("kdenlive-show-audio");
+    KIcon customIcon("kdenlive-custom-effect");
     QListWidgetItem* item;
 
     for (int i = 0; i < m_clipref->effectsCount(); i++) {
-        QDomElement d = m_clipref->effectAt(i);
+        const QDomElement d = m_clipref->effectAt(i);
+        if (d.isNull()) {
+            kDebug() << " . . . . WARNING, NULL EFFECT IN STACK!!!!!!!!!";
+            continue;
+        }
+
+        /*QDomDocument doc;
+        doc.appendChild(doc.importNode(d, true));
+        kDebug() << "IMPORTED STK: " << doc.toString();*/
 
         QDomNode namenode = d.elementsByTagName("name").item(0);
         if (!namenode.isNull()) {
@@ -178,7 +210,7 @@ void EffectStackView::setupListView(int ix)
             if ("audio" == type) {
                 item = new QListWidgetItem(audioIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
             } else if ("custom" == type) {
-                item = new QListWidgetItem(i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
+                item = new QListWidgetItem(customIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
             } else {
                 item = new QListWidgetItem(videoIcon, i18n(namenode.toElement().text().toUtf8().data()), m_ui.effectlist);
             }
@@ -187,8 +219,7 @@ void EffectStackView::setupListView(int ix)
             else item->setCheckState(Qt::Checked);
         }
     }
-    if (m_clipref->effectsCount() == 0) {
-        m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+    if (m_ui.effectlist->count() == 0) {
         m_ui.buttonDel->setEnabled(false);
         m_ui.buttonSave->setEnabled(false);
         m_ui.buttonReset->setEnabled(false);
@@ -198,15 +229,13 @@ void EffectStackView::setupListView(int ix)
         if (ix < 0) ix = 0;
         if (ix > m_ui.effectlist->count() - 1) ix = m_ui.effectlist->count() - 1;
         m_ui.effectlist->setCurrentRow(ix);
-        m_ui.buttonDel->setEnabled(true);
-        m_ui.buttonSave->setEnabled(true);
-        m_ui.buttonReset->setEnabled(true);
-        m_ui.buttonUp->setEnabled(ix > 0);
-        m_ui.buttonDown->setEnabled(ix < m_clipref->effectsCount() - 1);
     }
+    m_ui.effectlist->blockSignals(false);
+    if (m_ui.effectlist->count() == 0) m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+    else slotItemSelectionChanged(false);
 }
 
-void EffectStackView::slotItemSelectionChanged()
+void EffectStackView::slotItemSelectionChanged(bool update)
 {
     bool hasItem = m_ui.effectlist->currentItem();
     int activeRow = m_ui.effectlist->currentRow();
@@ -215,7 +244,7 @@ void EffectStackView::slotItemSelectionChanged()
     if (hasItem && m_ui.effectlist->currentItem()->isSelected()) {
         m_effectedit->transferParamDesc(m_clipref->effectAt(activeRow), m_clipref->cropStart().frames(KdenliveSettings::project_fps()), m_clipref->cropDuration().frames(KdenliveSettings::project_fps()));//minx max frame
     }
-    if (m_clipref) m_clipref->setSelectedEffect(activeRow);
+    if (m_clipref && update) m_clipref->setSelectedEffect(activeRow);
     m_ui.buttonDel->setEnabled(hasItem);
     m_ui.buttonSave->setEnabled(hasItem);
     m_ui.buttonReset->setEnabled(hasItem && isChecked);
@@ -277,6 +306,7 @@ void EffectStackView::raiseWindow(QWidget* dock)
 
 void EffectStackView::clear()
 {
+    m_ui.effectlist->blockSignals(true);
     m_ui.effectlist->clear();
     m_ui.buttonDel->setEnabled(false);
     m_ui.buttonSave->setEnabled(false);
@@ -284,6 +314,7 @@ void EffectStackView::clear()
     m_ui.buttonUp->setEnabled(false);
     m_ui.buttonDown->setEnabled(false);
     m_effectedit->transferParamDesc(QDomElement(), 0, 0);
+    m_ui.effectlist->blockSignals(false);
 }
 
 #include "effectstackview.moc"