X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=2b2aecf31ffc6fc5db2b6582f392bc8bef972505;hb=421dd62d67e8bfcaa293f86bfdba1dd30d363873;hp=daa92360ff3ff5638230d7846be1d8da5aac6e28;hpb=ae8db598f20ac54c54ea02246530e011f15d0570;p=kdenlive

diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp
index daa92360..2b2aecf3 100644
--- a/src/transitionsettings.cpp
+++ b/src/transitionsettings.cpp
@@ -16,74 +16,163 @@
  ***************************************************************************/
 
 
-#include <KDebug>
 
 #include "transitionsettings.h"
 #include "transition.h"
 #include "effectslist.h"
 #include "effectstackedit.h"
+#include "kdenlivesettings.h"
 #include "mainwindow.h"
 
-TransitionSettings::TransitionSettings(QWidget* parent): QWidget(parent) {
-    ui.setupUi(this);
-    effectEdit = new EffectStackEdit(ui.frame, this);
+#include <KDebug>
+
+TransitionSettings::TransitionSettings(QWidget* parent) :
+        QWidget(parent),
+        m_usedTransition(NULL),
+        m_tracksCount(0),
+        m_autoTrackTransition(0)
+{
+    m_ui.setupUi(this);
+    m_effectEdit = new EffectStackEdit(m_ui.frame);
+    connect(m_effectEdit, SIGNAL(seekTimeline(int)), this, SIGNAL(seekTimeline(int)));
     setEnabled(false);
-    ui.listWidget->addItems(MainWindow::transitions.effectNames());
-    kDebug() << MainWindow::transitions.effectNames().size();
-    ui.listWidget->setCurrentRow(0);
-    connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
-    connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), effectEdit , SLOT(transferParamDesc(const QDomElement&, int , int)));
-    connect(effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&)));
-}
 
+    QMap<QString, QStringList> transitionsList;
+    int max = MainWindow::transitions.effectNames().count();
+    QStringList transitionInfo;
+    int ix = 0;
+
+    for (; ix < max; ix++) {
+        transitionInfo = MainWindow::transitions.effectIdInfo(ix);
+        transitionInfo << QString::number(ix);
+        transitionsList.insert(transitionInfo.at(0).toLower(), transitionInfo);
+    }
+    ix = 0;
+    foreach(const QStringList &value, transitionsList) {
+        m_ui.transitionList->addItem(value.at(0));
+        m_ui.transitionList->setItemData(ix, MainWindow::transitions.getInfoFromIndex(value.last().toInt()), Qt::ToolTipRole);
+        ix++;
+    }
+
+    connect(m_ui.transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged()));
+    connect(m_ui.transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged()));
+
+    connect(this, SIGNAL(transferParamDesc(const QDomElement&, int , int)), m_effectEdit , SLOT(transferParamDesc(const QDomElement&, int , int)));
+    connect(m_effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&)));
+}
 
-void TransitionSettings::slotTransitionChanged() {
+void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const uint tracksCount)
+{
+    m_tracksCount = tracksCount;
+    m_effectEdit->updateProjectFormat(profile, t);
+    QStringList tracksList;
+    tracksList << i18n("Auto");
+    for (uint i = 0; i < tracksCount; i++) {
+        tracksList << QString::number(i);
+    }
+    tracksList << i18n("Black");
+    m_ui.transitionTrack->blockSignals(true);
+    m_ui.transitionTrack->clear();
+    m_ui.transitionTrack->addItems(tracksList);
+    m_ui.transitionTrack->blockSignals(false);
+}
 
-    QDomElement e = m_usedTransition->toXML();
 
