X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=7cc622012bf50053a6491d8c30e8146aad223d24;hb=ff2dda64a4bb0ee5057f429018a96dc5efbc283d;hp=84952f9bc9d3aeb10347f8103c766f77a425bead;hpb=485eee3beffea9b2504b84925ec096e82bbe1ea0;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 84952f9b..7cc62201 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -62,7 +62,6 @@ #include "tracksconfigdialog.h" #include "commands/configtrackscommand.h" #include "commands/rebuildgroupcommand.h" -#include "commands/razorgroupcommand.h" #include "commands/refreshmonitorcommand.h" #include "profilesdialog.h" @@ -110,35 +109,44 @@ bool sortGuidesList(const Guide *g1 , const Guide *g2) // const int duration = animate ? 1500 : 1; CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent) : - QGraphicsView(projectscene, parent), - m_tracksHeight(KdenliveSettings::trackheight()), - m_projectDuration(0), - m_cursorPos(0), - m_document(doc), - m_scene(projectscene), - m_cursorLine(NULL), - m_operationMode(NONE), - m_moveOpMode(NONE), - m_dragItem(NULL), - m_dragGuide(NULL), - m_visualTip(NULL), - m_animation(NULL), - m_clickPoint(), - m_autoScroll(KdenliveSettings::autoscroll()), - m_pasteEffectsAction(NULL), - m_ungroupAction(NULL), - m_scrollOffset(0), - m_clipDrag(false), - m_findIndex(0), - m_tool(SELECTTOOL), - m_copiedItems(), - m_menuPosition(), - m_blockRefresh(false), - m_selectionGroup(NULL), - m_selectedTrack(0), - m_audioCorrelator(NULL), - m_audioAlignmentReference(NULL), - m_controlModifier(false) + QGraphicsView(projectscene, parent) + , m_tracksHeight(KdenliveSettings::trackheight()) + , m_projectDuration(0) + , m_cursorPos(0) + , m_document(doc) + , m_scene(projectscene) + , m_cursorLine(NULL) + , m_operationMode(NONE) + , m_moveOpMode(NONE) + , m_dragItem(NULL) + , m_dragGuide(NULL) + , m_visualTip(NULL) + , m_animation(NULL) + , m_clickPoint() + , m_autoScroll(KdenliveSettings::autoscroll()) + , m_timelineContextMenu(NULL) + , m_timelineContextClipMenu(NULL) + , m_timelineContextTransitionMenu(NULL) + , m_markerMenu(NULL) + , m_autoTransition(NULL) + , m_pasteEffectsAction(NULL) + , m_ungroupAction(NULL) + , m_editGuide(NULL) + , m_deleteGuide(NULL) + , m_clipTypeGroup(NULL) + , m_scrollOffset(0) + , m_clipDrag(false) + , m_findIndex(0) + , m_tool(SELECTTOOL) + , m_copiedItems() + , m_menuPosition() + , m_blockRefresh(false) + , m_selectionGroup(NULL) + , m_selectedTrack(0) + , m_spacerOffset(0) + , m_audioCorrelator(NULL) + , m_audioAlignmentReference(NULL) + , m_controlModifier(false) { if (doc) { m_commandStack = doc->commandStack(); @@ -231,11 +239,13 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi m_markerMenu = new QMenu(i18n("Go to marker..."), this); m_markerMenu->setEnabled(false); markermenu->addMenu(m_markerMenu); - connect(m_markerMenu, SIGNAL(triggered(QAction *)), this, SLOT(slotGoToMarker(QAction *))); + connect(m_markerMenu, SIGNAL(triggered(QAction*)), this, SLOT(slotGoToMarker(QAction*))); QList list = m_timelineContextClipMenu->actions(); for (int i = 0; i < list.count(); i++) { if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i); else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i); + else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i)); + else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i)); } m_timelineContextTransitionMenu = transition; @@ -322,12 +332,9 @@ bool CustomTrackView::checkTrackHeight() } } double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); - + m_cursorLine->setLine(0, 0, 0, newHeight - 1); for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), newHeight)); - m_guides.at(i)->setLine(l); + m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); @@ -405,16 +412,34 @@ void CustomTrackView::slotCheckPositionScrolling() } } +void CustomTrackView::slotAlignPlayheadToMousePos() +{ + /* get curser point ref in screen coord */ + QPoint ps = QCursor::pos(); + /* get xPos in scene coord */ + int mappedXPos = qMax((int)(mapToScene(mapFromGlobal(ps)).x() + 0.5), 0); + /* move playhead to new xPos*/ + seekCursorPos(mappedXPos); +} + +int CustomTrackView::getMousePos() const +{ + return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0); +} // virtual void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { int pos = event->x(); int mappedXPos = qMax((int)(mapToScene(event->pos()).x() + 0.5), 0); - double snappedPos = getSnapPointForPos(mappedXPos); emit mousePosition(mappedXPos); + if (m_operationMode == SCROLLTIMELINE) { + QGraphicsView::mouseMoveEvent(event); + return; + } + if (event->buttons() & Qt::MidButton) return; if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && m_operationMode != RESIZESTART && m_operationMode != RESIZEEND)) { event->setAccepted(true); @@ -446,7 +471,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (parent) parent->resizeStart((int)(snappedPos - m_dragItemInfo.startPos.frames(m_document->fps()))); } else { - m_dragItem->resizeStart((int)(snappedPos)); + m_dragItem->resizeStart((int)(snappedPos), true, false); } QString crop = m_document->timecode().getDisplayTimecode(m_dragItem->cropStart(), KdenliveSettings::frametimecode()); QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); @@ -459,7 +484,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (parent) parent->resizeEnd((int)(snappedPos - m_dragItemInfo.endPos.frames(m_document->fps()))); } else { - m_dragItem->resizeEnd((int)(snappedPos)); + m_dragItem->resizeEnd((int)(snappedPos), false); } QString duration = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration(), KdenliveSettings::frametimecode()); QString offset = m_document->timecode().getDisplayTimecode(m_dragItem->cropDuration() - m_dragItemInfo.cropDuration, KdenliveSettings::frametimecode()); @@ -491,7 +516,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) // Make sure there is no collision QList children = m_selectionGroup->childItems(); - QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + QPainterPath shape = m_selectionGroup->clipGroupSpacerShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); QList collidingItems = scene()->items(shape, Qt::IntersectsItemShape); collidingItems.removeAll(m_selectionGroup); for (int i = 0; i < children.count(); i++) { @@ -517,7 +542,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) } snappedPos += offset; // make sure we have no collision - shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0)); + shape = m_selectionGroup->clipGroupSpacerShape(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++) { @@ -593,11 +618,8 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (m_tool == RAZORTOOL) { setCursor(m_razorCursor); - //QGraphicsView::mouseMoveEvent(event); - //return; } else if (m_tool == SPACERTOOL) { setCursor(m_spacerCursor); - return; } QList itemList = items(event->pos()); @@ -606,12 +628,18 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) { opMode = MOVEGUIDE; + setCursor(Qt::SplitHCursor); } else for (int i = 0; i < itemList.count(); i++) { - if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { - item = (QGraphicsRectItem*) itemList.at(i); - break; - } - } + if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) { + item = (QGraphicsRectItem*) itemList.at(i); + break; + } + } + + if (m_tool == SPACERTOOL) { + event->accept(); + return; + } if (item && event->buttons() == Qt::NoButton) { AbstractClipItem *clip = static_cast (item); @@ -707,15 +735,16 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) return; } else if (opMode == MOVEGUIDE) { m_moveOpMode = opMode; - setCursor(Qt::SplitHCursor); } else { removeTipAnimation(); setCursor(Qt::ArrowCursor); if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) { QGraphicsView::mouseMoveEvent(event); m_moveOpMode = SEEK; - seekCursorPos(mappedXPos); - slotCheckPositionScrolling(); + if (mappedXPos != m_document->renderer()->getCurrentSeekPosition() && mappedXPos != cursorPos()) { + seekCursorPos(mappedXPos); + slotCheckPositionScrolling(); + } return; } else m_moveOpMode = NONE; } @@ -759,7 +788,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragGuide = NULL; if (m_tool != RAZORTOOL) activateMonitor(); - else if (m_document->renderer()->playSpeed() != 0.0) { + else if (m_document->renderer()->isPlaying()) { m_document->renderer()->pause(); return; } @@ -770,12 +799,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) { // Pressing Ctrl + left mouse button in an empty area scrolls the timeline setDragMode(QGraphicsView::ScrollHandDrag); - QGraphicsView::mousePressEvent(event); m_blockRefresh = false; - m_operationMode = NONE; + m_operationMode = SCROLLTIMELINE; + QGraphicsView::mousePressEvent(event); return; } - // if a guide and a clip were pressed, just select the guide for (int i = 0; i < collisionList.count(); ++i) { if (collisionList.at(i)->type() == GUIDEITEM) { @@ -800,11 +828,16 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) AbstractGroupItem *dragGroup = NULL; AbstractClipItem *collisionClip = NULL; bool found = false; + QStringList lockedTracks; + double yOffset = 0; + m_selectionMutex.lock(); while (!m_dragGuide && ct < collisionList.count()) { if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) { collisionClip = static_cast (collisionList.at(ct)); - if (collisionClip->isItemLocked()) - break; + if (collisionClip->isItemLocked() || !collisionClip->isEnabled()) { + ct++; + continue; + } if (collisionClip == m_dragItem) { collisionClip = NULL; } @@ -812,12 +845,25 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem = collisionClip; } found = true; - m_dragItem->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y()); + for (int i = 0; i < m_document->tracksCount(); i++) { + if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); + } + yOffset = mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y(); + m_dragItem->setProperty("y_absolute", yOffset); + m_dragItem->setProperty("locked_tracks", lockedTracks); m_dragItemInfo = m_dragItem->info(); - if (m_selectionGroup) m_selectionGroup->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y()); - if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { - dragGroup = static_cast (m_dragItem->parentItem()); - dragGroup->setProperty("y_absolute", mapToScene(m_clickEvent).y() - m_dragItem->scenePos().y()); + if (m_selectionGroup) { + m_selectionGroup->setProperty("y_absolute", yOffset); + m_selectionGroup->setProperty("locked_tracks", lockedTracks); + } + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) { + QGraphicsItem *topGroup = m_dragItem->parentItem(); + while (topGroup->parentItem() && topGroup->parentItem()->type() == GROUPWIDGET && topGroup->parentItem() != m_selectionGroup) { + topGroup = topGroup->parentItem(); + } + dragGroup = static_cast (topGroup); + dragGroup->setProperty("y_absolute", yOffset); + dragGroup->setProperty("locked_tracks", lockedTracks); } break; } @@ -827,6 +873,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem) emit clipItemSelected(NULL); m_dragItem = NULL; } + #if QT_VERSION >= 0x040800 // Add shadow to dragged item, currently disabled because of painting artifacts /*if (m_dragItem) { @@ -836,22 +883,28 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem->setGraphicsEffect(eff); }*/ #endif - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) { + if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isEnabled()) { // update transition menu action m_autoTransition->setChecked(static_cast(m_dragItem)->isAutomatic()); m_autoTransition->setEnabled(true); - } else m_autoTransition->setEnabled(false); - + // A transition is selected + QPoint p; + ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); + } else { + emit transitionItemSelected(NULL); + m_autoTransition->setEnabled(false); + } // context menu requested if (event->button() == Qt::RightButton) { - if (m_dragItem) { - if (dragGroup) dragGroup->setSelected(true); - else if (!m_dragItem->isSelected()) { - resetSelectionGroup(false); - m_scene->clearSelection(); - m_dragItem->setSelected(true); - } - } else if (!m_dragGuide) { + if (!m_dragItem && !m_dragGuide) { // check if there is a guide close to mouse click QList guidesCollisionList = items(event->pos().x() - 5, event->pos().y(), 10, 2); // a rect of height < 2 does not always collide with the guide for (int i = 0; i < guidesCollisionList.count(); i++) { @@ -869,17 +922,17 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } m_operationMode = NONE; + if (dragGroup == NULL) { + if (m_dragItem && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) + dragGroup = static_cast (m_dragItem->parentItem()); + } displayContextMenu(event->globalPos(), m_dragItem, dragGroup); m_menuPosition = m_clickEvent; - m_dragItem = NULL; - event->accept(); - return; } - + m_selectionMutex.unlock(); // No item under click if (m_dragItem == NULL || m_tool == SPACERTOOL) { resetSelectionGroup(false); - setCursor(Qt::ArrowCursor); m_scene->clearSelection(); //event->accept(); updateClipTypeActions(NULL); @@ -913,6 +966,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) QList offsetList; // create group to hold selected items + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); @@ -938,6 +992,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } } m_spacerOffset = m_selectionGroup->sceneBoundingRect().left() - (int)(mapToScene(m_clickEvent).x()); + m_selectionMutex.unlock(); if (!offsetList.isEmpty()) { qSort(offsetList); QList cleandOffsetList; @@ -951,7 +1006,8 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) updateSnapPoints(NULL, cleandOffsetList, true); } m_operationMode = SPACER; - } else { + } else if (event->button() != Qt::RightButton) { + setCursor(Qt::ArrowCursor); seekCursorPos((int)(mapToScene(event->x(), 0).x())); } QGraphicsView::mousePressEvent(event); @@ -969,8 +1025,8 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) { razorGroup((AbstractGroupItem *)m_dragItem->parentItem(), cutPos); } else { - AbstractClipItem *clip = static_cast (m_dragItem); - RazorClipCommand* command = new RazorClipCommand(this, clip->info(), cutPos); + ClipItem *clip = static_cast (m_dragItem); + RazorClipCommand* command = new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos); m_commandStack->push(command); } setDocumentModified(); @@ -1000,25 +1056,40 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } else { resetSelectionGroup(); } - dragGroup = NULL; - if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { - dragGroup = static_cast (m_dragItem->parentItem()); - } + /*if () { + dragGroup = NULL; + if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) { + dragGroup = static_cast (m_dragItem->parentItem()); + } + }*/ bool selected = !m_dragItem->isSelected(); + m_dragItem->setZValue(99); + if (m_dragItem->parentItem()) m_dragItem->parentItem()->setZValue(99); QGraphicsView::mousePressEvent(event); - + if (dragGroup) { dragGroup->setSelected(selected); - if (dragGroup->parentItem()) + QList children = dragGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + children.at(i)->setSelected(selected); + } + if (dragGroup->parentItem()) { dragGroup->parentItem()->setSelected(selected); + } } else m_dragItem->setSelected(selected); if (selected == false) { m_dragItem = NULL; } - groupSelectedItems(); + groupSelectedItems(QList (), false, true); + m_selectionMutex.lock(); + if (m_selectionGroup) { + m_selectionGroup->setProperty("y_absolute", yOffset); + m_selectionGroup->setProperty("locked_tracks", lockedTracks); + } + m_selectionMutex.unlock(); if (m_dragItem) { ClipItem *clip = static_cast (m_dragItem); updateClipTypeActions(dragGroup == NULL ? clip : NULL); @@ -1028,6 +1099,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } else { QGraphicsView::mousePressEvent(event); + m_selectionMutex.lock(); if (m_selectionGroup) { QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); i++) { @@ -1036,9 +1108,11 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionGroup->setSelected(itemSelected); } - if (dragGroup) + if (dragGroup) { dragGroup->setSelected(itemSelected); + } m_dragItem->setSelected(itemSelected); + m_selectionMutex.unlock(); } if (collisionClip != NULL || m_dragItem == NULL) { @@ -1076,6 +1150,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) else updateSnapPoints(m_dragItem); } else { + m_selectionMutex.lock(); QList offsetList; QList children = m_selectionGroup->childItems(); for (int i = 0; i < children.count(); i++) { @@ -1097,6 +1172,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } updateSnapPoints(NULL, cleandOffsetList, true); } + m_selectionMutex.unlock(); } if (m_operationMode == KEYFRAME) { @@ -1175,7 +1251,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) resetSelectionGroup(false); m_dragItem->setSelected(true); } - m_blockRefresh = false; } @@ -1197,18 +1272,22 @@ void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos) void CustomTrackView::rebuildGroup(AbstractGroupItem *group) { if (group) { + m_selectionMutex.lock(); + if (group == m_selectionGroup) m_selectionGroup = NULL; QList children = group->childItems(); m_document->clipManager()->removeGroup(group); - /*for (int i = 0; i < children.count(); i++) { + for (int i = 0; i < children.count(); i++) { group->removeFromGroup(children.at(i)); - }*/ + } scene()->destroyItemGroup(group); - groupSelectedItems(children, false, true, true); + m_selectionMutex.unlock(); + groupSelectedItems(children, group != m_selectionGroup, true); } } void CustomTrackView::resetSelectionGroup(bool selectItems) { + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) { // delete selection group bool snap = KdenliveSettings::snaptopoints(); @@ -1218,22 +1297,25 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; for (int i = 0; i < children.count(); i++) { - if (children.at(i)->parentItem() == 0 && (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { - if (!static_cast (children.at(i))->isItemLocked()) { - children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); - children.at(i)->setSelected(selectItems); - } - } else if (children.at(i)->type() == GROUPWIDGET) { - children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); - children.at(i)->setSelected(selectItems); + if (children.at(i)->parentItem() == 0) { + if ((children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)) { + if (!static_cast (children.at(i))->isItemLocked()) { + children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); + children.at(i)->setSelected(selectItems); + } + } else if (children.at(i)->type() == GROUPWIDGET) { + children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true); + children.at(i)->setSelected(selectItems); + } } } KdenliveSettings::setSnaptopoints(snap); } } -void CustomTrackView::groupSelectedItems(QList selection, bool force, bool createNewGroup, bool selectNewGroup) +void CustomTrackView::groupSelectedItems(QList selection, bool createNewGroup, bool selectNewGroup) { + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; @@ -1244,22 +1326,42 @@ void CustomTrackView::groupSelectedItems(QList selection, bool QSet itemsList; for (int i = 0; i < selection.count(); i++) { + if (selectNewGroup) selection.at(i)->setSelected(true); if (selection.at(i)->type() == GROUPWIDGET) { - groupsList.insert(static_cast (selection.at(i))); + AbstractGroupItem *it = static_cast (selection.at(i)); + while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) { + it = static_cast (it->parentItem()); + } + if (!it || it->isItemLocked()) continue; + groupsList.insert(it); } } for (int i = 0; i < selection.count(); i++) { if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) { if (selection.at(i)->parentItem() && selection.at(i)->parentItem()->type() == GROUPWIDGET) { - groupsList.insert(static_cast (selection.at(i)->parentItem())); + AbstractGroupItem *it = static_cast (selection.at(i)->parentItem()); + while (it->parentItem() && it->parentItem()->type() == GROUPWIDGET) { + it = static_cast (it->parentItem()); + } + if (!it || it->isItemLocked()) continue; + groupsList.insert(it); } else { + AbstractClipItem *it = static_cast (selection.at(i)); + if (!it || it->isItemLocked()) continue; itemsList.insert(selection.at(i)); } } } if (itemsList.isEmpty() && groupsList.isEmpty()) return; - + if (itemsList.count() == 1 && groupsList.isEmpty()) { + // only one item selected: + QSetIterator it(itemsList); + m_dragItem = static_cast(it.next()); + m_dragItem->setSelected(true); + return; + } + QRectF rectUnion; // Find top left position of selection foreach (const QGraphicsItemGroup *value, groupsList) { @@ -1268,56 +1370,59 @@ void CustomTrackView::groupSelectedItems(QList selection, bool foreach (const QGraphicsItem *value, itemsList) { rectUnion = rectUnion.united(value->sceneBoundingRect()); } - if (force || selection.count() > 1) { - bool snap = KdenliveSettings::snaptopoints(); - KdenliveSettings::setSnaptopoints(false); - if (createNewGroup) { - AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); - 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 - foreach (QGraphicsItemGroup *value, groupsList) { - QList children = value->childItems(); - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) - itemsList.insert(children.at(i)); - } - AbstractGroupItem *grp = static_cast(value); - m_document->clipManager()->removeGroup(grp); - scene()->destroyItemGroup(grp); + bool snap = KdenliveSettings::snaptopoints(); + KdenliveSettings::setSnaptopoints(false); + if (createNewGroup) { + AbstractGroupItem *newGroup = m_document->clipManager()->createGroup(); + 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); + + // Check if we are trying to include a group in a group + foreach (QGraphicsItemGroup *value, groupsList) { + newGroup->addItem(value); + } + + foreach (QGraphicsItemGroup *value, groupsList) { + QList children = value->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) + itemsList.insert(children.at(i)); } + AbstractGroupItem *grp = static_cast(value); + m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; + scene()->destroyItemGroup(grp); + } - foreach (QGraphicsItem *value, itemsList) { - newGroup->addItem(value); - } - KdenliveSettings::setSnaptopoints(snap); - if (selectNewGroup) newGroup->setSelected(true); - } else { - m_selectionGroup = new AbstractGroupItem(m_document->fps()); - 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()); + foreach (QGraphicsItem *value, itemsList) { + newGroup->addItem(value); + } + scene()->addItem(newGroup); + KdenliveSettings::setSnaptopoints(snap); + if (selectNewGroup) newGroup->setSelected(true); + } else { + m_selectionGroup = new AbstractGroupItem(m_document->fps()); + 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); - foreach (QGraphicsItemGroup *value, groupsList) { - m_selectionGroup->addItem(value); - } - foreach (QGraphicsItem *value, itemsList) { - m_selectionGroup->addItem(value); - } - KdenliveSettings::setSnaptopoints(snap); - if (m_selectionGroup) { - m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); - m_selectionGroupInfo.track = m_selectionGroup->track(); - if (selectNewGroup) m_selectionGroup->setSelected(true); - } + scene()->addItem(m_selectionGroup); + foreach (QGraphicsItemGroup *value, groupsList) { + m_selectionGroup->addItem(value); + } + foreach (QGraphicsItem *value, itemsList) { + m_selectionGroup->addItem(value); } - } else resetSelectionGroup(); + KdenliveSettings::setSnaptopoints(snap); + if (m_selectionGroup) { + m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()); + m_selectionGroupInfo.track = m_selectionGroup->track(); + if (selectNewGroup) m_selectionGroup->setSelected(true); + } + } } void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) @@ -1348,10 +1453,14 @@ void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) } else*/ { // add keyframe GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart(); + int single = m_dragItem->checkForSingleKeyframe(); int val = m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y()); ClipItem * item = static_cast (m_dragItem); + QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); + if (single > -1) { + item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1, single); + } //QString previous = item->keyframes(item->selectedEffectIndex()); - QDomElement oldEffect = item->selectedEffect().cloneNode().toElement(); item->insertKeyframe(item->getEffectAtIndex(item->selectedEffectIndex()), keyFramePos.frames(m_document->fps()), val); //item->updateKeyframeEffect(); //QString next = item->keyframes(item->selectedEffectIndex()); @@ -1495,7 +1604,7 @@ void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, Abs //build go to marker menu if (item->baseClip()) { QList markers = item->baseClip()->commentedSnapMarkers(); - int offset = item->startPos().frames(m_document->fps()); + int offset = (item->startPos()- item->cropStart()).frames(m_document->fps()); if (!markers.isEmpty()) { for (int i = 0; i < markers.count(); i++) { int pos = (int) markers.at(i).time().frames(m_document->timecode().fps()); @@ -1548,9 +1657,15 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) return; } - AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false); - updateTrackDuration(pasteInfo.track, command); - m_commandStack->push(command); + // Add refresh command for undo + QUndoCommand *addCommand = new QUndoCommand(); + addCommand->setText(i18n("Add timeline clip")); + new RefreshMonitorCommand(this, false, true, addCommand); + new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false, addCommand); + new RefreshMonitorCommand(this, true, false, addCommand); + updateTrackDuration(pasteInfo.track, addCommand); + + m_commandStack->push(addCommand); selectClip(true, false); // Automatic audio split @@ -1560,10 +1675,17 @@ void CustomTrackView::insertClipCut(DocClipBase *clip, int in, int out) bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) { - if (data->hasFormat("kdenlive/clip")) { - m_clipDrag = true; - m_scene->clearSelection(); - resetSelectionGroup(false); + QPointF framePos = mapToScene(pos); + int track = framePos.y() / KdenliveSettings::trackheight(); + m_clipDrag = data->hasFormat("kdenlive/clip") || data->hasFormat("kdenlive/producerslist"); + // This is not a clip drag, maybe effect or other... + if (!m_clipDrag) return false; + m_scene->clearSelection(); + m_dragItem = NULL; + resetSelectionGroup(false); + QMutexLocker lock(&m_selectionMutex); + if (track < 0 || track > m_document->tracksCount() - 1 || m_document->trackInfoAt(m_document->tracksCount() - track - 1).isLocked) return true; + if (data->hasFormat("kdenlive/clip")) { QStringList list = QString(data->data("kdenlive/clip")).split(';'); DocClipBase *clip = m_document->getBaseClip(list.at(0)); if (clip == NULL) { @@ -1574,7 +1696,6 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) emit displayMessage(i18n("Clip not ready"), ErrorMessage); return false; } - QPointF framePos = mapToScene(pos); ItemInfo info; info.startPos = GenTime(); info.cropStart = GenTime(list.at(1).toInt(), m_document->fps()); @@ -1599,19 +1720,19 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) QList offsetList; offsetList.append(info.endPos); updateSnapPoints(NULL, offsetList); + QStringList lockedTracks; + for (int i = 0; i < m_document->tracksCount(); i++) { + if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); + } + m_selectionGroup->setProperty("locked_tracks", lockedTracks); m_selectionGroup->setPos(framePos); scene()->addItem(m_selectionGroup); m_selectionGroup->setSelected(true); - return true; } else if (data->hasFormat("kdenlive/producerslist")) { - m_clipDrag = true; QStringList ids = QString(data->data("kdenlive/producerslist")).split(';'); - m_scene->clearSelection(); - resetSelectionGroup(false); QList offsetList; QList infoList; - QPointF framePos = mapToScene(pos); GenTime start = GenTime((int)(framePos.x() + 0.5), m_document->fps()); int track = (int)(framePos.y() / m_tracksHeight); framePos.setX((int)(framePos.x() + 0.5)); @@ -1649,7 +1770,7 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) if (!canBePastedTo(infoList, AVWIDGET)) { return true; } - m_selectionGroup = new AbstractGroupItem(m_document->fps()); + if (ids.size() > 1) m_selectionGroup = new AbstractGroupItem(m_document->fps()); start = GenTime(); for (int i = 0; i < ids.size(); ++i) { QString clipData = ids.at(i); @@ -1671,22 +1792,32 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) start += info.cropDuration; offsetList.append(start); ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, getFrameWidth(), false); - m_selectionGroup->addItem(item); + if (ids.size() > 1) m_selectionGroup->addItem(item); + else m_dragItem = item; + item->setSelected(true); if (!clip->isPlaceHolder()) m_waitingThumbs.append(item); } updateSnapPoints(NULL, offsetList); - m_selectionGroup->setPos(framePos); - scene()->addItem(m_selectionGroup); + QStringList lockedTracks; + for (int i = 0; i < m_document->tracksCount(); i++) { + if (m_document->trackInfoAt(i).isLocked) lockedTracks << QString::number(m_document->tracksCount() - i - 1); + } + + if (m_selectionGroup) { + m_selectionGroup->setProperty("locked_tracks", lockedTracks); + m_selectionGroup->setPos(framePos); + scene()->addItem(m_selectionGroup); + } + else if (m_dragItem) { + m_dragItem->setProperty("locked_tracks", lockedTracks); + m_dragItem->setPos(framePos); + scene()->addItem(m_dragItem); + } //m_selectionGroup->setZValue(10); m_thumbsTimer.start(); - return true; - - } else { - // the drag is not a clip (may be effect, ...) - m_clipDrag = false; - return false; } + return true; } @@ -1773,10 +1904,12 @@ void CustomTrackView::addEffect(int track, GenTime pos, QDomElement effect) return; } EffectsParameterList params = clip->addEffect(effect); - if (!m_document->renderer()->mltAddEffect(track, pos, params)) + if (!m_document->renderer()->mltAddEffect(track, pos, params)) { emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage); - clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt()); - if (clip->isSelected()) emit clipItemSelected(clip); + clip->deleteEffect(params.paramValue("kdenlive_ix")); + } + else clip->setSelectedEffect(params.paramValue("kdenlive_ix").toInt()); + if (clip->isMainSelectedClip()) emit clipItemSelected(clip); } else emit displayMessage(i18n("Cannot find clip to add effect"), ErrorMessage); } @@ -1811,8 +1944,8 @@ void CustomTrackView::deleteEffect(int track, GenTime pos, QDomElement effect) } ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), m_document->tracksCount() - track); if (clip) { - clip->deleteEffect(index); - emit clipItemSelected(clip); + clip->deleteEffect(index); + if (clip->isMainSelectedClip()) emit clipItemSelected(clip); } } @@ -1827,6 +1960,9 @@ void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem * else effectName = i18n("effect"); effectCommand->setText(i18n("Add %1", effectName)); for (int i = 0; i < itemList.count(); i++) { + if (itemList.at(i)->type() == GROUPWIDGET) { + itemList << itemList.at(i)->childItems(); + } if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = static_cast (itemList.at(i)); if (effect.tagName() == "effectgroup") { @@ -1868,12 +2004,27 @@ void CustomTrackView::slotAddEffect(ClipItem *clip, QDomElement effect) if (clip) slotAddEffect(effect, clip->startPos(), clip->track()); } +void CustomTrackView::slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int track) +{ + if (clip == NULL) return; + slotAddEffect(effect, pos, track); + if (clip->parentItem()) { + // Clip is in a group, should not happen + kDebug()<<"/// DROPPED ON ITEM IN GRP"; + } + else if (clip != m_dragItem) { + clearSelection(false); + m_dragItem = clip; + clip->setSelected(true); + emit clipItemSelected(clip); + } +} + void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) { QList itemList; QUndoCommand *effectCommand = new QUndoCommand(); QString effectName; - int offset = effect.attribute("clipstart").toInt(); if (effect.tagName() == "effectgroup") { effectName = effect.attribute("name"); @@ -1927,19 +2078,20 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) if (effectCommand->childCount() > 0) { m_commandStack->push(effectCommand); setDocumentModified(); - if (effectCommand->childCount() == 1) { + /*if (effectCommand->childCount() == 1) { // Display newly added clip effect for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *clip = static_cast(itemList.at(i)); clip->setSelectedEffect(clip->effectsCount()); - if (!clip->isSelected()) { + if (!clip->isSelected() && (!m_dragItem || !itemList.contains(m_dragItem))) { + kDebug()<<"// CLIP WAS NO SELECTED, DRG: "<<(m_dragItem == NULL); clearSelection(false); clip->setSelected(true); m_dragItem = clip; + emit clipItemSelected(clip); + break; } - emit clipItemSelected(clip); - break; } } } @@ -1953,7 +2105,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } } } - } + }*/ } else delete effectCommand; } @@ -2280,7 +2432,7 @@ void CustomTrackView::slotUpdateClipRegion(ClipItem *clip, int ix, QString regio m_commandStack->push(command); } -ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, bool execute) +ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, EffectsList oldStack, bool execute) { if (cut) { // cut clip @@ -2341,17 +2493,23 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo item->resizeEnd(cutPos); scene()->addItem(dup); - if (item->checkKeyFrames()) + + if (item->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()))) slotRefreshEffects(item); - if (dup->checkKeyFrames()) + + if (dup->checkKeyFrames(m_document->width(), m_document->height(), info.cropDuration.frames(m_document->fps()), cutTime.frames(m_document->fps()))) slotRefreshEffects(dup); item->baseClip()->addReference(); m_document->updateClip(item->baseClip()->getId()); setDocumentModified(); KdenliveSettings::setSnaptopoints(snap); - if (execute && item->isSelected()) - emit clipItemSelected(item); + if (execute && item->isSelected()) { + m_scene->clearSelection(); + dup->setSelected(true); + m_dragItem = dup; + emit clipItemSelected(dup); + } return dup; } else { // uncut clip @@ -2372,18 +2530,6 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo bool snap = KdenliveSettings::snaptopoints(); KdenliveSettings::setSnaptopoints(false); - // join fade effects again - int ix = dup->hasEffect(QString(), "fadeout"); - if (ix != -1) { - QDomElement effect = dup->effectAtIndex(ix); - item->addEffect(effect); - } - ix = dup->hasEffect(QString(), "fade_to_black"); - if (ix != -1) { - QDomElement effect = dup->effectAtIndex(ix); - item->addEffect(effect); - } - m_waitingThumbs.removeAll(dup); bool selected = item->isSelected(); if (dup->isSelected()) { @@ -2399,9 +2545,10 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; - bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos); + bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos, false); if (success) { item->resizeEnd((int) info.endPos.frames(m_document->fps())); + item->setEffectList(oldStack); setDocumentModified(); } else { emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); @@ -2604,7 +2751,11 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) m_selectionGroup->setPos(pos); emit mousePosition((int)(m_selectionGroup->scenePos().x() + 0.5)); event->acceptProposedAction(); - } else { + } else if (m_dragItem) { + m_dragItem->setPos(pos); + emit mousePosition((int)(m_dragItem->scenePos().x() + 0.5)); + event->acceptProposedAction(); + } else { // Drag enter was not possible, try again at mouse position insertDropClips(event->mimeData(), event->pos()); event->accept(); @@ -2616,20 +2767,27 @@ void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) { - if (m_selectionGroup && m_clipDrag) { + if ((m_selectionGroup || m_dragItem) && m_clipDrag) { m_thumbsTimer.stop(); m_waitingThumbs.clear(); - QList items = m_selectionGroup->childItems(); + QList items; + QMutexLocker lock(&m_selectionMutex); + if (m_selectionGroup) items = m_selectionGroup->childItems(); + else if (m_dragItem) items.append(m_dragItem); qDeleteAll(items); - scene()->destroyItemGroup(m_selectionGroup); + if (m_selectionGroup) scene()->destroyItemGroup(m_selectionGroup); m_selectionGroup = NULL; + m_dragItem = NULL; + event->accept(); } else QGraphicsView::dragLeaveEvent(event); } void CustomTrackView::dropEvent(QDropEvent * event) { - if (m_selectionGroup && m_clipDrag) { - QList items = m_selectionGroup->childItems(); + if ((m_selectionGroup || m_dragItem) && m_clipDrag) { + QList items; + if (m_selectionGroup) items = m_selectionGroup->childItems(); + else if (m_dragItem) items.append(m_dragItem); resetSelectionGroup(); m_dragItem = NULL; m_scene->clearSelection(); @@ -2637,6 +2795,9 @@ void CustomTrackView::dropEvent(QDropEvent * event) QUndoCommand *addCommand = new QUndoCommand(); addCommand->setText(i18n("Add timeline clip")); QList brokenClips; + + // Add refresh command for undo + new RefreshMonitorCommand(this, false, true, addCommand); for (int i = 0; i < items.count(); i++) { ClipItem *item = static_cast (items.at(i)); @@ -2671,12 +2832,17 @@ void CustomTrackView::dropEvent(QDropEvent * event) updateTrackDuration(info.track, addCommand); if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) { - // add transparency transition - QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement(); - new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); + // add transparency transition if space is available + if (canBePastedTo(info, TRANSITIONWIDGET)) { + QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement(); + new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand); + } } item->setSelected(true); } + // Add refresh command for redo + new RefreshMonitorCommand(this, false, false, addCommand); + qDeleteAll(brokenClips); brokenClips.clear(); if (addCommand->childCount() > 0) m_commandStack->push(addCommand); @@ -2707,7 +2873,7 @@ void CustomTrackView::dropEvent(QDropEvent * event) m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1); if (items.count() > 1) { - groupSelectedItems(items, true); + groupSelectedItems(items); } else if (items.count() == 1) { m_dragItem = static_cast (items.at(0)); emit clipItemSelected((ClipItem*) m_dragItem, false); @@ -2752,10 +2918,12 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf newdupInfo.startPos = info.endPos; newdupInfo.cropStart += diff2; newdupInfo.cropDuration = clipInfo.endPos - info.endPos; - new RazorClipCommand(this, clipInfo, info.startPos, false, command); + new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, false, command); new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, command); - ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); - if (dup) dup->resizeStart(info.endPos.frames(m_document->fps())); + ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false); + if (dup) { + dup->resizeStart(info.endPos.frames(m_document->fps())); + } } else { ItemInfo newclipInfo = clip->info(); newclipInfo.endPos = info.startPos; @@ -2795,10 +2963,10 @@ void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, ItemInf dupInfo.startPos = info.startPos; dupInfo.cropStart += diff; dupInfo.cropDuration = clipInfo.endPos - info.startPos; - new RazorClipCommand(this, clipInfo, info.startPos, false, command); + new RazorClipCommand(this, clipInfo, clip->effectList(), info.startPos, true, command); // Commented out; variable dup unused. --granjow //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false); - cutClip(clipInfo, info.startPos, true, false); + //cutClip(clipInfo, info.startPos, true, false); } } // TODO: add insertspacecommand @@ -2867,6 +3035,7 @@ Qt::DropActions CustomTrackView::supportedDropActions() const void CustomTrackView::setDuration(int duration) { + if (m_projectDuration == duration) return; int diff = qAbs(duration - sceneRect().width()); if (diff * matrix().m11() > -50) { if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height()); @@ -2895,7 +3064,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); QList selection = m_scene->items(r); resetSelectionGroup(); - + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { @@ -2947,19 +3116,17 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) if (tr) tr->setForcedTrack(info.forceTrack, info.a_track); else kDebug()<<"// Cannot update TRANSITION AT: "<fps()); } - + m_selectionMutex.unlock(); resetSelectionGroup(false); m_document->renderer()->unlockService(tractor); } int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), maxHeight)); - m_guides.at(i)->setLine(l); + m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); + m_cursorLine->setLine(0, 0, 0, maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); viewport()->update(); //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged())); @@ -2970,6 +3137,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) void CustomTrackView::removeTrack(int ix) { + // Clear effect stack + clearSelection(); + emit transitionItemSelected(NULL); + // Delete track in MLT playlist m_document->renderer()->mltDeleteTrack(m_document->tracksCount() - ix); m_document->deleteTrack(m_document->tracksCount() - ix - 1); @@ -2977,13 +3148,11 @@ void CustomTrackView::removeTrack(int ix) double startY = ix * (m_tracksHeight + 1) + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY); QList selection = m_scene->items(r); - - resetSelectionGroup(); - + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); for (int i = 0; i < selection.count(); i++) { - if ((!selection.at(i)->parentItem()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { + if ((selection.at(i) && !selection.at(i)->parentItem() && selection.at(i)->isEnabled()) && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) { m_selectionGroup->addItem(selection.at(i)); } } @@ -3022,16 +3191,15 @@ void CustomTrackView::removeTrack(int ix) } } } + m_selectionMutex.unlock(); resetSelectionGroup(false); m_document->renderer()->unlockService(tractor); int maxHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), maxHeight)); - m_guides.at(i)->setLine(l); + m_guides.at(i)->setLine(0, 0, 0, maxHeight - 1); } - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight - 1); + m_cursorLine->setLine(0, 0, 0, maxHeight - 1); setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); m_selectedTrack = qMin(m_selectedTrack, m_document->tracksCount() - 1); @@ -3343,6 +3511,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t { int diff = duration.frames(m_document->fps()); resetSelectionGroup(); + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); ClipItem *clip; @@ -3399,6 +3568,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } } } + m_selectionMutex.unlock(); resetSelectionGroup(false); if (track != -1) track = m_document->tracksCount() - track; @@ -3410,29 +3580,29 @@ void CustomTrackView::deleteClip(const QString &clipId) resetSelectionGroup(); QList itemList = items(); QUndoCommand *deleteCommand = new QUndoCommand(); + new RefreshMonitorCommand(this, false, true, deleteCommand); int count = 0; for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { ClipItem *item = (ClipItem *)itemList.at(i); if (item->clipProducer() == clipId) { - count++; + count++; if (item->parentItem()) { - // Clip is in a group, destroy the group - new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); + // Clip is in a group, destroy the group + new GroupClipsCommand(this, QList() << item->info(), QList(), false, deleteCommand); } new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteCommand); } } } - deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); if (count == 0) { delete deleteCommand; } else { + deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count)); + new RefreshMonitorCommand(this, true, false, deleteCommand); updateTrackDuration(-1, deleteCommand); - new RefreshMonitorCommand(this, false, deleteCommand); m_commandStack->push(deleteCommand); } - m_document->renderer()->doRefresh(); } void CustomTrackView::seekCursorPos(int pos) @@ -3497,8 +3667,15 @@ void CustomTrackView::checkScrolling() void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) { if (m_moveOpMode == SEEK) m_moveOpMode = NONE; + if (m_operationMode == SCROLLTIMELINE) { + m_operationMode = NONE; + setDragMode(QGraphicsView::NoDrag); + QGraphicsView::mouseReleaseEvent(event); + return; + } if (!m_controlModifier && m_operationMode != RUBBERSELECTION) { //event->accept(); + setDragMode(QGraphicsView::NoDrag); if (m_clipDrag) QGraphicsView::mouseReleaseEvent(event); } m_clipDrag = false; @@ -3527,6 +3704,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } m_dragGuide = NULL; m_dragItem = NULL; + QGraphicsView::mouseReleaseEvent(event); return; } else if (m_operationMode == SPACER && m_selectionGroup) { int track; @@ -3604,6 +3782,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) resetSelectionGroup(); groupSelectedItems(); m_operationMode = NONE; + if (m_selectionGroup == NULL && m_dragItem) { + // Only 1 item selected + if (m_dragItem->type() == AVWIDGET) + emit clipItemSelected(static_cast(m_dragItem)); + } } if (m_dragItem == NULL && m_selectionGroup == NULL) { @@ -3921,6 +4104,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); } } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) { // resize end @@ -3946,6 +4130,7 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) } } else { prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps())); + if (m_dragItem->type() == AVWIDGET) static_cast (m_dragItem)->slotUpdateRange(); } } else if (m_operationMode == FADEIN) { // resize fade in effect @@ -4068,19 +4253,6 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) updateEffect(m_document->tracksCount() - item->track(), item->startPos(), item->selectedEffect()); emit clipItemSelected(item); } - if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) { - // A transition is selected - QPoint p; - ClipItem *transitionClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track); - if (transitionClip && transitionClip->baseClip()) { - QString size = transitionClip->baseClip()->getProperty("frame_size"); - double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); - if (factor == 0) factor = 1.0; - p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); - p.setY(size.section('x', 1, 1).toInt()); - } - emit transitionItemSelected(static_cast (m_dragItem), getPreviousVideoTrack(m_dragItem->track()), p); - } else emit transitionItemSelected(NULL); if (m_operationMode != NONE && m_operationMode != MOVE) setDocumentModified(); m_operationMode = NONE; } @@ -4145,11 +4317,12 @@ void CustomTrackView::deleteSelectedClips() } scene()->clearSelection(); QUndoCommand *deleteSelected = new QUndoCommand(); + new RefreshMonitorCommand(this, false, true, deleteSelected); int groupCount = 0; int clipCount = 0; int transitionCount = 0; - // expand & destroy groups + // expand & destroy groups for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == GROUPWIDGET) { groupCount++; @@ -4176,20 +4349,19 @@ void CustomTrackView::deleteSelectedClips() } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET) itemList.insert(i + 1, itemList.at(i)->parentItem()); } - + emit clipItemSelected(NULL); + emit transitionItemSelected(NULL); for (int i = 0; i < itemList.count(); i++) { if (itemList.at(i)->type() == AVWIDGET) { clipCount++; ClipItem *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE CLP AT: "<info().startPos.frames(25); new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteSelected); - emit clipItemSelected(NULL); } else if (itemList.at(i)->type() == TRANSITIONWIDGET) { transitionCount++; Transition *item = static_cast (itemList.at(i)); //kDebug()<<"// DELETE TRANS AT: "<info().startPos.frames(25); new AddTransitionCommand(this, item->info(), item->transitionEndTrack(), item->toXML(), true, true, deleteSelected); - emit transitionItemSelected(NULL); } } if (groupCount > 0 && clipCount == 0 && transitionCount == 0) @@ -4200,9 +4372,8 @@ void CustomTrackView::deleteSelectedClips() deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount)); else deleteSelected->setText(i18n("Delete selected items")); updateTrackDuration(-1, deleteSelected); - new RefreshMonitorCommand(this, false, deleteSelected); + new RefreshMonitorCommand(this, true, false, deleteSelected); m_commandStack->push(deleteSelected); - m_document->renderer()->doRefresh(); } @@ -4224,7 +4395,7 @@ void CustomTrackView::doChangeClipSpeed(ItemInfo info, ItemInfo speedIndependant item->updateRectGeometry(); if (item->cropDuration().frames(m_document->fps()) != endPos) item->resizeEnd((int) info.startPos.frames(m_document->fps()) + endPos - 1); - updatePositionEffects(item, info); + updatePositionEffects(item, info, false); setDocumentModified(); } else { emit displayMessage(i18n("Invalid clip"), ErrorMessage); @@ -4246,7 +4417,7 @@ void CustomTrackView::cutSelectedClips() if (!groups.contains(group)) groups << group; } else if (currentPos > item->startPos() && currentPos < item->endPos()) { - RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos); + RazorClipCommand *command = new RazorClipCommand(this, item->info(), item->effectList(), currentPos); m_commandStack->push(command); } } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) { @@ -4264,9 +4435,15 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) { if (group) { QList children = group->childItems(); + QUndoCommand *command = new QUndoCommand; + command->setText(i18n("Cut Group")); + groupClips(false, children, command); QList clips1, transitions1; - QList clipsCut, transitionsCut; + QList transitionsCut; QList clips2, transitions2; + QList clipsToCut; + + // Collect info for (int i = 0; i < children.count(); ++i) { children.at(i)->setSelected(false); AbstractClipItem *child = static_cast (children.at(i)); @@ -4275,71 +4452,42 @@ void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos) clips1 << child->info(); else if (cutPos < child->startPos()) clips2 << child->info(); - else - clipsCut << child->info(); + else { + clipsToCut << child; + } } else { if (cutPos > child->endPos()) transitions1 << child->info(); else if (cutPos < child->startPos()) transitions2 << child->info(); - else - transitionsCut << child->info(); + else { + //transitionsCut << child->info(); + // Transition cut not implemented, leave it in first group... + transitions1 << child->info(); + } } } - if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) + if (clipsToCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty()))) { + delete command; return; - RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos); + } + // Process the cut + for (int i = 0; i < clipsToCut.count(); i++) { + ClipItem *clip = static_cast(clipsToCut.at(i)); + new RazorClipCommand(this, clip->info(), clip->effectList(), cutPos, false, command); + ClipItem *secondClip = cutClip(clip->info(), cutPos, true); + clips1 << clip->info(); + clips2 << secondClip->info(); + } + new GroupClipsCommand(this, clips1, transitions1, true, command); + new GroupClipsCommand(this, clips2, transitions2, true, command); m_commandStack->push(command); } } -void CustomTrackView::slotRazorGroup(QList clips1, QList transitions1, QList clipsCut, QList transitionsCut, QList clips2, QList transitions2, GenTime cutPos, bool cut) -{ - if (cut) { - for (int i = 0; i < clipsCut.count(); ++i) { - ClipItem *clip = getClipItemAt(clipsCut.at(i).startPos.frames(m_document->fps()), clipsCut.at(i).track); - if (clip) { - ClipItem *clipBehind = cutClip(clipsCut.at(i), cutPos, true); - clips1 << clip->info(); - if (clipBehind != NULL) - clips2 << clipBehind->info(); - } - } - /* TODO: cut transitionsCut - * For now just append them to group1 */ - transitions1 << transitionsCut; - doGroupClips(clips1, transitions1, true); - doGroupClips(clips2, transitions2, true); - } else { - /* we might also just use clipsCut.at(0)->parentItem(). - * Do this loop just in case something went wrong during cut */ - for (int i = 0; i < clipsCut.count(); ++i) { - ClipItem *clip = getClipItemAt(cutPos.frames(m_document->fps()), clipsCut.at(i).track); - if (clip && clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { - AbstractGroupItem *group = static_cast (clip->parentItem()); - QList children = group->childItems(); - QList groupClips; - QList groupTrans; - for (int j = 0; j < children.count(); ++j) { - if (children.at(j)->type() == AVWIDGET) - groupClips << ((AbstractClipItem *)children.at(j))->info(); - else if (children.at(j)->type() == TRANSITIONWIDGET) - groupTrans << ((AbstractClipItem *)children.at(j))->info(); - } - doGroupClips(groupClips, groupTrans, false); - break; - } - } - for (int i = 0; i < clipsCut.count(); ++i) - cutClip(clipsCut.at(i), cutPos, false); - // TODO: uncut transitonsCut - doGroupClips(QList () << clips1 << clipsCut << clips2, QList () << transitions1 << transitionsCut << transitions2, true); - } -} - -void CustomTrackView::groupClips(bool group) +void CustomTrackView::groupClips(bool group, QList itemList, QUndoCommand *command) { - QList itemList = scene()->selectedItems(); + if (itemList.isEmpty()) itemList = scene()->selectedItems(); QList clipInfos; QList transitionInfos; @@ -4361,8 +4509,12 @@ void CustomTrackView::groupClips(bool group) } } if (clipInfos.count() > 0) { - GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); - m_commandStack->push(command); + if (command) { + new GroupClipsCommand(this, clipInfos, transitionInfos, group, command); + } else { + GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group); + m_commandStack->push(command); + } } } @@ -4371,12 +4523,14 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList resetSelectionGroup(); m_scene->clearSelection(); if (!group) { - for (int i = 0; i < clipInfos.count(); i++) { + // ungroup, find main group to destroy it... + for (int i = 0; i < clipInfos.count(); i++) { ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track); if (clip == NULL) continue; if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast (clip->parentItem()); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); } clip->setFlag(QGraphicsItem::ItemIsMovable, true); @@ -4387,7 +4541,9 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList if (tr->parentItem() && tr->parentItem()->type() == GROUPWIDGET) { AbstractGroupItem *grp = static_cast (tr->parentItem()); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); + grp = NULL; } tr->setFlag(QGraphicsItem::ItemIsMovable, true); } @@ -4409,7 +4565,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList //clip->setSelected(true); } } - groupSelectedItems(list, false, true); + groupSelectedItems(list, true, true); setDocumentModified(); } @@ -4461,8 +4617,9 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false); } setDocumentModified(); - if (refresh) + if (refresh) { m_document->renderer()->doRefresh(); + } if (!baseclip->isPlaceHolder()) m_waitingThumbs.append(item); m_thumbsTimer.start(); @@ -4678,7 +4835,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta // Group Items resetSelectionGroup(); m_scene->clearSelection(); - + m_selectionMutex.lock(); m_selectionGroup = new AbstractGroupItem(m_document->fps()); scene()->addItem(m_selectionGroup); @@ -4776,7 +4933,7 @@ void CustomTrackView::moveGroup(QList startClip, QList sta m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML()); } } - + m_selectionMutex.unlock(); resetSelectionGroup(false); for (int i = 0; i < groupList.count(); i++) { rebuildGroup(groupList.at(i)); @@ -4859,8 +5016,9 @@ void CustomTrackView::resizeClip(const ItemInfo &start, const ItemInfo &end, boo ItemInfo clipinfo = item->info(); clipinfo.track = m_document->tracksCount() - clipinfo.track; bool success = m_document->renderer()->mltResizeClipStart(clipinfo, end.startPos - clipinfo.startPos); - if (success) + if (success) { item->resizeStart((int) end.startPos.frames(m_document->fps())); + } else emit displayMessage(i18n("Error when resizing clip"), ErrorMessage); } else { @@ -5063,11 +5221,22 @@ void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldI } else { // Check transition keyframes QDomElement old = transition->toXML(); - if (transition->updateKeyframes()) { + if (transition->updateKeyframes(oldInfo.cropDuration.frames(m_document->fps()) - 1)) { QDomElement xml = transition->toXML(); m_document->renderer()->mltUpdateTransition(xml.attribute("tag"), xml.attribute("tag"), xml.attribute("transition_btrack").toInt(), m_document->tracksCount() - xml.attribute("transition_atrack").toInt(), transition->startPos(), transition->endPos(), xml); new EditTransitionCommand(this, transition->track(), transition->startPos(), old, xml, false, command); } + ItemInfo info = transition->info(); + QPoint p; + ClipItem *transitionClip = getClipItemAt(info.startPos, info.track); + if (transitionClip && transitionClip->baseClip()) { + QString size = transitionClip->baseClip()->getProperty("frame_size"); + double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble(); + if (factor == 0) factor = 1.0; + p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5)); + p.setY(size.section('x', 1, 1).toInt()); + } + emit transitionItemSelected(transition, getPreviousVideoTrack(info.track), p, true); new MoveTransitionCommand(this, oldInfo, info, false, command); } } @@ -5136,7 +5305,7 @@ void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool if (effectPos != -1) { QDomElement effect = item->getEffectAtIndex(effectPos); int max = item->cropDuration().frames(m_document->fps()); - int end = max + item->cropStart().frames(m_document->fps()); + int end = max + item->cropStart().frames(m_document->fps()) - 1; if (start > max) { // Make sure the fade effect is not longer than the clip item->setFadeOut(max); @@ -5157,7 +5326,7 @@ void CustomTrackView::updatePositionEffects(ClipItem* item, ItemInfo info, bool if (effectPos != -1) { QDomElement effect = item->getEffectAtIndex(effectPos); int max = item->cropDuration().frames(m_document->fps()); - int end = max + item->cropStart().frames(m_document->fps()); + int end = max + item->cropStart().frames(m_document->fps()) - 1; if (start > max) { // Make sure the fade effect is not longer than the clip item->setFadeOut(max); @@ -5320,13 +5489,15 @@ void CustomTrackView::slotAddClipExtraData(const QString &id, const QString &key void CustomTrackView::slotAddClipMarker(const QString &id, QList newMarkers, QUndoCommand *groupCommand) { - QUndoCommand *subCommand = NULL; + DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!base) return; + QUndoCommand *subCommand = NULL; if (newMarkers.count() > 1 && groupCommand == NULL) { subCommand = new QUndoCommand; subCommand->setText("Add markers"); } for (int i = 0; i < newMarkers.count(); i++) { - CommentedTime oldMarker = m_document->clipManager()->getClipById(id)->markerAt(newMarkers.at(i).time()); + CommentedTime oldMarker = base->markerAt(newMarkers.at(i).time()); if (oldMarker == CommentedTime()) { oldMarker = newMarkers.at(i); oldMarker.setMarkerType(-1); @@ -5357,6 +5528,7 @@ void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) { DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!base) return; QList markers = base->commentedSnapMarkers(); if (markers.isEmpty()) { @@ -5378,6 +5550,7 @@ void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) void CustomTrackView::slotSaveClipMarkers(const QString &id) { DocClipBase *base = m_document->clipManager()->getClipById(id); + if (!base) return; QList < CommentedTime > markers = base->commentedSnapMarkers(); if (!markers.isEmpty()) { // Set up categories @@ -5391,7 +5564,7 @@ void CustomTrackView::slotSaveClipMarkers(const QString &id) KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox); fd.setMode(KFile::File); fd.setOperationMode(KFileDialog::Saving); - fd.exec(); + if (fd.exec() != QDialog::Accepted) return; QString url = fd.selectedFile(); //QString url = KFileDialog::getSaveFileName(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Save markers")); if (url.isEmpty()) return; @@ -5433,7 +5606,7 @@ void CustomTrackView::slotLoadClipMarkers(const QString &id) KFileDialog fd(KUrl("kfiledialog:///projectfolder"), "text/plain", this, cbox); fd.setMode(KFile::File); fd.setOperationMode(KFileDialog::Opening); - fd.exec(); + if (fd.exec() != QDialog::Accepted) return; QString url = fd.selectedFile(); //KUrl url = KFileDialog::getOpenUrl(KUrl("kfiledialog:///projectfolder"), "text/plain", this, i18n("Load marker file")); @@ -5541,28 +5714,29 @@ void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const void CustomTrackView::editGuide(const GenTime &oldPos, const GenTime &pos, const QString &comment) { - if (oldPos > GenTime() && pos > GenTime()) { - // move guide + if (comment.isEmpty() && pos < GenTime()) { + // Delete guide + bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == oldPos) { - Guide *item = m_guides.at(i); - item->updateGuide(pos, comment); + delete m_guides.takeAt(i); + found = true; break; } } - } else if (pos > GenTime()) addGuide(pos, comment); - else { - // remove guide - bool found = false; + if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); + } + + else if (oldPos >= GenTime()) { + // move guide for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == oldPos) { - delete m_guides.takeAt(i); - found = true; + Guide *item = m_guides.at(i); + item->updateGuide(pos, comment); break; } } - if (!found) emit displayMessage(i18n("No guide at cursor time"), ErrorMessage); - } + } else addGuide(pos, comment); qSort(m_guides.begin(), m_guides.end(), sortGuidesList); m_document->syncGuides(m_guides); } @@ -5652,7 +5826,7 @@ void CustomTrackView::slotDeleteGuide(int guidePos) bool found = false; for (int i = 0; i < m_guides.count(); i++) { if (m_guides.at(i)->position() == pos) { - EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true); + EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true); m_commandStack->push(command); found = true; break; @@ -5665,7 +5839,7 @@ void CustomTrackView::slotDeleteGuide(int guidePos) void CustomTrackView::slotDeleteTimeLineGuide() { if (m_dragGuide == NULL) return; - EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(), QString(), true); + EditGuideCommand *command = new EditGuideCommand(this, m_dragGuide->position(), m_dragGuide->label(), GenTime(-1), QString(), true); m_commandStack->push(command); } @@ -5675,7 +5849,7 @@ void CustomTrackView::slotDeleteAllGuides() QUndoCommand *deleteAll = new QUndoCommand(); deleteAll->setText("Delete all guides"); for (int i = 0; i < m_guides.count(); i++) { - new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll); + new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(-1), QString(), true, deleteAll); } m_commandStack->push(deleteAll); } @@ -5683,6 +5857,16 @@ void CustomTrackView::slotDeleteAllGuides() void CustomTrackView::setTool(PROJECTTOOL tool) { m_tool = tool; + switch (m_tool) { + case RAZORTOOL: + setCursor(m_razorCursor); + break; + case SPACERTOOL: + setCursor(m_spacerCursor); + break; + default: + unsetCursor(); + } } void CustomTrackView::setScale(double scaleFactor, double verticalScale) @@ -5696,11 +5880,9 @@ void CustomTrackView::setScale(double scaleFactor, double verticalScale) setMatrix(newmatrix); if (adjust) { double newHeight = m_tracksHeight * m_document->tracksCount() * matrix().m22(); - m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), newHeight - 1); + m_cursorLine->setLine(0, 0, 0, newHeight - 1); for (int i = 0; i < m_guides.count(); i++) { - QLineF l = m_guides.at(i)->line(); - l.setP2(QPointF(l.x2(), newHeight)); - m_guides.at(i)->setLine(l); + m_guides.at(i)->setLine(0, 0, 0, newHeight - 1); } setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount()); } @@ -5987,6 +6169,7 @@ void CustomTrackView::pasteClip() } QUndoCommand *pasteClips = new QUndoCommand(); pasteClips->setText("Paste clips"); + new RefreshMonitorCommand(this, false, true, pasteClips); for (int i = 0; i < m_copiedItems.count(); i++) { // parse all clip names @@ -6016,7 +6199,7 @@ void CustomTrackView::pasteClip() } } updateTrackDuration(-1, pasteClips); - new RefreshMonitorCommand(this, false, pasteClips); + new RefreshMonitorCommand(this, false, false, pasteClips); m_commandStack->push(pasteClips); } @@ -6368,11 +6551,16 @@ void CustomTrackView::slotConfigTracks(int ix) void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) { if (m_document->tracksCount() < 2) return; - double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; + // Clear effect stack + clearSelection(); + emit transitionItemSelected(NULL); + + double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2; QRectF r(0, startY, sceneRect().width(), m_tracksHeight / 2 - 1); QList selection = m_scene->items(r); QUndoCommand *deleteTrack = new QUndoCommand(); deleteTrack->setText("Delete track"); + new RefreshMonitorCommand(this, false, true, deleteTrack); // Delete all clips in selected track for (int i = 0; i < selection.count(); i++) { @@ -6393,6 +6581,7 @@ void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) } new AddTrackCommand(this, ix, trackinfo, false, deleteTrack); + new RefreshMonitorCommand(this, true, false, deleteTrack); m_commandStack->push(deleteTrack); } @@ -6475,7 +6664,7 @@ void CustomTrackView::loadGroups(const QDomNodeList &groups) if (clip) list.append(clip);//clip->setSelected(true); } } - groupSelectedItems(list, false, true); + groupSelectedItems(list, true); } } @@ -6704,7 +6893,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef videoIx++; } } - groupSelectedItems(QList ()<()<setFlag(QGraphicsItem::ItemIsMovable, true); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); } } @@ -6871,9 +7061,27 @@ void CustomTrackView::doChangeClipType(const GenTime &pos, int track, bool video void CustomTrackView::updateClipTypeActions(ClipItem *clip) { + bool hasAudio; + bool hasAV; if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) { m_clipTypeGroup->setEnabled(false); + hasAudio = clip != NULL && clip->clipType() == AUDIO; + hasAV = false; } else { + switch (clip->clipType()) { + case AV: + case PLAYLIST: + hasAudio = true; + hasAV = true; + break; + case AUDIO: + hasAudio = true; + hasAV = false; + break; + default: + hasAudio = false; + hasAV = false; + } m_clipTypeGroup->setEnabled(true); QList actions = m_clipTypeGroup->actions(); QString lookup; @@ -6887,6 +7095,13 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip) } } } + + for (int i = 0; i < m_audioActions.count(); i++) { + m_audioActions.at(i)->setEnabled(hasAudio); + } + for (int i = 0; i < m_avActions.count(); i++) { + m_avActions.at(i)->setEnabled(hasAV); + } } void CustomTrackView::slotGoToMarker(QAction *action) @@ -6977,6 +7192,7 @@ void CustomTrackView::updateProjectFps() } m_document->clipManager()->removeGroup(grp); m_scene->addItem(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); scene()->clearSelection(); /*for (int j = 0; j < children.count(); j++) { @@ -6985,7 +7201,7 @@ void CustomTrackView::updateProjectFps() children.at(j)->setSelected(true); } }*/ - groupSelectedItems(children, true, true); + groupSelectedItems(children, true); } else if (itemList.at(i)->type() == GUIDEITEM) { Guide *g = static_cast(itemList.at(i)); g->updatePos(); @@ -7058,6 +7274,7 @@ void CustomTrackView::slotSelectTrack(int ix) void CustomTrackView::slotSelectClipsInTrack() { QRectF rect(0, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 1); + resetSelectionGroup(); QList selection = m_scene->items(rect); m_scene->clearSelection(); QList list; @@ -7066,16 +7283,14 @@ void CustomTrackView::slotSelectClipsInTrack() list.append(selection.at(i)); } } - resetSelectionGroup(); - groupSelectedItems(list); + groupSelectedItems(list, false, true); } void CustomTrackView::slotSelectAllClips() { - QList selection = m_scene->items(); m_scene->clearSelection(); resetSelectionGroup(); - groupSelectedItems(selection); + groupSelectedItems(m_scene->items(), false, true); } void CustomTrackView::selectClip(bool add, bool group, int track, int pos) @@ -7184,6 +7399,7 @@ void CustomTrackView::insertZoneOverwrite(QStringList data, int in) void CustomTrackView::clearSelection(bool emitInfo) { + if (m_dragItem) m_dragItem->setSelected(false); resetSelectionGroup(); scene()->clearSelection(); m_dragItem = NULL; @@ -7528,7 +7744,7 @@ void CustomTrackView::adjustEffects(ClipItem* item, ItemInfo oldInfo, QUndoComma { QMap effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo); - if (effects.count()) { + if (!effects.isEmpty()) { QMap::const_iterator i = effects.constBegin(); while (i != effects.constEnd()) { new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effect(i.key()), i.value().attribute("kdenlive_ix").toInt(), true, true, command); @@ -7564,19 +7780,27 @@ void CustomTrackView::slotGotFilterJobResults(const QString &/*id*/, int startPo void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) { - if (!m_selectionGroup) { - emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage); - return; - } - // Make sure there is no collision - QList children = m_selectionGroup->childItems(); ClipItem *item = NULL; - for (int i = 0; i < children.count(); i++) { - if (children.at(i)->type() == AVWIDGET) { - item = (ClipItem*) children.at(i); - break; - } + if (type == TRANSITIONWIDGET) { + // We want to import keyframes to a transition + if (!m_selectionGroup) { + emit displayMessage(i18n("You need to select one clip and one transition"), ErrorMessage); + return; + } + // Make sure there is no collision + QList children = m_selectionGroup->childItems(); + for (int i = 0; i < children.count(); i++) { + if (children.at(i)->type() == AVWIDGET) { + item = (ClipItem*) children.at(i); + break; + } + } + } + else { + // Import keyframes from current clip to its effect + if (m_dragItem) item = static_cast (m_dragItem); } + if (!item) { emit displayMessage(i18n("No clip found"), ErrorMessage); return; @@ -7605,7 +7829,23 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) return; } QString keyframeData = ui.data_list->itemData(ui.data_list->currentIndex()).toString(); - QStringList keyframeList = keyframeData.split(';', QString::SkipEmptyParts); + + int offset = item->cropStart().frames(m_document->fps()); + Mlt::Geometry geometry(keyframeData.toUtf8().data(), item->baseClip()->maxDuration().frames(m_document->fps()), m_document->mltProfile().width, m_document->mltProfile().height); + Mlt::Geometry newGeometry(QString().toUtf8().data(), item->baseClip()->maxDuration().frames(m_document->fps()), m_document->mltProfile().width, m_document->mltProfile().height); + Mlt::GeometryItem gitem; + geometry.fetch(&gitem, offset); + gitem.frame(0); + newGeometry.insert(gitem); + int pos = offset + 1; + while (!geometry.next_key(&gitem, pos)) { + pos = gitem.frame(); + gitem.frame(pos - offset); + pos++; + newGeometry.insert(gitem); + } + QStringList keyframeList = QString(newGeometry.serialise()).split(';', QString::SkipEmptyParts); + QString result; if (ui.import_position->isChecked()) { if (ui.import_size->isChecked()) { @@ -7628,7 +7868,7 @@ void CustomTrackView::slotImportClipKeyframes(GRAPHICSRECTITEM type) result.append(';'); } } - emit importKeyframes(type, result); + emit importKeyframes(type, result, ui.limit_keyframes->isChecked() ? ui.max_keyframes->value() : -1); delete d; }