#include "markerdialog.h"
#include "mainwindow.h"
#include "ui_keyframedialog_ui.h"
+#include "clipdurationdialog.h"
//TODO:
// const int duration = animate ? 1500 : 1;
CustomTrackView::CustomTrackView(KdenliveDoc *doc, QGraphicsScene * projectscene, QWidget *parent)
- : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL) {
+ : QGraphicsView(projectscene, parent), m_cursorPos(0), m_dropItem(NULL), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_scale(1.0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0) {
if (doc) m_commandStack = doc->commandStack();
else m_commandStack == NULL;
setMouseTracking(true);
if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) {
double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x() - m_clickPoint.x());
//kDebug() << "/////// MOVE CLIP, EVENT Y: "<<m_clickPoint.y();//<<event->scenePos().y()<<", SCENE HEIGHT: "<<scene()->sceneRect().height();
- int moveTrack = (int) mapToScene(event->pos() + QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? - m_clickPoint.y() : 0))).y() / m_tracksHeight;
+ int moveTrack = (int) mapToScene(event->pos() - QPoint(0, (m_dragItem->type() == TRANSITIONWIDGET ? m_dragItem->boundingRect().height() / 2 : 0))).y() / m_tracksHeight;
int currentTrack = m_dragItem->track();
- if (moveTrack > 1000)moveTrack = 0;
+ if (moveTrack > 1000) moveTrack = 0;
else if (moveTrack > m_tracksList.count() - 1) moveTrack = m_tracksList.count() - 1;
else if (moveTrack < 0) moveTrack = 0;
QString next = item->keyframes(item->selectedEffectIndex());
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
- updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
+ updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
}
} else {
QString next = item->keyframes(item->selectedEffectIndex());
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, m_dragItem->track(), m_dragItem->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
- updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
+ updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
+ }
+ } else {
+ ClipDurationDialog d(m_dragItem, m_document->timecode(), this);
+ if (d.exec() == QDialog::Accepted) {
+ if (d.startPos() != m_dragItem->startPos()) {
+ if (m_dragItem->type() == AVWIDGET) {
+ ItemInfo startInfo;
+ startInfo.startPos = m_dragItem->startPos();
+ startInfo.endPos = m_dragItem->endPos();
+ startInfo.track = m_dragItem->track();
+ ItemInfo endInfo;
+ endInfo.startPos = d.startPos();
+ endInfo.endPos = m_dragItem->endPos() + (endInfo.startPos - startInfo.startPos);
+ endInfo.track = m_dragItem->track();
+ MoveClipCommand *command = new MoveClipCommand(this, startInfo, endInfo, true);
+ m_commandStack->push(command);
+ } else {
+ //TODO: move transition
+ }
+ }
+ if (d.duration() != m_dragItem->duration()) {
+ if (m_dragItem->type() == AVWIDGET) {
+ ItemInfo startInfo;
+ startInfo.startPos = m_dragItem->startPos();
+ startInfo.endPos = m_dragItem->endPos();
+ startInfo.track = m_dragItem->track();
+ ItemInfo endInfo;
+ endInfo.startPos = startInfo.startPos;
+ endInfo.endPos = endInfo.startPos + d.duration();
+ endInfo.track = m_dragItem->track();
+ ResizeClipCommand *command = new ResizeClipCommand(this, startInfo, endInfo, true);
+ m_commandStack->push(command);
+ } else {
+ //TODO: resize transition
+ }
+ }
}
}
}
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
if (clip) {
clip->setKeyframes(index, keyframes);
- updateEffect(m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index));
+ updateEffect(m_tracksList.count() - clip->track(), clip->startPos(), clip->effectAt(index), index);
} else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);
}
m_document->setModified(true);
}
-void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect) {
+void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix) {
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_tracksList.count() - track);
if (clip) {
QMap <QString, QString> effectParams = clip->getEffectArgs(effect);
if (effectParams.value("disabled") == "1") {
- QString index = effectParams.value("kdenlive_ix");
- if (!m_document->renderer()->mltRemoveEffect(track, pos, index))
- emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
+ if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.value("kdenlive_ix"))) {
+ kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
+ } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
} else if (!m_document->renderer()->mltEditEffect(m_tracksList.count() - clip->track(), clip->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
+ if (ix == clip->selectedEffectIndex()) {
+ clip->setSelectedEffect(clip->selectedEffectIndex());
+ }
}
m_document->setModified(true);
}
m_document->setModified(true);
}
-void CustomTrackView::slotChangeEffectState(ClipItem *clip, QDomElement effect, bool disable) {
+void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable) {
+ QDomElement effect = clip->effectAt(effectPos);
QDomElement oldEffect = effect.cloneNode().toElement();
effect.setAttribute("disabled", disable);
- EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, true);
+ EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
m_document->setModified(true);
}
m_document->setModified(true);
}
-void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect) {
- EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, true);
+void CustomTrackView::slotUpdateClipEffect(ClipItem *clip, QDomElement oldeffect, QDomElement effect, int ix) {
+ EditEffectCommand *command = new EditEffectCommand(this, m_tracksList.count() - clip->track(), clip->startPos(), oldeffect, effect, ix, true);
m_commandStack->push(command);
}
}
void CustomTrackView::checkScrolling() {
- QRect rectInView = viewport()->rect();
+ int vert = verticalScrollBar()->value();
+ int hor = cursorPos();
+ ensureVisible(hor, vert + 10, 2, 2, 50, 0);
+ //centerOn(QPointF(cursorPos(), m_tracksHeight));
+ /*QRect rectInView = viewport()->rect();
int delta = rectInView.width() / 3;
int max = rectInView.right() + horizontalScrollBar()->value() - delta;
//kDebug() << "CURSOR POS: "<<m_cursorPos<< "Scale: "<<m_scale;
- if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));
+ if (m_cursorPos * m_scale >= max) horizontalScrollBar()->setValue((int)(horizontalScrollBar()->value() + 1 + m_scale));*/
}
void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
// undo last move and emit error message
MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true);
m_commandStack->push(command);
- emit displayMessage(i18n("Cannot move clip to requested position"), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(m_dragItemInfo.startPos.seconds(), 'g', 2)), ErrorMessage);
}
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
ClipItem * item = (ClipItem *) m_dragItem;
QStringList clipeffects = item->effectNames();
if (clipeffects.contains(i18n("Fade in"))) {
- QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade in"));
+ int ix = clipeffects.indexOf(i18n("Fade in"));
+ QDomElement oldeffect = item->effectAt(ix);
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
EffectsList::setParameter(effect, "in", QString::number(start));
EffectsList::setParameter(effect, "out", QString::number(end));
- slotUpdateClipEffect(item, oldeffect, effect);
+ slotUpdateClipEffect(item, oldeffect, effect, ix);
}
} else if (item->fadeIn() != 0) {
QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade in");
ClipItem * item = (ClipItem *) m_dragItem;
QStringList clipeffects = item->effectNames();
if (clipeffects.contains(i18n("Fade out"))) {
- QDomElement oldeffect = item->effectAt(clipeffects.indexOf("Fade out"));
+ int ix = clipeffects.indexOf(i18n("Fade out"));
+ QDomElement oldeffect = item->effectAt(ix);
int end = (item->duration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
EffectsList::setParameter(effect, "in", QString::number(start));
EffectsList::setParameter(effect, "out", QString::number(end));
- slotUpdateClipEffect(item, oldeffect, effect);
+ slotUpdateClipEffect(item, oldeffect, effect, ix);
}
} else if (item->fadeOut() != 0) {
QDomElement effect = MainWindow::audioEffects.getEffectByName("Fade out");
QString next = item->keyframes(item->selectedEffectIndex());
EditKeyFrameCommand *command = new EditKeyFrameCommand(this, item->track(), item->startPos(), item->selectedEffectIndex(), previous, next, false);
m_commandStack->push(command);
- updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
+ updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect(), item->selectedEffectIndex());
}
emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
- emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", QString::number(start.startPos.seconds(), 'g', 2), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
item->moveTo((int) end.startPos.frames(m_document->fps()), m_scale, (int)((end.track - start.track) * m_tracksHeight), end.track);
} else {
// undo last move and emit error message
- emit displayMessage(i18n("Cannot move clip to requested position"), ErrorMessage);
+ emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(end.startPos.seconds(), 'g', 2)), ErrorMessage);
}
}
}
void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end) {
- int offset;
+ int offset = 0;
bool resizeClipStart = true;
if (start.startPos == end.startPos) resizeClipStart = false;
- if (resizeClipStart) offset = 1;
- else offset = -1;
+ /*if (resizeClipStart) offset = 1;
+ else offset = -1;*/
ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track);
if (!item) {
emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
item->resizeStart((int) end.startPos.frames(m_document->fps()), m_scale);
updateClipFade(item);
} else {
- m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.startPos - item->startPos());
- item->resizeEnd((int) end.startPos.frames(m_document->fps()), m_scale);
+ m_document->renderer()->mltResizeClipEnd(m_tracksList.count() - item->track(), item->startPos(), item->cropStart(), item->cropStart() + end.endPos - item->startPos());
+ item->resizeEnd((int) end.endPos.frames(m_document->fps()), m_scale);
updateClipFade(item, true);
}
m_document->renderer()->doRefresh();
return guides;
}
+bool CustomTrackView::findString(const QString &text) {
+ QString marker;
+ for (int i = 0; i < m_searchPoints.size(); ++i) {
+ marker = m_searchPoints.at(i).comment();
+ if (marker.contains(text, Qt::CaseInsensitive)) {
+ setCursorPos(m_searchPoints.at(i).time().frames(m_document->fps()), true);
+ int vert = verticalScrollBar()->value();
+ int hor = cursorPos();
+ ensureVisible(hor, vert + 10, 2, 2, 50, 0);
+ m_findIndex = i;
+ return true;
+ }
+ }
+ return false;
+}
+
+bool CustomTrackView::findNextString(const QString &text) {
+ QString marker;
+ for (int i = m_findIndex + 1; i < m_searchPoints.size(); ++i) {
+ marker = m_searchPoints.at(i).comment();
+ if (marker.contains(text, Qt::CaseInsensitive)) {
+ setCursorPos(m_searchPoints.at(i).time().frames(m_document->fps()), true);
+ int vert = verticalScrollBar()->value();
+ int hor = cursorPos();
+ ensureVisible(hor, vert + 10, 2, 2, 50, 0);
+ m_findIndex = i;
+ return true;
+ }
+ }
+ m_findIndex = -1;
+ return false;
+}
+
+void CustomTrackView::initSearchStrings() {
+ m_searchPoints.clear();
+
+ QList<QGraphicsItem *> itemList = items();
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
+ GenTime start = item->startPos();
+ CommentedTime t(start, item->clipName());
+ m_searchPoints.append(t);
+
+ QList < CommentedTime > markers = item->commentedSnapMarkers();
+ m_searchPoints += markers;
+ }
+ }
+}
+
+void CustomTrackView::clearSearchStrings() {
+ m_searchPoints.clear();
+ m_findIndex = 0;
+}
+
/*
void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect )
{
projects / kdenlive / blobdiff