-    //set old values from e in <ktransition> to desc (like reverse and so )
-    /* QDomElement desc = m_transitions->getEffectByName(ui.listWidget->currentItem()->text());
-     if (m_usedTransition) {
-         m_usedTransition->setTransitionParameters(desc);
-         m_usedTransition->update();
-     }
-     emit transitionUpdated(e, m_usedTransition->toXML());*/
-    if (m_usedTransition && m_usedTransition->transitionName() == ui.listWidget->currentItem()->text() && !e.attribute("tag").isNull()) {
+void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent)
+{
+    QDomElement e = m_usedTransition->toXML().cloneNode().toElement();
+    if (reinit) {
+        // Reset the transition parameters to the default one
+        QDomElement newTransition = MainWindow::transitions.getEffectByName(m_ui.transitionList->currentText()).cloneNode().toElement();
+        slotUpdateEffectParams(e, newTransition);
+        emit transferParamDesc(newTransition, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
+    } else if (!updateCurrent) {
+        // Transition changed, update parameters dialog
+        //slotUpdateEffectParams(e, e);
+        m_effectEdit->transferParamDesc(e, m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
+    } else {
+        // Same transition, we just want to update the parameters value
         slotUpdateEffectParams(e, e);
-    } else
-        slotUpdateEffectParams(e, MainWindow::transitions.getEffectByName(ui.listWidget->currentItem()->text()));
-    emit transferParamDesc(m_usedTransition->toXML(), 0, 0);
+        if (m_usedTransition->hasGeometry()) emit transferParamDesc(m_usedTransition->toXML(), m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps()));
+    }
+}
+
+void TransitionSettings::slotTransitionTrackChanged()
+{
+    if (m_usedTransition == NULL) return;
+    int ix = 0;
+    QDomElement oldxml = m_usedTransition->toXML().cloneNode().toElement();
+    if (m_ui.transitionTrack->currentIndex() > 0) {
+        ix = m_ui.transitionTrack->count() - m_ui.transitionTrack->currentIndex() - 1;
+        m_usedTransition->setForcedTrack(true, ix);
+        m_effectEdit->updateParameter("force_track", "1");
+        emit transitionUpdated(m_usedTransition, oldxml);
+    } else {
+        ix = m_autoTrackTransition;
+        m_usedTransition->setForcedTrack(false, ix);
+        m_effectEdit->updateParameter("force_track", "0");
+        emit transitionUpdated(m_usedTransition, oldxml);
+    }
+    m_effectEdit->updateParameter("transition_btrack", QString::number(ix));
 }
 
-void TransitionSettings::slotTransitionItemSelected(Transition* t) {
+void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update)
+{
     setEnabled(t != NULL);
-    m_usedTransition = t;
-    if (m_usedTransition) {
-        QList<QListWidgetItem*> list = ui.listWidget->findItems(m_usedTransition->transitionName(), Qt::MatchExactly);
-        if (list.size() > 0) {
-            disconnect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
-            ui.listWidget->setCurrentItem(list[0]);
-            connect(ui.listWidget, SIGNAL(currentRowChanged(int)), this, SLOT(slotTransitionChanged()));
+    m_effectEdit->setFrameSize(p);
+    m_autoTrackTransition = nextTrack;
+    if (t == m_usedTransition) {
+        if (t == NULL) return;
+        if (update) {
+            m_ui.transitionTrack->blockSignals(true);
+            if (t->forcedTrack()) m_ui.transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack());
+            else m_ui.transitionTrack->setCurrentIndex(0);
+            m_ui.transitionTrack->blockSignals(false);
+        }
+        if (update || t->cropDuration() != m_transitionDuration || t->startPos() != m_transitionStart) {
+            m_transitionDuration = t->cropDuration();
+            m_transitionStart = t->startPos();
+            slotTransitionChanged(false, true);
         }
+        return;
+    } else if (update) return;
+    if (t) {
+        m_transitionDuration = t->cropDuration();
+        m_transitionStart = t->startPos();
+        m_ui.transitionTrack->blockSignals(true);
+        if (!t->forcedTrack()) m_ui.transitionTrack->setCurrentIndex(0);
+        else m_ui.transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack());
+        m_ui.transitionTrack->blockSignals(false);
+        int ix = m_ui.transitionList->findText(t->transitionName(), Qt::MatchExactly);
+        m_usedTransition = t;
+        if (ix != -1) {
+            m_ui.transitionList->blockSignals(true);
+            m_ui.transitionList->setCurrentIndex(ix);
+            slotTransitionChanged(false, false);
+            m_ui.transitionList->blockSignals(false);
+        }
+    } else {
+        // null transition selected
+        m_usedTransition = NULL;
+        m_effectEdit->transferParamDesc(QDomElement(), 0, 0);
     }
 
 }
 
-void TransitionSettings::slotUpdateEffectParams(const QDomElement& oldparam, const QDomElement& param) {
+void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, const QDomElement &param)
+{
     if (m_usedTransition) {
         m_usedTransition->setTransitionParameters(param);
         m_usedTransition->update();
     }
-    QString test;
-    QTextStream str(&test);
-    oldparam.save(str, 2);
-    m_usedTransition->toXML().save(str, 2);
-    kDebug() << test;
     //oldparam must be also first given to Transition and then return the toXML()
-    emit transitionUpdated(m_usedTransition, oldparam);
+    if (oldparam != param) {
+        emit transitionUpdated(m_usedTransition, oldparam);
+    }
 }
 
-void TransitionSettings::raiseWindow(QWidget* dock) {
+void TransitionSettings::raiseWindow(QWidget* dock)
+{
     if (dock && m_usedTransition)
         dock->raise();