From f8eb4753c4d354f8156c8421d7b01c0af0a052fc Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Tue, 15 Jul 2008 10:54:51 +0000 Subject: [PATCH] copy / paste clips and transitions, move several clips svn path=/branches/KDE4/; revision=2313 --- src/abstractclipitem.cpp | 49 +++++--- src/abstractclipitem.h | 3 +- src/clipitem.cpp | 10 ++ src/clipitem.h | 3 + src/customtrackview.cpp | 264 ++++++++++++++++++++++++++++++++------- src/customtrackview.h | 11 ++ src/mainwindow.cpp | 53 ++++++-- src/mainwindow.h | 17 +++ src/transition.cpp | 6 + src/transition.h | 3 +- 10 files changed, 341 insertions(+), 78 deletions(-) diff --git a/src/abstractclipitem.cpp b/src/abstractclipitem.cpp index 3eb281fe..7e48fd2e 100644 --- a/src/abstractclipitem.cpp +++ b/src/abstractclipitem.cpp @@ -35,7 +35,15 @@ AbstractClipItem::AbstractClipItem(const ItemInfo info, const QRectF& rect, doub m_cropDuration = info.endPos - info.startPos; } -void AbstractClipItem::moveTo(int x, double scale, int offset, int newTrack) { +ItemInfo AbstractClipItem::info() const { + ItemInfo itemInfo; + itemInfo.startPos = startPos(); + itemInfo.endPos = endPos(); + itemInfo.track = track(); + return itemInfo; +} + +void AbstractClipItem::moveTo(int x, double scale, int offset, int newTrack, bool checkCollision) { double origX = rect().x(); double origY = rect().y(); bool success = true; @@ -43,28 +51,29 @@ void AbstractClipItem::moveTo(int x, double scale, int offset, int newTrack) { setRect(x * scale, origY + offset, rect().width(), rect().height()); QList collisionList = collidingItems(Qt::IntersectsItemBoundingRect); if (collisionList.size() == 0) m_track = newTrack; - for (int i = 0; i < collisionList.size(); ++i) { - QGraphicsItem *item = collisionList.at(i); - if (item->type() == type()) { - if (offset == 0) { - QRectF other = ((QGraphicsRectItem *)item)->rect(); - if (x < m_startPos.frames(m_fps)) { - kDebug() << "COLLISION, MOVING TO------"; - m_startPos = ((AbstractClipItem *)item)->endPos(); - origX = m_startPos.frames(m_fps) * scale; - } else if (x > m_startPos.frames(m_fps)) { - //kDebug() << "COLLISION, MOVING TO+++: "<startPos().frames(m_fps); - m_startPos = ((AbstractClipItem *)item)->startPos() - m_cropDuration; - origX = m_startPos.frames(m_fps) * scale; + if (checkCollision) + for (int i = 0; i < collisionList.size(); ++i) { + QGraphicsItem *item = collisionList.at(i); + if (item->type() == type()) { + if (offset == 0) { + QRectF other = ((QGraphicsRectItem *)item)->rect(); + if (x < m_startPos.frames(m_fps)) { + kDebug() << "COLLISION, MOVING TO------"; + m_startPos = ((AbstractClipItem *)item)->endPos(); + origX = m_startPos.frames(m_fps) * scale; + } else if (x > m_startPos.frames(m_fps)) { + //kDebug() << "COLLISION, MOVING TO+++: "<startPos().frames(m_fps); + m_startPos = ((AbstractClipItem *)item)->startPos() - m_cropDuration; + origX = m_startPos.frames(m_fps) * scale; + } } + setRect(origX, origY, rect().width(), rect().height()); + offset = 0; + origX = rect().x(); + success = false; + break; } - setRect(origX, origY, rect().width(), rect().height()); - offset = 0; - origX = rect().x(); - success = false; - break; } - } if (success) { m_track = newTrack; m_startPos = GenTime(x, m_fps); diff --git a/src/abstractclipitem.h b/src/abstractclipitem.h index 6e27d8ea..0e0765e9 100644 --- a/src/abstractclipitem.h +++ b/src/abstractclipitem.h @@ -36,13 +36,14 @@ public: int selectedKeyFramePos() const; double selectedKeyFrameValue() const; double keyFrameFactor() const; + ItemInfo info() const; virtual OPERATIONTYPE operationMode(QPointF pos, double scale) = 0; virtual GenTime startPos() const ; virtual void setTrack(int track); virtual GenTime endPos() const ; virtual int track() const ; - virtual void moveTo(int x, double scale, int offset, int newTrack); + virtual void moveTo(int x, double scale, int offset, int newTrack, bool checkCollision = true); virtual GenTime cropStart() const ; virtual void resizeStart(int posx, double scale); virtual void resizeEnd(int posx, double scale); diff --git a/src/clipitem.cpp b/src/clipitem.cpp index 5497f4ca..1db6e65d 100644 --- a/src/clipitem.cpp +++ b/src/clipitem.cpp @@ -97,6 +97,16 @@ ClipItem::~ClipItem() { if (endThumbTimer) delete endThumbTimer; } +ClipItem *ClipItem::clone(double scale) const { + ClipItem *duplicate = new ClipItem(m_clip, info(), cropStart(), scale, m_fps); + duplicate->setEffectList(m_effectList); + return duplicate; +} + +void ClipItem::setEffectList(const EffectsList effectList) { + //m_effectList = effectList.clone(); +} + int ClipItem::selectedEffectIndex() const { return m_selectedEffect; } diff --git a/src/clipitem.h b/src/clipitem.h index 2db1fed2..6e72adb4 100644 --- a/src/clipitem.h +++ b/src/clipitem.h @@ -52,6 +52,7 @@ public: DocClipBase *baseClip() const; QString clipName() const; QDomElement xml() const; + ClipItem *clone(double scale) const; void setFadeOut(int pos, double scale); void setFadeIn(int pos, double scale); @@ -89,6 +90,7 @@ public: void initEffect(QDomElement effect); QString keyframes(const int index); void setKeyframes(const int ix, const QString keyframes); + void setEffectList(const EffectsList effectList); protected: //virtual void mouseMoveEvent(QGraphicsSceneMouseEvent * event); @@ -135,6 +137,7 @@ private: QMap channelPaths; /** Called when clip start is resized, adjust keyframes values */ void checkEffectsKeyframesPos(const int previous, const int current, bool fromStart); + private slots: void slotThumbReady(int frame, QPixmap pix); void slotFetchThumbs(); diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 95c592ba..ad998f1a 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -69,7 +69,7 @@ // 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), m_findIndex(0) { + : 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), m_menuPosition(QPoint()) { if (doc) m_commandStack = doc->commandStack(); else m_commandStack == NULL; setMouseTracking(true); @@ -189,8 +189,17 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { else if (moveTrack < 0) moveTrack = 0; int offset = moveTrack - currentTrack; - if (offset != 0) offset = m_tracksHeight * offset; - m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset, moveTrack); + if (m_selectedClipList.count() == 1) m_dragItem->moveTo((int)(snappedPos / m_scale), m_scale, offset * m_tracksHeight, moveTrack); + else { + int moveOffset = (int)(snappedPos / m_scale) - m_dragItem->startPos().frames(m_document->fps()); + if (canBeMoved(m_selectedClipList, GenTime(moveOffset, m_document->fps()), offset)) { + for (int i = 0; i < m_selectedClipList.count(); i++) { + AbstractClipItem *item = m_selectedClipList.at(i); + item->moveTo(item->startPos().frames(m_document->fps()) + moveOffset, m_scale, offset * m_tracksHeight, item->track() + offset, false); + } + } + } + } else if (m_operationMode == RESIZESTART) { double snappedPos = getSnapPointForPos(mapToScene(event->pos()).x()); m_dragItem->resizeStart((int)(snappedPos / m_scale), m_scale); @@ -435,23 +444,24 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { // virtual void CustomTrackView::mousePressEvent(QMouseEvent * event) { + m_menuPosition = QPoint(); activateMonitor(); m_clickEvent = event->pos(); + QList collisionList = items(event->pos()); if (event->button() == Qt::MidButton) { m_document->renderer()->switchPlay(); return; } - if (event->modifiers() == Qt::ControlModifier) { + if (event->modifiers() == Qt::ControlModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::ScrollHandDrag); QGraphicsView::mousePressEvent(event); return; - } else if (event->modifiers() == Qt::ShiftModifier) { + } else if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) { setDragMode(QGraphicsView::RubberBandDrag); QGraphicsView::mousePressEvent(event); return; } else { bool collision = false; - QList collisionList = items(event->pos()); if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) { // a guide item was pressed collisionList.at(0)->setFlag(QGraphicsItem::ItemIsMovable, true); @@ -485,10 +495,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { } // select item if (!item->isSelected()) { - QList itemList = items(); - for (int i = 0; i < itemList.count(); i++) { - itemList.at(i)->setSelected(false); - itemList.at(i)->update(); + + if (event->modifiers() != Qt::ControlModifier) { + QList itemList = items(); + for (int i = 0; i < itemList.count(); i++) { + itemList.at(i)->setSelected(false); + itemList.at(i)->update(); + } } item->setSelected(true); item->update(); @@ -501,6 +514,13 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { m_dragItemInfo.endPos = m_dragItem->endPos(); m_dragItemInfo.track = m_dragItem->track(); + m_selectedClipList.clear(); + QList selected = scene()->selectedItems(); + for (int i = 0; i < selected.count(); i++) { + if (selected.at(i)->type() == AVWIDGET || selected.at(i)->type() == TRANSITIONWIDGET) + m_selectedClipList.append(static_cast (selected.at(i))); + } + m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale); if (m_operationMode == KEYFRAME) { m_dragItem->updateSelectedKeyFrame(); @@ -545,6 +565,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) { //emit clipItemSelected(NULL); if (event->button() == Qt::RightButton) { displayContextMenu(event->globalPos()); + m_menuPosition = event->pos(); } else setCursorPos((int)(mapToScene(event->x(), 0).x() / m_scale)); } else if (event->button() == Qt::RightButton) { m_operationMode = NONE; @@ -906,11 +927,7 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { void CustomTrackView::dropEvent(QDropEvent * event) { if (m_dropItem) { - ItemInfo info; - info.startPos = m_dropItem->startPos(); - info.endPos = m_dropItem->endPos(); - info.track = m_dropItem->track(); - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), info, false, false); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, m_dropItem->xml(), m_dropItem->clipProducer(), m_dropItem->info(), false, false); m_commandStack->push(command); m_dropItem->baseClip()->addReference(); m_document->updateClip(m_dropItem->baseClip()->getId()); @@ -979,11 +996,7 @@ void CustomTrackView::deleteClip(int clipId) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - ItemInfo info; - info.startPos = item->startPos(); - info.endPos = item->endPos(); - info.track = item->track(); - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true); + AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), true, true); m_commandStack->push(command); //delete item; } @@ -1056,25 +1069,71 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_operationMode == MOVE) { setCursor(Qt::OpenHandCursor); - // move clip - if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { - bool success = m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps()))); - if (success) { - MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - } else { - // undo last move and emit error message - MoveClipCommand *command = new MoveClipCommand(this, info, m_dragItemInfo, true); + + if (m_selectedClipList.count() == 1) { + // we are moving one clip, easy + if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { + bool success = m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps()))); + if (success) { + MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false); + m_commandStack->push(command); + } else { + // 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 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)) { + MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); m_commandStack->push(command); - emit displayMessage(i18n("Cannot move clip to position %1seconds", QString::number(m_dragItemInfo.startPos.seconds(), 'g', 2)), ErrorMessage); + Transition *transition = (Transition *) m_dragItem; + transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); + m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); + } + } else { + // Moving several clips. We need to delete them and readd them to new position, + // or they might overlap each other during the move + + GenTime timeOffset = info.startPos - m_dragItemInfo.startPos; + int trackOffset = info.track - m_dragItemInfo.track; + if (timeOffset != GenTime() || trackOffset != 0) { + QUndoCommand *moveClips = new QUndoCommand(); + moveClips->setText("Move clips"); + // remove items in MLT playlist + for (int i = 0; i < m_selectedClipList.count(); i++) { + AbstractClipItem *item = m_selectedClipList.at(i); + ItemInfo info = item->info(); + info.startPos = info.startPos - timeOffset; + info.endPos = info.endPos - timeOffset; + info.track = info.track - trackOffset; + if (item->type() == AVWIDGET) { + ClipItem *clip = static_cast (item); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, false, true, moveClips); + m_document->renderer()->mltRemoveClip(m_tracksList.count() - info.track, info.startPos); + } else { + Transition *tr = static_cast (item); + new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, true, moveClips); + m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML()); + } + } + + for (int i = 0; i < m_selectedClipList.count(); i++) { + // re-add items in correct place + AbstractClipItem *item = m_selectedClipList.at(i); + if (item->type() == AVWIDGET) { + ClipItem *clip = static_cast (item); + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), item->info(), false, false, moveClips); + m_document->renderer()->mltInsertClip(m_tracksList.count() - item->track(), item->startPos(), clip->xml()); + } else { + Transition *tr = static_cast (item); + ItemInfo transitionInfo = tr->info(); + new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, false, moveClips); + m_document->renderer()->mltAddTransition(tr->transitionTag(), tr->transitionEndTrack() + trackOffset, m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML()); + } + } + m_commandStack->push(moveClips); } - } - if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) { - MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false); - m_commandStack->push(command); - Transition *transition = (Transition *) m_dragItem; - transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track())); - m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos); } } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) { @@ -1174,9 +1233,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { } void CustomTrackView::deleteClip(ItemInfo info) { - ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track); + ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track); if (!item) { - kDebug() << "----------------  ERROR, CANNOT find clip to move at...";// << rect.x(); + kDebug() << "----------------  ERROR, CANNOT find clip to delete at...";// << rect.x(); return; } if (item->isSelected()) emit clipItemSelected(NULL); @@ -1188,19 +1247,17 @@ void CustomTrackView::deleteClip(ItemInfo info) { } void CustomTrackView::deleteSelectedClips() { - + QList itemList = scene()->selectedItems(); + if (itemList.count() == 0) { + emit displayMessage(i18n("Select clip to delete"), ErrorMessage); + return; + } QUndoCommand *deleteSelected = new QUndoCommand(); deleteSelected->setText("Delete selected items"); - - QList itemList = scene()->selectedItems(); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *) itemList.at(i); - ItemInfo info; - info.startPos = item->startPos(); - info.endPos = item->endPos(); - info.track = item->track(); - new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), info, true, true, deleteSelected); + new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), true, true, deleteSelected); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { Transition *item = (Transition *) itemList.at(i); ItemInfo info; @@ -1877,6 +1934,119 @@ void CustomTrackView::clearSearchStrings() { m_findIndex = 0; } +void CustomTrackView::copyClip() { + while (m_copiedItems.count() > 0) { + delete m_copiedItems.takeFirst(); + } + QList itemList = scene()->selectedItems(); + if (itemList.count() == 0) { + emit displayMessage(i18n("Select a clip before copying"), ErrorMessage); + return; + } + for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == AVWIDGET) { + ClipItem *dup = static_cast (itemList.at(i)); + m_copiedItems.append(dup->clone(m_scale)); + } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { + Transition *dup = static_cast (itemList.at(i)); + m_copiedItems.append(dup->clone(m_scale)); + } + } +} + +bool CustomTrackView::canBePastedTo(ItemInfo info, int type) const { + QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1)); + QList collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect); + for (int i = 0; i < collisions.count(); i++) { + if (collisions.at(i)->type() == type) return false; + } + return true; +} + +bool CustomTrackView::canBePasted(QList items, GenTime offset, int trackOffset) const { + for (int i = 0; i < items.count(); i++) { + ItemInfo info = items.at(i)->info(); + info.startPos += offset; + info.endPos += offset; + info.track += trackOffset; + if (!canBePastedTo(info, items.at(i)->type())) return false; + } + return true; +} + +bool CustomTrackView::canBeMoved(QList items, GenTime offset, int trackOffset) const { + QPainterPath movePath; + movePath.moveTo(0, 0); + + for (int i = 0; i < items.count(); i++) { + ItemInfo info = items.at(i)->info(); + info.startPos = info.startPos + offset; + info.endPos = info.endPos + offset; + info.track = info.track + trackOffset; + if (info.startPos < GenTime()) { + // No clip should go below 0 + return false; + } + QRectF rect((double) info.startPos.frames(m_document->fps()) * m_scale, (double)(info.track * m_tracksHeight + 1), (double)(info.endPos - info.startPos).frames(m_document->fps()) * m_scale, (double)(m_tracksHeight - 1)); + movePath.addRect(rect); + } + QList collisions = scene()->items(movePath, Qt::IntersectsItemBoundingRect); + for (int i = 0; i < collisions.count(); i++) { + if ((collisions.at(i)->type() == AVWIDGET || collisions.at(i)->type() == TRANSITIONWIDGET) && !items.contains(static_cast (collisions.at(i)))) { + kDebug() << " //////////// CLIP COLLISION, MOVE NOT ALLOWED"; + return false; + } + } + return true; +} + +void CustomTrackView::pasteClip() { + if (m_copiedItems.count() == 0) { + emit displayMessage(i18n("No clip copied"), ErrorMessage); + return; + } + QPoint position; + if (m_menuPosition.isNull()) position = mapFromGlobal(QCursor::pos()); + else position = m_menuPosition; + GenTime pos = GenTime((int)(mapToScene(position).x() / m_scale), m_document->fps()); + int track = (int)(position.y() / m_tracksHeight); + ItemInfo first = m_copiedItems.at(0)->info(); + + GenTime offset = pos - first.startPos; + int trackOffset = track - first.track; + + if (!canBePasted(m_copiedItems, offset, trackOffset)) { + emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage); + return; + } + QUndoCommand *pasteClips = new QUndoCommand(); + pasteClips->setText("Paste clips"); + + for (int i = 0; i < m_copiedItems.count(); i++) { + // parse all clip names + if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == AVWIDGET) { + ClipItem *clip = static_cast (m_copiedItems.at(i)); + ItemInfo info; + info.startPos = clip->startPos() + offset; + info.endPos = clip->endPos() + offset; + info.track = clip->track() + trackOffset; + if (canBePastedTo(info, AVWIDGET)) { + new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, true, false, pasteClips); + } else emit displayMessage(i18n("Cannot paste clip to selected place"), ErrorMessage); + } else if (m_copiedItems.at(i) && m_copiedItems.at(i)->type() == TRANSITIONWIDGET) { + Transition *tr = static_cast (m_copiedItems.at(i)); + ItemInfo info; + info.startPos = tr->startPos() + offset; + info.endPos = tr->endPos() + offset; + info.track = tr->track() + trackOffset; + if (canBePastedTo(info, TRANSITIONWIDGET)) { + new AddTransitionCommand(this, info, tr->transitionEndTrack() + trackOffset, tr->toXML(), false, true, pasteClips); + } else emit displayMessage(i18n("Cannot paste transition to selected place"), ErrorMessage); + } + } + m_commandStack->push(pasteClips); +} + /* void CustomTrackView::drawForeground ( QPainter * painter, const QRectF & rect ) { diff --git a/src/customtrackview.h b/src/customtrackview.h index 03597a9a..1ed4541d 100644 --- a/src/customtrackview.h +++ b/src/customtrackview.h @@ -117,6 +117,8 @@ public slots: void slotDeleteGuide(); void slotDeleteAllGuides(); void editGuide(const GenTime oldPos, const GenTime pos, const QString &comment); + void copyClip(); + void pasteClip(); protected: virtual void drawBackground(QPainter * painter, const QRectF & rect); @@ -172,9 +174,18 @@ private: int m_findIndex; PROJECTTOOL m_tool; QCursor m_razorCursor; + /** list containing items currently copied in the timeline */ + QList m_copiedItems; + QList m_selectedClipList; + /** Used to get the point in timeline where a context menu was opened */ + QPoint m_menuPosition; + /** Get the index of the video track that is just below current track */ int getPreviousVideoTrack(int track); void updateClipFade(ClipItem * item, bool updateFadeOut = false); + bool canBePastedTo(ItemInfo info, int type) const; + bool canBePasted(QList items, GenTime offset, int trackOffset) const; + bool canBeMoved(QList items, GenTime offset, int trackOffset) const; private slots: void slotRefreshGuides(); diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 10f1b4c8..2c58bf9d 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -89,7 +89,7 @@ EffectsList MainWindow::transitions; MainWindow::MainWindow(QWidget *parent) : KXmlGuiWindow(parent), - m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false) { + m_activeDocument(NULL), m_activeTimeline(NULL), m_renderWidget(NULL), m_jogProcess(NULL), m_findActivated(false), m_initialized(false) { setlocale(LC_NUMERIC, "POSIX"); parseProfiles(); setFont(KGlobalSettings::toolBarFont()); @@ -213,7 +213,7 @@ MainWindow::MainWindow(QWidget *parent) customEffectsMenu->addAction(action); } - QMenu *viewMenu = static_cast (factory()->container("dockwindows", this)); + QMenu *viewMenu = static_cast(factory()->container("dockwindows", this)); const QList viewActions = createPopupMenu()->actions(); viewMenu->insertActions(NULL, viewActions); @@ -235,8 +235,11 @@ MainWindow::MainWindow(QWidget *parent) } connect(transitionsMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotAddTransition(QAction *))); + m_timelineContextMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Paste))); + m_timelineContextClipMenu->addAction(actionCollection()->action("delete_timeline_clip")); m_timelineContextClipMenu->addAction(actionCollection()->action("cut_timeline_clip")); + m_timelineContextClipMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); QMenu *markersMenu = (QMenu*)(factory()->container("marker_menu", this)); m_timelineContextClipMenu->addMenu(markersMenu); @@ -246,6 +249,7 @@ MainWindow::MainWindow(QWidget *parent) m_timelineContextClipMenu->addMenu(customEffectsMenu); m_timelineContextTransitionMenu->addAction(actionCollection()->action("delete_timeline_clip")); + m_timelineContextTransitionMenu->addAction(actionCollection()->action(KStandardAction::name(KStandardAction::Copy))); connect(projectMonitorDock, SIGNAL(visibilityChanged(bool)), m_projectMonitor, SLOT(refreshMonitor(bool))); connect(clipMonitorDock, SIGNAL(visibilityChanged(bool)), m_clipMonitor, SLOT(refreshMonitor(bool))); @@ -258,10 +262,7 @@ MainWindow::MainWindow(QWidget *parent) setAutoSaveSettings(); if (KdenliveSettings::openlastproject()) { - KSharedConfigPtr config = KGlobal::config(); - QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString()); - openFile(KUrl(Lastproject)); - + openLastFile(); } else newFile(); activateShuttleDevice(); @@ -289,6 +290,18 @@ bool MainWindow::queryClose() { return true; } +void MainWindow::saveProperties(KConfig*) { + // save properties here,used by session management + saveFile(); +} + + +void MainWindow::readProperties(KConfig *config) { + // read properties here,used by session management + QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString()); + openFile(KUrl(Lastproject)); +} + void MainWindow::activateShuttleDevice() { if (m_jogProcess) delete m_jogProcess; m_jogProcess = NULL; @@ -645,6 +658,12 @@ void MainWindow::setupActions() { KStandardAction::preferences(this, SLOT(slotPreferences()), actionCollection()); + KStandardAction::copy(this, SLOT(slotCopy()), + actionCollection()); + + KStandardAction::paste(this, SLOT(slotPaste()), + actionCollection()); + KStandardAction::undo(this, SLOT(undo()), actionCollection()); @@ -737,6 +756,7 @@ void MainWindow::saveFileAs(const QString &outputFileName) { m_timelineArea->setTabText(m_timelineArea->currentIndex(), m_activeDocument->description()); m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), m_activeDocument->url().path()); m_activeDocument->setModified(false); + m_fileOpenRecent->addUrl(KUrl(outputFileName)); } void MainWindow::saveFileAs() { @@ -763,6 +783,12 @@ void MainWindow::openFile() { //changed openFile(url); } +void MainWindow::openLastFile() { + KSharedConfigPtr config = KGlobal::config(); + QString Lastproject = config->group("Recent Files").readPathEntry("File1", QString()); + openFile(KUrl(Lastproject)); +} + void MainWindow::openFile(const KUrl &url) { //new //TODO: get video profile from url before opening it MltVideoProfile prof = ProfilesDialog::getVideoProfile(KdenliveSettings::default_profile()); @@ -774,6 +800,7 @@ void MainWindow::openFile(const KUrl &url) { //new m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path()); if (m_timelineArea->count() > 1) m_timelineArea->setTabBarHidden(false); slotGotProgressInfo(QString(), -1); + m_projectMonitor->refreshMonitor(true); //connectDocument(trackView, doc); } @@ -1260,12 +1287,22 @@ void MainWindow::slotSetTool(PROJECTTOOL tool) { } } +void MainWindow::slotCopy() { + if (!m_activeDocument || !m_activeTimeline) return; + m_activeTimeline->projectView()->copyClip(); +} + +void MainWindow::slotPaste() { + if (!m_activeDocument || !m_activeTimeline) return; + m_activeTimeline->projectView()->pasteClip(); +} + void MainWindow::slotFind() { + if (!m_activeDocument || !m_activeTimeline) return; m_projectSearch->setEnabled(false); m_findActivated = true; m_findString = QString(); - TrackView *currentTab = (TrackView *) m_timelineArea->currentWidget(); - currentTab->projectView()->initSearchStrings(); + m_activeTimeline->projectView()->initSearchStrings(); statusBar()->showMessage(i18n("Starting -- find text as you type")); m_findTimer.start(5000); qApp->installEventFilter(this); diff --git a/src/mainwindow.h b/src/mainwindow.h index dd82147b..6fb14d96 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -71,6 +71,18 @@ protected: virtual void customEvent(QEvent * e); virtual void keyPressEvent(QKeyEvent *ke); bool eventFilter(QObject *obj, QEvent *ev); + /** + * This function is called when it is time for the app to save its + * properties for session management purposes. + */ + void saveProperties(KConfig *); + + /** + * This function is called when this app is restored. The KConfig + * object points to the session management config file that was saved + * with @ref saveProperties + */ + void readProperties(KConfig *); private: KTabWidget* m_timelineArea; @@ -137,6 +149,7 @@ private: bool m_findActivated; QString m_findString; QTimer m_findTimer; + bool m_initialized; void readOptions(); void saveOptions(); @@ -157,6 +170,7 @@ private slots: void activateDocument(); void connectDocument(TrackView*, KdenliveDoc*); void openFile(); + void openLastFile(); void saveFile(); void saveFileAs(); void saveFileAs(const QString &outputFileName); @@ -211,6 +225,9 @@ private slots: void slotEditGuide(); void slotDeleteGuide(); void slotDeleteAllGuides(); + + void slotCopy(); + void slotPaste(); }; diff --git a/src/transition.cpp b/src/transition.cpp index 4004435f..be01c204 100644 --- a/src/transition.cpp +++ b/src/transition.cpp @@ -60,6 +60,12 @@ Transition::Transition(const ItemInfo info, int transitiontrack, double scale, d Transition::~Transition() { } +Transition *Transition::clone(double scale) { + QDomElement xml = toXML().cloneNode().toElement(); + Transition *tr = new Transition(info(), transitionEndTrack(), scale, m_fps, xml); + return tr; +} + QString Transition::transitionName() const { return m_name; } diff --git a/src/transition.h b/src/transition.h index 445b53b4..a6dc6154 100644 --- a/src/transition.h +++ b/src/transition.h @@ -67,9 +67,8 @@ public: bool isValid() const; /** Transition should be linked to another track */ void updateTransitionEndTrack(int newtrack); - const ClipItem *referencedClip() const; - + Transition *clone(double scale); private: bool m_singleClip; QLinearGradient m_gradient; -- 2.39.5