Resetting an effect should not loose the filter id

[kdenlive] / src / effectstackview.cpp

diff --git a/src/effectstackview.cpp b/src/effectstackview.cpp
index a33eb2e2c227336919eb3831af3d8752a4563a26..655b0d5888f6b3889ac456fc5418c3111d0fde4b 100644 (file)
--- a/src/effectstackview.cpp
+++ b/src/effectstackview.cpp
@@ -41,31 +41,34 @@ EffectStackView::EffectStackView(EffectsList *audioEffectList, EffectsList *vide
        ui.buttonDown->setToolTip(i18n("Move effect down"));
        ui.buttonDel->setIcon(KIcon("trash-empty"));
        ui.buttonDel->setToolTip(i18n("Delete effect"));
-       
+       ui.buttonReset->setIcon(KIcon("view-refresh"));
+       ui.buttonReset->setToolTip(i18n("Reset effect"));       
 
        
        ui.effectlist->setDragDropMode(QAbstractItemView::NoDragDrop);//use internal if drop is recognised right
        
        connect (ui.effectlist, SIGNAL ( itemSelectionChanged()), this , SLOT( slotItemSelectionChanged() ));
+       connect (ui.effectlist, SIGNAL(itemChanged ( QListWidgetItem *)), this , SLOT( slotItemChanged(QListWidgetItem *) ));
        connect (ui.buttonNew, SIGNAL (clicked()), this, SLOT (slotNewEffect()) );
        connect (ui.buttonUp, SIGNAL (clicked()), this, SLOT (slotItemUp()) );
        connect (ui.buttonDown, SIGNAL (clicked()), this, SLOT (slotItemDown()) );
        connect (ui.buttonDel, SIGNAL (clicked()), this, SLOT (slotItemDel()) );
+       connect (ui.buttonReset, SIGNAL (clicked()), this, SLOT (slotResetEffect()) );
        connect( this, SIGNAL (transferParamDesc(const QDomElement&,int ,int) ), effectedit , SLOT(transferParamDesc(const QDomElement&,int ,int)));
-       connect(effectedit, SIGNAL (parameterChanged(const QDomElement&  ) ), this , SLOT (slotUpdateEffectParams(const QDomElement&)));
+       connect(effectedit, SIGNAL (parameterChanged( const QDomElement&, const QDomElement& ) ), this , SLOT (slotUpdateEffectParams( const QDomElement&, const QDomElement& )));
        effectLists["audio"]=audioEffectList;
        effectLists["video"]=videoEffectList;
        effectLists["custom"]=customEffectList;
        
-       ui.infoBox->hide();     
-       
+       ui.infoBox->hide();
+       setEnabled(false);
+       setEnabled(false);
        
 }
 
-void EffectStackView::slotUpdateEffectParams(const QDomElement& e){
-       //effects[ui.effectlist->currentRow()]=e;
+void EffectStackView::slotUpdateEffectParams(const QDomElement& old, const QDomElement& e){
        if (clipref)
-               emit updateClipEffect(clipref, e);
+               emit updateClipEffect(clipref, old, e);
 }
 
 void EffectStackView::slotClipItemSelected(ClipItem* c)
@@ -76,14 +79,22 @@ void EffectStackView::slotClipItemSelected(ClipItem* c)
                return;
        }
        setEnabled(true);
-       //effects=clipref->effectNames();
-       for (int i=0;i<clipref->effectsCount();i++){
-               QDomElement element=clipref->effectAt(i);//kDebug()<<"// SET STACK :"<<element.attribute("kdenlive_ix")<<", ("<<i<<") = "<<element.attribute("tag");
-       }
        setupListView();
        
 }
 
