#include <KDebug>
-TransitionSettings::TransitionSettings(QWidget* parent) :
+TransitionSettings::TransitionSettings(Monitor *monitor, 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);
+ m_effectEdit = new EffectStackEdit(monitor, frame);
vbox1->setContentsMargins(0, 0, 0, 0);
vbox1->setSpacing(0);
vbox1->addWidget(m_effectEdit);
connect(m_effectEdit, SIGNAL(seekTimeline(int)), this, SIGNAL(seekTimeline(int)));
setEnabled(false);
- QMap<QString, QStringList> transitionsList;
+ QList<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);
+ transitionsList.append(transitionInfo);
}
ix = 0;
foreach(const QStringList &value, transitionsList) {
- transitionList->addItem(value.at(0));
+ 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(transitionList, SIGNAL(activated(int)), this, SLOT(slotTransitionChanged()));
connect(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&)));
+ connect(monitor, SIGNAL(renderPosition(int)), this, SLOT(slotRenderPos(int)));
}
void TransitionSettings::updateProjectFormat(MltVideoProfile profile, Timecode t, const QList <TrackInfo> info)
{
- m_tracksCount = info.count();
m_effectEdit->updateProjectFormat(profile, t);
- QStringList tracksList;
+ 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);
- for (int i = 0; i < m_tracksCount; i++) {
- if (!info.at(i).trackName.isEmpty())
- transitionTrack->addItem(info.at(i).trackName + '(' + QString::number(i) + ')', i);
- else transitionTrack->addItem(QString::number(i));
+ 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);
}
- transitionTrack->addItem(i18n("Black"), m_tracksCount);
+ transitionTrack->addItem(i18n("Black"), 0);
+ transitionTrack->setCurrentIndex(transitionTrack->findData(current));
transitionTrack->blockSignals(false);
}
// 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()));
+ m_effectEdit->transferParamDesc(newTransition, m_usedTransition->info(), 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, m_usedTransition->info(), 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(), m_usedTransition->info(), false);
}
}
int ix = 0;
QDomElement oldxml = m_usedTransition->toXML().cloneNode().toElement();
if (transitionTrack->currentIndex() > 0) {
- ix = transitionTrack->count() - transitionTrack->currentIndex() - 1;
+ 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));
}
if (t == NULL) return;
if (update) {
transitionTrack->blockSignals(true);
- if (t->forcedTrack()) transitionTrack->setCurrentIndex(m_tracksCount + 1 - t->transitionEndTrack());
+ updateTrackList();
+ if (t->forcedTrack()) transitionTrack->setCurrentIndex(transitionTrack->findData(t->transitionEndTrack()));
else transitionTrack->setCurrentIndex(0);
transitionTrack->blockSignals(false);
}
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->findText(t->transitionName(), Qt::MatchExactly);
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) {
transitionList->blockSignals(true);
transitionList->setCurrentIndex(ix);
} else {
// null transition selected
m_usedTransition = NULL;
- m_effectEdit->transferParamDesc(QDomElement(), 0, 0);
+ ItemInfo info;
+ m_effectEdit->transferParamDesc(QDomElement(), info, false);
}
}
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)
}
+void TransitionSettings::slotRenderPos(int pos)
+{
+ if (m_usedTransition)
+ m_effectEdit->slotSyncEffectsPos(pos - m_usedTransition->startPos().frames(KdenliveSettings::project_fps()));
+}
+
+#include "transitionsettings.moc"
projects / kdenlive / blobdiff