X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=e086b21aff5bbb76a3c9eb68017bebd194de7ba7;hb=f77746744a2b7c21dadfcc4fc364d41a9ee10d81;hp=d8a45938e85d27efd2c187c62dc4cd197365a673;hpb=b37d59473f5b30c22df7720f0cf192c383b3be07;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index d8a45938..e086b21a 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -31,11 +31,14 @@ #include "customtrackview.h" #include "initeffects.h" #include "profilesdialog.h" +#include "configtrackscommand.h" #include #include +#include #include +#include TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : QWidget(parent), @@ -45,8 +48,9 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : m_verticalZoom(1) { - m_view.setupUi(this); - + setupUi(this); +// ruler_frame->setMaximumHeight(); +// size_frame->setMaximumHeight(); m_scene = new CustomTrackScene(doc); m_trackview = new CustomTrackView(doc, m_scene, parent); m_trackview->scale(1, 1); @@ -55,65 +59,65 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : m_ruler = new CustomRuler(doc->timecode(), m_trackview); connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int))); + connect(m_ruler, SIGNAL(adjustZoom(int)), this, SIGNAL(setZoom(int))); QHBoxLayout *layout = new QHBoxLayout; layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0); layout->setSpacing(0); - m_view.ruler_frame->setLayout(layout); + ruler_frame->setLayout(layout); layout->addWidget(m_ruler); - QHBoxLayout *sizeLayout = new QHBoxLayout; sizeLayout->setContentsMargins(0, 0, 0, 0); sizeLayout->setSpacing(0); - m_view.size_frame->setLayout(sizeLayout); - - QString style1 = "QToolButton {border-style: none;margin: 0px 3px;padding: 0px;} QToolButton:pressed:hover { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;} QToolButton:hover { background-color: rgba(255, 255, 255, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}"; + size_frame->setLayout(sizeLayout); QToolButton *butSmall = new QToolButton(this); butSmall->setIcon(KIcon("kdenlive-zoom-small")); butSmall->setToolTip(i18n("Smaller tracks")); + butSmall->setAutoRaise(true); connect(butSmall, SIGNAL(clicked()), this, SLOT(slotVerticalZoomDown())); sizeLayout->addWidget(butSmall); QToolButton *butLarge = new QToolButton(this); butLarge->setIcon(KIcon("kdenlive-zoom-large")); butLarge->setToolTip(i18n("Bigger tracks")); + butLarge->setAutoRaise(true); connect(butLarge, SIGNAL(clicked()), this, SLOT(slotVerticalZoomUp())); sizeLayout->addWidget(butLarge); - m_view.size_frame->setStyleSheet(style1); - QHBoxLayout *tracksLayout = new QHBoxLayout; tracksLayout->setContentsMargins(0, 0, 0, 0); tracksLayout->setSpacing(0); - m_view.tracks_frame->setLayout(tracksLayout); + tracks_frame->setLayout(tracksLayout); - m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + headers_area->setFixedWidth(70); - m_headersLayout = new QVBoxLayout; - m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0); - m_headersLayout->setSpacing(0); - m_view.headers_container->setLayout(m_headersLayout); - - connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); + QVBoxLayout *headersLayout = new QVBoxLayout; + headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0); + headersLayout->setSpacing(0); + headers_container->setLayout(headersLayout); + connect(headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); tracksLayout->addWidget(m_trackview); - - connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int))); + connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), headers_area->verticalScrollBar(), SLOT(setValue(int))); connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); + connect(m_trackview, SIGNAL(tracksChanged()), this, SLOT(slotReloadTracks())); + 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))); slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); slotSetZone(m_doc->zone()); + connect(m_trackview, SIGNAL(documentModified()), this, SLOT(slotCheckProjectAudio())); } TrackView::~TrackView() @@ -122,6 +126,18 @@ TrackView::~TrackView() delete m_trackview; } +//virtual +void TrackView::keyPressEvent(QKeyEvent * event) +{ + if (event->key() == Qt::Key_Up) { + m_trackview->slotTrackUp(); + event->accept(); + } else if (event->key() == Qt::Key_Down) { + m_trackview->slotTrackDown(); + event->accept(); + } else QWidget::keyPressEvent(event); +} + int TrackView::duration() const { return m_trackview->duration(); @@ -132,6 +148,21 @@ int TrackView::tracksNumber() const return m_projectTracks - 1; } +void TrackView::slotCheckProjectAudio() +{ + bool hasAudio = false; + const QList list = m_doc->tracksList(); + int max = list.count(); + for (int i = 0; i < max; i++) { + TrackInfo info = list.at(max - i - 1); + if (!info.isMute && m_trackview->hasAudio(i)) { + hasAudio = true; + break; + } + } + emit projectHasAudio(hasAudio); +} + int TrackView::inPoint() const { return m_ruler->inPoint(); @@ -242,10 +273,6 @@ void TrackView::parseDocument(QDomDocument doc) p = playlists.item(j).toElement(); if (p.attribute("id") == playlist_name) break; } - int black_clips = p.childNodes().count(); - for (int i = 0; i < black_clips; i++) - m_doc->loadingProgressed(); - qApp->processEvents(); pos--; } } @@ -274,15 +301,36 @@ void TrackView::parseDocument(QDomDocument doc) transitionAdd = false; //kDebug() << "// TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)"; //break; - } else if (paramName == "a_track") a_track = p.text().toInt(); - else if (paramName == "b_track") b_track = p.text().toInt(); - else if (paramName == "mlt_service") mlt_service = p.text(); + } else if (paramName == "a_track") { + a_track = qMax(0, p.text().toInt()); + a_track = qMin(m_projectTracks - 1, a_track); + if (a_track != p.text().toInt()) { + // the transition track was out of bounds + m_documentErrors.append(i18n("Transition %1 had an invalid track: %2 > %3", e.attribute("id"), p.text().toInt(), a_track) + '\n'); + EffectsList::setProperty(e, "a_track", QString::number(a_track)); + } + } else if (paramName == "b_track") { + b_track = qMax(0, p.text().toInt()); + b_track = qMin(m_projectTracks - 1, b_track); + if (b_track != p.text().toInt()) { + // the transition track was out of bounds + m_documentErrors.append(i18n("Transition %1 had an invalid track: %2 > %3", e.attribute("id"), p.text().toInt(), b_track) + '\n'); + EffectsList::setProperty(e, "b_track", QString::number(b_track)); + } + } else if (paramName == "mlt_service") mlt_service = p.text(); else if (paramName == "kdenlive_id") transitionId = p.text(); else if (paramName == "geometry") mlt_geometry = p.text(); else if (paramName == "automatic" && p.text() == "1") isAutomatic = true; else if (paramName == "force_track" && p.text() == "1") forceTrack = true; } } + if (a_track == b_track || b_track == 0) { + // invalid transition, remove it + m_documentErrors.append(i18n("Removed invalid transition: %1", e.attribute("id")) + '\n'); + tractor.removeChild(transitions.item(i)); + i--; + continue; + } if (transitionAdd || mlt_service != "mix") { // Transition should be added to the scene ItemInfo transitionInfo; @@ -311,36 +359,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)); @@ -349,10 +397,11 @@ void TrackView::parseDocument(QDomDocument doc) transitionInfo.startPos = GenTime(e.attribute("in").toInt(), m_doc->fps()); transitionInfo.endPos = GenTime(e.attribute("out").toInt() + 1, m_doc->fps()); 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--; @@ -389,6 +438,21 @@ void TrackView::parseDocument(QDomDocument doc) slotRebuildTrackHeaders(); if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors); + if (infoXml.hasAttribute("upgraded")) { + // Our document was upgraded, create a backup copy just in case + QString baseFile = m_doc->url().path().section(".kdenlive", 0, 0); + int ct = 0; + QString backupFile = baseFile + "_backup" + QString::number(ct) + ".kdenlive"; + while (QFile::exists(backupFile)) { + 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.\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)); + } + slotCheckProjectAudio(); //m_trackview->setCursorPos(cursorPos); //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); } @@ -411,7 +475,7 @@ void TrackView::moveCursorPos(int pos) void TrackView::slotChangeZoom(int horizontal, int vertical) { m_ruler->setPixelPerMark(horizontal); - m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; // m_ruler->comboScale[m_currentZoom] / + m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; if (vertical == -1) { // user called zoom @@ -419,8 +483,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(); } } @@ -444,37 +510,73 @@ void TrackView::refresh() m_trackview->viewport()->update(); } +void TrackView::slotRepaintTracks() +{ + QLayoutItem *child; + for (int i = 0; i < headers_container->layout()->count(); i++) { + child = headers_container->layout()->itemAt(i); + if (child->widget() && child->widget()->height() > 5) { + HeaderTrack *head = static_cast (child->widget()); + if (head) head->setSelectedIndex(m_trackview->selectedTrack()); + } + } +} + +void TrackView::slotReloadTracks() +{ + slotRebuildTrackHeaders(); + emit updateTracksInfo(); +} + void TrackView::slotRebuildTrackHeaders() { - QList list = m_doc->tracksList(); + const QList list = m_doc->tracksList(); QLayoutItem *child; - while ((child = m_headersLayout->takeAt(0)) != 0) { - if (child->widget()) delete child->widget(); + while ((child = headers_container->layout()->takeAt(0)) != 0) { + QWidget *wid = child->widget(); delete child; + if (wid) wid->deleteLater(); } int max = list.count(); - int height = KdenliveSettings::trackheight() * m_scene->scale().y(); + int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; + HeaderTrack *header = NULL; + QFrame *frame = NULL; for (int i = 0; i < max; i++) { - HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this); + frame = new QFrame(headers_container); + frame->setFixedHeight(1); + frame->setFrameStyle(QFrame::Plain); + frame->setFrameShape(QFrame::Box); + frame->setLineWidth(1); + headers_container->layout()->addWidget(frame); + TrackInfo info = list.at(max - i - 1); + header = new HeaderTrack(i, info, height, headers_container); + header->setSelectedIndex(m_trackview->selectedTrack()); connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int))); connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int))); connect(header, SIGNAL(switchTrackLock(int)), m_trackview, SLOT(slotSwitchTrackLock(int))); - + 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))); - m_headersLayout->addWidget(header); + 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); + frame->setFixedHeight(1); + frame->setFrameStyle(QFrame::Plain); + frame->setFrameShape(QFrame::Box); + frame->setLineWidth(1); + headers_container->layout()->addWidget(frame); } void TrackView::adjustTrackHeaders() { - int height = KdenliveSettings::trackheight() * m_scene->scale().y(); + int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; QLayoutItem *child; - for (int i = 0; i < m_headersLayout->count(); i++) { - child = m_headersLayout->itemAt(i); - if (child->widget())(static_cast (child->widget()))->adjustSize(height); + for (int i = 0; i < headers_container->layout()->count(); i++) { + child = headers_container->layout()->itemAt(i); + if (child->widget() && child->widget()->height() > 5)(static_cast (child->widget()))->adjustSize(height); } } @@ -489,8 +591,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) if (elem.tagName() == "blank") { position += elem.attribute("length").toInt(); } else if (elem.tagName() == "entry") { - m_doc->loadingProgressed(); - qApp->processEvents(); // Found a clip int in = elem.attribute("in").toInt(); int out = elem.attribute("out").toInt(); @@ -503,9 +603,12 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) QString idString = elem.attribute("producer"); QString id = idString; double speed = 1.0; + int strobe = 1; if (idString.startsWith("slowmotion")) { id = idString.section(':', 1, 1); speed = idString.section(':', 2, 2).toDouble(); + strobe = idString.section(':', 3, 3).toInt(); + if (strobe == 0) strobe = 1; } else id = id.section('_', 0, 0); DocClipBase *clip = m_doc->clipManager()->getClipById(id); if (clip == NULL) { @@ -544,25 +647,35 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) clipinfo.startPos = GenTime(position, m_doc->fps()); clipinfo.endPos = clipinfo.startPos + GenTime(out - in + 1, m_doc->fps()); clipinfo.cropStart = GenTime(in, m_doc->fps()); + clipinfo.cropDuration = clipinfo.endPos - clipinfo.startPos; + clipinfo.track = ix; //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); - ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, false); + ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, false); if (idString.endsWith("_video")) item->setVideoOnly(true); else if (idString.endsWith("_audio")) item->setAudioOnly(true); m_scene->addItem(item); if (locked) item->setItemLocked(true); clip->addReference(); position += (out - in + 1); + 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))); + EffectsList::setParameter(speedeffect, "strobe", QString::number(strobe)); + item->addEffect(speedeffect, false); + item->effectsCounter(); + } // 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()) { @@ -572,8 +685,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)) { @@ -624,7 +741,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) double fact; if (factor.isEmpty()) fact = 1; else if (factor.startsWith('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); + fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); } else fact = factor.toDouble(); for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { // parse effect parameters @@ -700,9 +817,17 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) QString factor = e.attribute("factor", "1"); double fact; if (factor.startsWith('%')) { - fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); + fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); } else fact = factor.toDouble(); - 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; } @@ -717,8 +842,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(); } } } @@ -765,8 +890,10 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const // prepend MLT XML document root if no path in clip resource and not a color clip if (!resource.startsWith('/') && !resource.startsWith("0x")) resource.prepend(docRoot); DocClipBase *missingClip = NULL; - if (!resource.isEmpty()) - missingClip = m_doc->clipManager()->getClipByResource(resource); + if (!resource.isEmpty()) { + QList list = m_doc->clipManager()->getClipByResource(resource); + if (!list.isEmpty()) missingClip = list.at(0); + } return missingClip; } @@ -796,16 +923,18 @@ void TrackView::slotChangeTrackLock(int ix, bool lock) widgets.at(ix)->setLock(lock); } + 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(); - /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() / 2); - m_trackview->checkTrackHeight(false);*/ + m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value()); } void TrackView::slotVerticalZoomUp() @@ -813,11 +942,40 @@ void TrackView::slotVerticalZoomUp() if (m_verticalZoom == 2) return; m_verticalZoom++; m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom); - /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() * 2); - m_trackview->checkTrackHeight(false);*/ - 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()); +} + +void TrackView::updateProjectFps() +{ + m_ruler->updateProjectFps(m_doc->timecode()); + m_trackview->updateProjectFps(); +} + +void TrackView::slotRenameTrack(int ix, QString name) +{ + int tracknumber = m_doc->tracksCount() - ix; + 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"