X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=b8110fb7deb5d0d149d8381162bc52a3f9a5bb76;hb=baee85e1b80475ee7a145c9752b51df6ba5b3ad7;hp=16e0da314683bb46a31b69d0b36313a530b22381;hpb=1bb5954abb1179a8cd75a3dbffec0911f297357e;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 16e0da31..b8110fb7 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -31,6 +31,7 @@ #include "customtrackview.h" #include "initeffects.h" #include "profilesdialog.h" +#include "configtrackscommand.h" #include #include @@ -106,11 +107,11 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : connect(m_trackview, SIGNAL(updateTrackHeaders()), this, SLOT(slotRepaintTracks())); parseDocument(m_doc->toXml()); - int error = m_doc->setSceneList(); - if (error == -1) *ok = false; + if (m_doc->setSceneList() == -1) *ok = false; else *ok = true; connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int))); connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int))); + connect(m_trackview->horizontalScrollBar(), SIGNAL(rangeChanged(int, int)), this, SLOT(slotUpdateVerticalScroll(int, int))); connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int))); connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool))); @@ -342,35 +343,36 @@ void TrackView::parseDocument(QDomDocument doc) if (isWipeTransition) transitionId = "slide"; } } + QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement(); - for (int k = 0; k < transitionparams.count(); k++) { - p = transitionparams.item(k).toElement(); - if (!p.isNull()) { - QString paramName = p.attribute("name"); - QString paramValue = p.text(); - - QDomNodeList params = base.elementsByTagName("parameter"); - if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) { - QDomElement e = params.item(i).toElement(); - if (!e.isNull() && e.attribute("tag") == paramName) { - if (e.attribute("type") == "double") { - QString factor = e.attribute("factor", "1"); - if (factor != "1") { - double fact; - if (factor.startsWith('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else fact = factor.toDouble(); - double val = paramValue.toDouble() * fact; - paramValue = QString::number(val); + if (!base.isNull()) for (int k = 0; k < transitionparams.count(); k++) { + p = transitionparams.item(k).toElement(); + if (!p.isNull()) { + QString paramName = p.attribute("name"); + QString paramValue = p.text(); + + QDomNodeList params = base.elementsByTagName("parameter"); + if (paramName != "a_track" && paramName != "b_track") for (int i = 0; i < params.count(); i++) { + QDomElement e = params.item(i).toElement(); + if (!e.isNull() && e.attribute("tag") == paramName) { + if (e.attribute("type") == "double") { + QString factor = e.attribute("factor", "1"); + if (factor != "1") { + double fact; + if (factor.startsWith('%')) { + fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); + } else fact = factor.toDouble(); + double val = paramValue.toDouble() * fact; + paramValue = QString::number(val); + } } + e.setAttribute("value", paramValue); + break; } - e.setAttribute("value", paramValue); - break; } - } + } } - } /*QDomDocument doc; doc.appendChild(doc.importNode(base, true)); @@ -381,9 +383,9 @@ void TrackView::parseDocument(QDomDocument doc) transitionInfo.track = m_projectTracks - 1 - b_track; //kDebug() << "/////////////// +++++++++++ ADDING TRANSITION ON TRACK: " << b_track << ", TOTAL TRKA: " << m_projectTracks; - if (transitionInfo.startPos >= transitionInfo.endPos) { + if (transitionInfo.startPos >= transitionInfo.endPos || base.isNull()) { // invalid transition, remove it. - m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n'); + m_documentErrors.append(i18n("Removed invalid transition: (%1, %2, %3)", e.attribute("id"), mlt_service, transitionId) + '\n'); kDebug() << "///// REMOVED INVALID TRANSITION: " << e.attribute("id"); tractor.removeChild(transitions.item(i)); i--; @@ -429,8 +431,10 @@ void TrackView::parseDocument(QDomDocument doc) ct++; backupFile = baseFile + "_backup" + QString::number(ct) + ".kdenlive"; } - if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this)) KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version.\n To make sure you don't lose data, a backup copy called %1 was created.", backupFile)); - else KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, it was not possible to create a backup copy.", backupFile)); + if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this)) + KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version.\nTo make sure you don't lose data, a backup copy called %1 was created.", backupFile)); + else + KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, but it was not possible to create a backup copy.", backupFile)); } //m_trackview->setCursorPos(cursorPos); //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); @@ -462,8 +466,10 @@ void TrackView::slotChangeZoom(int horizontal, int vertical) m_trackview->setScale(m_scale, m_scene->scale().y()); } else { m_verticalZoom = vertical; - if (m_verticalZoom == 0) m_trackview->setScale(m_scale, 0.5); - else m_trackview->setScale(m_scale, m_verticalZoom); + if (m_verticalZoom == 0) + m_trackview->setScale(m_scale, 0.5); + else + m_trackview->setScale(m_scale, m_verticalZoom); adjustTrackHeaders(); } } @@ -534,8 +540,8 @@ void TrackView::slotRebuildTrackHeaders() connect(header, SIGNAL(selectTrack(int)), m_trackview, SLOT(slotSelectTrack(int))); connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int))); connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int))); - connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int))); - connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int))); + connect(header, SIGNAL(renameTrack(int, QString)), this, SLOT(slotRenameTrack(int, QString))); + connect(header, SIGNAL(configTrack(int)), this, SIGNAL(configTrack(int))); headers_container->layout()->addWidget(header); } frame = new QFrame(this); @@ -635,7 +641,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) if (locked) item->setItemLocked(true); clip->addReference(); position += (out - in + 1); - kDebug() << "/////////\n\n\n" << "CLIP SPEED: " << speed << ", " << strobe << "\n\n\n/////////////////////"; if (speed != 1.0 || strobe > 1) { QDomElement speedeffect = MainWindow::videoEffects.getEffectByTag(QString(), "speed").cloneNode().toElement(); EffectsList::setParameter(speedeffect, "speed", QString::number((int)(100 * speed + 0.5))); @@ -647,12 +652,13 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) // parse clip effects QDomNodeList effects = elem.childNodes(); for (int ix = 0; ix < effects.count(); ix++) { + bool disableeffect = false; QDomElement effect = effects.at(ix).toElement(); if (effect.tagName() == "filter") { // add effect to clip QString effecttag; QString effectid; - QString effectindex; + QString effectindex = QString::number(ix + 1); QString ladspaEffectFile; // Get effect tag & index for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { @@ -662,8 +668,12 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) effecttag = effectparam.text(); } else if (effectparam.attribute("name") == "kdenlive_id") { effectid = effectparam.text(); + } else if (effectparam.attribute("name") == "disable" && effectparam.text().toInt() == 1) { + // Fix effects index + disableeffect = true; } else if (effectparam.attribute("name") == "kdenlive_ix") { - effectindex = effectparam.text(); + // Fix effects index + effectparam.firstChild().setNodeValue(effectindex); } else if (effectparam.attribute("name") == "src") { ladspaEffectFile = effectparam.text(); if (!QFile::exists(ladspaEffectFile)) { @@ -689,7 +699,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) QDomElement currenteffect = clipeffect.cloneNode().toElement(); currenteffect.setAttribute("kdenlive_ix", effectindex); QDomNodeList clipeffectparams = currenteffect.childNodes(); - + if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) { //kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *"; // effect is key-framable, read all effects to retrieve keyframes @@ -792,16 +802,15 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) if (factor.startsWith('%')) { fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); } else fact = factor.toDouble(); - if (e.attribute("type") == "simplekeyframe") { - QStringList kfrs = paramvalue.split(";"); - for (int l = 0; l < kfrs.count(); l++) { - QString fr = kfrs.at(l).section("=", 0, 0); - double val = kfrs.at(l).section("=", 1, 1).toDouble(); - kfrs[l] = fr + ":" + QString::number((int) (val * fact)); - } - e.setAttribute("keyframes", kfrs.join(";")); - } - else e.setAttribute("value", paramvalue.toDouble() * fact); + if (e.attribute("type") == "simplekeyframe") { + QStringList kfrs = paramvalue.split(";"); + for (int l = 0; l < kfrs.count(); l++) { + QString fr = kfrs.at(l).section("=", 0, 0); + double val = kfrs.at(l).section("=", 1, 1).toDouble(); + kfrs[l] = fr + ":" + QString::number((int)(val * fact)); + } + e.setAttribute("keyframes", kfrs.join(";")); + } else e.setAttribute("value", paramvalue.toDouble() * fact); } else e.setAttribute("value", paramvalue); break; } @@ -816,8 +825,8 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) } currenteffect.setAttribute("src", ladspaEffectFile); } + if (disableeffect) currenteffect.setAttribute("disable", "1"); item->addEffect(currenteffect, false); - item->effectsCounter(); } } } @@ -903,8 +912,10 @@ void TrackView::slotVerticalZoomDown() if (m_verticalZoom == 0) return; m_verticalZoom--; m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom); - if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5); - else m_trackview->setScale(m_scene->scale().x(), 1); + if (m_verticalZoom == 0) + m_trackview->setScale(m_scene->scale().x(), 0.5); + else + m_trackview->setScale(m_scene->scale().x(), 1); adjustTrackHeaders(); m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value()); } @@ -914,8 +925,10 @@ void TrackView::slotVerticalZoomUp() if (m_verticalZoom == 2) return; m_verticalZoom++; m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom); - if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2); - else m_trackview->setScale(m_scene->scale().x(), 1); + if (m_verticalZoom == 2) + m_trackview->setScale(m_scene->scale().x(), 2); + else + m_trackview->setScale(m_scene->scale().x(), 1); adjustTrackHeaders(); m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value()); } @@ -926,19 +939,26 @@ void TrackView::updateProjectFps() m_trackview->updateProjectFps(); } -void TrackView::slotRenameTrack(int ix) +void TrackView::slotRenameTrack(int ix, QString name) { int tracknumber = m_doc->tracksCount() - ix; - TrackInfo info = m_doc->trackInfoAt(tracknumber - 1); - bool ok; - QString newName = QInputDialog::getText(this, i18n("New Track Name"), i18n("Enter new name"), QLineEdit::Normal, info.trackName, &ok); - if (ok) { - info.trackName = newName; - m_doc->setTrackType(tracknumber - 1, info); - QTimer::singleShot(300, this, SLOT(slotReloadTracks())); - m_doc->setModified(true); - } + QList tracks = m_doc->tracksList(); + tracks[tracknumber - 1].trackName = name; + ConfigTracksCommand *configTracks = new ConfigTracksCommand(m_trackview, m_doc->tracksList(), tracks); + m_doc->commandStack()->push(configTracks); + m_doc->setModified(true); +} + +void TrackView::slotUpdateVerticalScroll(int /*min*/, int max) +{ + int height = 0; + if (max > 0) height = m_trackview->horizontalScrollBar()->height() - 1; + headers_container->layout()->setContentsMargins(0, m_trackview->frameWidth(), 0, height); } +void TrackView::updateRuler() +{ + m_ruler->update(); +} #include "trackview.moc"