#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);
-
- 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()));
parseDocument(m_doc->toXml());
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--;
}
}
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 loose 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
void TrackView::slotRebuildTrackHeaders()
{
- kDebug() << "--------- - - - -REBUILD TLK HEAD";
const QList <TrackInfo> list = m_doc->tracksList();
QLayoutItem *child;
- m_view.headers_container->hide();
- 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);
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(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_headersLayout->addWidget(header);
+ headers_container->layout()->addWidget(header);
}
- m_view.headers_container->show();
+ 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 <HeaderTrack *>(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 <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);
// 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 <DocClipBase *> list = m_doc->clipManager()->getClipByResource(resource);
+ if (!list.isEmpty()) missingClip = list.at(0);
+ }
return missingClip;
}
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();
- /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() / 2);
- m_trackview->checkTrackHeight(false);*/
+ m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
}
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)
projects / kdenlive / blobdiff