Fix broken keyframes when dropping an effect on another clip

[kdenlive] / src / effectstack / effectstackview2.cpp

diff --git a/src/effectstack/effectstackview2.cpp b/src/effectstack/effectstackview2.cpp
index 9baa8435864364ad27202dec8110ef240215c3c4..a2d83f00a15ead7e501bd85a5639d51f69a3272e 100644 (file)
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@ -103,12 +103,12 @@ void EffectStackView2::slotClipItemSelected(ClipItem* c)
         if (c) {
             QString cname = m_clipref->clipName();
             if (cname.length() > 30) {
-                m_ui.checkAll->setToolTip(i18n("Effects for %1").arg(cname));
+                m_ui.checkAll->setToolTip(i18n("Effects for %1", cname));
                 cname.truncate(27);
-                m_ui.checkAll->setText(i18n("Effects for %1").arg(cname) + "...");
+                m_ui.checkAll->setText(i18n("Effects for %1", cname) + "...");
             } else {
                 m_ui.checkAll->setToolTip(QString());
-                m_ui.checkAll->setText(i18n("Effects for %1").arg(cname));
+                m_ui.checkAll->setText(i18n("Effects for %1", cname));
             }
             m_ui.checkAll->setEnabled(true);
             QString size = c->baseClip()->getProperty("frame_size");
@@ -140,7 +140,7 @@ void EffectStackView2::slotTrackItemSelected(int ix, const TrackInfo info)
     m_trackInfo = info;
     setEnabled(true);
     m_ui.checkAll->setToolTip(QString());
-    m_ui.checkAll->setText(i18n("Effects for track %1").arg(info.trackName.isEmpty() ? QString::number(ix) : info.trackName));
+    m_ui.checkAll->setText(i18n("Effects for track %1", info.trackName.isEmpty() ? QString::number(ix) : info.trackName));
     m_ui.checkAll->setEnabled(true);
     m_trackindex = ix;
     setupListView();
@@ -375,6 +375,8 @@ void EffectStackView2::startDrag()
     QPixmap pixmap;
     if (m_draggedEffect) {
         QDomElement effect = m_draggedEffect->effect().cloneNode().toElement();
+       // Keep clip crop start in case we want to paste effect 
+       effect.setAttribute("clipstart", m_clipref->cropStart().frames(KdenliveSettings::project_fps()));
         doc.appendChild(doc.importNode(effect, true));
         pixmap = QPixmap::grabWidget(m_draggedEffect->title);
     }