#include <QScrollBar>
#include <QApplication>
#include <QInputDialog>
-
+#include <KMessageBox>
bool sortGuidesList(const Guide *g1 , const Guide *g2)
{
offsetList.append(item->startPos());
offsetList.append(item->endPos());
m_selectionGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
} else if (selection.at(i)->parentItem() == 0 && selection.at(i)->type() == GROUPWIDGET) {
QList<QGraphicsItem *> children = selection.at(i)->childItems();
for (int j = 0; j < children.count(); j++) {
offsetList.append(item->endPos());
}
m_selectionGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
} else if (selection.at(i)->parentItem()) {
m_selectionGroup->addToGroup(selection.at(i)->parentItem());
- selection.at(i)->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
}
}
} else if (m_operationMode == MOVE) {
setCursor(Qt::ClosedHandCursor);
if (m_dragItem) m_dragItem->setZValue(10);
+ if (m_selectionGroup) m_selectionGroup->setZValue(10);
} else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) {
ItemInfo info;
info.startPos = m_dragItem->startPos();
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 <AbstractClipItem *>(children.at(i))->isItemLocked()) {
- children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
children.at(i)->setSelected(selectItems);
}
} else if (children.at(i)->type() == GROUPWIDGET) {
- children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ children.at(i)->setFlag(QGraphicsItem::ItemIsMovable, true);
children.at(i)->setSelected(selectItems);
}
}
for (int i = 0; i < selection.count(); i++) {
if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
newGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
}
}
KdenliveSettings::setSnaptopoints(snap);
for (int i = 0; i < selection.count(); i++) {
if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
m_selectionGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
}
}
KdenliveSettings::setSnaptopoints(snap);
m_selectionGroup = new AbstractGroupItem(m_document->fps());
ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1);
m_selectionGroup->addToGroup(item);
- item->setFlags(QGraphicsItem::ItemIsSelectable);
+ item->setFlag(QGraphicsItem::ItemIsMovable, false);
QList <GenTime> offsetList;
offsetList.append(info.endPos);
offsetList.append(start);
ClipItem *item = new ClipItem(clip, info, m_document->fps(), 1.0, 1, false);
item->setZValue(10);
- item->setFlags(QGraphicsItem::ItemIsSelectable);
+ item->setFlag(QGraphicsItem::ItemIsMovable, false);
m_selectionGroup->addToGroup(item);
m_waitingThumbs.append(item);
}
}
m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML(), refresh);
if (m_dragItem == item) m_dragItem = NULL;
+
+#if QT_VERSION >= 0x040600
+ // animate item deletion
+ item->closeAnimation();
+#else
delete item;
+#endif
emit transitionItemSelected(NULL);
setDocumentModified();
}
//TODO: take care of edit mode for undo
item->baseClip()->addReference();
- item->setZValue(2);
+ item->setZValue(item->defaultZValue());
m_document->updateClip(item->baseClip()->getId());
ItemInfo info = item->info();
if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT) == -1) {
emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
}
- if (m_scene->editMode() == OVERWRITEEDIT) {
- // if we are in overwrite or push mode, move clips accordingly
- QRectF rect(clipInfo.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (clipInfo.endPos - clipInfo.startPos).frames(m_document->fps()) - 1, m_tracksHeight / 2 - 2);
- QList<QGraphicsItem *> selection = m_scene->items(rect);
- selection.removeAll(item);
- for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET) {
- ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
- kDebug() << " - - FOUND COLLIDE CLIP: " << clip->baseClip()->getId();
- if (clip->startPos() < item->startPos()) {
- if (clip->endPos() > item->endPos()) {
- ItemInfo clipInfo = clip->info();
- ItemInfo dupInfo = clipInfo;
- GenTime diff = item->startPos() - clip->startPos();
- dupInfo.startPos = item->startPos();
- dupInfo.cropStart += diff + GenTime(1, m_document->fps());
- dupInfo.cropDuration += GenTime() - diff;
- ItemInfo newdupInfo = dupInfo;
- GenTime diff2 = item->endPos() - item->startPos();
- newdupInfo.startPos = GenTime(item->endPos().frames(m_document->fps()), m_document->fps());
- newdupInfo.cropStart += diff2;
- newdupInfo.cropDuration += GenTime() - diff2;
- new RazorClipCommand(this, clipInfo, item->startPos(), false, addCommand);
- new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, addCommand);
- ClipItem *dup = cutClip(clipInfo, item->startPos(), true, false);
- if (dup) dup->resizeStart(item->endPos().frames(m_document->fps()));
-
- } else {
- ItemInfo newclipInfo = clip->info();
- newclipInfo.endPos = item->startPos();
- new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, addCommand);
- clip->resizeEnd(item->startPos().frames(m_document->fps()));
- }
- } else if (clip->endPos() < item->endPos()) {
- new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, true, addCommand);
- scene()->removeItem(clip);
- delete clip;
- clip = NULL;
- } else {
- ItemInfo newclipInfo = clip->info();
- newclipInfo.startPos = item->endPos();
- new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, addCommand);
- clip->resizeStart(item->endPos().frames(m_document->fps()));
- }
- }
- }
- }
+ adjustTimelineClips(m_scene->editMode(), item, addCommand);
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, addCommand);
setFocus();
}
+void CustomTrackView::adjustTimelineClips(EDITMODE mode, ClipItem *item, QUndoCommand *command)
+{
+ if (mode == OVERWRITEEDIT) {
+ // if we are in overwrite or push mode, move clips accordingly
+ bool snap = KdenliveSettings::snaptopoints();
+ KdenliveSettings::setSnaptopoints(false);
+ ItemInfo info = item->info();
+ QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
+ QList<QGraphicsItem *> selection = m_scene->items(rect);
+ selection.removeAll(item);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
+ if (clip->startPos() < info.startPos) {
+ if (clip->endPos() > info.endPos) {
+ ItemInfo clipInfo = clip->info();
+ ItemInfo dupInfo = clipInfo;
+ GenTime diff = info.startPos - clip->startPos();
+ dupInfo.startPos = info.startPos;
+ dupInfo.cropStart += diff;
+ dupInfo.cropDuration = clipInfo.endPos - info.startPos;
+ ItemInfo newdupInfo = dupInfo;
+ GenTime diff2 = info.endPos - info.startPos;
+ newdupInfo.startPos = info.endPos;
+ newdupInfo.cropStart += diff2;
+ newdupInfo.cropDuration = clipInfo.endPos - info.endPos;
+ new RazorClipCommand(this, clipInfo, 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()));
+
+ } else {
+ ItemInfo newclipInfo = clip->info();
+ newclipInfo.endPos = info.startPos;
+ new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command);
+ clip->resizeEnd(info.startPos.frames(m_document->fps()));
+ }
+ } else if (clip->endPos() < info.endPos) {
+ new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, true, command);
+ scene()->removeItem(clip);
+ delete clip;
+ clip = NULL;
+ } else {
+ ItemInfo newclipInfo = clip->info();
+ newclipInfo.startPos = info.endPos;
+ new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, command);
+ clip->resizeStart(info.endPos.frames(m_document->fps()));
+ }
+ }
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ }
+}
+
+
+void CustomTrackView::adjustTimelineTransitions(EDITMODE mode, Transition *item, QUndoCommand *command)
+{
+ if (mode == OVERWRITEEDIT) {
+ // if we are in overwrite or push mode, move clips accordingly
+ bool snap = KdenliveSettings::snaptopoints();
+ KdenliveSettings::setSnaptopoints(false);
+ ItemInfo info = item->info();
+ QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight, (info.endPos - info.startPos).frames(m_document->fps()) - 1, 5);
+ QList<QGraphicsItem *> selection = m_scene->items(rect);
+ selection.removeAll(item);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == TRANSITIONWIDGET) {
+ Transition *tr = static_cast<Transition *>(selection.at(i));
+ if (tr->startPos() < info.startPos) {
+ ItemInfo firstPos = tr->info();
+ ItemInfo newPos = firstPos;
+ firstPos.endPos = item->startPos();
+ newPos.startPos = item->endPos();
+ new MoveTransitionCommand(this, tr->info(), firstPos, true, command);
+ if (tr->endPos() > info.endPos) {
+ // clone transition
+ new AddTransitionCommand(this, newPos, tr->transitionEndTrack(), tr->toXML(), false, true, command);
+ }
+ } else if (tr->endPos() > info.endPos) {
+ // just resize
+ ItemInfo firstPos = tr->info();
+ firstPos.startPos = item->endPos();
+ new MoveTransitionCommand(this, tr->info(), firstPos, true, command);
+ } else {
+ // remove transition
+ new AddTransitionCommand(this, tr->info(), tr->transitionEndTrack(), tr->toXML(), true, true, command);
+ }
+ }
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ }
+}
QStringList CustomTrackView::mimeTypes() const
{
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)) {
m_selectionGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
}
}
// Move graphic items
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)) {
m_selectionGroup->addToGroup(selection.at(i));
- selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
}
}
// Move graphic items
if (clip) {
if (clip->parentItem()) {
m_selectionGroup->addToGroup(clip->parentItem());
- clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
} else {
m_selectionGroup->addToGroup(clip);
- clip->setFlags(QGraphicsItem::ItemIsSelectable);
+ clip->setFlag(QGraphicsItem::ItemIsMovable, false);
}
if (trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track) == -1 || clipsToMove.at(i).startPos.frames(m_document->fps()) < trackClipStartList.value(m_document->tracksCount() - clipsToMove.at(i).track))
trackClipStartList[m_document->tracksCount() - clipsToMove.at(i).track] = clipsToMove.at(i).startPos.frames(m_document->fps());
if (transition) {
if (transition->parentItem()) {
m_selectionGroup->addToGroup(transition->parentItem());
- transition->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ transition->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
} else {
m_selectionGroup->addToGroup(transition);
- transition->setFlags(QGraphicsItem::ItemIsSelectable);
+ transition->setFlag(QGraphicsItem::ItemIsMovable, false);
}
if (trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track) == -1 || transToMove.at(i).startPos.frames(m_document->fps()) < trackTransitionStartList.value(m_document->tracksCount() - transToMove.at(i).track))
trackTransitionStartList[m_document->tracksCount() - transToMove.at(i).track] = transToMove.at(i).startPos.frames(m_document->fps());
if (m_operationMode == MOVE) {
setCursor(Qt::OpenHandCursor);
- if (m_dragItem) m_dragItem->setZValue(2);
+ if (m_dragItem) m_dragItem->setZValue(m_dragItem->defaultZValue());
+ if (m_selectionGroup) m_selectionGroup->setZValue(1);
if (m_dragItem->parentItem() == 0) {
// we are moving one clip, easy
if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
if (success) {
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Move clip"));
+ adjustTimelineClips(m_scene->editMode(), item, moveCommand);
- if (m_scene->editMode() == OVERWRITEEDIT) {
- // if we are in overwrite or push mode, move clips accordingly
- QRectF rect(info.startPos.frames(m_document->fps()), info.track * m_tracksHeight + m_tracksHeight / 2, (info.endPos - info.startPos).frames(m_document->fps()) - 1, m_tracksHeight / 2 - 2);
- QList<QGraphicsItem *> selection = m_scene->items(rect);
- selection.removeAll(item);
- for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET) {
- ClipItem *clip = static_cast<ClipItem *>(selection.at(i));
- if (clip->startPos() < item->startPos()) {
- if (clip->endPos() > item->endPos()) {
- ItemInfo clipInfo = clip->info();
- ItemInfo dupInfo = clipInfo;
- GenTime diff = item->startPos() - clip->startPos();
- dupInfo.startPos = item->startPos();
- dupInfo.cropStart += diff + GenTime(1, m_document->fps());
- dupInfo.cropDuration += GenTime() - diff;
- ItemInfo newdupInfo = dupInfo;
- GenTime diff2 = item->endPos() - item->startPos();
- newdupInfo.startPos = GenTime(item->endPos().frames(m_document->fps()), m_document->fps());
- newdupInfo.cropStart += diff2;
- newdupInfo.cropDuration += GenTime() - diff2;
- new RazorClipCommand(this, clipInfo, item->startPos(), false, moveCommand);
- new ResizeClipCommand(this, dupInfo, newdupInfo, false, false, moveCommand);
- ClipItem *dup = cutClip(clipInfo, item->startPos(), true, false);
- if (dup) dup->resizeStart(item->endPos().frames(m_document->fps()));
- } else {
- ItemInfo newclipInfo = clip->info();
- newclipInfo.endPos = item->startPos();
- new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, moveCommand);
- clip->resizeEnd(item->startPos().frames(m_document->fps()));
- }
- } else if (clip->endPos() < item->endPos()) {
- new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), clip->info(), clip->effectList(), false, true, moveCommand);
- scene()->removeItem(clip);
- delete clip;
- clip = NULL;
- } else {
- ItemInfo newclipInfo = clip->info();
- newclipInfo.startPos = item->endPos();
- new ResizeClipCommand(this, clip->info(), newclipInfo, false, false, moveCommand);
- clip->resizeStart(item->endPos().frames(m_document->fps()));
- }
- }
- }
- }
int tracknumber = m_document->tracksCount() - item->track() - 1;
bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
if (isLocked) item->setItemLocked(true);
// we have to move both transitions, remove the start one so that there is no collision
new AddTransitionCommand(this, startTrInfo, startTransition->transitionEndTrack(), startTransition->toXML(), true, true, moveCommand);
}
+ adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand);
new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
if (moveStartTrans) {
// re-add transition in correct place
if (m_dragItemInfo.track != info.track && !startTransition->forcedTrack()) {
transTrack = getPreviousVideoTrack(info.track);
}
+ adjustTimelineTransitions(m_scene->editMode(), startTransition, moveCommand);
new AddTransitionCommand(this, newStartTrInfo, transTrack, startTransition->toXML(), false, true, moveCommand);
}
}
}
}
- if (moveStartTrans && !moveEndTrans) new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand);
+ if (moveStartTrans && !moveEndTrans) {
+ adjustTimelineTransitions(m_scene->editMode(), startTransition, moveCommand);
+ new MoveTransitionCommand(this, startTrInfo, newStartTrInfo, true, moveCommand);
+ }
// Also move automatic transitions (on upper track)
Transition *tr = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
// transition end should be adjusted to clip on upper track
newTrInfo.endPos = newTrInfo.endPos + (newTrInfo.startPos - trInfo.startPos);
}
- if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos) {
+ adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand);
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ }
}
}
if (m_dragItemInfo.track == info.track && (tr == NULL || tr->endPos() < m_dragItemInfo.endPos)) {
// transition start should be moved
newTrInfo.startPos = newTrInfo.startPos + (newTrInfo.endPos - trInfo.endPos);
}
- if (newTrInfo.startPos < newTrInfo.endPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ if (newTrInfo.startPos < newTrInfo.endPos) {
+ adjustTimelineTransitions(m_scene->editMode(), tr, moveCommand);
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, moveCommand);
+ }
}
}
}
m_commandStack->push(moveCommand);
+ //checkTrackSequence(m_dragItem->track());
} else {
// undo last move and emit error message
bool snap = KdenliveSettings::snaptopoints();
emit displayMessage(i18n("Cannot move transition"), ErrorMessage);
transition->setPos((int) m_dragItemInfo.startPos.frames(m_document->fps()), (m_dragItemInfo.track) * m_tracksHeight + 1);
} else {
- MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
- m_commandStack->push(command);
+ QUndoCommand *moveCommand = new QUndoCommand();
+ moveCommand->setText(i18n("Move transition"));
+ adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand);
+ new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand);
+ m_commandStack->push(moveCommand);
}
}
} else {
GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos;
const int trackOffset = (int)(m_dragItem->scenePos().y() / m_tracksHeight) - m_dragItemInfo.track;
//kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25);
+ QUndoCommand *moveGroup = new QUndoCommand();
+ moveGroup->setText(i18n("Move group"));
if (timeOffset != GenTime() || trackOffset != 0) {
// remove items in MLT playlist
ClipItem *clip = static_cast <ClipItem*>(item);
info.track = m_document->tracksCount() - info.track;
Mlt::Producer *prod;
+ adjustTimelineClips(m_scene->editMode(), clip, moveGroup);
if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
else prod = clip->baseClip()->producer(info.track);
- m_document->renderer()->mltInsertClip(info, clip->xml(), prod);
+ m_document->renderer()->mltInsertClip(info, clip->xml(), prod, m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
for (int i = 0; i < clip->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, clip->getEffectArgs(clip->effectAt(i)), false);
}
newTrack = getPreviousVideoTrack(info.track);
}
tr->updateTransitionEndTrack(newTrack);
+ adjustTimelineTransitions(m_scene->editMode(), tr, moveGroup);
m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
- MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false);
- m_commandStack->push(move);
+ new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup);
+ m_commandStack->push(moveGroup);
//QPointF top = group->sceneBoundingRect().topLeft();
//QPointF oldpos = m_selectionGroup->scenePos();
m_commandStack->push(resizeCommand);
} else {
+ bool snap = KdenliveSettings::snaptopoints();
+ KdenliveSettings::setSnaptopoints(false);
m_dragItem->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps()));
+ KdenliveSettings::setSnaptopoints(snap);
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
} else if (m_dragItem->type() == TRANSITIONWIDGET) {
Transition *transition = static_cast <Transition *>(m_dragItem);
if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - m_dragItemInfo.track), (int)(m_document->tracksCount() - m_dragItemInfo.track), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos)) {
// Cannot resize transition
+ bool snap = KdenliveSettings::snaptopoints();
+ KdenliveSettings::setSnaptopoints(false);
transition->resizeStart((int) m_dragItemInfo.startPos.frames(m_document->fps()));
+ KdenliveSettings::setSnaptopoints(snap);
emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
} else {
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
}*/
m_waitingThumbs.removeAll(item);
if (m_dragItem == item) m_dragItem = NULL;
- scene()->removeItem(item);
+#if QT_VERSION >= 0x040600
+ // animate item deletion
+ item->closeAnimation();
+#else
delete item;
item = NULL;
+#endif
+
setDocumentModified();
if (refresh) m_document->renderer()->doRefresh();
}
m_document->clipManager()->removeGroup(grp);
scene()->destroyItemGroup(grp);
}
- clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ clip->setFlag(QGraphicsItem::ItemIsMovable, true);
}
for (int i = 0; i < transitionInfos.count(); i++) {
Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
m_document->clipManager()->removeGroup(grp);
scene()->destroyItemGroup(grp);
}
- tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ tr->setFlag(QGraphicsItem::ItemIsMovable, true);
}
setDocumentModified();
return;
clip->setItemLocked(false);
if (clip->parentItem()) {
m_selectionGroup->addToGroup(clip->parentItem());
- clip->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ clip->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
} else {
m_selectionGroup->addToGroup(clip);
- clip->setFlags(QGraphicsItem::ItemIsSelectable);
+ clip->setFlag(QGraphicsItem::ItemIsMovable, false);
}
m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
} else kDebug() << "//MISSING CLIP AT: " << startClip.at(i).startPos.frames(25);
tr->setItemLocked(false);
if (tr->parentItem()) {
m_selectionGroup->addToGroup(tr->parentItem());
- tr->parentItem()->setFlags(QGraphicsItem::ItemIsSelectable);
+ tr->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
} else {
m_selectionGroup->addToGroup(tr);
- tr->setFlags(QGraphicsItem::ItemIsSelectable);
+ tr->setFlag(QGraphicsItem::ItemIsMovable, false);
}
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
} else kDebug() << "//MISSING TRANSITION AT: " << startTransition.at(i).startPos.frames(25);
break;
}
}
- clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ clip->setFlag(QGraphicsItem::ItemIsMovable, true);
m_document->clipManager()->removeGroup(grp);
scene()->destroyItemGroup(grp);
}
for (int j = 0; j < children.count(); j++) {
if (children.at(j)->type() == AVWIDGET || children.at(j)->type() == TRANSITIONWIDGET) {
AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
- clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ clip->setFlag(QGraphicsItem::ItemIsMovable, true);
clip->updateFps(m_document->fps());
}
}
if (group) groupSelectedItems();
}
+QStringList CustomTrackView::extractTransitionsLumas()
+{
+ QStringList urls;
+ QList<QGraphicsItem *> itemList = items();
+ Transition *transitionitem;
+ QDomElement transitionXml;
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ transitionitem = static_cast <Transition*>(itemList.at(i));
+ transitionXml = transitionitem->toXML();
+ QString luma = EffectsList::parameter(transitionXml, "luma");
+ if (!luma.isEmpty()) urls << luma;
+ }
+ }
+ return urls;
+}
+
void CustomTrackView::setEditMode(EDITMODE mode)
{
m_scene->setEditMode(mode);
}
+void CustomTrackView::checkTrackSequence(int track)
+{
+ QList <int> times = m_document->renderer()->checkTrackSequence(m_document->tracksCount() - track);
+ //track = m_document->tracksCount() -track;
+ QRectF rect(0, track * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2);
+ QList<QGraphicsItem *> selection = m_scene->items(rect);
+ QList <int> timelineList;
+ timelineList.append(0);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem *>(selection.at(i));
+ int start = clip->startPos().frames(m_document->fps());
+ int end = clip->endPos().frames(m_document->fps());
+ if (!timelineList.contains(start)) timelineList.append(start);
+ if (!timelineList.contains(end)) timelineList.append(end);
+ }
+ }
+ qSort(timelineList);
+ kDebug() << "// COMPARE:\n" << times << "\n" << timelineList << "\n-------------------";
+ if (times != timelineList) KMessageBox::sorry(this, i18n("error"), i18n("TRACTOR"));
+}
+
projects / kdenlive / blobdiff