+void EffectStackView::slotItemChanged(QListWidgetItem *item)
+{
+    bool disable = true;
+    if (item->checkState() == Qt::Checked) disable = false;
+    ui.buttonReset->setEnabled( !disable);
+    int activeRow = ui.effectlist->currentRow();
+    if ( activeRow>=0  ){
+       emit changeEffectState(clipref, clipref->effectAt(activeRow), disable);
+    }
+}
+
+
 void EffectStackView::setupListView(){
 
        ui.effectlist->clear();
@@ -93,19 +104,25 @@ void EffectStackView::setupListView(){
                if (!namenode.isNull()) {
                        QListWidgetItem* item = new QListWidgetItem(namenode.toElement().text(), ui.effectlist);
                        item->setFlags(Qt::ItemIsSelectable|Qt::ItemIsDragEnabled|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
-                       item->setCheckState(Qt::Checked);
+                       if (d.attribute("disabled") == "1") item->setCheckState(Qt::Unchecked);
+                       else item->setCheckState(Qt::Checked);
                }
        }
+       if (clipref->effectsCount() == 0)
+         emit transferParamDesc(QDomElement(), 0, 100);
        ui.effectlist->setCurrentRow(0);
+       
 }
 
 void EffectStackView::slotItemSelectionChanged(){
        bool hasItem = ui.effectlist->currentItem();
        int activeRow = ui.effectlist->currentRow();
+       bool isChecked = ui.effectlist->currentItem()->checkState() == Qt::Checked;
        if (hasItem && ui.effectlist->currentItem()->isSelected() ){
-               emit transferParamDesc(clipref->effectAt(activeRow) ,0,100);//minx max frame
+               emit transferParamDesc(clipref->effectAt(activeRow), 0, 100);//minx max frame
        }
        ui.buttonDel->setEnabled( hasItem );
+       ui.buttonReset->setEnabled( hasItem && isChecked);
        ui.buttonUp->setEnabled( activeRow >0 );
        ui.buttonDown->setEnabled( (activeRow < ui.effectlist->count()-1) && hasItem );
 }
@@ -117,8 +134,6 @@ void EffectStackView::slotItemUp(){
                QDomElement before = clipref->effectAt(activeRow-1).cloneNode().toElement();
                clipref->setEffectAt(activeRow-1, act);
                clipref->setEffectAt(activeRow, before);
-               //renumberEffects();
-               //effects.swap(activeRow, activeRow-1);
        }
        QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
        ui.effectlist->insertItem (activeRow-1, item);
@@ -133,8 +148,6 @@ void EffectStackView::slotItemDown(){
                QDomElement after = clipref->effectAt(activeRow+1).cloneNode().toElement();
                clipref->setEffectAt(activeRow+1, act);
                clipref->setEffectAt(activeRow, after);
-               //renumberEffects();
-               //effects.swap(activeRow, activeRow+1);
        }
        QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
        ui.effectlist->insertItem (activeRow+1, item);
@@ -146,40 +159,27 @@ void EffectStackView::slotItemDel(){
        int activeRow = ui.effectlist->currentRow();
        if ( activeRow>=0  ){
                emit removeEffect(clipref, clipref->effectAt(activeRow));
-               //effects.take(activeRow);
-               //renumberEffects();
-               //effects.removeAt(activeRow);
        }
-       /*if (effects.size()>0 && activeRow>0) {
-               QListWidgetItem *item = ui.effectlist->takeItem(activeRow);
-               kDebug()<<"777777   DELETING ITEM: "<<activeRow;
-               delete item;
-       }*/
-       
 }
 
-void EffectStackView::renumberEffects(){/*
-       QMap<int,QDomElement> tmplist=effects;
-       QMapIterator<int,QDomElement> it(tmplist);
-       effects.clear();
-       int i=0;
-       
-       while (it.hasNext()){
-               it.next();
-               QDomElement item=it.value();
-               int currentVal = item.attributes().namedItem("kdenlive_ix").nodeValue().toInt();
-               item.attributes().namedItem("kdenlive_ix").setNodeValue(QString::number(i));
-               effects[i]=item;
-               if (clipref && i != currentVal)
-                       emit updateClipEffect(clipref,item);
-               QString outstr;
-               QTextStream str(&outstr);
-               item.save(str,2);
-               kDebug() << "nummer: " << i << " " << outstr;
-               kDebug()<<"EFFECT "<<i<<" = "<<item.attribute("tag");
-               i++;
-       }*/
-       
+void EffectStackView::slotResetEffect()
+{
+       int activeRow = ui.effectlist->currentRow();
+       QDomElement old = clipref->effectAt(activeRow).cloneNode().toElement();
+       QDomElement dom;
+       QString effectName = ui.effectlist->currentItem()->text();
+       foreach (QString type, effectLists.keys() ){
+               EffectsList *list=effectLists[type];
+               if (list->effectNames().contains(effectName)) {
+                   dom = list->getEffectByName(effectName);
+                   break;
+               }
+       }
+       if (!dom.isNull()) {
+           dom.setAttribute("kdenlive_ix", old.attribute("kdenlive_ix"));
+           emit updateClipEffect(clipref, old, dom);
+           slotItemSelectionChanged();
+       }
 }
 
 void EffectStackView::slotNewEffect(){
@@ -211,7 +211,8 @@ void EffectStackView::slotNewEffect(){
                //TODO effects.append(result->data().toString());
                foreach (EffectsList* e, effectLists.values()){
                        QDomElement dom=e->getEffectByName(result->data().toString());
-                       clipref->addEffect(dom);
+                       if (clipref)
+                               clipref->addEffect(dom);
                        slotClipItemSelected(clipref);
                }