X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=833c1110397efbdec769f67e7b808aaa7df73774;hb=ead7176d2ab818ec3a1275aeca2b2fc0c1ea1276;hp=d93c430e4d64b2539217fa7a57027df23d2a8838;hpb=ff0bb42c6e2cffc73de72730c38526e4805e3e24;p=kdenlive diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index d93c430e..833c1110 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -16,81 +16,172 @@ ***************************************************************************/ -#include #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 + +TransitionSettings::TransitionSettings(QWidget* parent) : + QWidget(parent), + m_usedTransition(NULL), + m_tracksCount(0), + m_autoTrackTransition(0) +{ + setupUi(this); + QVBoxLayout *vbox1 = new QVBoxLayout(frame); + m_effectEdit = new EffectStackEdit(frame); + vbox1->setContentsMargins(0, 0, 0, 0); + vbox1->setSpacing(0); + vbox1->addWidget(m_effectEdit); + frame->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum)); + 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&))); -} + QList 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.append(transitionInfo); + } + ix = 0; + foreach(const QStringList &value, transitionsList) { + QStringList data = value; + if (!data.isEmpty()) data.removeLast(); + transitionList->addItem(value.at(0), data); + transitionList->setItemData(ix, MainWindow::transitions.getInfoFromIndex(value.last().toInt()), Qt::ToolTipRole); + ix++; + } -void TransitionSettings::slotTransitionChanged() { + connect(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged())); + connect(transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged())); - QDomElement e = m_usedTransition->toXML(); + 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&))); +} - //set old values from e in 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());*/ - /*QDomDocument doc; - doc.appendChild(doc.importNode(e, true)); - kDebug()<<"/////////// TRANSITION CHANGED: "< info) +{ + m_tracksCount = info.count(); + m_effectEdit->updateProjectFormat(profile, t); + QStringList tracksList; + transitionTrack->blockSignals(true); + transitionTrack->clear(); + transitionTrack->addItem(i18n("Auto"), -1); + for (int i = 0; i < m_tracksCount; i++) { + int ix = m_tracksCount - i - 1; + if (!info.at(ix).trackName.isEmpty()) + transitionTrack->addItem(info.at(ix).trackName + '(' + QString::number(i) + ')'); + else transitionTrack->addItem(QString::number(i)); + } + transitionTrack->addItem(i18n("Black"), m_tracksCount); + transitionTrack->blockSignals(false); +} - 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(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(e, 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 (transitionTrack->currentIndex() > 0) { + ix = transitionTrack->count() - 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); - if (t == m_usedTransition) return; - m_usedTransition = t; - if (m_usedTransition) { - QList list = ui.listWidget->findItems(m_usedTransition->transitionName(), Qt::MatchExactly); - if (list.size() > 0) { - ui.listWidget->blockSignals(true); - ui.listWidget->setCurrentItem(list[0]); - slotTransitionChanged(); - ui.listWidget->blockSignals(false); + m_effectEdit->setFrameSize(p); + m_autoTrackTransition = nextTrack; + if (t == m_usedTransition) { + if (t == NULL) return; + if (update) { + transitionTrack->blockSignals(true); + if (t->forcedTrack()) transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack()); + else transitionTrack->setCurrentIndex(0); + 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(); + transitionTrack->blockSignals(true); + if (!t->forcedTrack()) transitionTrack->setCurrentIndex(0); + else transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack()); + transitionTrack->blockSignals(false); + int ix = transitionList->findData(t->transitionInfo(), Qt::UserRole, Qt::MatchExactly); + m_usedTransition = t; + if (ix != -1) { + transitionList->blockSignals(true); + transitionList->setCurrentIndex(ix); + slotTransitionChanged(false, false); + 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 ¶m) +{ 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();