#include <KDebug>
#include <KMessageBox>
+#include <KIO/NetAccess>
#include <QScrollBar>
#include <QInputDialog>
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);
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);
+ size_frame->setLayout(sizeLayout);
QToolButton *butSmall = new QToolButton(this);
butSmall->setIcon(KIcon("kdenlive-zoom-small"));
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);
- m_view.headers_area->setFixedWidth(70);
+ headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ headers_area->setFixedWidth(70);
QVBoxLayout *headersLayout = new QVBoxLayout;
headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0);
headersLayout->setSpacing(0);
- m_view.headers_container->setLayout(headersLayout);
- connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int)));
+ 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)));
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();
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--;
}
}
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;
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.
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());
}
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
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 <HeaderTrack *>(child->widget());
+ if (head) head->setSelectedIndex(m_trackview->selectedTrack());
+ }
+ }
+}
+
+void TrackView::slotReloadTracks()
+{
+ slotRebuildTrackHeaders();
+ emit updateTracksInfo();
+}
+
void TrackView::slotRebuildTrackHeaders()
{
const QList <TrackInfo> list = m_doc->tracksList();
QLayoutItem *child;
- while ((child = m_view.headers_container->layout()->takeAt(0)) != 0) {
+ while ((child = headers_container->layout()->takeAt(0)) != 0) {
QWidget *wid = child->widget();
delete child;
if (wid) wid->deleteLater();
HeaderTrack *header = NULL;
QFrame *frame = NULL;
for (int i = 0; i < max; i++) {
- frame = new QFrame(m_view.headers_container);
+ frame = new QFrame(headers_container);
frame->setFixedHeight(1);
frame->setFrameStyle(QFrame::Plain);
frame->setFrameShape(QFrame::Box);
frame->setLineWidth(1);
- m_view.headers_container->layout()->addWidget(frame);
+ headers_container->layout()->addWidget(frame);
TrackInfo info = list.at(max - i - 1);
- header = new HeaderTrack(i, info, height, m_view.headers_container);
+ 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)));
connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int)));
- m_view.headers_container->layout()->addWidget(header);
+ headers_container->layout()->addWidget(header);
}
frame = new QFrame(this);
frame->setFixedHeight(1);
frame->setFrameStyle(QFrame::Plain);
frame->setFrameShape(QFrame::Box);
frame->setLineWidth(1);
- m_view.headers_container->layout()->addWidget(frame);
+ headers_container->layout()->addWidget(frame);
}
{
int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
QLayoutItem *child;
- for (int i = 0; i < m_view.headers_container->layout()->count(); i++) {
- child = m_view.headers_container->layout()->itemAt(i);
+ 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 <HeaderTrack *>(child->widget()))->adjustSize(height);
}
}
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();
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);
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)));
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;
}
widgets.at(ix)->setLock(lock);
}
+
void TrackView::slotVerticalZoomDown()
{
if (m_verticalZoom == 0) return;
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(m_view.headers_area->verticalScrollBar()->value());
+ m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
}
void TrackView::slotVerticalZoomUp()
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(m_view.headers_area->verticalScrollBar()->value());
+ 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)
if (ok) {
info.trackName = newName;
m_doc->setTrackType(tracknumber - 1, info);
- QTimer::singleShot(300, this, SLOT(slotRebuildTrackHeaders()));
+ QTimer::singleShot(300, this, SLOT(slotReloadTracks()));
m_doc->setModified(true);
}
}
projects / kdenlive / blobdiff