m_doc(doc)
{
- 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);
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 *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());
trackduration = slotAddProjectTrack(pos, p, m_doc->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
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();
{
QList <TrackInfo> list = m_doc->tracksList();
QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
- for (int i = 0; i < widgets.count(); i++)
- delete widgets.at(i);
+ qDeleteAll(widgets);
int max = list.count();
for (int i = 0; i < max; i++) {
HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this);
connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
m_headersLayout->addWidget(header);
}
- view->headers_container->adjustSize();
+ m_view.headers_container->adjustSize();
}
} 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,
+ // 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
- /*QDomElement producerXml;
- producerXml.setTagName("producer");
- producerXml.setAttribute("resource", "0xff0000ff");
+ // 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);
- missingClip = new DocClipBase(m_doc->clipManager(), producerXml, 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
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);
break;
}
}
- // prepend westley document root if no path in clip resource and not a color clip
+ // 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())
projects / kdenlive / blobdiff