X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fediteffectcommand.cpp;h=b6a98145f2c0ab8605a3a859edafd30e5e9519b6;hb=0bd6bcac38586a437a5b5e7b51ff7e6459187cf7;hp=8e3652369bdac4fcfd612e092e7413ad7043d03a;hpb=69fc8364266f9668d1c77ce09afbbf3b7fec8492;p=kdenlive

diff --git a/src/editeffectcommand.cpp b/src/editeffectcommand.cpp
index 8e365236..b6a98145 100644
--- a/src/editeffectcommand.cpp
+++ b/src/editeffectcommand.cpp
@@ -17,28 +17,55 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA          *
  ***************************************************************************/
 
-#include <KLocale>
 
 #include "editeffectcommand.h"
+#include "customtrackview.h"
 
-EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, bool doIt)
-         : m_view(view), m_track(track), m_pos(pos), m_oldeffect(oldeffect), m_doIt(doIt) {
-	    m_effect = effect.cloneNode().toElement();
-	    setText(i18n("Edit effect"));
-	 }
+#include <KLocale>
 
+EditEffectCommand::EditEffectCommand(CustomTrackView *view, const int track, GenTime pos, QDomElement oldeffect, QDomElement effect, int stackPos, bool doIt, QUndoCommand *parent) :
+        QUndoCommand(parent),
+        m_view(view),
+        m_track(track),
+        m_oldeffect(oldeffect),
+        m_effect(effect),
+        m_pos(pos),
+        m_stackPos(stackPos),
+        m_doIt(doIt)
+{
+    QString effectName;
+    QDomElement namenode = effect.firstChildElement("name");
+    if (!namenode.isNull()) effectName = i18n(namenode.text().toUtf8().data());
+    else effectName = i18n("effect");
+    setText(i18n("Edit effect %1", effectName));
+}
 
-// virtual 
+// virtual
+int EditEffectCommand::id() const
+{
+    return 1;
+}
+
+// virtual
+bool EditEffectCommand::mergeWith(const QUndoCommand * other)
+{
+    if (other->id() != id()) return false;
+    if (m_track != static_cast<const EditEffectCommand*>(other)->m_track) return false;
+    if (m_pos != static_cast<const EditEffectCommand*>(other)->m_pos) return false;
+    m_effect = static_cast<const EditEffectCommand*>(other)->m_effect.cloneNode().toElement();
+    return true;
+}
+
+// virtual
 void EditEffectCommand::undo()
 {
-kDebug()<<"----  undoing action";
-  m_view->updateEffect(m_track, m_pos, m_oldeffect);
+    m_view->updateEffect(m_track, m_pos, m_oldeffect, m_stackPos, false);
 }
-// virtual 
+// virtual
 void EditEffectCommand::redo()
 {
-kDebug()<<"----  redoing action";
-  m_view->updateEffect(m_track, m_pos, m_effect);
+    m_view->updateEffect(m_track, m_pos, m_effect, m_stackPos, m_doIt);
+    m_doIt = false;
 }
 
-#include "editeffectcommand.moc"
+