X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=b6009c1a9dd4564baa1225c3981bad80f9121616;hb=798233633b721e85bed5f8c120a32556e257365d;hp=0ed52e0984eba2e69bdf3cd531399bef574d978f;hpb=000c8e2337fe448a6e35896f3ef1a95dedbb39c7;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 0ed52e09..b6009c1a 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -34,8 +34,10 @@ #include #include +#include #include +#include TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : QWidget(parent), @@ -45,8 +47,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,53 +58,52 @@ 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); - - m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + tracks_frame->setLayout(tracksLayout); - m_headersLayout = new QVBoxLayout; - m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0); - m_headersLayout->setSpacing(0); - m_view.headers_container->setLayout(m_headersLayout); + headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + headers_area->setFixedWidth(70); - 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(); @@ -122,6 +124,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(); @@ -242,10 +256,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 +284,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; @@ -348,6 +379,7 @@ 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) { // invalid transition, remove it. @@ -388,6 +420,18 @@ 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.\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)); + } //m_trackview->setCursorPos(cursorPos); //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height()); } @@ -410,7 +454,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 @@ -443,37 +487,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)), this, SLOT(slotRenameTrack(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); } } @@ -488,8 +568,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(); @@ -546,6 +624,8 @@ 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, strobe, false); @@ -712,7 +792,15 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) if (factor.startsWith('%')) { 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; } @@ -775,8 +863,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; } @@ -806,6 +896,7 @@ void TrackView::slotChangeTrackLock(int ix, bool lock) widgets.at(ix)->setLock(lock); } + void TrackView::slotVerticalZoomDown() { if (m_verticalZoom == 0) return; @@ -814,8 +905,7 @@ void TrackView::slotVerticalZoomDown() 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() @@ -823,16 +913,31 @@ 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); 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) +{ + 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); + } } + #include "trackview.moc"