X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftransitionsettings.cpp;h=e7984f19d16bef67f80522e3fff315762d1fa6db;hb=16e43620d9ff9e432ea91ded529f1e365d03fd52;hp=7b16827dfb5b6de448f4241b00032d491edd5aac;hpb=fe16b157c1f157d522d401620b73f7ec875dc64e;p=kdenlive diff --git a/src/transitionsettings.cpp b/src/transitionsettings.cpp index 7b16827d..e7984f19 100644 --- a/src/transitionsettings.cpp +++ b/src/transitionsettings.cpp @@ -26,17 +26,22 @@ #include -TransitionSettings::TransitionSettings(QWidget* parent) : +TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) : QWidget(parent), m_usedTransition(NULL), - m_tracksCount(0) + m_autoTrackTransition(0) { - m_ui.setupUi(this); - m_effectEdit = new EffectStackEdit(m_ui.frame); + setupUi(this); + QVBoxLayout *vbox1 = new QVBoxLayout(frame); + m_effectEdit = new EffectStackEdit(monitor, 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); - QMap transitionsList; + QList transitionsList; int max = MainWindow::transitions.effectNames().count(); QStringList transitionInfo; int ix = 0; @@ -44,55 +49,77 @@ TransitionSettings::TransitionSettings(QWidget* parent) : for (; ix < max; ix++) { transitionInfo = MainWindow::transitions.effectIdInfo(ix); transitionInfo << QString::number(ix); - transitionsList.insert(transitionInfo.at(0).toLower(), transitionInfo); + transitionsList.append(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); + 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++; } - 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(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged())); + connect(transitionTrack, SIGNAL(activated(int)), this, SLOT(slotTransitionTrackChanged())); connect(m_effectEdit, SIGNAL(parameterChanged(const QDomElement&, const QDomElement&)), this , SLOT(slotUpdateEffectParams(const QDomElement&, const QDomElement&))); + connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int))); } -void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const uint tracksCount) +void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList info) { - m_tracksCount = tracksCount; m_effectEdit->updateProjectFormat(profile, t); - QStringList tracksList; - tracksList << i18n("Auto"); - for (uint i = 0; i < tracksCount; i++) { - tracksList << QString::number(i); + m_tracks = info; + updateTrackList(); +} + +void TransitionSettings::updateTimecodeFormat() +{ + m_effectEdit->updateTimecodeFormat(); +} + +void TransitionSettings::updateTrackList() +{ + transitionTrack->blockSignals(true); + int current = transitionTrack->itemData(transitionTrack->currentIndex()).toInt(); + transitionTrack->clear(); + transitionTrack->addItem(i18n("Auto"), -1); + int limit = 1; + if (m_usedTransition) + limit = m_usedTransition->track() + 1; + kDebug() << "/ / TRANS TRK: " << limit; + KIcon videoIcon("kdenlive-show-video"); + KIcon audioIcon("kdenlive-show-audio"); + for (int i = limit; i < m_tracks.count(); i++) { + int ix = m_tracks.count() - i - 1; + transitionTrack->addItem(m_tracks.at(ix).type == VIDEOTRACK ? videoIcon : audioIcon, + m_tracks.at(ix).trackName.isEmpty() ? QString::number(i) : m_tracks.at(ix).trackName + " (" + QString::number(i) + ")", + m_tracks.count() - i); } - tracksList << i18n("Black"); - m_ui.transitionTrack->blockSignals(true); - m_ui.transitionTrack->clear(); - m_ui.transitionTrack->addItems(tracksList); - m_ui.transitionTrack->blockSignals(false); + transitionTrack->addItem(i18n("Black"), 0); + transitionTrack->setCurrentIndex(transitionTrack->findData(current)); + transitionTrack->blockSignals(false); } void TransitionSettings::slotTransitionChanged(bool reinit, bool updateCurrent) { QDomElement e = m_usedTransition->toXML().cloneNode().toElement(); + int start = m_usedTransition->startPos().frames(KdenliveSettings::project_fps()); + int end = m_usedTransition->endPos().frames(KdenliveSettings::project_fps()); if (reinit) { // Reset the transition parameters to the default one - QDomElement newTransition = MainWindow::transitions.getEffectByName(m_ui.transitionList->currentText()).cloneNode().toElement(); + 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())); + m_effectEdit->transferParamDesc(newTransition, start, start, end, false); } 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())); + m_effectEdit->transferParamDesc(e, start, start, end, false); } else { // Same transition, we just want to update the parameters value slotUpdateEffectParams(e, e); - if (m_usedTransition->hasGeometry()) emit transferParamDesc(m_usedTransition->toXML(), m_usedTransition->startPos().frames(KdenliveSettings::project_fps()), m_usedTransition->endPos().frames(KdenliveSettings::project_fps())); + if (m_usedTransition->hasGeometry()) m_effectEdit->transferParamDesc(m_usedTransition->toXML(), start, start, end, false); } } @@ -101,58 +128,62 @@ 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; + if (transitionTrack->currentIndex() > 0) { + ix = transitionTrack->itemData(transitionTrack->currentIndex()).toInt(); 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); } + emit transitionUpdated(m_usedTransition, oldxml); m_effectEdit->updateParameter("transition_btrack", QString::number(ix)); } -void TransitionSettings::slotTransitionItemSelected(Transition* t, QPoint p, bool update) +void TransitionSettings::slotTransitionItemSelected(Transition* t, int nextTrack, QPoint p, bool update) { setEnabled(t != NULL); 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); + transitionTrack->blockSignals(true); + updateTrackList(); + if (t->forcedTrack()) transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack())); + else transitionTrack->setCurrentIndex(0); + transitionTrack->blockSignals(false); } - if (update || t->duration() != m_transitionDuration || t->startPos() != m_transitionStart) { - m_transitionDuration = t->duration(); + 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->duration(); + 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); + transitionTrack->blockSignals(true); m_usedTransition = t; + updateTrackList(); + if (!t->forcedTrack()) + transitionTrack->setCurrentIndex(0); + else + transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack())); + transitionTrack->blockSignals(false); + int ix = transitionList->findData(t->transitionInfo(), Qt::UserRole, Qt::MatchExactly); if (ix != -1) { - m_ui.transitionList->blockSignals(true); - m_ui.transitionList->setCurrentIndex(ix); + transitionList->blockSignals(true); + transitionList->setCurrentIndex(ix); slotTransitionChanged(false, false); - m_ui.transitionList->blockSignals(false); + transitionList->blockSignals(false); } - } - else { - // null transition selected - m_usedTransition = NULL; - m_effectEdit->transferParamDesc(QDomElement(), 0, 0); + } else { + // null transition selected + m_usedTransition = NULL; + m_effectEdit->transferParamDesc(QDomElement(), 0, 0, 0, false); } } @@ -164,9 +195,8 @@ void TransitionSettings::slotUpdateEffectParams(const QDomElement &oldparam, con m_usedTransition->update(); } //oldparam must be also first given to Transition and then return the toXML() - if (oldparam != param) { + if (oldparam != param) emit transitionUpdated(m_usedTransition, oldparam); - } } void TransitionSettings::raiseWindow(QWidget* dock) @@ -176,3 +206,10 @@ void TransitionSettings::raiseWindow(QWidget* dock) } +void TransitionSettings::slotRenderPos(int pos) +{ + if (m_usedTransition) + m_effectEdit->slotSyncEffectsPos(pos - m_usedTransition->startPos().frames(KdenliveSettings::project_fps())); +} + +#include "transitionsettings.moc"