Commit c364333d authored by Vincent Pinon's avatar Vincent Pinon

Put Wipe fallback to Dissolve at end of list to avoid confusion

BUG: 351727
parent 6c3c0e59
......@@ -598,10 +598,10 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList *
if (pos != -1)
names.takeAt(pos);
QStringList imagenamelist = QStringList() << i18n("None");
QStringList imagefiles = QStringList() << QString();
QStringList imagenamelist;
QStringList imagefiles;
QStringList filters;
filters << "*.pgm" << "*.png";
filters << "*.png" << "*.pgm";
QStringList customLumas = QStandardPaths::locateAll(QStandardPaths::DataLocation, "lumas");
foreach(QString folder, customLumas) {
if (!folder.endsWith('/'))
......@@ -621,7 +621,9 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList *
imagenamelist.append(fname);
imagefiles.append(lumafolder.absoluteFilePath(fname));
}
imagenamelist.append(i18n("None (Dissolve)"));
imagefiles.append(QString());
//WARNING: this is a hack to get around temporary invalid metadata in MLT, 2nd of june 2011 JBM
QStringList customTransitions;
customTransitions << "composite" << "luma" << "affine" << "mix" << "region";
......@@ -697,7 +699,7 @@ void initEffects::fillTransitionsList(Mlt::Repository *repository, EffectsList *
paramList.append(quickParameterFill(ret, i18n("Softness"), "softness", "double", "0", "0", "100", "", "", "100"));
paramList.append(quickParameterFill(ret, i18nc("@property: means that the image is inverted", "Invert"), "invert", "bool", "0", "0", "1"));
paramList.append(quickParameterFill(ret, i18n("Image File"), "resource", "list", "", "", "", imagefiles.join(";"), imagenamelist.join(",")));
paramList.append(quickParameterFill(ret, i18n("Image File"), "resource", "list", imagefiles.first(), "", "", imagefiles.join(";"), imagenamelist.join(",")));
paramList.append(quickParameterFill(ret, i18n("Reverse Transition"), "reverse", "bool", "0", "0", "1"));
//thumbnailer.prepareThumbnailsCall(imagelist);
} else if (name == "composite") {
......
......@@ -305,7 +305,6 @@ void RecManager::slotReadProcessInfo()
void RecManager::slotVideoDeviceChanged(int)
{
int currentItem = m_device_selector->currentData().toInt();
qDebug()<<"// changed to: "<<currentItem;
KdenliveSettings::setDefaultcapture(currentItem);
switch (currentItem) {
case Video4Linux:
......
......@@ -55,9 +55,8 @@ TransitionSettings::TransitionSettings(Monitor *monitor, QWidget* parent) :
QList<QStringList> transitionsList;
int max = MainWindow::transitions.effectNames().count();
QStringList transitionInfo;
int ix = 1;
for (; ix <= max; ++ix) {
int ix = 0;
for (; ix < max; ++ix) {
transitionInfo = MainWindow::transitions.effectIdInfo(ix);
if (transitionInfo.isEmpty()) continue;
transitionInfo << QString::number(ix);
......@@ -132,7 +131,6 @@ void TransitionSettings::updateTrackList()
int limit = 1;
if (m_usedTransition)
limit = m_usedTransition->track() + 1;
////qDebug() << "/ / TRANS TRK: " << limit;
QIcon videoIcon = QIcon::fromTheme("kdenlive-show-video");
QIcon audioIcon = QIcon::fromTheme("kdenlive-show-audio");
for (int i = limit; i < m_tracks.count(); ++i) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment