X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fcustomtrackview.cpp;h=cbc29dff8eb821718903eb126610d22281cd186b;hb=27ac7e68c934a04d2922986b07ea8e5dde2cad50;hp=6cc2333ded67a005759424ded0e34f938eee0cd2;hpb=a3b7e870f1b6e72ec3a34d342dbdc03215780063;p=kdenlive diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp index 6cc2333d..cbc29dff 100644 --- a/src/customtrackview.cpp +++ b/src/customtrackview.cpp @@ -1040,7 +1040,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) if (selected == false) { m_dragItem = NULL; } - groupSelectedItems(QList (), false, false, true); + groupSelectedItems(QList (), false, true); if (m_dragItem) { ClipItem *clip = static_cast (m_dragItem); updateClipTypeActions(dragGroup == NULL ? clip : NULL); @@ -1224,7 +1224,7 @@ void CustomTrackView::rebuildGroup(AbstractGroupItem *group) group->removeFromGroup(children.at(i)); }*/ scene()->destroyItemGroup(group); - groupSelectedItems(children, false, true, true); + groupSelectedItems(children, true, true); } } @@ -1253,7 +1253,7 @@ void CustomTrackView::resetSelectionGroup(bool selectItems) } } -void CustomTrackView::groupSelectedItems(QList selection, bool force, bool createNewGroup, bool selectNewGroup) +void CustomTrackView::groupSelectedItems(QList selection, bool createNewGroup, bool selectNewGroup) { if (m_selectionGroup) { kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP"; @@ -1280,13 +1280,14 @@ void CustomTrackView::groupSelectedItems(QList selection, bool } } if (itemsList.isEmpty() && groupsList.isEmpty()) return; - if (itemsList.count() == 1) { + 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) { @@ -1295,56 +1296,54 @@ 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); + + 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); + } - 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); + } + 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) @@ -2734,7 +2733,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); @@ -3445,24 +3444,23 @@ void CustomTrackView::deleteClip(const QString &clipId) 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, false, deleteCommand); m_commandStack->push(deleteCommand); } - m_document->renderer()->doRefresh(); } void CustomTrackView::seekCursorPos(int pos) @@ -4440,7 +4438,7 @@ void CustomTrackView::doGroupClips(QList clipInfos, QList //clip->setSelected(true); } } - groupSelectedItems(list, false, true, true); + groupSelectedItems(list, true, true); setDocumentModified(); } @@ -6519,7 +6517,7 @@ void CustomTrackView::loadGroups(const QDomNodeList &groups) if (clip) list.append(clip);//clip->setSelected(true); } } - groupSelectedItems(list, false, true); + groupSelectedItems(list, true); } } @@ -6748,7 +6746,7 @@ void CustomTrackView::doSplitAudio(const GenTime &pos, int track, EffectsList ef videoIx++; } } - groupSelectedItems(QList ()<()<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(); @@ -7111,14 +7109,14 @@ void CustomTrackView::slotSelectClipsInTrack() list.append(selection.at(i)); } } - groupSelectedItems(list, false, false, true); + groupSelectedItems(list, false, true); } void CustomTrackView::slotSelectAllClips() { m_scene->clearSelection(); resetSelectionGroup(); - groupSelectedItems(m_scene->items(), false, false, true); + groupSelectedItems(m_scene->items(), false, true); } void CustomTrackView::selectClip(bool add, bool group, int track, int pos)