#include "customtrackview.h"
#include "initeffects.h"
#include "profilesdialog.h"
-#include "configtrackscommand.h"
+#include "commands/configtrackscommand.h"
#include <KDebug>
#include <KMessageBox>
{
delete m_ruler;
delete m_trackview;
+ delete m_scene;
}
//virtual
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);
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
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;
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);
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)));
// parse track
int position = 0;
QMap <QString, QString> producerReplacementIds;
+ int frame_width = m_trackview->getFrameWidth();
QDomNodeList children = xml.childNodes();
for (int nodeindex = 0; nodeindex < children.count(); nodeindex++) {
QDomNode n = children.item(nodeindex);
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);
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();
starttag = e.attribute("starttag", "start");
endtag = e.attribute("endtag", "end");
factor = e.attribute("factor", "1");
+ offset = e.attribute("offset", "0").toDouble();
break;
}
}
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) {
continueParsing = false;
break;
} else if (subeffectparam.attribute("name") == endtag) {
- endvalue = subeffectparam.text().toDouble() * fact;
+ endvalue = offset + subeffectparam.text().toDouble() * fact;
break;
}
}
} 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 = locale.toDouble(kfrs.at(l).section('=', 1, 1));
//kfrs[l] = fr + ":" + locale.toString((int)(val * fact));
- kfrs[l] = fr + ":" + QString::number((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", locale.toDouble(paramvalue, &ok) * fact);
+ e.setAttribute("value", offset + locale.toDouble(paramvalue, &ok) * fact);
if (!ok)
e.setAttribute("value", paramvalue);
} else {
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"
projects / kdenlive / blobdiff