X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=7cc622012bf50053a6491d8c30e8146aad223d24;hb=61652e69d3a1166ac4853aef5ea0e2d97f76ac8c;hp=b587488fb89a549c2e4cf2681dd15a6ddc88e9b4;hpb=8a308c87de5f59596ae3f6e9c3ac691ec9538cb4;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index b587488f..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,7 +239,7 @@ 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); @@ -324,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()); @@ -417,6 +422,11 @@ void CustomTrackView::slotAlignPlayheadToMousePos() seekCursorPos(mappedXPos); } +int CustomTrackView::getMousePos() const +{ + return qMax((int)(mapToScene(mapFromGlobal(QCursor::pos())).x() + 0.5), 0); +} + // virtual void CustomTrackView::mouseMoveEvent(QMouseEvent * event) { @@ -506,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++) { @@ -532,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++) { @@ -794,7 +804,6 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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) { @@ -821,6 +830,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) 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)); @@ -846,8 +856,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_selectionGroup->setProperty("y_absolute", yOffset); m_selectionGroup->setProperty("locked_tracks", lockedTracks); } - if (dragGroup) { - dragGroup = static_cast (m_dragItem->parentItem()); + 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); } @@ -908,10 +922,14 @@ 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_selectionMutex.unlock(); // No item under click if (m_dragItem == NULL || m_tool == SPACERTOOL) { resetSelectionGroup(false); @@ -948,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); @@ -973,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; @@ -1005,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(); @@ -1036,13 +1056,18 @@ 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); QList children = dragGroup->childItems(); @@ -1059,11 +1084,12 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) m_dragItem = NULL; } 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); @@ -1073,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++) { @@ -1081,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) { @@ -1121,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++) { @@ -1142,6 +1172,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) } updateSnapPoints(NULL, cleandOffsetList, true); } + m_selectionMutex.unlock(); } if (m_operationMode == KEYFRAME) { @@ -1241,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, 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(); @@ -1262,14 +1297,16 @@ 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); @@ -1278,6 +1315,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) void CustomTrackView::groupSelectedItems(QList selection, bool createNewGroup, bool selectNewGroup) { + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; return; @@ -1290,15 +1328,27 @@ void CustomTrackView::groupSelectedItems(QList selection, bool 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)); } } @@ -1329,8 +1379,11 @@ void CustomTrackView::groupSelectedItems(QList selection, bool 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) { + newGroup->addItem(value); + } + foreach (QGraphicsItemGroup *value, groupsList) { QList children = value->childItems(); for (int i = 0; i < children.count(); i++) { @@ -1339,12 +1392,14 @@ void CustomTrackView::groupSelectedItems(QList selection, bool } 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); } + scene()->addItem(newGroup); KdenliveSettings::setSnaptopoints(snap); if (selectNewGroup) newGroup->setSelected(true); } else { @@ -1398,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()); @@ -1618,12 +1677,13 @@ bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint &pos) { QPointF framePos = mapToScene(pos); int track = framePos.y() / KdenliveSettings::trackheight(); - m_scene->clearSelection(); - m_dragItem = NULL; - resetSelectionGroup(false); 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(';'); @@ -1844,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); } @@ -1882,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); } } @@ -1898,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") { @@ -1939,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"); @@ -1998,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; } } } @@ -2024,7 +2105,7 @@ void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) } } } - } + }*/ } else delete effectCommand; } @@ -2351,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 @@ -2412,9 +2493,11 @@ 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(); @@ -2447,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()) { @@ -2477,6 +2548,7 @@ ClipItem *CustomTrackView::cutClip(ItemInfo info, GenTime cutTime, bool cut, boo 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); @@ -2699,6 +2771,7 @@ void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) m_thumbsTimer.stop(); m_waitingThumbs.clear(); QList items; + QMutexLocker lock(&m_selectionMutex); if (m_selectionGroup) items = m_selectionGroup->childItems(); else if (m_dragItem) items.append(m_dragItem); qDeleteAll(items); @@ -2759,9 +2832,11 @@ 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("affine", QString()).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); } @@ -2843,9 +2918,9 @@ 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); + ClipItem *dup = cutClip(clipInfo, info.startPos, true, EffectsList(), false); if (dup) { dup->resizeStart(info.endPos.frames(m_document->fps())); } @@ -2888,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 @@ -2960,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()); @@ -2988,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++) { @@ -3040,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())); @@ -3063,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); @@ -3070,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)); } } @@ -3115,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); @@ -3436,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; @@ -3492,6 +3568,7 @@ void CustomTrackView::insertSpace(QList clipsToMove, QList t } } } + m_selectionMutex.unlock(); resetSelectionGroup(false); if (track != -1) track = m_document->tracksCount() - track; @@ -3627,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; @@ -4244,7 +4322,7 @@ void CustomTrackView::deleteSelectedClips() 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++; @@ -4271,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) @@ -4340,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) { @@ -4358,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)); @@ -4369,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; @@ -4455,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); + } } } @@ -4465,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); @@ -4481,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); } @@ -4773,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); @@ -4871,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)); @@ -5159,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); } } @@ -5416,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); @@ -5453,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()) { @@ -5474,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 @@ -5487,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; @@ -5529,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")); @@ -5803,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()); } @@ -6476,7 +6551,11 @@ 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(); @@ -6860,6 +6939,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef } clip->setFlag(QGraphicsItem::ItemIsMovable, true); m_document->clipManager()->removeGroup(grp); + if (grp == m_selectionGroup) m_selectionGroup = NULL; scene()->destroyItemGroup(grp); } } @@ -7112,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++) { @@ -7318,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;