X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Ftrackview.cpp;h=2e62176abfe454f5d4195db7c3d873c543fb0450;hb=6cefbd3fbc436ec4cc3a44b38b738244a0037922;hp=0e2bcd8a1b2bbacf67fcf032f8e68eccf1914fa3;hpb=1e007c2d73386e714ed480aba390b827e181994a;p=kdenlive diff --git a/src/trackview.cpp b/src/trackview.cpp index 0e2bcd8a..2e62176a 100644 --- a/src/trackview.cpp +++ b/src/trackview.cpp @@ -30,7 +30,7 @@ #include "customtrackview.h" #include "initeffects.h" #include "profilesdialog.h" -#include "configtrackscommand.h" +#include "commands/configtrackscommand.h" #include #include @@ -118,13 +118,13 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) : slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); slotSetZone(m_doc->zone(), false); - setEnabled(!doc->isReadOnly()); } TrackView::~TrackView() { delete m_ruler; delete m_trackview; + delete m_scene; } //virtual @@ -192,15 +192,8 @@ void TrackView::parseDocument(QDomDocument doc) m_documentErrors.clear(); m_replacementProducerIds.clear(); - //kDebug() << "//// DOCUMENT: " << doc.toString(); - /*QDomNode props = doc.elementsByTagName("properties").item(0); - if (!props.isNull()) { - cursorPos = props.toElement().attribute("timeline_position").toInt(); - }*/ - // parse project tracks QDomElement mlt = doc.firstChildElement("mlt"); - if (mlt.hasAttribute("LC_NUMERIC")) m_locale = QLocale(mlt.attribute("LC_NUMERIC")); QDomElement tractor = mlt.firstChildElement("tractor"); QDomNodeList tracks = tractor.elementsByTagName("track"); QDomNodeList playlists = doc.elementsByTagName("playlist"); @@ -368,13 +361,15 @@ void TrackView::parseDocument(QDomDocument doc) if (!e.isNull() && e.attribute("tag") == paramName) { if (e.attribute("type") == "double") { QString factor = e.attribute("factor", "1"); - if (factor != "1") { + double offset = e.attribute("offset", "0").toDouble(); + if (factor != "1" || offset != 0) { double fact; if (factor.contains('%')) { fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else fact = factor.toDouble(); - double val = paramValue.toDouble() * fact; - paramValue = QString::number(val); + } else { + fact = factor.toDouble(); + } + paramValue = QLocale().toString(offset + paramValue.toDouble() * fact); } } e.setAttribute("value", paramValue); @@ -414,8 +409,6 @@ void TrackView::parseDocument(QDomDocument doc) } } } - - QDomElement infoXml = mlt.firstChildElement("kdenlivedoc"); // Add guides @@ -479,7 +472,7 @@ void TrackView::moveCursorPos(int pos) void TrackView::slotChangeZoom(int horizontal, int vertical) { m_ruler->setPixelPerMark(horizontal); - m_scale = (double) FRAME_SIZE / m_ruler->comboScale[horizontal]; + m_scale = (double) m_trackview->getFrameWidth() / m_ruler->comboScale[horizontal]; if (vertical == -1) { // user called zoom @@ -497,7 +490,7 @@ void TrackView::slotChangeZoom(int horizontal, int vertical) int TrackView::fitZoom() const { - int zoom = (int)((duration() + 20 / m_scale) * FRAME_SIZE / m_trackview->width()); + int zoom = (int)((duration() + 20 / m_scale) * m_trackview->getFrameWidth() / m_trackview->width()); int i; for (i = 0; i < 13; i++) if (m_ruler->comboScale[i] > zoom) break; @@ -541,6 +534,16 @@ void TrackView::slotRebuildTrackHeaders() int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1; HeaderTrack *header = NULL; QFrame *frame = NULL; + + QPalette p = palette(); + KColorScheme scheme(p.currentColorGroup(), KColorScheme::View, KSharedConfig::openConfig(KdenliveSettings::colortheme())); + QColor norm = scheme.shade(scheme.background(KColorScheme::ActiveBackground).color(), KColorScheme::MidShade); + p.setColor(QPalette::Button, norm); + + QColor col = scheme.background().color(); + QColor col2 = scheme.foreground().color(); + headers_container->setStyleSheet(QString("QLineEdit { background-color: transparent;color: rgb(%4, %5, %6);} QLineEdit:hover{ background-color: rgb(%1, %2, %3);} QLineEdit:focus { background-color: rgb(%1, %2, %3);}").arg(col.red()).arg(col.green()).arg(col.blue()).arg(col2.red()).arg(col2.green()).arg(col2.blue())); + for (int i = 0; i < max; i++) { frame = new QFrame(headers_container); frame->setFrameStyle(QFrame::HLine); @@ -548,6 +551,7 @@ void TrackView::slotRebuildTrackHeaders() headers_container->layout()->addWidget(frame); TrackInfo info = list.at(max - i - 1); header = new HeaderTrack(i, info, height, headers_container); + header->setPalette(p); 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))); @@ -582,6 +586,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod // parse track int position = 0; QMap producerReplacementIds; + int frame_width = m_trackview->getFrameWidth(); QDomNodeList children = xml.childNodes(); for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) { QDomNode n = children.item(nodeindex); @@ -608,8 +613,9 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod double speed = 1.0; int strobe = 1; if (idString.startsWith("slowmotion")) { + QLocale locale; id = idString.section(':', 1, 1); - speed = idString.section(':', 2, 2).toDouble(); + speed = locale.toDouble(idString.section(':', 2, 2)); strobe = idString.section(':', 3, 3).toInt(); if (strobe == 0) strobe = 1; } @@ -722,7 +728,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod 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); + ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, frame_width, false); if (idString.endsWith("_video")) item->setVideoOnly(true); else if (idString.endsWith("_audio")) item->setAudioOnly(true); m_scene->addItem(item); @@ -750,6 +756,7 @@ int TrackView::slotAddProjectTrack(int ix, QDomElement xml, bool locked, QDomNod void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNode, ClipItem *clip, int trackIndex) { int effectNb = 0; + QLocale locale; for (int ix = 0; ix < effects.count(); ix++) { bool disableeffect = false; QDomElement effect = effects.at(ix).toElement(); @@ -759,7 +766,6 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo QString effecttag; QString effectid; QString effectindex = QString::number(effectNb); - QString ladspaEffectFile; // Get effect tag & index for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) { // parse effect parameters @@ -774,15 +780,6 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } else if (effectparam.attribute("name") == "kdenlive_ix") { // Fix effects index effectparam.firstChild().setNodeValue(effectindex); - } else if (effectparam.attribute("name") == "src") { - ladspaEffectFile = effectparam.text(); - if (!QFile::exists(ladspaEffectFile)) { - // If the ladspa effect file is missing, recreate it - kDebug() << "// MISSING LADSPA FILE: " << ladspaEffectFile; - ladspaEffectFile = m_doc->getLadspaFile(); - effectparam.firstChild().setNodeValue(ladspaEffectFile); - kDebug() << "// ... REPLACED WITH: " << ladspaEffectFile; - } } } //kDebug() << "+ + CLIP EFF FND: " << effecttag << ", " << effectid << ", " << effectindex; @@ -810,6 +807,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo QString factor; QString starttag; QString endtag; + double offset = 0; QDomNodeList params = currenteffect.elementsByTagName("parameter"); for (int i = 0; i < params.count(); i++) { QDomElement e = params.item(i).toElement(); @@ -817,6 +815,7 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo starttag = e.attribute("starttag", "start"); endtag = e.attribute("endtag", "end"); factor = e.attribute("factor", "1"); + offset = e.attribute("offset", "0").toDouble(); break; } } @@ -826,23 +825,24 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo double startvalue = 0; double endvalue = 0; double fact; - if (factor.isEmpty()) fact = 1; - else if (factor.contains('%')) { + if (factor.contains('%')) { fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor); - } else fact = factor.toDouble(); + } 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() * fact; + startvalue = offset + effectparam.text().toDouble() * fact; if (effectparam.attribute("name") == endtag) - endvalue = effectparam.text().toDouble() * fact; + endvalue = offset + effectparam.text().toDouble() * fact; } // add first keyframe if (effectout <= effectin) { // there is only one keyframe - keyframes.append(QString::number(effectin) + ':' + m_locale.toString(startvalue) + ';'); - } else keyframes.append(QString::number(effectin) + ':' + m_locale.toString(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';'); + keyframes.append(QString::number(effectin) + ':' + locale.toString(startvalue) + ';'); + } else keyframes.append(QString::number(effectin) + ':' + locale.toString(startvalue) + ';' + QString::number(effectout) + ':' + QString::number(endvalue) + ';'); QDomNode lastParsedEffect; ix++; QDomNode n2 = effects.at(ix); @@ -862,12 +862,12 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo continueParsing = false; break; } else if (subeffectparam.attribute("name") == endtag) { - endvalue = subeffectparam.text().toDouble() * fact; + endvalue = offset + subeffectparam.text().toDouble() * fact; break; } } if (continueParsing) { - keyframes.append(QString::number(effectout) + ':' + m_locale.toString(endvalue) + ';'); + keyframes.append(QString::number(effectout) + ':' + locale.toString(endvalue) + ';'); ix++; } } @@ -910,18 +910,19 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } else { fact = factor.toDouble(); } + double offset = e.attribute("offset", "0").toDouble(); if (type == "simplekeyframe") { QStringList kfrs = paramvalue.split(";"); for (int l = 0; l < kfrs.count(); l++) { QString fr = kfrs.at(l).section('=', 0, 0); - double val = m_locale.toDouble(kfrs.at(l).section('=', 1, 1)); - //kfrs[l] = fr + ":" + m_locale.toString((int)(val * fact)); - kfrs[l] = fr + ":" + QString::number((int) (val * fact)); + double val = locale.toDouble(kfrs.at(l).section('=', 1, 1)); + //kfrs[l] = fr + ":" + locale.toString((int)(val * fact)); + kfrs[l] = fr + ":" + QString::number((int) (offset + val * fact)); } e.setAttribute("keyframes", kfrs.join(";")); } else if (type == "double" || type == "constant") { bool ok; - e.setAttribute("value", m_locale.toDouble(paramvalue, &ok) * fact); + e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact); if (!ok) e.setAttribute("value", paramvalue); } else { @@ -931,16 +932,6 @@ void TrackView::slotAddProjectEffects(QDomNodeList effects, QDomElement parentNo } } } - // Old LADSPA filter, deprecated - /*if (effecttag == "ladspa") { - //QString ladspaEffectFile = EffectsList::parameter(effect, "src", "property"); - - if (!QFile::exists(ladspaEffectFile)) { - // If the ladspa effect file is missing, recreate it - initEffects::ladspaEffectFile(ladspaEffectFile, currenteffect.attribute("ladspaid").toInt(), m_trackview->getLadspaParams(currenteffect)); - } - currenteffect.setAttribute("src", ladspaEffectFile); - }*/ if (disableeffect) currenteffect.setAttribute("disable", "1"); if (clip) @@ -1120,6 +1111,24 @@ void TrackView::slotSaveTimelinePreview(const QString path) img.save(path); } +void TrackView::updateProfile() +{ + m_ruler->updateFrameSize(); + m_trackview->updateSceneFrameWidth(); + slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); + slotSetZone(m_doc->zone(), false); +} + +void TrackView::checkTrackHeight() +{ + if (m_trackview->checkTrackHeight()) { + m_doc->clipManager()->clearCache(); + m_ruler->updateFrameSize(); + m_trackview->updateSceneFrameWidth(); + slotChangeZoom(m_doc->zoom().x(), m_doc->zoom().y()); + slotSetZone(m_doc->zone(), false); + } +} #include "trackview.moc"