#include "mainwindow.h"
#include "customtrackview.h"
#include "initeffects.h"
+#include "profilesdialog.h"
#include <KDebug>
#include <KMessageBox>
#include <QScrollBar>
-TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
+TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
QWidget(parent),
m_scale(1.0),
m_projectTracks(0),
- m_doc(doc)
+ m_doc(doc),
+ m_verticalZoom(1)
{
m_view.setupUi(this);
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);
tracksLayout->setSpacing(0);
connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders()));
parseDocument(m_doc->toXml());
- m_doc->setSceneList();
+ int error = m_doc->setSceneList();
+ if (error == -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)));
connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool)));
- slotChangeZoom(m_doc->zoom());
+ slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y());
slotSetZone(m_doc->zone());
}
+TrackView::~TrackView()
+{
+ delete m_ruler;
+ delete m_trackview;
+}
int TrackView::duration() const
{
QDomElement e = params.item(i).toElement();
if (!e.isNull() && e.attribute("tag") == paramName) {
if (e.attribute("type") == "double") {
- QString factor = e.attribute("factor", "1");
+ QString factor = e.attribute("factor", "1");
if (factor != "1") {
- double val = paramValue.toDouble() * factor.toDouble();
+ double fact;
+ if (factor.startsWith('%')) {
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ }
+ else fact = factor.toDouble();
+ double val = paramValue.toDouble() * fact;
paramValue = QString::number(val);
}
}
// 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);
m_trackview->setCursorPos(pos, false);
}
-void TrackView::slotChangeZoom(int factor)
+void TrackView::slotChangeZoom(int horizontal, int vertical)
{
- 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_ruler->setPixelPerMark(horizontal);
+ m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; // m_ruler->comboScale[m_currentZoom] /
+
+ if (vertical == -1) {
+ // user called zoom
+ m_doc->setZoom(horizontal, m_verticalZoom);
+ m_trackview->setScale(m_scale, m_scene->scale().y());
+ } else {
+ m_verticalZoom = vertical;
+ if (m_verticalZoom == 0) m_trackview->setScale(m_scale, 0.5);
+ else m_trackview->setScale(m_scale, m_verticalZoom);
+ adjustTrackHeaders();
+ }
}
int TrackView::fitZoom() const
void TrackView::slotRebuildTrackHeaders()
{
QList <TrackInfo> list = m_doc->tracksList();
- QList<HeaderTrack *> widgets = findChildren<HeaderTrack *>();
- qDeleteAll(widgets);
+ 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)));
connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
m_headersLayout->addWidget(header);
}
- m_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 <HeaderTrack *>(child->widget()))->adjustSize(height);
+ }
+}
+
int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked)
{
// parse track
// Found a clip
int in = elem.attribute("in").toInt();
int out = elem.attribute("out").toInt();
- if (in > out || in == out || m_invalidProducers.contains(elem.attribute("producer"))) {
+ if (in > out || /*in == out ||*/ m_invalidProducers.contains(elem.attribute("producer"))) {
m_documentErrors.append(i18n("Invalid clip removed from track %1 at %2\n", ix, position));
xml.removeChild(children.at(nodeindex));
nodeindex--;
if (MainWindow::videoEffects.hasKeyFrames(currenteffect)) {
//kDebug() << " * * * * * * * * * * ** CLIP EFF WITH KFR FND * * * * * * * * * * *";
// effect is key-framable, read all effects to retrieve keyframes
- double factor = 0;
+ QString factor;
QString starttag;
QString endtag;
QDomNodeList params = currenteffect.elementsByTagName("parameter");
if (e.attribute("type") == "keyframe") {
starttag = e.attribute("starttag", "start");
endtag = e.attribute("endtag", "end");
- factor = e.attribute("factor", "1").toDouble();
+ factor = e.attribute("factor", "1");
break;
}
}
int effectout = effect.attribute("out").toInt();
double startvalue = 0;
double endvalue = 0;
+ double fact;
+ if (factor.isEmpty()) fact = 1;
+ else if (factor.startsWith('%')) {
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ } else fact = factor.toDouble();
for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
// parse effect parameters
QDomElement effectparam = n3.toElement();
if (effectparam.attribute("name") == starttag)
- startvalue = effectparam.text().toDouble() * factor;
+ startvalue = effectparam.text().toDouble() * fact;
if (effectparam.attribute("name") == endtag)
- endvalue = effectparam.text().toDouble() * factor;
+ endvalue = effectparam.text().toDouble() * fact;
}
// add first keyframe
keyframes.append(QString::number(effectin) + ':' + QString::number(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';');
continueParsing = false;
break;
} else if (subeffectparam.attribute("name") == endtag) {
- endvalue = subeffectparam.text().toDouble() * factor;
+ endvalue = subeffectparam.text().toDouble() * fact;
break;
}
}
for (int k = 0; k < clipeffectparams.count(); k++) {
e = clipeffectparams.item(k).toElement();
if (!e.isNull() && e.tagName() == "parameter" && e.attribute("name") == paramname) {
- double factor = e.attribute("factor", "1").toDouble();
- if (factor != 1) {
- e.setAttribute("value", paramvalue.toDouble() * factor);
+ if (e.attribute("factor", "1") != "1") {
+ QString factor = e.attribute("factor", "1");
+ double fact;
+ if (factor.startsWith('%')) {
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ } else fact = factor.toDouble();
+ e.setAttribute("value", paramvalue.toDouble() * fact);
} else e.setAttribute("value", paramvalue);
break;
}
}
}
// 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);
+ if (!resource.startsWith('/') && !resource.startsWith("0x")) resource.prepend(docRoot);
DocClipBase *missingClip = NULL;
if (!resource.isEmpty())
missingClip = m_doc->clipManager()->getClipByResource(resource);
widgets.at(ix)->setLock(lock);
}
+void TrackView::slotVerticalZoomDown()
+{
+ if (m_verticalZoom == 0) return;
+ m_verticalZoom--;
+ m_doc->setZoom(m_doc->zoom().x(), 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++;
+ 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();
+}
#include "trackview.moc"
projects / kdenlive / blobdiff