#include "groupclipscommand.h"
#include "splitaudiocommand.h"
#include "changecliptypecommand.h"
+#include "trackdialog.h"
#include <KDebug>
#include <KLocale>
else m_commandStack = NULL;
setMouseTracking(true);
setAcceptDrops(true);
+ setFrameShape(QFrame::NoFrame);
+ setLineWidth(0);
+ //setCacheMode(QGraphicsView::CacheBackground);
+ //setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+
KdenliveSettings::setTrackheight(m_tracksHeight);
m_animationTimer = new QTimeLine(800);
m_animationTimer->setFrameRange(0, 5);
m_tipPen.setColor(border);
m_tipPen.setWidth(3);
setContentsMargins(0, 0, 0, 0);
- const int maxWidth = m_tracksHeight * m_document->tracksCount();
- setSceneRect(0, 0, sceneRect().width(), maxWidth);
- verticalScrollBar()->setMaximum(maxWidth);
- m_cursorLine = projectscene->addLine(0, 0, 0, maxWidth);
+ const int maxHeight = m_tracksHeight * m_document->tracksCount();
+ setSceneRect(0, 0, sceneRect().width(), maxHeight);
+ verticalScrollBar()->setMaximum(maxHeight);
+ m_cursorLine = projectscene->addLine(0, 0, 0, maxHeight);
m_cursorLine->setZValue(1000);
- QPen pen1;
- pen1.setWidthF(1.0);
- pen1.setCosmetic(true);
+
+ QPen pen1 = QPen();
+ pen1.setWidth(1);
+ pen1.setColor(Qt::black);
m_cursorLine->setPen(pen1);
+ m_cursorLine->setFlag(QGraphicsItem::ItemIgnoresTransformations, true);
KIcon razorIcon("edit-cut");
m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
{
int pos = event->x();
int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5);
+ double snappedPos = getSnapPointForPos(mappedXPos);
emit mousePosition(mappedXPos);
if (event->buttons() & Qt::MidButton) return;
- if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) {
- QGraphicsView::mouseMoveEvent(event);
+ if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) {
+ event->setAccepted(true);
m_moveOpMode = NONE;
+ QGraphicsView::mouseMoveEvent(event);
return;
}
} else if (m_scrollTimer.isActive()) m_scrollTimer.stop();
} else if (m_operationMode == RESIZESTART && move) {
- double snappedPos = getSnapPointForPos(mappedXPos);
m_document->renderer()->pause();
m_dragItem->resizeStart((int)(snappedPos));
} else if (m_operationMode == RESIZEEND && move) {
- double snappedPos = getSnapPointForPos(mappedXPos);
m_document->renderer()->pause();
m_dragItem->resizeEnd((int)(snappedPos));
} else if (m_operationMode == FADEIN && move) {
pos = (br.bottom() - pos) * maxh;
m_dragItem->updateKeyFramePos(keyFramePos, pos);
}
+ if (m_visualTip) scene()->removeItem(m_visualTip);
m_animationTimer->stop();
delete m_animation;
m_animation = NULL;
m_visualTip = NULL;
return;
} else if (m_operationMode == MOVEGUIDE) {
+ if (m_visualTip) scene()->removeItem(m_visualTip);
m_animationTimer->stop();
delete m_animation;
m_animation = NULL;
} else if (m_operationMode == SPACER && move && m_selectionGroup) {
// spacer tool
int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
- m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y());
+ if (snappedPos < 0) snappedPos = 0;
+ // Make sure there is no collision
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+ QList<QGraphicsItem*> collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
+ collidingItems.removeAll(m_selectionGroup);
+ for (int i = 0; i < children.count(); i++) {
+ collidingItems.removeAll(children.at(i));
+ }
+ bool collision = false;
+ for (int i = 0; i < collidingItems.count(); i++) {
+ if (collidingItems.at(i)->type() == AVWIDGET) {
+ collision = true;
+ break;
+ }
+ }
+ if (!collision) {
+ // Check transitions
+ shape = m_selectionGroup->transitionGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
+ collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
+ collidingItems.removeAll(m_selectionGroup);
+ for (int i = 0; i < children.count(); i++) {
+ collidingItems.removeAll(children.at(i));
+ }
+ for (int i = 0; i < collidingItems.count(); i++) {
+ if (collidingItems.at(i)->type() == TRANSITIONWIDGET) {
+ collision = true;
+ break;
+ }
+ }
+ }
+
+ if (!collision)
+ m_selectionGroup->translate(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0);
+ //m_selectionGroup->setPos(mappedXPos + (((int) m_selectionGroup->boundingRect().topLeft().x() + 0.5) - mappedClick) , m_selectionGroup->pos().y());
}
}
AbstractClipItem *clip = static_cast <AbstractClipItem*>(item);
if (m_tool == RAZORTOOL) {
// razor tool over a clip, display current frame in monitor
- if (false && /*!m_blockRefresh && */item->type() == AVWIDGET) {
+ if (false && !m_blockRefresh && item->type() == AVWIDGET) {
//TODO: solve crash when showing frame when moving razor over clip
emit showClipFrame(((ClipItem *) item)->baseClip(), mappedXPos - (clip->startPos() - clip->cropStart()).frames(m_document->fps()));
}
return;
} else {
if (m_visualTip) {
+ scene()->removeItem(m_visualTip);
m_animationTimer->stop();
delete m_animation;
m_animation = NULL;
setCursor(Qt::SplitHCursor);
} else {
if (m_visualTip) {
+ scene()->removeItem(m_visualTip);
m_animationTimer->stop();
delete m_animation;
m_animation = NULL;
if (event->modifiers() & Qt::ShiftModifier) {
// Rectangle selection
+ setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
setDragMode(QGraphicsView::RubberBandDrag);
if (!(event->modifiers() & Qt::ControlModifier)) {
resetSelectionGroup();
scene()->clearSelection();
}
- QGraphicsView::mousePressEvent(event);
m_blockRefresh = false;
m_operationMode = RUBBERSELECTION;
+ QGraphicsView::mousePressEvent(event);
return;
}
}
ct++;
}
- if (!found) m_dragItem = NULL;
+ if (!found) {
+ if (m_dragItem) emit clipItemSelected(NULL);
+ m_dragItem = NULL;
+ }
if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
// update transition menu action
setCursor(Qt::ArrowCursor);
m_scene->clearSelection();
//event->accept();
- emit clipItemSelected(NULL);
updateClipTypeActions(NULL);
if (m_tool == SPACERTOOL) {
QList<QGraphicsItem *> selection;
if (event->modifiers() == Qt::ControlModifier) {
// Ctrl + click, select all items on track after click position
int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
- selection = items(m_clickEvent.x(), track * m_tracksHeight + m_tracksHeight / 2, mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x(), m_tracksHeight / 2 - 2);
+ QRectF rect(mapToScene(m_clickEvent).x(), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - mapToScene(m_clickEvent).x(), m_tracksHeight / 2 - 2);
+
+ bool isOk;
+ selection = checkForGroups(rect, isOk);
+ if (!isOk) {
+ // groups found on track, do not allow the move
+ emit displayMessage(i18n("Cannot use spacer in a track with a group"), ErrorMessage);
+ return;
+ }
kDebug() << "SPACER TOOL + CTRL, SELECTING ALL CLIPS ON TRACK " << track << " WITH SELECTION RECT " << m_clickEvent.x() << "/" << track * m_tracksHeight + 1 << "; " << mapFromScene(sceneRect().width(), 0).x() - m_clickEvent.x() << "/" << m_tracksHeight - 2;
} else {
kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height();
}
+ // create group to hold selected items
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
QList <GenTime> offsetList;
for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) {
AbstractClipItem *item = static_cast<AbstractClipItem *>(selection.at(i));
offsetList.append(item->startPos());
offsetList.append(item->endPos());
- selection.at(i)->setSelected(true);
- }
- if (selection.at(i)->type() == GROUPWIDGET) {
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ } else if (selection.at(i)->parentItem() == 0 && selection.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> children = selection.at(i)->childItems();
for (int j = 0; j < children.count(); j++) {
AbstractClipItem *item = static_cast<AbstractClipItem *>(children.at(j));
offsetList.append(item->startPos());
offsetList.append(item->endPos());
}
- selection.at(i)->setSelected(true);
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ } else if (selection.at(i)->parentItem()) {
+ m_selectionGroup->addToGroup(selection.at(i)->parentItem());
+ selection.at(i)->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
}
}
}
updateSnapPoints(NULL, cleandOffsetList, true);
}
- groupSelectedItems(true);
m_operationMode = SPACER;
- } else setCursorPos((int)(mapToScene(event->x(), 0).x()));
+ } else {
+ setCursorPos((int)(mapToScene(event->x(), 0).x()));
+ }
QGraphicsView::mousePressEvent(event);
return;
}
if (event->modifiers() == Qt::ControlModifier || itemSelected == false) {
if (event->modifiers() != Qt::ControlModifier) {
- m_scene->clearSelection();
resetSelectionGroup(false);
+ m_scene->clearSelection();
+ // A refresh seems necessary otherwise in zoomed mode, some clips disappear
+ viewport()->update();
} else resetSelectionGroup();
dragGroup = NULL;
if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
}
+ if (collisionClip != NULL || m_dragItem == NULL) {
+ if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) {
+ ClipItem *selected = static_cast <ClipItem*>(m_dragItem);
+ emit clipItemSelected(selected);
+ } else emit clipItemSelected(NULL);
+ }
+
+ // If clicked item is selected, allow move
+ if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
+
+ m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
+ m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
+
// Update snap points
- if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem);
- else {
+ if (m_selectionGroup == NULL) {
+ if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL);
+ else updateSnapPoints(m_dragItem);
+ } else {
QList <GenTime> offsetList;
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
for (int i = 0; i < children.count(); i++) {
}
}
- if (collisionClip != NULL || m_dragItem == NULL) {
- if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) {
- ClipItem *selected = static_cast <ClipItem*>(m_dragItem);
- emit clipItemSelected(selected);
- } else emit clipItemSelected(NULL);
- }
-
- // If clicked item is selected, allow move
- if (event->modifiers() != Qt::ControlModifier && m_operationMode == NONE/* && (m_dragItem->isSelected() || (dragGroup && dragGroup->isSelected()))*/) QGraphicsView::mousePressEvent(event);
-
- m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
- m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
-
if (m_operationMode == KEYFRAME) {
m_dragItem->updateSelectedKeyFrame();
m_blockRefresh = false;
m_blockRefresh = false;
//kDebug()<<pos;
- //QGraphicsView::mousePressEvent(event);
+ QGraphicsView::mousePressEvent(event);
}
void CustomTrackView::resetSelectionGroup(bool selectItems)
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
scene()->destroyItemGroup(m_selectionGroup);
for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+ if (children.at(i)->parentItem() == 0 && (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) {
if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
- children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemClipsToShape);
+ children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
children.at(i)->setSelected(selectItems);
}
} else if (children.at(i)->type() == GROUPWIDGET) {
- children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemClipsToShape);
+ children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
children.at(i)->setSelected(selectItems);
}
}
}
QList<QGraphicsItem *> selection = m_scene->selectedItems();
if (selection.isEmpty()) return;
- QPointF top = selection.at(0)->sceneBoundingRect().topLeft();
+ QRectF rectUnion;
// Find top left position of selection
- for (int i = 1; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET) {
- QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft();
- if (currenttop.x() < top.x()) top.setX(currenttop.x());
- if (currenttop.y() < top.y()) top.setY(currenttop.y());
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
+ rectUnion = rectUnion.united(selection.at(i)->sceneBoundingRect());
+ } else if (selection.at(i)->parentItem()) {
+ rectUnion = rectUnion.united(selection.at(i)->parentItem()->sceneBoundingRect());
}
}
KdenliveSettings::setSnaptopoints(false);
if (createNewGroup) {
AbstractGroupItem *newGroup = m_document->clipManager()->createGroup();
- newGroup->translate(-top.x(), -top.y() + 1);
- newGroup->setPos(top.x(), top.y() - 1);
+ newGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
+ QPointF diff = newGroup->pos();
+ newGroup->translate(-diff.x(), -diff.y());
+ //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1);
+
scene()->addItem(newGroup);
// CHeck if we are trying to include a group in a group
KdenliveSettings::setSnaptopoints(snap);
} else {
m_selectionGroup = new AbstractGroupItem(m_document->fps());
- m_selectionGroup->translate(-top.x(), -top.y() + 1);
- m_selectionGroup->setPos(top.x(), top.y() - 1);
+ m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
+ QPointF diff = m_selectionGroup->pos();
+ //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1);
+ m_selectionGroup->translate(- diff.x(), -diff.y());
+
scene()->addItem(m_selectionGroup);
for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
+ if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
m_selectionGroup->addToGroup(selection.at(i));
selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
}
ItemInfo startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
clipInfo.cropStart = d.cropStart();
- new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand);
+ new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand);
}
if (d.startPos() != clipInfo.startPos) {
ItemInfo startInfo = clipInfo;
ItemInfo startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
clipInfo.cropStart = d.cropStart();
- new ResizeClipCommand(this, startInfo, clipInfo, true, moveCommand);
+ new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand);
}
m_commandStack->push(moveCommand);
}
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
if (clip) {
clip->setKeyframes(index, keyframes);
- updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index);
+ updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false);
} else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);
}
emit activateDocumentMonitor();
}
-void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
+bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
{
- if (event->mimeData()->hasFormat("kdenlive/clip")) {
+ if (data->hasFormat("kdenlive/clip")) {
m_clipDrag = true;
resetSelectionGroup();
- QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';');
- m_selectionGroup = new AbstractGroupItem(m_document->fps());
- QPoint pos;
+ QStringList list = QString(data->data("kdenlive/clip")).split(';');
DocClipBase *clip = m_document->getBaseClip(list.at(0));
if (clip == NULL) {
kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << list.at(0);
- return;
+ return false;
}
+ const QPointF framePos = mapToScene(pos);
ItemInfo info;
info.startPos = GenTime();
info.cropStart = GenTime(list.at(1).toInt(), m_document->fps());
info.endPos = GenTime(list.at(2).toInt() - list.at(1).toInt(), m_document->fps());
- info.track = (int)(1 / m_tracksHeight);
+ info.cropDuration = info.endPos - info.startPos;
+ info.originalcropStart = info.cropStart;
+ info.track = 0;
+
+ // Check if clip can be inserted at that position
+ ItemInfo pasteInfo = info;
+ pasteInfo.startPos = GenTime((int)(framePos.x() + 0.5), m_document->fps());
+ pasteInfo.endPos = pasteInfo.startPos + info.endPos;
+ pasteInfo.track = (int)(framePos.y() / m_tracksHeight);
+ if (!canBePastedTo(pasteInfo, AVWIDGET)) {
+ return true;
+ }
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1);
m_selectionGroup->addToGroup(item);
item->setFlags(QGraphicsItem::ItemIsSelectable);
- //TODO: check if we do not overlap another clip when first dropping in timeline
- // if (insertPossible(m_selectionGroup, event->pos()))
+
QList <GenTime> offsetList;
offsetList.append(info.endPos);
updateSnapPoints(NULL, offsetList);
+ m_selectionGroup->setPos(framePos);
scene()->addItem(m_selectionGroup);
- event->acceptProposedAction();
- } else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
+ return true;
+ } else if (data->hasFormat("kdenlive/producerslist")) {
m_clipDrag = true;
- QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';');
+ QStringList ids = QString(data->data("kdenlive/producerslist")).split(';');
m_scene->clearSelection();
resetSelectionGroup(false);
- m_selectionGroup = new AbstractGroupItem(m_document->fps());
- QPoint pos;
- GenTime start;
QList <GenTime> offsetList;
+ QList <ItemInfo> infoList;
+ const QPointF framePos = mapToScene(pos);
+ GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps());
+ int track = (int)(framePos.y() / m_tracksHeight);
+
+ // Check if clips can be inserted at that position
for (int i = 0; i < ids.size(); ++i) {
DocClipBase *clip = m_document->getBaseClip(ids.at(i));
if (clip == NULL) {
kDebug() << " WARNING))))))))) CLIP NOT FOUND : " << ids.at(i);
- return;
+ return false;
}
ItemInfo info;
info.startPos = start;
- info.endPos = info.startPos + clip->duration();
- info.track = (int)(1 / m_tracksHeight);
- ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false);
+ info.cropDuration = clip->duration();
+ info.endPos = info.startPos + info.cropDuration;
+ info.track = track;
+ infoList.append(info);
start += clip->duration();
+ }
+ if (!canBePastedTo(infoList, AVWIDGET)) {
+ return true;
+ }
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ start = GenTime();
+ for (int i = 0; i < ids.size(); ++i) {
+ DocClipBase *clip = m_document->getBaseClip(ids.at(i));
+ ItemInfo info;
+ info.startPos = start;
+ info.cropDuration = clip->duration();
+ info.endPos = info.startPos + info.cropDuration;
+ info.track = 0;
+ start += info.cropDuration;
offsetList.append(start);
- m_selectionGroup->addToGroup(item);
+ ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false);
item->setFlags(QGraphicsItem::ItemIsSelectable);
+ m_selectionGroup->addToGroup(item);
m_waitingThumbs.append(item);
}
- //TODO: check if we do not overlap another clip when first dropping in timeline
- //if (insertPossible(m_selectionGroup, event->pos()))
+
updateSnapPoints(NULL, offsetList);
+ m_selectionGroup->setPos(framePos);
scene()->addItem(m_selectionGroup);
m_thumbsTimer.start();
- event->acceptProposedAction();
+ return true;
} else {
// the drag is not a clip (may be effect, ...)
m_clipDrag = false;
- QGraphicsView::dragEnterEvent(event);
+ return false;
}
}
-bool CustomTrackView::insertPossible(AbstractGroupItem *group, const QPoint &pos) const
-{
- QPolygonF path;
- QList<QGraphicsItem *> children = group->childItems();
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == AVWIDGET) {
- ClipItem *clip = static_cast <ClipItem *>(children.at(i));
- ItemInfo info = clip->info();
- kDebug() << " / / INSERT : " << pos.x();
- QRectF shape = QRectF(clip->startPos().frames(m_document->fps()), clip->track() * m_tracksHeight + 1, clip->cropDuration().frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
- kDebug() << " / / INSERT RECT: " << shape;
- path = path.united(QPolygonF(shape));
- }
- }
-
- QList<QGraphicsItem*> collindingItems = scene()->items(path, Qt::IntersectsItemShape);
- if (collindingItems.isEmpty()) return true;
- else {
- for (int i = 0; i < collindingItems.count(); i++) {
- QGraphicsItem *collision = collindingItems.at(i);
- if (collision->type() == AVWIDGET) {
- // Collision
- kDebug() << "// COLLISIION DETECTED";
- return false;
- }
- }
- return true;
- }
+void CustomTrackView::dragEnterEvent(QDragEnterEvent * event)
+{
+ if (insertDropClips(event->mimeData(), event->pos())) {
+ event->acceptProposedAction();
+ } else QGraphicsView::dragEnterEvent(event);
}
-
bool CustomTrackView::itemCollision(AbstractClipItem *item, ItemInfo newPos)
{
QRectF shape = QRectF(newPos.startPos.frames(m_document->fps()), newPos.track * m_tracksHeight + 1, (newPos.endPos - newPos.startPos).frames(m_document->fps()) - 0.02, m_tracksHeight - 1);
void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect)
{
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
// Special case: speed effect
if (effect.attribute("id") == "speed") {
int strobe = EffectsList::parameter(effect, "strobe").toInt();
if (strobe == 0) strobe = 1;
doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId());
- clip->addEffect(effect);
+ EffectsParameterList params = clip->addEffect(effect);
+ m_document->renderer()->mltAddEffect(track, pos, params);
if (clip->isSelected()) emit clipItemSelected(clip);
return;
}
-
EffectsParameterList params = clip->addEffect(effect);
+ if (effect.attribute("disabled") == "1") {
+ // Effect is disabled, don't add it to MLT playlist
+ if (clip->isSelected()) emit clipItemSelected(clip);
+ return;
+ }
if (!m_document->renderer()->mltAddEffect(track, pos, params))
emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
if (clip->isSelected()) emit clipItemSelected(clip);
QString index = effect.attribute("kdenlive_ix");
// Special case: speed effect
if (effect.attribute("id") == "speed") {
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
ItemInfo info = clip->info();
doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
clip->deleteEffect(index);
emit clipItemSelected(clip);
+ m_document->renderer()->mltRemoveEffect(track, pos, index, true);
return;
}
}
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
}
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip) {
clip->deleteEffect(index);
emit clipItemSelected(clip);
setDocumentModified();
}
-void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement effect, int ix, bool triggeredByUser)
+void CustomTrackView::updateEffect(int track, GenTime pos, QDomElement insertedEffect, int ix, bool triggeredByUser)
{
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
+ QDomElement effect = insertedEffect.cloneNode().toElement();
if (clip) {
-
// Special case: speed effect
if (effect.attribute("id") == "speed") {
ItemInfo info = clip->info();
- double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
- int strobe = EffectsList::parameter(effect, "strobe").toInt();
- if (strobe == 0) strobe = 1;
- doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId());
+ if (effect.attribute("disabled") == "1") doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
+ else {
+ double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
+ int strobe = EffectsList::parameter(effect, "strobe").toInt();
+ if (strobe == 0) strobe = 1;
+ doChangeClipSpeed(info, speed, clip->speed(), strobe, clip->baseClip()->getId());
+ }
clip->setEffectAt(ix, effect);
if (ix == clip->selectedEffectIndex()) {
clip->setSelectedEffect(ix);
+ if (!triggeredByUser) emit clipItemSelected(clip, ix);
}
return;
}
void CustomTrackView::moveEffect(int track, GenTime pos, int oldPos, int newPos)
{
- ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, m_document->tracksCount() - track);
+ ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track);
if (clip && !clip->effectAt(newPos - 1).isNull() && !clip->effectAt(oldPos - 1).isNull()) {
- QDomElement act = clip->effectAt(newPos - 1).cloneNode().toElement();
- QDomElement before = clip->effectAt(oldPos - 1).cloneNode().toElement();
+ QDomElement act = clip->effectAt(newPos - 1);
+ QDomElement before = clip->effectAt(oldPos - 1);
clip->setEffectAt(oldPos - 1, act);
clip->setEffectAt(newPos - 1, before);
- m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
+ // special case: speed effect, which is a pseudo-effect, not appearing in MLT's effects
+ if (act.attribute("id") == "speed") {
+ m_document->renderer()->mltUpdateEffectPosition(track, pos, oldPos, newPos);
+ } else if (before.attribute("id") == "speed") {
+ m_document->renderer()->mltUpdateEffectPosition(track, pos, newPos, oldPos);
+ } else m_document->renderer()->mltMoveEffect(track, pos, oldPos, newPos);
emit clipItemSelected(clip, newPos - 1);
setDocumentModified();
} else emit displayMessage(i18n("Cannot move effect"), ErrorMessage);
void CustomTrackView::slotChangeEffectState(ClipItem *clip, int effectPos, bool disable)
{
- QDomElement effect = clip->effectAt(effectPos).cloneNode().toElement();
+ QDomElement effect = clip->effectAt(effectPos);
QDomElement oldEffect = effect.cloneNode().toElement();
- if (effect.attribute("id") == "speed") {
- if (clip) {
- ItemInfo info = clip->info();
- effect.setAttribute("disabled", (int) disable);
- if (disable) doChangeClipSpeed(info, 1.0, clip->speed(), 1, clip->baseClip()->getId());
- else {
- double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
- int strobe = EffectsList::parameter(effect, "strobe").toInt();
- if (strobe == 0) strobe = 1;
- doChangeClipSpeed(info, speed, 1.0, strobe, clip->baseClip()->getId());
- }
- return;
- }
- }
+
effect.setAttribute("disabled", (int) disable);
EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
m_document->renderer()->mltCutClip(m_document->tracksCount() - info.track, cutTime);
int cutPos = (int) cutTime.frames(m_document->fps());
- ItemInfo newPos;
+ ItemInfo newPos = info;
double speed = item->speed();
newPos.startPos = cutTime;
newPos.endPos = info.endPos;
// uncut clip
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
- ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()) + 1, info.track);
+ ClipItem *dup = getClipItemAt((int) cutTime.frames(m_document->fps()), info.track);
if (!item || !dup || item == dup) {
emit displayMessage(i18n("Cannot find clip to uncut"), ErrorMessage);
m_blockRefresh = false;
setDocumentModified();
}
-void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params)
+void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh)
{
Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true);
//kDebug() << "---- ADDING transition " << params.attribute("value");
- if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) {
+ if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML(), refresh)) {
scene()->addItem(tr);
setDocumentModified();
} else {
}
}
-void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/)
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh)
{
Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
if (!item) {
emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
return;
}
- m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML());
+ m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML(), refresh);
if (m_dragItem == item) m_dragItem = NULL;
delete item;
emit transitionItemSelected(NULL);
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event)
{
- event->setDropAction(Qt::IgnoreAction);
- const QPointF pos = mapToScene(event->pos());
- if (m_selectionGroup && m_clipDrag) {
- m_selectionGroup->setPos(pos.x(), pos.y());
- emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5));
- event->setDropAction(Qt::MoveAction);
- event->acceptProposedAction();
+ if (m_clipDrag) {
+ const QPointF pos = mapToScene(event->pos());
+ if (m_selectionGroup) {
+ m_selectionGroup->setPos(pos);
+ emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5));
+ event->acceptProposedAction();
+ } else {
+ // Drag enter was not possible, try again at mouse position
+ insertDropClips(event->mimeData(), event->pos());
+ event->accept();
+ }
} else {
QGraphicsView::dragMoveEvent(event);
}
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
+ emit trackHeightChanged();
+ //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
//setFixedHeight(50 * m_tracksCount);
}
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
+ emit trackHeightChanged();
+ //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
}
void CustomTrackView::changeTrack(int ix, TrackInfo type)
setDocumentModified();
}
+QList<QGraphicsItem *> CustomTrackView::checkForGroups(const QRectF &rect, bool &ok)
+{
+ // Check there is no group going over several tracks there, or that would result in timeline corruption
+ QList<QGraphicsItem *> selection = scene()->items(rect);
+ int maxHeight = m_tracksHeight * 1.5;
+ for (int i = 0; i < selection.count(); i++) {
+ // Check that we don't try to move a group with clips on other tracks
+ if (selection.at(i)->type() == GROUPWIDGET && (selection.at(i)->boundingRect().height() >= maxHeight)) {
+ ok = false;
+ break;
+ } else if (selection.at(i)->parentItem() && (selection.at(i)->parentItem()->boundingRect().height() >= maxHeight)) {
+ ok = false;
+ break;
+ }
+ }
+ return selection;
+}
+
void CustomTrackView::slotRemoveSpace()
{
GenTime pos;
pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight);
}
+
ClipItem *item = getClipItemAt(pos, track);
if (item) {
emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
int length = m_document->renderer()->mltGetSpaceLength(pos, m_document->tracksCount() - track, true);
//kDebug() << "// GOT LENGT; " << length;
if (length <= 0) {
- emit displayMessage(i18n("You must be in an empty space to remove space (time=%1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
+ emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track:%2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
return;
}
- QRectF r(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 1);
- QList<QGraphicsItem *> items = m_scene->items(r);
+ // Make sure there is no group in the way
+ QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2);
+
+ bool isOk;
+ QList<QGraphicsItem *> items = checkForGroups(rect, isOk);
+ if (!isOk) {
+ // groups found on track, do not allow the move
+ emit displayMessage(i18n("Cannot remove space in a track with a group"), ErrorMessage);
+ return;
+ }
QList<ItemInfo> clipsToMove;
QList<ItemInfo> transitionsToMove;
if (d.exec() != QDialog::Accepted) return;
GenTime spaceDuration = d.selectedDuration();
track = d.selectedTrack();
+
ClipItem *item = getClipItemAt(pos, track);
if (item) pos = item->startPos();
- int minh = 0;
- int maxh = sceneRect().height();
- if (track != -1) {
- minh = track * m_tracksHeight + m_tracksHeight / 2;
- maxh = m_tracksHeight / 2 - 1;
+ // Make sure there is no group in the way
+ QRectF rect(pos.frames(m_document->fps()), track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight / 2 - 2);
+ bool isOk;
+ QList<QGraphicsItem *> items = checkForGroups(rect, isOk);
+ if (!isOk) {
+ // groups found on track, do not allow the move
+ emit displayMessage(i18n("Cannot insert space in a track with a group"), ErrorMessage);
+ return;
}
- QRectF r(pos.frames(m_document->fps()), minh, sceneRect().width() - pos.frames(m_document->fps()), maxh);
- QList<QGraphicsItem *> items = m_scene->items(r);
-
QList<ItemInfo> clipsToMove;
QList<ItemInfo> transitionsToMove;
}
if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track))
trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps());
- } else emit displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames(clipsToMove.at(i).startPos.frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage);
- }
+ } else emit {
+ displayMessage(i18n("Cannot move clip at position %1, track %2", m_document->timecode().getTimecodeFromFrames((clipsToMove.at(i).startPos + offset).frames(m_document->fps())), clipsToMove.at(i).track), ErrorMessage);
+ }
+ }
if (!transToMove.isEmpty()) for (int i = 0; i < transToMove.count(); i++) {
transition = getTransitionItemAtStart(transToMove.at(i).startPos + offset, transToMove.at(i).track);
if (transition) {
- if (transition->parentItem()) m_selectionGroup->addToGroup(transition->parentItem());
- m_selectionGroup->addToGroup(transition);
+ if (transition->parentItem()) {
+ m_selectionGroup->addToGroup(transition->parentItem());
+ transition->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ } else {
+ m_selectionGroup->addToGroup(transition);
+ transition->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track))
trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps());
- transition->setFlags(QGraphicsItem::ItemIsSelectable);
} else emit displayMessage(i18n("Cannot move transition at position %1, track %2", m_document->timecode().getTimecodeFromFrames(transToMove.at(i).startPos.frames(m_document->fps())), transToMove.at(i).track), ErrorMessage);
}
m_selectionGroup->translate(diff, 0);
// update items coordinates
- QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ QList<QGraphicsItem *> itemList = m_selectionGroup->childItems();
+
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
static_cast < AbstractClipItem *>(itemList.at(i))->updateItem();
} else if (itemList.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> children = itemList.at(i)->childItems();
for (int j = 0; j < children.count(); j++) {
- static_cast < AbstractClipItem *>(children.at(j))->updateItem();
+ AbstractClipItem * clp = static_cast < AbstractClipItem *>(children.at(j));
+ clp->updateItem();
}
}
}
resetSelectionGroup();
QList<QGraphicsItem *> itemList = items();
QUndoCommand *deleteCommand = new QUndoCommand();
- deleteCommand->setText(i18n("Delete timeline clips"));
int count = 0;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
}
}
}
+ deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count));
if (count == 0) delete deleteCommand;
else m_commandStack->push(deleteCommand);
}
{
if (m_moveOpMode == SEEK) m_moveOpMode = NONE;
QGraphicsView::mouseReleaseEvent(event);
+ setViewportUpdateMode(QGraphicsView::MinimalViewportUpdate);
if (m_scrollTimer.isActive()) m_scrollTimer.stop();
if (event->button() == Qt::MidButton) {
return;
// We are moving all tracks
track = -1;
} else track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
- GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
+ GenTime timeOffset = GenTime((int)(m_selectionGroup->scenePos().x()), m_document->fps()) - m_selectionGroupInfo.startPos;
+
if (timeOffset != GenTime()) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
trackTransitionStartList[i] = -1;
}
- int max = items.count();
- for (int i = 0; i < max; i++) {
+ for (int i = 0; i < items.count(); i++) {
if (items.at(i)->type() == GROUPWIDGET)
- items += static_cast <QGraphicsItemGroup *>(items.at(i))->childItems();
+ items += items.at(i)->childItems();
}
for (int i = 0; i < items.count(); i++) {
int tracknumber = m_document->tracksCount() - item->track() - 1;
bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
if (isLocked) item->setItemLocked(true);
-
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Move clip"));
new MoveClipCommand(this, m_dragItemInfo, info, false, moveCommand);
ItemInfo trInfo = tr->info();
ItemInfo newTrInfo = trInfo;
newTrInfo.endPos = m_dragItem->endPos();
+ kDebug() << "CLIP ENDS AT: " << newTrInfo.endPos.frames(25);
+ kDebug() << "CLIP STARTS AT: " << newTrInfo.startPos.frames(25);
ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
if (!upperClip || !upperClip->baseClip()->isTransparent()) {
if (!getClipItemAtStart(trInfo.startPos, tr->track())) {
items += items.at(i)->childItems();
}
}
-
+ m_document->renderer()->blockSignals(true);
for (int i = 0; i < items.count(); i++) {
if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
-
+ m_document->renderer()->blockSignals(false);
for (int i = 0; i < items.count(); i++) {
// re-add items in correct place
if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
}
}
- updateClipFade(static_cast <ClipItem *>(m_dragItem));
- new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand);
+
+ ClipItem *clip = static_cast < ClipItem * >(m_dragItem);
+ updateClipFade(clip);
+
+ // check keyframes
+ QDomDocument doc;
+ QDomElement root = doc.createElement("list");
+ doc.appendChild(root);
+ QList <int> indexes;
+ for (int i = 0; i < clip->effectsCount(); i++) {
+ QDomElement effect = clip->effectAt(i);
+ if (EffectsList::hasKeyFrames(effect)) {
+ doc.appendChild(doc.importNode(effect, true));
+ indexes.append(i);
+ }
+ }
+
+ if (clip->checkEffectsKeyframesPos(m_dragItemInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) {
+ // Keyframes were modified, updateClip
+ QDomNodeList effs = doc.elementsByTagName("effect");
+ // Hack:
+ // Since we must always resize clip before updating the keyframes, we
+ // put a resize command before & after checking keyframes so that
+ // we are sure the resize is performed before whenever we do or undo the action
+
+ new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
+ for (int i = 0; i < indexes.count(); i++) {
+ new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand);
+ updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i));
+ }
+ new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
+ emit clipItemSelected(clip);
+ } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand);
+
m_commandStack->push(resizeCommand);
} else {
m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps()));
}
}
- new ResizeClipCommand(this, m_dragItemInfo, info, false, resizeCommand);
+ // check keyframes
+ ClipItem *clip = static_cast < ClipItem * >(m_dragItem);
+ QDomDocument doc;
+ QDomElement root = doc.createElement("list");
+ doc.appendChild(root);
+ QList <int> indexes;
+ for (int i = 0; i < clip->effectsCount(); i++) {
+ QDomElement effect = clip->effectAt(i);
+ if (EffectsList::hasKeyFrames(effect)) {
+ doc.appendChild(doc.importNode(effect, true));
+ indexes.append(i);
+ }
+ }
+
+ if (clip->checkEffectsKeyframesPos((m_dragItemInfo.cropStart + m_dragItemInfo.endPos - m_dragItemInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) {
+ // Keyframes were modified, updateClip
+ QDomNodeList effs = doc.elementsByTagName("effect");
+ // Hack:
+ // Since we must always resize clip before updating the keyframes, we
+ // put a resize command before & after checking keyframes so that
+ // we are sure the resize is performed before whenever we do or undo the action
+
+ new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
+ for (int i = 0; i < indexes.count(); i++) {
+ new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand);
+ updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i));
+ }
+ new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
+ emit clipItemSelected(clip);
+ } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand);
+
m_commandStack->push(resizeCommand);
- updateClipFade(static_cast <ClipItem *>(m_dragItem));
+ updateClipFade(clip);
} else {
m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
int ix = item->hasEffect("volume", "fadein");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
+ QDomElement oldeffect = item->effectAt(ix);
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
}
ix = item->hasEffect("volume", "fade_from_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
+ QDomElement oldeffect = item->effectAt(ix);
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
int ix = item->hasEffect("volume", "fadeout");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
+ QDomElement oldeffect = item->effectAt(ix);
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
}
ix = item->hasEffect("brightness", "fade_to_black");
if (ix != -1) {
- QDomElement oldeffect = item->effectAt(ix).cloneNode().toElement();
+ QDomElement oldeffect = item->effectAt(ix);
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
m_operationMode = NONE;
}
-void CustomTrackView::deleteClip(ItemInfo info)
+void CustomTrackView::deleteClip(ItemInfo info, bool refresh)
{
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
delete tr;
}
}*/
- scene()->removeItem(item);
m_waitingThumbs.removeAll(item);
if (m_dragItem == item) m_dragItem = NULL;
+ scene()->removeItem(item);
delete item;
item = NULL;
setDocumentModified();
- m_document->renderer()->doRefresh();
+ if (refresh) m_document->renderer()->doRefresh();
}
void CustomTrackView::deleteSelectedClips()
}
scene()->clearSelection();
QUndoCommand *deleteSelected = new QUndoCommand();
- deleteSelected->setText(i18n("Delete selected items"));
- bool resetGroup = false;
+ bool resetGroup = false;
+ int groupCount = 0;
+ int clipCount = 0;
+ int transitionCount = 0;
// expand & destroy groups
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == GROUPWIDGET) {
+ groupCount++;
QList<QGraphicsItem *> children = itemList.at(i)->childItems();
itemList += children;
QList <ItemInfo> clipInfos;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
+ clipCount++;
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
if (item->parentItem()) resetGroup = true;
//kDebug()<<"// DELETE CLP AT: "<<item->info().startPos.frames(25);
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected);
emit clipItemSelected(NULL);
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ transitionCount++;
Transition *item = static_cast <Transition *>(itemList.at(i));
//kDebug()<<"// DELETE TRANS AT: "<<item->info().startPos.frames(25);
if (item->parentItem()) resetGroup = true;
emit transitionItemSelected(NULL);
}
}
-
+ if (groupCount > 0 && clipCount == 0 && transitionCount == 0)
+ deleteSelected->setText(i18np("Delete selected group", "Delete selected groups", groupCount));
+ else if (clipCount > 0 && groupCount == 0 && transitionCount == 0)
+ deleteSelected->setText(i18np("Delete selected clip", "Delete selected clips", clipCount));
+ else if (transitionCount > 0 && groupCount == 0 && clipCount == 0)
+ deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount));
+ else deleteSelected->setText(i18n("Delete selected items"));
m_commandStack->push(deleteSelected);
}
item->updateRectGeometry();
if (item->cropDuration().frames(m_document->fps()) > endPos)
item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
+ updateClipFade(item);
setDocumentModified();
} else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
}
m_document->clipManager()->removeGroup(grp);
scene()->destroyItemGroup(grp);
}
- clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemClipsToShape);
+ clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
for (int i = 0; i < transitionInfos.count(); i++) {
Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
m_document->clipManager()->removeGroup(grp);
scene()->destroyItemGroup(grp);
}
- tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemClipsToShape);
+ tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
}
setDocumentModified();
return;
setDocumentModified();
}
-void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects)
+void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool refresh)
{
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
if (baseclip == NULL) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
}
setDocumentModified();
- m_document->renderer()->doRefresh();
+ if (refresh) m_document->renderer()->doRefresh();
m_waitingThumbs.append(item);
m_thumbsTimer.start();
}
-void CustomTrackView::slotUpdateClip(const QString &clipId)
+void CustomTrackView::slotUpdateClip(const QString &clipId, bool reload)
{
QList<QGraphicsItem *> list = scene()->items();
ClipItem *clip = NULL;
if (clip->clipProducer() == clipId) {
ItemInfo info = clip->info();
info.track = m_document->tracksCount() - clip->track();
- m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer());
+ if (reload) m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer());
clip->refreshClip(true);
clip->update();
}
ClipItem *CustomTrackView::getClipItemAt(int pos, int track)
{
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos, track * m_tracksHeight + m_tracksHeight / 2));
+ const QPointF p(pos, track * m_tracksHeight + m_tracksHeight / 2);
+ QList<QGraphicsItem *> list = scene()->items(p);
ClipItem *clip = NULL;
for (int i = 0; i < list.size(); i++) {
if (list.at(i)->type() == AVWIDGET) {
Transition *CustomTrackView::getTransitionItemAt(int pos, int track)
{
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos, (track + 1) * m_tracksHeight));
+ const QPointF p(pos, (track + 1) * m_tracksHeight);
+ QList<QGraphicsItem *> list = scene()->items(p);
Transition *clip = NULL;
for (int i = 0; i < list.size(); i++) {
if (list.at(i)->type() == TRANSITIONWIDGET) {
Transition *CustomTrackView::getTransitionItemAtEnd(GenTime pos, int track)
{
int framepos = (int)(pos.frames(m_document->fps()));
- QList<QGraphicsItem *> list = scene()->items(QPointF(framepos - 1, (track + 1) * m_tracksHeight));
+ const QPointF p(framepos - 1, (track + 1) * m_tracksHeight);
+ QList<QGraphicsItem *> list = scene()->items(p);
Transition *clip = NULL;
for (int i = 0; i < list.size(); i++) {
if (list.at(i)->type() == TRANSITIONWIDGET) {
Transition *CustomTrackView::getTransitionItemAtStart(GenTime pos, int track)
{
- QList<QGraphicsItem *> list = scene()->items(QPointF(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight));
+ const QPointF p(pos.frames(m_document->fps()), (track + 1) * m_tracksHeight);
+ QList<QGraphicsItem *> list = scene()->items(p);
Transition *clip = NULL;
for (int i = 0; i < list.size(); ++i) {
if (list.at(i)->type() == TRANSITIONWIDGET) {
return clip;
}
-void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end)
+void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end, bool refresh)
{
if (m_selectionGroup) resetSelectionGroup(false);
ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()), start.track);
// undo last move and emit error message
emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
}
- m_document->renderer()->doRefresh();
+ if (refresh) m_document->renderer()->doRefresh();
//kDebug() << " // MOVED CLIP TO: " << end.startPos.frames(25) << ", ITEM START: " << item->startPos().frames(25);
}
resetSelectionGroup();
m_scene->clearSelection();
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+
+ m_document->renderer()->blockSignals(true);
for (int i = 0; i < startClip.count(); i++) {
if (reverseMove) {
startClip[i].startPos = startClip.at(i).startPos - offset;
ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
if (clip) {
clip->setItemLocked(false);
- if (clip->parentItem()) clip->parentItem()->setSelected(true);
- else clip->setSelected(true);
+ if (clip->parentItem()) {
+ m_selectionGroup->addToGroup(clip->parentItem());
+ clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ } else {
+ m_selectionGroup->addToGroup(clip);
+ clip->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
} else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25);
}
Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track);
if (tr) {
tr->setItemLocked(false);
- if (tr->parentItem()) tr->parentItem()->setSelected(true);
- else tr->setSelected(true);
+ if (tr->parentItem()) {
+ m_selectionGroup->addToGroup(tr->parentItem());
+ tr->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ } else {
+ m_selectionGroup->addToGroup(tr);
+ tr->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
} else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25);
}
- groupSelectedItems(true);
+ m_document->renderer()->blockSignals(false);
+
if (m_selectionGroup) {
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
+ m_selectionGroup->translate(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
+ //m_selectionGroup->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
// Expand groups
for (int i = 0; i < max; i++) {
if (children.at(i)->type() == GROUPWIDGET) {
children += children.at(i)->childItems();
+ AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(children.at(i));
+ //grp->moveBy(offset.frames(m_document->fps()), trackOffset *(qreal) m_tracksHeight);
+ /*m_document->clipManager()->removeGroup(grp);
+ m_scene->destroyItemGroup(grp);*/
+ children.removeAll(children.at(i));
+ i--;
}
}
m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
+ resetSelectionGroup(false);
KdenliveSettings::setSnaptopoints(snap);
m_document->renderer()->doRefresh();
} else kDebug() << "///////// WARNING; NO GROUP TO MOVE";
}
-void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end)
+void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end, bool m_refresh)
{
Transition *item = getTransitionItemAt(start.startPos, start.track);
if (!item) {
item->resizeStart((int) end.startPos.frames(m_document->fps()));
} else if (end.startPos == start.startPos) {
// Transition end resize;
+ kDebug() << "// resize END: " << end.endPos.frames(m_document->fps());
item->resizeEnd((int) end.endPos.frames(m_document->fps()));
} else {
// Move & resize
}
emit transitionItemSelected(item, getPreviousVideoTrack(item->track()), p);
}
- m_document->renderer()->doRefresh();
+ if (m_refresh) m_document->renderer()->doRefresh();
}
-void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end)
+void CustomTrackView::resizeClip(const ItemInfo start, const ItemInfo end, bool dontWorry)
{
- bool resizeClipStart = true;
- if (start.startPos == end.startPos) resizeClipStart = false;
- /*if (resizeClipStart) offset = 1;
- else offset = -1;*/
- ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps())), start.track);
+ bool resizeClipStart = (start.startPos != end.startPos);
+ ClipItem *item = getClipItemAtStart(start.startPos, start.track);
if (!item) {
+ if (dontWorry) return;
emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos;
return;
// Item is part of a group, reset group
resetSelectionGroup();
}
+
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- if (resizeClipStart && start.startPos != end.startPos) {
+ if (resizeClipStart) {
ItemInfo clipinfo = item->info();
clipinfo.track = m_document->tracksCount() - clipinfo.track;
- bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - item->startPos());
+ bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos);
if (success) {
kDebug() << "RESIZE CLP STRAT TO:" << end.startPos.frames(m_document->fps()) << ", OLD ST: " << start.startPos.frames(25);
item->resizeStart((int) end.startPos.frames(m_document->fps()));
updateClipFade(item);
} else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
- } else if (!resizeClipStart) {
+ } else {
ItemInfo clipinfo = item->info();
clipinfo.track = m_document->tracksCount() - clipinfo.track;
bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, end.endPos - clipinfo.startPos);
updateClipFade(item);
} else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
- if (end.cropStart != start.cropStart) {
+ if (!resizeClipStart && end.cropStart != start.cropStart) {
kDebug() << "// RESIZE CROP, DIFF: " << (end.cropStart - start.cropStart).frames(25);
ItemInfo clipinfo = end;
clipinfo.track = m_document->tracksCount() - end.track;
void CustomTrackView::clipStart()
{
- ClipItem *item = getMainActiveClip();
+ AbstractClipItem *item = getMainActiveClip();
if (item != NULL) {
setCursorPos((int) item->startPos().frames(m_document->fps()));
checkScrolling();
void CustomTrackView::clipEnd()
{
- ClipItem *item = getMainActiveClip();
+ AbstractClipItem *item = getMainActiveClip();
if (item != NULL) {
setCursorPos((int) item->endPos().frames(m_document->fps()) - 1);
checkScrolling();
DocClipBase *base = m_document->clipManager()->getClipById(id);
if (!comment.isEmpty()) base->addSnapMarker(pos, comment);
else base->deleteSnapMarker(pos);
+ emit updateClipMarkers(base);
setDocumentModified();
viewport()->update();
}
return false;
}
}
- Guide *g = new Guide(this, pos, comment, m_document->fps(), m_tracksHeight * m_document->tracksCount());
+ Guide *g = new Guide(this, pos, comment, m_tracksHeight * m_document->tracksCount());
scene()->addItem(g);
m_guides.append(g);
qSort(m_guides.begin(), m_guides.end(), sortGuidesList);
QMatrix matrix;
matrix = matrix.scale(scaleFactor, verticalScale);
m_scene->setScale(scaleFactor, verticalScale);
+ if (m_visualTip) scene()->removeItem(m_visualTip);
m_animationTimer->stop();
delete m_visualTip;
m_visualTip = NULL;
m_animation = NULL;
double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
setMatrix(matrix);
+ m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount() * verticalScale);
int diff = sceneRect().width() - m_projectDuration;
if (diff * matrix.m11() < 50) {
if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height());
void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect)
{
- QRectF r = rect;
- r.setWidth(r.width() + 1);
- painter->setClipRect(r);
- painter->drawLine(r.left(), 0, r.right(), 0);
- uint max = m_document->tracksCount();
+ //kDebug() << "// DRAW BG: " << rect.width();
+ painter->setClipRect(rect);
KColorScheme scheme(palette().currentColorGroup(), KColorScheme::Window);
+ QPen pen1 = painter->pen();
+ pen1.setColor(scheme.shade(KColorScheme::DarkShade));
+ painter->setPen(pen1);
+ double min = rect.left();
+ double max = rect.right();
+ painter->drawLine(QPointF(min, 0), QPointF(max, 0));
+ uint maxTrack = m_document->tracksCount();
QColor lockedColor = scheme.background(KColorScheme::NegativeBackground).color();
QColor audioColor = palette().alternateBase().color();
QColor base = scheme.background(KColorScheme::NormalBackground).color();
- for (uint i = 0; i < max; i++) {
- if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(lockedColor));
- else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(audioColor));
- painter->drawLine(r.left(), m_tracksHeight *(i + 1), r.right(), m_tracksHeight *(i + 1));
+ for (uint i = 0; i < maxTrack; i++) {
+ TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1);
+ if (info.isLocked || info.type == AUDIOTRACK) {
+ const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1);
+ painter->fillRect(track, info.isLocked ? lockedColor : audioColor);
+ }
+ painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1)));
+ }
+ int lowerLimit = m_tracksHeight * maxTrack + 1;
+ if (height() > lowerLimit) {
+ const QRectF bg(min, lowerLimit, max - min, height() - lowerLimit);
+ painter->fillRect(bg, base);
}
- int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1;
- if (height() > lowerLimit)
- painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base));
}
bool CustomTrackView::findString(const QString &text)
return true;
}
+bool CustomTrackView::canBePastedTo(QList <ItemInfo> infoList, int type) const
+{
+ QPainterPath path;
+ for (int i = 0; i < infoList.count(); i++) {
+ const QRectF rect((double) infoList.at(i).startPos.frames(m_document->fps()), (double)(infoList.at(i).track * m_tracksHeight + 1), (double)(infoList.at(i).endPos - infoList.at(i).startPos).frames(m_document->fps()), (double)(m_tracksHeight - 1));
+ path.addRect(rect);
+ }
+ QList<QGraphicsItem *> collisions = scene()->items(path);
+ for (int i = 0; i < collisions.count(); i++) {
+ if (collisions.at(i)->type() == type) return false;
+ }
+ return true;
+}
+
bool CustomTrackView::canBePasted(QList<AbstractClipItem *> items, GenTime offset, int trackOffset) const
{
for (int i = 0; i < items.count(); i++) {
// parse all clip names
if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(m_copiedItems.at(i));
- ItemInfo info;
- info.startPos = clip->startPos() + offset;
- info.endPos = clip->endPos() + offset;
- info.cropStart = clip->cropStart();
- info.track = clip->track() + trackOffset;
+ ItemInfo info = clip->info();
+ info.startPos += offset;
+ info.endPos += offset;
+ info.track += trackOffset;
if (canBePastedTo(info, AVWIDGET)) {
new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), true, false, pasteClips);
} else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage);
return NULL;
}
-ClipItem *CustomTrackView::getMainActiveClip() const
+AbstractClipItem *CustomTrackView::getMainActiveClip() const
{
QList<QGraphicsItem *> clips = scene()->selectedItems();
if (clips.isEmpty()) {
return getClipUnderCursor();
} else {
- ClipItem *item = NULL;
+ AbstractClipItem *item = NULL;
for (int i = 0; i < clips.count(); ++i) {
- if (clips.at(i)->type() == AVWIDGET)
- item = static_cast < ClipItem *>(clips.at(i));
- if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break;
+ if (clips.count() == 1 || clips.at(i)->type() == AVWIDGET) {
+ item = static_cast < AbstractClipItem *>(clips.at(i));
+ if (clips.count() > 1 && item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) break;
+ }
}
if (item) return item;
}
}
if (clip->type() == TRANSITIONWIDGET) {
m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
- } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true));
+ } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false));
}
void CustomTrackView::setOutPoint()
if (clip->type() == TRANSITIONWIDGET) {
m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
- } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true));
+ } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false));
}
void CustomTrackView::slotUpdateAllThumbs()
void CustomTrackView::slotInsertTrack(int ix)
{
- kDebug() << "// INSERTING TRK: " << ix;
- QDialog d(parentWidget());
- Ui::AddTrack_UI view;
- view.setupUi(&d);
- view.track_nb->setMaximum(m_document->tracksCount() - 1);
- view.track_nb->setValue(ix);
- d.setWindowTitle(i18n("Insert Track"));
+ TrackDialog d(m_document, parentWidget());
+ d.label->setText(i18n("Insert track"));
+ d.track_nb->setMaximum(m_document->tracksCount() - 1);
+ d.track_nb->setValue(ix);
+ d.setWindowTitle(i18n("Insert New Track"));
+ d.slotUpdateName(ix);
if (d.exec() == QDialog::Accepted) {
- ix = view.track_nb->value();
- if (view.before_select->currentIndex() == 1) {
+ ix = d.track_nb->value();
+ if (d.before_select->currentIndex() == 1) {
ix++;
}
TrackInfo info;
- if (view.video_track->isChecked()) {
+ if (d.video_track->isChecked()) {
info.type = VIDEOTRACK;
info.isMute = false;
info.isBlind = false;
void CustomTrackView::slotDeleteTrack(int ix)
{
- bool ok;
- ix = QInputDialog::getInteger(this, i18n("Remove Track"), i18n("Track"), ix, 0, m_document->tracksCount() - 1, 1, &ok);
- if (ok) {
+ TrackDialog d(m_document, parentWidget());
+ d.label->setText(i18n("Delete track"));
+ d.before_select->setHidden(true);
+ d.track_nb->setMaximum(m_document->tracksCount() - 1);
+ d.track_nb->setValue(ix);
+ d.slotUpdateName(ix);
+ d.setWindowTitle(i18n("Delete Track"));
+ d.video_track->setHidden(true);
+ d.audio_track->setHidden(true);
+ if (d.exec() == QDialog::Accepted) {
+ ix = d.track_nb->value();
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
setDocumentModified();
void CustomTrackView::slotChangeTrack(int ix)
{
- QDialog d(parentWidget());
- Ui::AddTrack_UI view;
- view.setupUi(&d);
- view.label->setText(i18n("Change track"));
- view.before_select->setHidden(true);
- view.track_nb->setMaximum(m_document->tracksCount() - 1);
- view.track_nb->setValue(ix);
+ TrackDialog d(m_document, parentWidget());
+ d.label->setText(i18n("Change track"));
+ d.before_select->setHidden(true);
+ d.track_nb->setMaximum(m_document->tracksCount() - 1);
+ d.track_nb->setValue(ix);
+ d.slotUpdateName(ix);
d.setWindowTitle(i18n("Change Track Type"));
if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK)
- view.video_track->setChecked(true);
+ d.video_track->setChecked(true);
else
- view.audio_track->setChecked(true);
+ d.audio_track->setChecked(true);
if (d.exec() == QDialog::Accepted) {
TrackInfo info;
info.isLocked = false;
info.isMute = false;
- ix = view.track_nb->value();
+ ix = d.track_nb->value();
- if (view.video_track->isChecked()) {
+ if (d.video_track->isChecked()) {
info.type = VIDEOTRACK;
info.isBlind = false;
} else {
}
}
- selection = m_scene->items();
new AddTrackCommand(this, ix, trackinfo, false, deleteTrack);
m_commandStack->push(deleteTrack);
}
if (freetrack == 0) {
emit displayMessage(i18n("No empty space to put clip audio"), ErrorMessage);
} else {
- ItemInfo info;
- info.startPos = clip->startPos();
- info.endPos = clip->endPos();
- info.cropStart = clip->cropStart();
+ ItemInfo info = clip->info();
info.track = m_document->tracksCount() - freetrack;
addClip(clip->xml(), clip->clipProducer(), info, clip->effectList());
scene()->clearSelection();
break;
}
}
- clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable | QGraphicsItem::ItemClipsToShape);
+ clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
m_document->clipManager()->removeGroup(grp);
scene()->destroyItemGroup(grp);
}
emit transitionItemSelected(NULL);
}
-#include "customtrackview.moc"
+double CustomTrackView::fps() const
+{
+ return m_document->fps();
+}
+
+void CustomTrackView::updateProjectFps()
+{
+ // update all clips to the new fps
+ resetSelectionGroup();
+ scene()->clearSelection();
+ m_dragItem = NULL;
+ QList<QGraphicsItem *> itemList = items();
+ for (int i = 0; i < itemList.count(); i++) {
+ // remove all items and re-add them one by one
+ if (itemList.at(i) != m_cursorLine && itemList.at(i)->parentItem() == NULL) m_scene->removeItem(itemList.at(i));
+ }
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->parentItem() == 0 && (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET)) {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
+ clip->updateFps(m_document->fps());
+ m_scene->addItem(clip);
+ } else if (itemList.at(i)->type() == GROUPWIDGET) {
+ AbstractGroupItem *grp = static_cast <AbstractGroupItem *>(itemList.at(i));
+ QList<QGraphicsItem *> children = grp->childItems();
+ for (int j = 0; j < children.count(); j++) {
+ if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
+ clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ clip->updateFps(m_document->fps());
+ }
+ }
+ m_document->clipManager()->removeGroup(grp);
+ m_scene->addItem(grp);
+ scene()->destroyItemGroup(grp);
+ for (int j = 0; j < children.count(); j++) {
+ if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) {
+ //children.at(j)->setParentItem(0);
+ children.at(j)->setSelected(true);
+ }
+ }
+ groupSelectedItems(true, true);
+ } else if (itemList.at(i)->type() == GUIDEITEM) {
+ Guide *g = static_cast<Guide *>(itemList.at(i));
+ g->updatePos();
+ m_scene->addItem(g);
+ }
+ }
+ viewport()->update();
+}
projects / kdenlive / blobdiff