X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=e5acd82dfb5788b85969c82ecdd461b7fc17cab8;hb=edf2e497b4361db1bce089b0ef58dd566bf1d997;hp=934a69a40ce397c94fc74e414fdb12bf3d46d75a;hpb=1183abe0fc0e45609d32007d2c59dbe0b06e0b53;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 934a69a4..e5acd82d 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -36,12 +36,15 @@ #include -TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) - : QWidget(parent), m_doc(doc), m_scale(1.0), m_projectTracks(0) +TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) : + QWidget(parent), + m_scale(1.0), + m_projectTracks(0), + m_doc(doc), + m_verticalZoom(1) { - view = new Ui::TimeLine_UI(); - view->setupUi(this); + m_view.setupUi(this); m_scene = new CustomTrackScene(doc); m_trackview = new CustomTrackView(doc, m_scene, parent); @@ -52,30 +55,51 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) m_ruler = new CustomRuler(doc->timecode(), m_trackview); connect(m_ruler, SIGNAL(zoneMoved(int, int)), this, SIGNAL(zoneMoved(int, int))); QHBoxLayout *layout = new QHBoxLayout; - view->ruler_frame->setLayout(layout); - int left_margin; - int right_margin; - layout->getContentsMargins(&left_margin, 0, &right_margin, 0); - layout->setContentsMargins(left_margin, 0, right_margin, 0); + layout->setContentsMargins(m_trackview->frameWidth(), 0, 0, 0); + layout->setSpacing(0); + m_view.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;}"; + + QToolButton *butSmall = new QToolButton(this); + butSmall->setIcon(KIcon("kdenlive-zoom-small")); + butSmall->setToolTip(i18n("Smaller tracks")); + 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")); + 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); - view->tracks_frame->setLayout(tracksLayout); + tracksLayout->setSpacing(0); + m_view.tracks_frame->setLayout(tracksLayout); - view->headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - view->headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_headersLayout = new QVBoxLayout; - m_headersLayout->setContentsMargins(0, 0, 0, 0); + m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0); m_headersLayout->setSpacing(0); - view->headers_container->setLayout(m_headersLayout); + m_view.headers_container->setLayout(m_headersLayout); - connect(view->headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); + connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int))); tracksLayout->addWidget(m_trackview); - connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), view->headers_area->verticalScrollBar(), SLOT(setValue(int))); + connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int))); connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders())); parseDocument(m_doc->toXml()); @@ -83,13 +107,17 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) 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, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int))); - connect(m_trackview, SIGNAL(transitionItemSelected(Transition*, bool)), this, SLOT(slotTransitionItemSelected(Transition*, bool))); connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool))); slotChangeZoom(m_doc->zoom()); slotSetZone(m_doc->zone()); } +TrackView::~TrackView() +{ + delete m_ruler; + delete m_trackview; +} int TrackView::duration() const { @@ -116,11 +144,6 @@ void TrackView::slotSetZone(QPoint p) m_ruler->setZone(p); } -void TrackView::slotTransitionItemSelected(Transition *t, bool update) -{ - emit transitionItemSelected(t, update); -} - void TrackView::setDuration(int dur) { m_trackview->setDuration(dur); @@ -131,7 +154,8 @@ void TrackView::parseDocument(QDomDocument doc) { //int cursorPos = 0; m_documentErrors.clear(); - // kDebug() << "//// DOCUMENT: " << doc.toString(); + + //kDebug() << "//// DOCUMENT: " << doc.toString(); /*QDomNode props = doc.elementsByTagName("properties").item(0); if (!props.isNull()) { cursorPos = props.toElement().attribute("timeline_position").toInt(); @@ -151,9 +175,25 @@ void TrackView::parseDocument(QDomDocument doc) m_invalidProducers.clear(); QDomNodeList producers = doc.elementsByTagName("producer"); for (int i = 0; i < producers.count(); i++) { - // CHeck for invalid producers + // Check for invalid producers QDomNode n = producers.item(i); e = n.toElement(); + + /* + // Check for invalid markup + QDomNodeList params = e.elementsByTagName("property"); + for (int j = 0; j < params.count(); j++) { + QDomElement p = params.item(j).toElement(); + if (p.attribute("name") == "markup") { + QString val = p.text().toUtf8().data(); + kDebug()<<"//FOUND MARKUP, VAL: "<isTrackLocked(i - 1)); pos--; - //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; + //kDebug() << " PRO DUR: " << trackduration << ", TRACK DUR: " << duration; if (trackduration > duration) duration = trackduration; } else { // background black track @@ -221,18 +261,20 @@ void TrackView::parseDocument(QDomDocument doc) bool forceTrack = false; QString mlt_geometry; QString mlt_service; + QString transitionId; for (int k = 0; k < transitionparams.count(); k++) { p = transitionparams.item(k).toElement(); if (!p.isNull()) { QString paramName = p.attribute("name"); - // do not add audio mixing transitions + // do not add audio mixing transitions if (paramName == "internal_added" && p.text() == "237") { transitionAdd = false; - //kDebug() << "// TRANSITRION " << i << " IS NOT VALID (INTERN ADDED)"; + //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 == "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; @@ -241,8 +283,7 @@ void TrackView::parseDocument(QDomDocument doc) if (transitionAdd || mlt_service != "mix") { // Transition should be added to the scene ItemInfo transitionInfo; - QString transitionId; - if (mlt_service == "composite") { + if (mlt_service == "composite" && transitionId.isEmpty()) { // When adding composite transition, check if it is a wipe transition if (mlt_geometry.count(';') == 1) { mlt_geometry.remove(QChar('%'), Qt::CaseInsensitive); @@ -264,7 +305,7 @@ void TrackView::parseDocument(QDomDocument doc) break; } } - if (isWipeTransition) transitionId = "wipe"; + if (isWipeTransition) transitionId = "slide"; } } QDomElement base = MainWindow::transitions.getEffectByTag(mlt_service, transitionId).cloneNode().toElement(); @@ -330,9 +371,14 @@ void TrackView::parseDocument(QDomDocument doc) // Rebuild groups QDomNodeList groups = doc.elementsByTagName("group"); m_trackview->loadGroups(groups); - m_trackview->setDuration(duration); kDebug() << "/////////// TOTAL PROJECT DURATION: " << duration; + + // Remove Kdenlive extra info from xml doc before sending it to MLT + QDomElement mlt = doc.firstChildElement("mlt"); + QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); + mlt.removeChild(infoXml); + slotRebuildTrackHeaders(); if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors); //m_trackview->setCursorPos(cursorPos); @@ -359,7 +405,7 @@ void TrackView::slotChangeZoom(int factor) m_doc->setZoom(factor); m_ruler->setPixelPerMark(factor); m_scale = (double) FRAME_SIZE / m_ruler->comboScale[factor]; // m_ruler->comboScale[m_currentZoom] / - m_trackview->setScale(m_scale); + m_trackview->setScale(m_scale, m_scene->scale().y()); } int TrackView::fitZoom() const @@ -384,12 +430,15 @@ void TrackView::refresh() void TrackView::slotRebuildTrackHeaders() { QList list = m_doc->tracksList(); - QList widgets = findChildren(); - for (int i = 0; i < widgets.count(); i++) - delete widgets.at(i); + QLayoutItem *child; + while ((child = m_headersLayout->takeAt(0)) != 0) { + if (child->widget()) delete child->widget(); + delete child; + } int max = list.count(); + int height = KdenliveSettings::trackheight() * m_scene->scale().y(); for (int i = 0; i < max; i++) { - HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this); + HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this); 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))); @@ -399,10 +448,19 @@ void TrackView::slotRebuildTrackHeaders() connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int))); m_headersLayout->addWidget(header); } - view->headers_container->adjustSize(); } +void TrackView::adjustTrackHeaders() +{ + int height = KdenliveSettings::trackheight() * m_scene->scale().y(); + 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); + } +} + int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) { // parse track @@ -433,13 +491,44 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) speed = idString.section(':', 2, 2).toDouble(); } else id = id.section('_', 0, 0); DocClipBase *clip = m_doc->clipManager()->getClipById(id); + if (clip == NULL) { + // The clip in playlist was not listed in the kdenlive producers, + // something went wrong, repair required. + kWarning() << "CANNOT INSERT CLIP " << id; + + clip = getMissingProducer(id); + if (!clip) { + // We cannot find the producer, something is really wrong, add + // placeholder color clip + QDomDocument doc; + QDomElement producerXml = doc.createElement("producer"); + doc.appendChild(producerXml); + producerXml.setAttribute("colour", "0xff0000ff"); + producerXml.setAttribute("mlt_service", "colour"); + producerXml.setAttribute("length", "15000"); + producerXml.setAttribute("name", "INVALID"); + producerXml.setAttribute("type", COLOR); + producerXml.setAttribute("id", id); + clip = new DocClipBase(m_doc->clipManager(), doc.documentElement(), id); + xml.insertBefore(producerXml, QDomNode()); + m_doc->clipManager()->addClip(clip); + + m_documentErrors.append(i18n("Broken clip producer %1", id) + '\n'); + } else { + // Found correct producer + m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, clip->getId()) + '\n'); + elem.setAttribute("producer", clip->getId()); + } + m_doc->setModified(true); + } + if (clip != NULL) { ItemInfo clipinfo; 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.track = ix; - //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); + //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); if (idString.endsWith("_video")) item->setVideoOnly(true); else if (idString.endsWith("_audio")) item->setAudioOnly(true); @@ -607,38 +696,6 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked) } } } - } else { - // The clip in playlist was not listed in the kdenlive producers, - // something went wrong, repair required. - kWarning() << "CANNOT INSERT CLIP " << id; - int out = elem.attribute("out").toInt(); - - ItemInfo clipinfo; - 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.track = ix; - //kDebug() << "// INSERTING CLIP: " << in << "x" << out << ", track: " << ix << ", ID: " << id << ", SCALE: " << m_scale << ", FPS: " << m_doc->fps(); - - DocClipBase *missingClip = getMissingProducer(id); - if (!missingClip) { - // We cannot find the producer, something is really wrong, add - // placeholder color clip - QDomElement producerXml; - producerXml.setTagName("producer"); - producerXml.setAttribute("resource", "0xff0000ff"); - producerXml.setAttribute("mlt_service", "colour"); - producerXml.setAttribute("length", "15000"); - producerXml.setAttribute("id", id); - missingClip = new DocClipBase(m_doc->clipManager(), producerXml, id); - m_documentErrors.append(i18n("Boken clip producer %1", id) + '\n'); - } else m_documentErrors.append(i18n("Replaced wrong clip producer %1 with %2", id, missingClip->getId()) + '\n'); - ClipItem *item = new ClipItem(missingClip, clipinfo, m_doc->fps(), 1.0, false); - m_scene->addItem(item); - missingClip->addReference(); - position += (out - in + 1); - - m_doc->setModified(true); } //m_clipList.append(clip); } @@ -672,16 +729,15 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const QDomNodeList params = missingXml.childNodes(); QString resource; - QString mlt_service; for (int j = 0; j < params.count(); j++) { QDomElement e = params.item(j).toElement(); if (e.attribute("name") == "resource") { resource = e.firstChild().nodeValue(); - } else if (e.attribute("name") == "mlt_service") { - mlt_service = e.firstChild().nodeValue(); + break; } } - resource.prepend(docRoot); + // prepend MLT XML document root if no path in clip resource and not a color clip + if (!resource.contains('/') && !resource.startsWith("0x")) resource.prepend(docRoot); DocClipBase *missingClip = NULL; if (!resource.isEmpty()) missingClip = m_doc->clipManager()->getClipByResource(resource); @@ -714,5 +770,26 @@ void TrackView::slotChangeTrackLock(int ix, bool lock) widgets.at(ix)->setLock(lock); } +void TrackView::slotVerticalZoomDown() +{ + if (m_verticalZoom == 0) return; + m_verticalZoom--; + 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);*/ +} + +void TrackView::slotVerticalZoomUp() +{ + if (m_verticalZoom == 2) return; + 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(); +} #include "trackview.moc"