#include <KMessageBox>
#include <QScrollBar>
+#include <QInputDialog>
TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
QWidget(parent),
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"));
+ 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);
m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ m_view.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);
-
+ 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)));
tracksLayout->addWidget(m_trackview);
-
connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int)));
connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders()));
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 fact;
- if (factor.startsWith('%')) {
- fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
- }
- else fact = 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);
}
void TrackView::slotRebuildTrackHeaders()
{
- QList <TrackInfo> list = m_doc->tracksList();
+ const QList <TrackInfo> list = m_doc->tracksList();
QLayoutItem *child;
- while ((child = m_headersLayout->takeAt(0)) != 0) {
- if (child->widget()) delete child->widget();
+ while ((child = m_view.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(m_view.headers_container);
+ frame->setFixedHeight(1);
+ frame->setFrameStyle(QFrame::Plain);
+ frame->setFrameShape(QFrame::Box);
+ frame->setLineWidth(1);
+ m_view.headers_container->layout()->addWidget(frame);
+ TrackInfo info = list.at(max - i - 1);
+ header = new HeaderTrack(i, info, height, m_view.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(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
- m_headersLayout->addWidget(header);
+ connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int)));
+ m_view.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);
}
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 < m_view.headers_container->layout()->count(); i++) {
+ child = m_view.headers_container->layout()->itemAt(i);
+ if (child->widget() && child->widget()->height() > 5)(static_cast <HeaderTrack *>(child->widget()))->adjustSize(height);
}
}
QString idString = elem.attribute("producer");
QString id = idString;
double speed = 1.0;
+ int strobe = 1;
if (idString.startsWith("slowmotion")) {
id = idString.section(':', 1, 1);
speed = idString.section(':', 2, 2).toDouble();
+ strobe = idString.section(':', 3, 3).toInt();
+ if (strobe == 0) strobe = 1;
} else id = id.section('_', 0, 0);
DocClipBase *clip = m_doc->clipManager()->getClipById(id);
if (clip == NULL) {
clipinfo.cropStart = GenTime(in, m_doc->fps());
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, false);
+ ClipItem *item = new ClipItem(clip, clipinfo, m_doc->fps(), speed, strobe, false);
if (idString.endsWith("_video")) item->setVideoOnly(true);
else if (idString.endsWith("_audio")) item->setAudioOnly(true);
m_scene->addItem(item);
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)));
+ EffectsList::setParameter(speedeffect, "strobe", QString::number(strobe));
+ item->addEffect(speedeffect, false);
+ item->effectsCounter();
+ }
// parse clip effects
QDomNodeList effects = elem.childNodes();
double fact;
if (factor.isEmpty()) fact = 1;
else if (factor.startsWith('%')) {
- fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
} else fact = factor.toDouble();
for (QDomNode n3 = effect.firstChild(); !n3.isNull(); n3 = n3.nextSibling()) {
// parse effect parameters
QString factor = e.attribute("factor", "1");
double fact;
if (factor.startsWith('%')) {
- fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
+ fact = ProfilesDialog::getStringEval(m_doc->mltProfile(), factor);
} else fact = factor.toDouble();
e.setAttribute("value", paramvalue.toDouble() * fact);
} else e.setAttribute("value", paramvalue);
// 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;
}
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(m_view.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(m_view.headers_area->verticalScrollBar()->value());
}
+void TrackView::updateProjectFps()
+{
+ m_ruler->updateProjectFps(m_doc->timecode());
+ m_trackview->updateProjectFps();
+}
+
+void TrackView::slotRenameTrack(int ix)
+{
+ int tracknumber = m_doc->tracksCount() - ix;
+ TrackInfo info = m_doc->trackInfoAt(tracknumber - 1);
+ bool ok;
+ QString newName = QInputDialog::getText(this, i18n("New Track Name"), i18n("Enter new name"), QLineEdit::Normal, info.trackName, &ok);
+ if (ok) {
+ info.trackName = newName;
+ m_doc->setTrackType(tracknumber - 1, info);
+ QTimer::singleShot(300, this, SLOT(slotRebuildTrackHeaders()));
+ m_doc->setModified(true);
+ }
+}
+
+
#include "trackview.moc"
projects / kdenlive / blobdiff