setLineWidth(0);
//setCacheMode(QGraphicsView::CacheBackground);
//setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+ setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+ pixmapCache = new KPixmapCache("kdenlive-thumbs");
KdenliveSettings::setTrackheight(m_tracksHeight);
m_animationTimer = new QTimeLine(800);
m_animationTimer->setFrameRange(0, 5);
m_document->setModified(true);
}
-void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup)
+void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transition, QActionGroup *clipTypeGroup, QMenu *markermenu)
{
m_timelineContextMenu = timeline;
m_timelineContextClipMenu = clip;
m_clipTypeGroup = clipTypeGroup;
+ connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition()));
+
+ 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 *)));
QList <QAction *> 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);
m_timelineContextMenu->addAction(m_editGuide);
}
+void CustomTrackView::slotDoResetMenuPosition()
+{
+ m_menuPosition = QPoint();
+}
+
+void CustomTrackView::slotResetMenuPosition()
+{
+ // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos
+ QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition()));
+}
+
void CustomTrackView::checkAutoScroll()
{
m_autoScroll = KdenliveSettings::autoscroll();
// spacer tool
snappedPos = getSnapPointForPos(mappedXPos + m_spacerOffset);
if (snappedPos < 0) snappedPos = 0;
+
// Make sure there is no collision
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
QPainterPath shape = m_selectionGroup->clipGroupShape(QPointF(snappedPos - m_selectionGroup->sceneBoundingRect().left(), 0));
QList<QGraphicsItem*> collidingItems = scene()->items(shape, Qt::IntersectsItemShape);
collidingItems.removeAll(m_selectionGroup);
for (int i = 0; i < children.count(); i++) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+ for (int j = 0; j < subchildren.count(); j++) {
+ collidingItems.removeAll(subchildren.at(j));
+ }
+ }
collidingItems.removeAll(children.at(i));
}
bool collision = false;
+ int offset = 0;
+ for (int i = 0; i < collidingItems.count(); i++) {
+ if (!collidingItems.at(i)->isEnabled()) continue;
+ if (collidingItems.at(i)->type() == AVWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(collidingItems.at(i));
+ // Moving backward, determine best pos
+ QPainterPath clipPath;
+ clipPath.addRect(item->sceneBoundingRect());
+ QPainterPath res = shape.intersected(clipPath);
+ offset = qMax(offset, (int)(res.boundingRect().width() + 0.5));
+ }
+ }
+ snappedPos += offset;
+ // make sure we have no collision
+ shape = m_selectionGroup->clipGroupShape(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++) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+ for (int j = 0; j < subchildren.count(); j++) {
+ collidingItems.removeAll(subchildren.at(j));
+ }
+ }
+ collidingItems.removeAll(children.at(i));
+ }
+
for (int i = 0; i < collidingItems.count(); i++) {
if (!collidingItems.at(i)->isEnabled()) continue;
if (collidingItems.at(i)->type() == AVWIDGET) {
break;
}
}
+
+
if (!collision) {
// Check transitions
shape = m_selectionGroup->transitionGroupShape(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++) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+ for (int j = 0; j < subchildren.count(); j++) {
+ collidingItems.removeAll(subchildren.at(j));
+ }
+ }
+ collidingItems.removeAll(children.at(i));
+ }
+ offset = 0;
+
+ for (int i = 0; i < collidingItems.count(); i++) {
+ if (collidingItems.at(i)->type() == TRANSITIONWIDGET && snappedPos < m_selectionGroup->sceneBoundingRect().left()) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(collidingItems.at(i));
+ // Moving backward, determine best pos
+ QPainterPath clipPath;
+ clipPath.addRect(item->sceneBoundingRect());
+ QPainterPath res = shape.intersected(clipPath);
+ offset = qMax(offset, (int)(res.boundingRect().width() + 0.5));
+ }
+ }
+
+ snappedPos += offset;
+ // make sure we have no collision
+ shape = m_selectionGroup->transitionGroupShape(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++) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subchildren = children.at(i)->childItems();
+ for (int j = 0; j < subchildren.count(); j++) {
+ collidingItems.removeAll(subchildren.at(j));
+ }
+ }
collidingItems.removeAll(children.at(i));
}
for (int i = 0; i < collidingItems.count(); i++) {
kDebug() << "SELELCTING ELEMENTS WITHIN =" << event->pos().x() << "/" << 1 << ", " << mapFromScene(sceneRect().width(), 0).x() - event->pos().x() << "/" << sceneRect().height();
}
+ QList <GenTime> offsetList;
// create group to hold selected items
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
- QList <GenTime> offsetList;
+
for (int i = 0; i < selection.count(); i++) {
if (selection.at(i)->parentItem() == 0 && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)) {
AbstractClipItem *item = static_cast<AbstractClipItem *>(selection.at(i));
offsetList.append(item->endPos());
m_selectionGroup->addToGroup(selection.at(i));
selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
- } else if (selection.at(i)->parentItem() == 0 && selection.at(i)->type() == GROUPWIDGET) {
+ } else if (/*selection.at(i)->parentItem() == 0 && */selection.at(i)->type() == GROUPWIDGET) {
if (static_cast<AbstractGroupItem *>(selection.at(i))->isItemLocked()) continue;
QList<QGraphicsItem *> children = selection.at(i)->childItems();
for (int j = 0; j < children.count(); j++) {
}
m_selectionGroup->addToGroup(selection.at(i));
selection.at(i)->setFlag(QGraphicsItem::ItemIsMovable, false);
- } else if (selection.at(i)->parentItem()) {
+ } else if (selection.at(i)->parentItem() && !selection.contains(selection.at(i)->parentItem())) {
if (static_cast<AbstractGroupItem *>(selection.at(i)->parentItem())->isItemLocked()) continue;
+ //AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(selection.at(i)->parentItem());
m_selectionGroup->addToGroup(selection.at(i)->parentItem());
selection.at(i)->parentItem()->setFlag(QGraphicsItem::ItemIsMovable, false);
}
emit clipItemSelected(item, item->selectedEffectIndex());
}
} else if (m_dragItem && !m_dragItem->isItemLocked()) {
+ editItemDuration();
+ } else {
+ QList<QGraphicsItem *> collisionList = items(event->pos());
+ if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
+ Guide *editGuide = (Guide *) collisionList.at(0);
+ if (editGuide) slotEditGuide(editGuide->info());
+ }
+ }
+}
+
+void CustomTrackView::editItemDuration()
+{
+ AbstractClipItem *item;
+ if (m_dragItem) {
+ item = m_dragItem;
+ } else {
+ if (m_scene->selectedItems().count() == 1) {
+ item = static_cast <AbstractClipItem *>(m_scene->selectedItems().at(0));
+ } else {
+ if (m_scene->selectedItems().empty()) {
+ emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage);
+ } else {
+ emit displayMessage(i18n("Cannot edit the duration of multiple items"), ErrorMessage);
+ }
+ return;
+ }
+ }
+
+ if (!item->isItemLocked()) {
GenTime minimum;
GenTime maximum;
- if (m_dragItem->type() == TRANSITIONWIDGET) {
- getTransitionAvailableSpace(m_dragItem, minimum, maximum);
+ if (item->type() == TRANSITIONWIDGET) {
+ getTransitionAvailableSpace(item, minimum, maximum);
} else {
- getClipAvailableSpace(m_dragItem, minimum, maximum);
+ getClipAvailableSpace(item, minimum, maximum);
}
//kDebug()<<"// GOT MOVE POS: "<<minimum.frames(25)<<" - "<<maximum.frames(25);
- ClipDurationDialog d(m_dragItem, m_document->timecode(), minimum, maximum, this);
+ ClipDurationDialog d(item, m_document->timecode(), minimum, maximum, this);
if (d.exec() == QDialog::Accepted) {
- if (m_dragItem->type() == TRANSITIONWIDGET) {
+ if (item->type() == TRANSITIONWIDGET) {
// move & resize transition
ItemInfo startInfo;
- startInfo.startPos = m_dragItem->startPos();
- startInfo.endPos = m_dragItem->endPos();
- startInfo.track = m_dragItem->track();
+ startInfo.startPos = item->startPos();
+ startInfo.endPos = item->endPos();
+ startInfo.track = item->track();
ItemInfo endInfo;
endInfo.startPos = d.startPos();
endInfo.endPos = endInfo.startPos + d.duration();
- endInfo.track = m_dragItem->track();
+ endInfo.track = item->track();
MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true);
m_commandStack->push(command);
} else {
// move and resize clip
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Edit clip"));
- ItemInfo clipInfo = m_dragItem->info();
- if (d.duration() < m_dragItem->cropDuration() || d.cropStart() != clipInfo.cropStart) {
+ ItemInfo clipInfo = item->info();
+ if (d.duration() < item->cropDuration() || d.cropStart() != clipInfo.cropStart) {
// duration was reduced, so process it first
ItemInfo startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
if (d.startPos() != clipInfo.startPos) {
ItemInfo startInfo = clipInfo;
clipInfo.startPos = d.startPos();
- clipInfo.endPos = m_dragItem->endPos() + (clipInfo.startPos - startInfo.startPos);
+ clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos);
new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
}
- if (d.duration() > m_dragItem->cropDuration()) {
+ if (d.duration() > item->cropDuration()) {
// duration was increased, so process it after move
ItemInfo startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
m_commandStack->push(moveCommand);
}
}
- } else {
- QList<QGraphicsItem *> collisionList = items(event->pos());
- if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
- Guide *editGuide = (Guide *) collisionList.at(0);
- if (editGuide) slotEditGuide(editGuide->info());
- }
- }
+ } else emit displayMessage(i18n("Item is locked"), ErrorMessage);
}
-
void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes)
{
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
{
m_deleteGuide->setEnabled(m_dragGuide != NULL);
m_editGuide->setEnabled(m_dragGuide != NULL);
- if (clip == NULL) m_timelineContextMenu->popup(pos);
- else if (group != NULL) {
+ m_markerMenu->clear();
+ m_markerMenu->setEnabled(false);
+ if (clip == NULL) {
+ m_timelineContextMenu->popup(pos);
+ } else if (group != NULL) {
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
m_ungroupAction->setEnabled(true);
updateClipTypeActions(NULL);
m_ungroupAction->setEnabled(false);
if (clip->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem*>(clip);
+ //build go to marker menu
+ if (item->baseClip()) {
+ QList <CommentedTime> markers = item->baseClip()->commentedSnapMarkers();
+ int offset = item->startPos().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());
+ QString position = m_document->timecode().getTimecode(markers.at(i).time()) + ' ' + markers.at(i).comment();
+ QAction *go = m_markerMenu->addAction(position);
+ go->setData(pos + offset);
+ }
+ }
+ m_markerMenu->setEnabled(!m_markerMenu->isEmpty());
+ }
updateClipTypeActions(item);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
m_timelineContextClipMenu->popup(pos);
- } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+ } else if (clip->type() == TRANSITIONWIDGET) {
+ m_timelineContextTransitionMenu->popup(pos);
+ }
}
}
return;
}
EffectsParameterList params = clip->addEffect(effect);
- if (effect.attribute("disabled") == "1") {
- // Effect is disabled, don't add it to MLT playlist
- if (clip->isSelected()) emit clipItemSelected(clip);
- return;
- }
if (!m_document->renderer()->mltAddEffect(track, pos, params))
emit displayMessage(i18n("Problem adding effect to clip"), ErrorMessage);
if (clip->isSelected()) emit clipItemSelected(clip);
return;
}
}
- if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true) && effect.attribute("disabled") != "1") {
- kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disabled");
+ if (!m_document->renderer()->mltRemoveEffect(track, pos, index, true)) {
+ kDebug() << "// ERROR REMOV EFFECT: " << index << ", DISABLE: " << effect.attribute("disable");
emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
return;
}
if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
else effectName = i18n("effect");
effectCommand->setText(i18n("Add %1", effectName));
- int count = 0;
+
if (track == -1) itemList = scene()->selectedItems();
if (itemList.isEmpty()) {
ClipItem *clip = getClipItemAt((int) pos.frames(m_document->fps()), track);
if (clip) itemList.append(clip);
else emit displayMessage(i18n("Select a clip if you want to apply an effect"), ErrorMessage);
}
- kDebug() << "// REQUESTING EFFECT ON CLIP: " << pos.frames(25) << ", TRK: " << track << "SELECTED ITEMS: " << itemList.count();
+
+ //expand groups
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subitems = itemList.at(i)->childItems();
+ for (int j = 0; j < subitems.count(); j++) {
+ if (!itemList.contains(subitems.at(j))) itemList.append(subitems.at(j));
+ }
+ }
+ }
+
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
effect.setAttribute("src", ladpsaFile);
}
new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
- count++;
}
}
- if (count > 0) {
+ if (effectCommand->childCount() > 0) {
m_commandStack->push(effectCommand);
setDocumentModified();
} else delete effectCommand;
}
-void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect)
+void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect, bool affectGroup)
{
+ if (affectGroup && clip->parentItem() && clip->parentItem() == m_selectionGroup) {
+ //clip is in a group, also remove the effect in other clips of the group
+ QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+ QUndoCommand *delCommand = new QUndoCommand();
+ QString effectName;
+ QDomNode namenode = effect.elementsByTagName("name").item(0);
+ if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+ else effectName = i18n("effect");
+ delCommand->setText(i18n("Delete %1", effectName));
+
+ //expand groups
+ for (int i = 0; i < items.count(); i++) {
+ if (items.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> subitems = items.at(i)->childItems();
+ for (int j = 0; j < subitems.count(); j++) {
+ if (!items.contains(subitems.at(j))) items.append(subitems.at(j));
+ }
+ }
+ }
+
+ for (int i = 0; i < items.count(); i++) {
+ if (items.at(i)->type() == AVWIDGET) {
+ ClipItem *item = static_cast <ClipItem *>(items.at(i));
+ int ix = item->hasEffect(effect.attribute("tag"), effect.attribute("id"));
+ if (ix != -1) {
+ QDomElement eff = item->effectAt(ix);
+ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), eff, false, delCommand);
+ }
+ }
+ }
+ if (delCommand->childCount() > 0) m_commandStack->push(delCommand);
+ else delete delCommand;
+ return;
+ }
AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effect, false);
m_commandStack->push(command);
setDocumentModified();
if (clip) {
// Special case: speed effect
if (effect.attribute("id") == "speed") {
- if (effect.attribute("disabled") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
+ if (effect.attribute("disable") == "1") doChangeClipSpeed(clip->info(), clip->speedIndependantInfo(), 1.0, clip->speed(), 1, clip->baseClip()->getId());
else {
double speed = EffectsList::parameter(effect, "speed").toDouble() / 100.0;
int strobe = EffectsList::parameter(effect, "strobe").toInt();
clip->initEffect(effect);
effectParams = clip->getEffectArgs(effect);
}
- if (effectParams.paramValue("disabled") == "1") {
- if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) {
- kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex();
- } else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
- } else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
+ if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
clip->setEffectAt(ix, effect);
QDomElement effect = clip->effectAt(effectPos);
QDomElement oldEffect = effect.cloneNode().toElement();
- effect.setAttribute("disabled", (int) disable);
+ effect.setAttribute("disable", (int) disable);
EditEffectCommand *command = new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), oldEffect, effect, effectPos, true);
m_commandStack->push(command);
setDocumentModified();;
void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
{
//kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
- EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false);
+ QDomElement xml = tr->toXML();
+ if (old.isNull() || xml.isNull()) {
+ emit displayMessage(i18n("Cannot update transition"), ErrorMessage);
+ return;
+ }
+ EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false);
m_commandStack->push(command);
setDocumentModified();
}
kWarning() << "Unable to find transition at pos :" << pos.frames(m_document->fps()) << ", ON track: " << track;
return;
}
- m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition);
+ bool force = false;
+ if (oldTransition.attribute("transition_atrack") != transition.attribute("transition_atrack") || oldTransition.attribute("transition_btrack") != transition.attribute("transition_btrack")) force = true;
+ m_document->renderer()->mltUpdateTransition(oldTransition.attribute("tag"), transition.attribute("tag"), transition.attribute("transition_btrack").toInt(), m_document->tracksCount() - transition.attribute("transition_atrack").toInt(), item->startPos(), item->endPos(), transition, force);
//kDebug() << "ORIGINAL TRACK: "<< oldTransition.attribute("transition_btrack") << ", NEW TRACK: "<<transition.attribute("transition_btrack");
item->setTransitionParameters(transition);
if (updateTransitionWidget) {
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());
}
dupInfo.cropStart += diff;
dupInfo.cropDuration = clipInfo.endPos - info.startPos;
new RazorClipCommand(this, clipInfo, info.startPos, false, command);
- ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+ // Commented out; variable dup unused. --granjow
+ //ClipItem *dup = cutClip(clipInfo, info.startPos, true, false);
+ cutClip(clipInfo, info.startPos, true, false);
}
}
// TODO: add insertspacecommand
pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
}
- SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this);
+ SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount() + 1, this);
if (d.exec() != QDialog::Accepted) return;
GenTime spaceDuration = d.selectedDuration();
track = d.selectedTrack();
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
- slotDeleteEffect(item, oldeffect);
+ slotDeleteEffect(item, oldeffect, false);
} else {
end += start;
QDomElement effect = oldeffect.cloneNode().toElement();
int start = item->cropStart().frames(m_document->fps());
int end = item->fadeIn();
if (end == 0) {
- slotDeleteEffect(item, oldeffect);
+ slotDeleteEffect(item, oldeffect, false);
} else {
end += start;
QDomElement effect = oldeffect.cloneNode().toElement();
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
- slotDeleteEffect(item, oldeffect);
+ slotDeleteEffect(item, oldeffect, false);
} else {
start = end - start;
QDomElement effect = oldeffect.cloneNode().toElement();
int end = (item->cropDuration() + item->cropStart()).frames(m_document->fps());
int start = item->fadeOut();
if (start == 0) {
- slotDeleteEffect(item, oldeffect);
+ slotDeleteEffect(item, oldeffect, false);
} else {
start = end - start;
QDomElement effect = oldeffect.cloneNode().toElement();
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());
}
//item->moveTransition(GenTime((int) (endPos.x() - startPos.x()), m_document->fps()));
KdenliveSettings::setSnaptopoints(snap);
item->updateTransitionEndTrack(getPreviousVideoTrack(end.track));
- m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - end.track, item->transitionEndTrack(), start.startPos, start.endPos, end.startPos, end.endPos);
+ m_document->renderer()->mltMoveTransition(item->transitionTag(), m_document->tracksCount() - start.track, m_document->tracksCount() - item->track(), item->transitionEndTrack(), start.startPos, start.endPos, item->startPos(), item->endPos());
if (m_dragItem && m_dragItem == item) {
QPoint p;
ClipItem *transitionClip = getClipItemAt(item->startPos(), item->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());
}
return -1;
}
+void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
+{
+ QAction *act;
+ goMenu->clear();
+ double fps = m_document->fps();
+ for (int i = 0; i < m_guides.count(); i++) {
+ act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
+ act->setData(m_guides.at(i)->position().frames(m_document->fps()));
+ }
+ goMenu->setEnabled(!m_guides.isEmpty());
+}
+
void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment)
{
if (oldPos > GenTime() && pos > GenTime()) {
return false;
}
+void CustomTrackView::selectFound(QString track, QString pos)
+{
+ setCursorPos(m_document->timecode().getFrameCount(pos), true);
+ slotSelectTrack(track.toInt());
+ selectClip(true);
+ int vert = verticalScrollBar()->value();
+ int hor = cursorPos();
+ ensureVisible(hor, vert + 10, 2, 2, 50, 0);
+}
+
bool CustomTrackView::findNextString(const QString &text)
{
QString marker;
m_findIndex = 0;
}
+QList<ItemInfo> CustomTrackView::findId(const QString &clipId)
+{
+ QList<ItemInfo> matchingInfo;
+ QList<QGraphicsItem *> itemList = items();
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *)itemList.at(i);
+ if (item->clipProducer() == clipId) {
+ matchingInfo << item->info();
+ }
+ }
+ }
+ return matchingInfo;
+}
+
void CustomTrackView::copyClip()
{
qDeleteAll(m_copiedItems);
return true;
}
+
void CustomTrackView::pasteClip()
{
if (m_copiedItems.count() == 0) {
QPoint position;
if (m_menuPosition.isNull()) {
position = mapFromGlobal(QCursor::pos());
- if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) {
+ if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) {
emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
return;
}
} else position = m_menuPosition;
+
GenTime pos = GenTime((int)(mapToScene(position).x()), m_document->fps());
- int track = (int)(position.y() / m_tracksHeight);
- ItemInfo first = m_copiedItems.at(0)->info();
+ int track = (int)(mapToScene(position).y() / m_tracksHeight);
+
+ GenTime leftPos = m_copiedItems.at(0)->startPos();
+ int lowerTrack = m_copiedItems.at(0)->track();
+ int upperTrack = m_copiedItems.at(0)->track();
+ for (int i = 1; i < m_copiedItems.count(); i++) {
+ if (m_copiedItems.at(i)->startPos() < leftPos) leftPos = m_copiedItems.at(i)->startPos();
+ if (m_copiedItems.at(i)->track() < lowerTrack) lowerTrack = m_copiedItems.at(i)->track();
+ if (m_copiedItems.at(i)->track() > upperTrack) upperTrack = m_copiedItems.at(i)->track();
+ }
- GenTime offset = pos - first.startPos;
- int trackOffset = track - first.track;
+ GenTime offset = pos - leftPos;
+ int trackOffset = track - lowerTrack;
+ if (lowerTrack + trackOffset < 0) trackOffset = 0 - lowerTrack;
+ if (upperTrack + trackOffset > m_document->tracksCount() - 1) trackOffset = m_document->tracksCount() - upperTrack - 1;
if (!canBePasted(m_copiedItems, offset, trackOffset)) {
emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
return;
paste->setText("Paste effects");
QList<QGraphicsItem *> clips = scene()->selectedItems();
+
+ // expand groups
+ for (int i = 0; i < clips.count(); ++i) {
+ if (clips.at(i)->type() == GROUPWIDGET) {
+ QList<QGraphicsItem *> children = clips.at(i)->childItems();
+ for (int j = 0; j < children.count(); j++) {
+ if (children.at(j)->type() == AVWIDGET && !clips.contains(children.at(j))) {
+ clips.append(children.at(j));
+ }
+ }
+ }
+ }
+
+
for (int i = 0; i < clips.count(); ++i) {
if (clips.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast < ClipItem *>(clips.at(i));
}
}
}
- m_commandStack->push(paste);
+ if (paste->childCount() > 0) m_commandStack->push(paste);
+ else delete paste;
- // adjust effects (fades, ...)
+ //adjust effects (fades, ...)
for (int i = 0; i < clips.count(); ++i) {
- ClipItem *item = static_cast < ClipItem *>(clips.at(i));
- updatePositionEffects(item, item->info());
+ if (clips.at(i)->type() == AVWIDGET) {
+ ClipItem *item = static_cast < ClipItem *>(clips.at(i));
+ updatePositionEffects(item, item->info());
+ }
}
}
d.slotUpdateName(ix);
d.setWindowTitle(i18n("Change Track Type"));
- if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK)
+ TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
+ if (oldInfo.type == VIDEOTRACK)
d.video_track->setChecked(true);
else
d.audio_track->setChecked(true);
TrackInfo info;
info.isLocked = false;
info.isMute = false;
+ info.trackName = oldInfo.trackName;
ix = d.track_nb->value();
if (d.video_track->isChecked()) {
}
}
+void CustomTrackView::slotGoToMarker(QAction *action)
+{
+ int pos = action->data().toInt();
+ setCursorPos(pos, true);
+}
+
void CustomTrackView::reloadTransitionLumas()
{
QString lumaNames;
return m_selectedTrack;
}
+QStringList CustomTrackView::selectedClips() const
+{
+ QStringList clipIds;
+ QList<QGraphicsItem *> selection = m_scene->selectedItems();
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *)selection.at(i);
+ clipIds << item->clipProducer();
+ }
+ }
+ return clipIds;
+}
+
+QList<ClipItem *> CustomTrackView::selectedClipItems() const
+{
+ QList<ClipItem *> clips;
+ QList<QGraphicsItem *> selection = m_scene->selectedItems();
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET) {
+ clips.append((ClipItem *)selection.at(i));
+ }
+ }
+ return clips;
+}
+
void CustomTrackView::slotSelectTrack(int ix)
{
m_selectedTrack = qMax(0, ix);
void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
{
+ if (data.isEmpty()) return;
DocClipBase *clip = m_document->getBaseClip(data.at(0));
ItemInfo info;
info.startPos = GenTime(in, m_document->fps());
new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand);
m_commandStack->push(addCommand);
}
+
+void CustomTrackView::clearSelection()
+{
+ resetSelectionGroup();
+ scene()->clearSelection();
+ m_dragItem = NULL;
+ emit clipItemSelected(NULL);
+}
+
projects / kdenlive / blobdiff