#include "trackdialog.h"
#include "tracksconfigdialog.h"
#include "configtrackscommand.h"
+#include "rebuildgroupcommand.h"
+#include "razorgroupcommand.h"
#include <KDebug>
#include <KLocale>
emit mousePosition(mappedXPos);
if (event->buttons() & Qt::MidButton) return;
- if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) {
+ if (dragMode() == QGraphicsView::RubberBandDrag || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && m_operationMode != RESIZESTART && m_operationMode != RESIZEEND)) {
event->setAccepted(true);
m_moveOpMode = NONE;
QGraphicsView::mouseMoveEvent(event);
} else if (viewport()->width() - pos < 10) {
m_scrollOffset = 30;
m_scrollTimer.start();
- } else if (m_scrollTimer.isActive()) m_scrollTimer.stop();
-
+ } else if (m_scrollTimer.isActive()) {
+ m_scrollTimer.stop();
+ }
} else if (m_operationMode == RESIZESTART && move) {
m_document->renderer()->pause();
- m_dragItem->resizeStart((int)(snappedPos));
+ if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ if (parent)
+ parent->resizeStart((int)(snappedPos) - m_dragItemInfo.startPos.frames(m_document->fps()));
+ } else {
+ m_dragItem->resizeStart((int)(snappedPos));
+ }
} else if (m_operationMode == RESIZEEND && move) {
m_document->renderer()->pause();
- m_dragItem->resizeEnd((int)(snappedPos));
+ if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ if (parent)
+ parent->resizeEnd((int)(snappedPos) - m_dragItemInfo.endPos.frames(m_document->fps()));
+ } else {
+ m_dragItem->resizeEnd((int)(snappedPos));
+ }
} else if (m_operationMode == FADEIN && move) {
((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
} else if (m_operationMode == FADEOUT && move) {
pos = (br.bottom() - pos) * maxh;
m_dragItem->updateKeyFramePos(keyFramePos, pos);
}
- if (m_visualTip) {
- scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
- }
+ removeTipAnimation();
return;
} else if (m_operationMode == MOVEGUIDE) {
- if (m_visualTip) {
- scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
- }
+ removeTipAnimation();
QGraphicsView::mouseMoveEvent(event);
return;
} else if (m_operationMode == SPACER && move && 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++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
- }
}
collidingItems.removeAll(children.at(i));
}
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++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
- }
}
collidingItems.removeAll(children.at(i));
}
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++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
- }
}
collidingItems.removeAll(children.at(i));
}
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++) {
+ for (int j = 0; j < subchildren.count(); j++)
collidingItems.removeAll(subchildren.at(j));
- }
}
collidingItems.removeAll(children.at(i));
}
QGraphicsView::mouseMoveEvent(event);
return;
} else {
- if (m_visualTip) {
- scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
- }
+ removeTipAnimation();
}
m_moveOpMode = opMode;
+ setTipAnimation(clip, opMode, size);
if (opMode == MOVE) {
setCursor(Qt::OpenHandCursor);
+ if (item->type() == AVWIDGET) {
+ ClipItem *ci = static_cast <ClipItem *>(item);
+ QString message = ci->clipName() + i18n(":");
+ message.append(i18n(" Position:") + m_document->timecode().getDisplayTimecode(ci->info().startPos, KdenliveSettings::frametimecode()));
+ message.append(i18n(" Duration:") + m_document->timecode().getDisplayTimecode(ci->cropDuration(), KdenliveSettings::frametimecode()));
+ if (clip->parentItem() && clip->parentItem()->type() == GROUPWIDGET) {
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(clip->parentItem());
+ if (clip->parentItem() == m_selectionGroup)
+ message.append(i18n(" Selection duration:"));
+ else
+ message.append(i18n(" Group duration:"));
+ message.append(m_document->timecode().getDisplayTimecode(parent->duration(), KdenliveSettings::frametimecode()));
+ if (parent->parentItem() && parent->parentItem()->type() == GROUPWIDGET) {
+ AbstractGroupItem *parent2 = static_cast <AbstractGroupItem *>(parent->parentItem());
+ message.append(i18n(" Selection duration:") + m_document->timecode().getDisplayTimecode(parent2->duration(), KdenliveSettings::frametimecode()));
+ }
+ }
+ emit displayMessage(message, InformationMessage);
+ }
} else if (opMode == RESIZESTART) {
setCursor(KCursor("left_side", Qt::SizeHorCursor));
- if (m_visualTip == NULL) {
- QRectF rect = clip->sceneBoundingRect();
- QPolygon polygon;
- polygon << QPoint(0, - size * 2);
- polygon << QPoint(size * 2, 0);
- polygon << QPoint(0, size * 2);
- polygon << QPoint(0, - size * 2);
-
- m_visualTip = new QGraphicsPolygonItem(polygon);
- ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2);
- m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_animation->setScaleAt(.5, 2, 1);
- m_animation->setScaleAt(1, 1, 1);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
+ if (item->type() == AVWIDGET && item->parentItem() && item->parentItem() != m_selectionGroup)
+ emit displayMessage(i18n("Use Ctrl to resize only current item, otherwise all items in this group will be resized at once."), InformationMessage);
} else if (opMode == RESIZEEND) {
setCursor(KCursor("right_side", Qt::SizeHorCursor));
- if (m_visualTip == NULL) {
- QRectF rect = clip->sceneBoundingRect();
- QPolygon polygon;
- polygon << QPoint(0, - size * 2);
- polygon << QPoint(- size * 2, 0);
- polygon << QPoint(0, size * 2);
- polygon << QPoint(0, - size * 2);
-
- m_visualTip = new QGraphicsPolygonItem(polygon);
- ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_animation->setScaleAt(.5, 2, 1);
- m_animation->setScaleAt(1, 1, 1);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- } else if (opMode == FADEIN) {
- if (m_visualTip == NULL) {
- ClipItem *item = (ClipItem *) clip;
- QRectF rect = clip->sceneBoundingRect();
- m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setPos(rect.x() + item->fadeIn(), rect.y());
- m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_animation->setScaleAt(.5, 2, 2);
- m_animation->setScaleAt(1, 1, 1);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
+ if (item->type() == AVWIDGET && item->parentItem() && item->parentItem() != m_selectionGroup)
+ emit displayMessage(i18n("Use Ctrl to resize only current item, otherwise all items in this group will be resized at once."), InformationMessage);
+ } else if (opMode == FADEIN || opMode == FADEOUT) {
setCursor(Qt::PointingHandCursor);
- } else if (opMode == FADEOUT) {
- if (m_visualTip == NULL) {
- ClipItem *item = (ClipItem *) clip;
- QRectF rect = clip->sceneBoundingRect();
- m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setPos(rect.right() - item->fadeOut(), rect.y());
- m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_animation->setScaleAt(.5, 2, 2);
- m_animation->setScaleAt(1, 1, 1);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- setCursor(Qt::PointingHandCursor);
- } else if (opMode == TRANSITIONSTART) {
- if (m_visualTip == NULL) {
- QRectF rect = clip->sceneBoundingRect();
- QPolygon polygon;
- polygon << QPoint(0, - size * 2);
- polygon << QPoint(size * 2, 0);
- polygon << QPoint(0, 0);
- polygon << QPoint(0, - size * 2);
-
- m_visualTip = new QGraphicsPolygonItem(polygon);
- ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setPos(rect.x(), rect.bottom());
- m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_animation->setScaleAt(.5, 2, 2);
- m_animation->setScaleAt(1, 1, 1);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- setCursor(Qt::PointingHandCursor);
- } else if (opMode == TRANSITIONEND) {
- if (m_visualTip == NULL) {
- QRectF rect = clip->sceneBoundingRect();
- QPolygon polygon;
- polygon << QPoint(0, - size * 2);
- polygon << QPoint(- size * 2, 0);
- polygon << QPoint(0, 0);
- polygon << QPoint(0, - size * 2);
-
- m_visualTip = new QGraphicsPolygonItem(polygon);
- ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setPos(rect.right(), rect.bottom());
- m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_animation->setScaleAt(.5, 2, 2);
- m_animation->setScaleAt(1, 1, 1);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
+ emit displayMessage(i18n("Drag to add or resize a fade effect."), InformationMessage);
+ } else if (opMode == TRANSITIONSTART || opMode == TRANSITIONEND) {
setCursor(Qt::PointingHandCursor);
+ emit displayMessage(i18n("Click to add a transition."), InformationMessage);
} else if (opMode == KEYFRAME) {
setCursor(Qt::PointingHandCursor);
+ emit displayMessage(i18n("Move keyframe above or below clip to remove it, double click to add a new one."), InformationMessage);
}
} // no clip under mouse
else if (m_tool == RAZORTOOL) {
m_moveOpMode = opMode;
setCursor(Qt::SplitHCursor);
} else {
- if (m_visualTip) {
- scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
-
- }
+ removeTipAnimation();
setCursor(Qt::ArrowCursor);
if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
QGraphicsView::mouseMoveEvent(event);
}
#if QT_VERSION >= 0x040600
// Add shadow to dragged item, currently disabled because of painting artifacts
- //TODO: re-enable when fixed
+ //TODO: re-enable when fixed
/*QGraphicsDropShadowEffect *eff = new QGraphicsDropShadowEffect();
eff->setBlurRadius(5);
eff->setOffset(3, 3);
// Razor tool
if (m_tool == RAZORTOOL && m_dragItem) {
+ GenTime cutPos = GenTime((int)(mapToScene(event->pos()).x()), m_document->fps());
if (m_dragItem->type() == TRANSITIONWIDGET) {
emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage);
- event->accept();
- m_dragItem = NULL;
- return;
- } else if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
- emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage);
- event->accept();
- m_dragItem = NULL;
- return;
+ } else {
+ m_document->renderer()->pause();
+ if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ razorGroup((AbstractGroupItem *)m_dragItem->parentItem(), cutPos);
+ } else {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
+ RazorClipCommand* command = new RazorClipCommand(this, clip->info(), cutPos);
+ m_commandStack->push(command);
+ }
+ setDocumentModified();
}
- AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
- RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()));
- m_document->renderer()->pause();
- m_commandStack->push(command);
- setDocumentModified();
m_dragItem = NULL;
event->accept();
return;
}
bool itemSelected = false;
- if (m_dragItem->isSelected()) itemSelected = true;
- else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true;
- else if (dragGroup && dragGroup->isSelected()) itemSelected = true;
+ if (m_dragItem->isSelected())
+ itemSelected = true;
+ else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected())
+ itemSelected = true;
+ else if (dragGroup && dragGroup->isSelected())
+ itemSelected = true;
if (event->modifiers() == Qt::ControlModifier || itemSelected == false) {
if (event->modifiers() != Qt::ControlModifier) {
dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
}
bool selected = !m_dragItem->isSelected();
- if (dragGroup) dragGroup->setSelected(selected);
- else m_dragItem->setSelected(selected);
+ if (dragGroup)
+ dragGroup->setSelected(selected);
+ else
+ m_dragItem->setSelected(selected);
groupSelectedItems();
ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) {
ClipItem *selected = static_cast <ClipItem*>(m_dragItem);
emit clipItemSelected(selected);
- } else emit clipItemSelected(NULL);
+ } else {
+ emit clipItemSelected(NULL);
+ }
}
// If clicked item is selected, allow move
// Update snap points
if (m_selectionGroup == NULL) {
- if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART) updateSnapPoints(NULL);
- else updateSnapPoints(m_dragItem);
+ if (m_operationMode == RESIZEEND || m_operationMode == RESIZESTART)
+ updateSnapPoints(NULL);
+ else
+ updateSnapPoints(m_dragItem);
} else {
QList <GenTime> offsetList;
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
info.endPos = transitionClip->endPos();
} else {
GenTime transitionDuration(65, m_document->fps());
- if (m_dragItem->cropDuration() < transitionDuration) info.endPos = m_dragItem->endPos();
- else info.endPos = info.startPos + transitionDuration;
+ if (m_dragItem->cropDuration() < transitionDuration)
+ info.endPos = m_dragItem->endPos();
+ else
+ info.endPos = info.startPos + transitionDuration;
}
if (info.endPos == info.startPos) info.endPos = info.startPos + GenTime(65, m_document->fps());
// Check there is no other transition at that place
QGraphicsView::mousePressEvent(event);
}
+void CustomTrackView::rebuildGroup(int childTrack, GenTime childPos)
+{
+ const QPointF p((int)childPos.frames(m_document->fps()), childTrack * m_tracksHeight + m_tracksHeight / 2);
+ QList<QGraphicsItem *> list = scene()->items(p);
+ AbstractGroupItem *group = NULL;
+ for (int i = 0; i < list.size(); i++) {
+ if (!list.at(i)->isEnabled()) continue;
+ if (list.at(i)->type() == GROUPWIDGET) {
+ group = static_cast <AbstractGroupItem *>(list.at(i));
+ break;
+ }
+ }
+ rebuildGroup(group);
+}
+
+void CustomTrackView::rebuildGroup(AbstractGroupItem *group)
+{
+ if (group) {
+ QList <QGraphicsItem *> children = group->childItems();
+ m_document->clipManager()->removeGroup(group);
+ scene()->destroyItemGroup(group);
+ for (int i = 0; i < children.count(); i++)
+ children.at(i)->setSelected(true);
+ groupSelectedItems(false, true);
+ }
+}
+
void CustomTrackView::resetSelectionGroup(bool selectItems)
{
if (m_selectionGroup) {
scene()->addItem(newGroup);
- // CHeck if we are trying to include a group in a group
+ // Check if we are trying to include a group in a group
QList <AbstractGroupItem *> groups;
for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast<AbstractGroupItem *>(selection.at(i)))) {
+ if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast<AbstractGroupItem *>(selection.at(i))))
groups.append(static_cast<AbstractGroupItem *>(selection.at(i)));
- } else if (selection.at(i)->parentItem() && !groups.contains(static_cast<AbstractGroupItem *>(selection.at(i)->parentItem()))) groups.append(static_cast<AbstractGroupItem *>(selection.at(i)->parentItem()));
+ else if (selection.at(i)->parentItem() && !groups.contains(static_cast<AbstractGroupItem *>(selection.at(i)->parentItem())))
+ groups.append(static_cast<AbstractGroupItem *>(selection.at(i)->parentItem()));
}
if (!groups.isEmpty()) {
// ungroup previous groups
if (m_dragItem && m_dragItem->hasKeyFrames()) {
/*if (m_moveOpMode == KEYFRAME) {
// user double clicked on a keyframe, open edit dialog
- //TODO: update for effects with several values per keyframe
+ //TODO: update for effects with several values per keyframe
QDialog d(parentWidget());
Ui::KeyFrameDialog_UI view;
view.setupUi(&d);
if (m_scene->selectedItems().count() == 1) {
item = static_cast <AbstractClipItem *>(m_scene->selectedItems().at(0));
} else {
- if (m_scene->selectedItems().empty()) {
+ if (m_scene->selectedItems().empty())
emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage);
- } else {
+ else
emit displayMessage(i18n("Cannot edit the duration of multiple items"), ErrorMessage);
- }
return;
}
}
+ if (!item) {
+ emit displayMessage(i18n("Cannot find clip to edit"), ErrorMessage);
+ return;
+ }
+
+ if (item->type() == GROUPWIDGET || (item->parentItem() && item->parentItem()->type() == GROUPWIDGET)) {
+ emit displayMessage(i18n("Cannot edit an item in a group"), ErrorMessage);
+ return;
+ }
+
if (!item->isItemLocked()) {
GenTime minimum;
GenTime maximum;
- if (item->type() == TRANSITIONWIDGET) {
+ if (item->type() == TRANSITIONWIDGET)
getTransitionAvailableSpace(item, minimum, maximum);
- } else {
+ else
getClipAvailableSpace(item, minimum, maximum);
- }
- //kDebug()<<"// GOT MOVE POS: "<<minimum.frames(25)<<" - "<<maximum.frames(25);
+
ClipDurationDialog d(item, m_document->timecode(), minimum, maximum, this);
if (d.exec() == QDialog::Accepted) {
+ ItemInfo clipInfo = item->info();
+ ItemInfo startInfo = clipInfo;
if (item->type() == TRANSITIONWIDGET) {
// move & resize transition
- ItemInfo startInfo;
- 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 = item->track();
- MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, endInfo, true);
+ clipInfo.startPos = d.startPos();
+ clipInfo.endPos = clipInfo.startPos + d.duration();
+ clipInfo.track = item->track();
+ MoveTransitionCommand *command = new MoveTransitionCommand(this, startInfo, clipInfo, true);
m_commandStack->push(command);
} else {
// move and resize clip
QUndoCommand *moveCommand = new QUndoCommand();
moveCommand->setText(i18n("Edit clip"));
- 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();
clipInfo.cropStart = d.cropStart();
new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand);
}
if (d.startPos() != clipInfo.startPos) {
- ItemInfo startInfo = clipInfo;
+ startInfo = clipInfo;
clipInfo.startPos = d.startPos();
clipInfo.endPos = item->endPos() + (clipInfo.startPos - startInfo.startPos);
new MoveClipCommand(this, startInfo, clipInfo, true, moveCommand);
}
if (d.duration() > item->cropDuration()) {
// duration was increased, so process it after move
- ItemInfo startInfo = clipInfo;
+ startInfo = clipInfo;
clipInfo.endPos = clipInfo.startPos + d.duration();
clipInfo.cropStart = d.cropStart();
new ResizeClipCommand(this, startInfo, clipInfo, true, false, moveCommand);
m_commandStack->push(moveCommand);
}
}
- } else emit displayMessage(i18n("Item is locked"), ErrorMessage);
+ } else {
+ emit displayMessage(i18n("Item is locked"), ErrorMessage);
+ }
}
-void CustomTrackView::editKeyFrame(const GenTime pos, const int track, const int index, const QString keyframes)
+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);
+ /*ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()), track);
if (clip) {
clip->setKeyframes(index, keyframes);
updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(index), index, false);
- } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);
+ } else emit displayMessage(i18n("Cannot find clip with keyframe"), ErrorMessage);*/
}
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
if (!item || cutTime >= item->endPos() || cutTime <= item->startPos()) {
emit displayMessage(i18n("Cannot find clip to cut"), ErrorMessage);
- if (item) kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
- else kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track;
+ if (item)
+ kDebug() << "///////// ERROR CUTTING CLIP : (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), INFO: (" << info.startPos.frames(25) << "-" << info.endPos.frames(25) << ")" << ", CUT: " << cutTime.frames(25);
+ else
+ kDebug() << "/// ERROR NO CLIP at: " << info.startPos.frames(m_document->fps()) << ", track: " << info.track;
m_blockRefresh = false;
return NULL;
}
}
item->resizeEnd(cutPos);
scene()->addItem(dup);
- if (item->checkKeyFrames()) slotRefreshEffects(item);
- if (dup->checkKeyFrames()) slotRefreshEffects(dup);
+ if (item->checkKeyFrames())
+ slotRefreshEffects(item);
+ if (dup->checkKeyFrames())
+ slotRefreshEffects(dup);
item->baseClip()->addReference();
m_document->updateClip(item->baseClip()->getId());
setDocumentModified();
if (success) {
item->resizeEnd((int) info.endPos.frames(m_document->fps()));
setDocumentModified();
- } else
+ } else {
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
+ }
KdenliveSettings::setSnaptopoints(snap);
return item;
-
}
//QTimer::singleShot(3000, this, SLOT(slotEnableRefresh()));
}
if (isLocked) item->setItemLocked(true);
ItemInfo clipInfo = info;
clipInfo.track = m_document->tracksCount() - item->track();
- if (m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT) == -1) {
+
+ int worked = m_document->renderer()->mltInsertClip(clipInfo, item->xml(), item->baseClip()->producer(item->track()), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT);
+ if (worked == -1) {
emit displayMessage(i18n("Cannot insert clip in timeline"), ErrorMessage);
brokenClips.append(item);
continue;
setDocumentModified();
/*
- // debug info
+ // debug info
QRectF rect(0, 1 * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), 2);
QList<QGraphicsItem *> selection = m_scene->items(rect);
QStringList timelineList;
void CustomTrackView::setCursorPos(int pos, bool seek)
{
- kDebug() << "SEEk TO: " << pos << ", SEEK: " << seek;
if (pos == m_cursorPos) return;
emit cursorMoved((int)(m_cursorPos), (int)(pos));
m_cursorPos = pos;
trackTransitionStartList[m_document->tracksCount() - info.track] = info.startPos.frames(m_document->fps());
}
}
-
- InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
- m_commandStack->push(command);
- if (track != -1) track = m_document->tracksCount() - track;
- kDebug() << "SPACER TRACK:" << track;
- m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
+ if (!clipsToMove.isEmpty() || !transitionsToMove.isEmpty()) {
+ InsertSpaceCommand *command = new InsertSpaceCommand(this, clipsToMove, transitionsToMove, track, timeOffset, false);
+ m_commandStack->push(command);
+ if (track != -1) track = m_document->tracksCount() - track;
+ kDebug() << "SPACER TRACK:" << track;
+ m_document->renderer()->mltInsertSpace(trackClipStartList, trackTransitionStartList, track, timeOffset, GenTime());
+ setDocumentModified();
+ }
}
resetSelectionGroup(false);
m_operationMode = NONE;
adjustTimelineTransitions(m_scene->editMode(), transition, moveCommand);
new MoveTransitionCommand(this, m_dragItemInfo, info, false, moveCommand);
m_commandStack->push(moveCommand);
+ setDocumentModified();
}
}
} else {
info.track = m_document->tracksCount() - info.track;
Mlt::Producer *prod;
adjustTimelineClips(m_scene->editMode(), clip, ItemInfo(), 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);
+ 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_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);
m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
-
new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveGroup);
m_commandStack->push(moveGroup);
if (m_selectionGroup) {
m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
+ } else {
+ rebuildGroup((AbstractGroupItem *)group);
}
setDocumentModified();
}
m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) {
// resize start
- if (m_dragItem->type() == AVWIDGET) {
- ItemInfo resizeinfo = m_dragItemInfo;
- resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
- bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, m_dragItem->startPos() - m_dragItemInfo.startPos);
- if (success) {
+ if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ if (parent) {
QUndoCommand *resizeCommand = new QUndoCommand();
- resizeCommand->setText(i18n("Resize clip"));
-
- // Check if there is an automatic transition on that clip (lower track)
- Transition *transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track);
- if (transition && transition->isAutomatic()) {
- ItemInfo trInfo = transition->info();
- ItemInfo newTrInfo = trInfo;
- newTrInfo.startPos = m_dragItem->startPos();
- if (newTrInfo.startPos < newTrInfo.endPos)
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
- }
- // Check if there is an automatic transition on that clip (upper track)
- transition = getTransitionItemAtStart(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
- if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == m_dragItemInfo.track) {
- ItemInfo trInfo = transition->info();
- ItemInfo newTrInfo = trInfo;
- newTrInfo.startPos = m_dragItem->startPos();
- ClipItem * upperClip = getClipItemAt(m_dragItemInfo.startPos, m_dragItemInfo.track - 1);
- if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos) {
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
- }
- }
-
- ClipItem *clip = static_cast < ClipItem * >(m_dragItem);
- updatePositionEffects(clip, m_dragItemInfo);
-
- // check keyframes
- QDomDocument doc;
- QDomElement root = doc.createElement("list");
- doc.appendChild(root);
- QList <int> indexes;
- for (int i = 0; i < clip->effectsCount(); i++) {
- QDomElement effect = clip->effectAt(i);
- if (EffectsList::hasKeyFrames(effect)) {
- doc.appendChild(doc.importNode(effect, true));
- indexes.append(i);
+ resizeCommand->setText(i18n("Resize group"));
+ QList <QGraphicsItem *> items = parent->childItems();
+ QList <ItemInfo> infos = parent->resizeInfos();
+ parent->clearResizeInfos();
+ int itemcount = 0;
+ for (int i = 0; i < items.count(); ++i) {
+ AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
+ if (item && item->type() == AVWIDGET) {
+ ItemInfo info = infos.at(itemcount);
+ prepareResizeClipStart(item, info, item->startPos().frames(m_document->fps()), false, resizeCommand);
+ ++itemcount;
}
}
-
- if (clip->checkEffectsKeyframesPos(m_dragItemInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) {
- // Keyframes were modified, updateClip
- QDomNodeList effs = doc.elementsByTagName("effect");
- // Hack:
- // Since we must always resize clip before updating the keyframes, we
- // put a resize command before & after checking keyframes so that
- // we are sure the resize is performed before whenever we do or undo the action
-
- new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
- for (int i = 0; i < indexes.count(); i++) {
- new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand);
- updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i));
- }
- new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
- emit clipItemSelected(clip);
- } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand);
-
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_commandStack->push(command);
}
-
- }
- if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
- // Item was resized, rebuild group;
- AbstractGroupItem *group = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
- QList <QGraphicsItem *> children = group->childItems();
- m_document->clipManager()->removeGroup(group);
- scene()->destroyItemGroup(group);
- for (int i = 0; i < children.count(); i++) {
- children.at(i)->setSelected(true);
- }
- groupSelectedItems(false, true);
+ } else {
+ prepareResizeClipStart(m_dragItem, m_dragItemInfo, m_dragItem->startPos().frames(m_document->fps()));
}
- //m_document->renderer()->doRefresh();
} else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
// resize end
- if (m_dragItem->type() == AVWIDGET) {
- ItemInfo resizeinfo = info;
- resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
- bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos);
- if (success) {
+ if (event->modifiers() != Qt::ControlModifier && m_dragItem->type() == AVWIDGET && m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
+ AbstractGroupItem *parent = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ if (parent) {
QUndoCommand *resizeCommand = new QUndoCommand();
- resizeCommand->setText(i18n("Resize clip"));
-
- // Check if there is an automatic transition on that clip (lower track)
- Transition *tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track);
- if (tr && tr->isAutomatic()) {
- ItemInfo trInfo = tr->info();
- ItemInfo newTrInfo = trInfo;
- newTrInfo.endPos = m_dragItem->endPos();
- if (newTrInfo.endPos > newTrInfo.startPos) new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
- }
-
- // Check if there is an automatic transition on that clip (upper track)
- tr = getTransitionItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1);
- if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == m_dragItemInfo.track) {
- ItemInfo trInfo = tr->info();
- ItemInfo newTrInfo = trInfo;
- newTrInfo.endPos = m_dragItem->endPos();
- ClipItem * upperClip = getClipItemAtEnd(m_dragItemInfo.endPos, m_dragItemInfo.track - 1);
- if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos) {
- new MoveTransitionCommand(this, trInfo, newTrInfo, true, resizeCommand);
+ resizeCommand->setText(i18n("Resize group"));
+ QList <QGraphicsItem *> items = parent->childItems();
+ QList <ItemInfo> infos = parent->resizeInfos();
+ parent->clearResizeInfos();
+ int itemcount = 0;
+ for (int i = 0; i < items.count(); ++i) {
+ AbstractClipItem *item = static_cast<AbstractClipItem *>(items.at(i));
+ if (item && item->type() == AVWIDGET) {
+ ItemInfo info = infos.at(itemcount);
+ prepareResizeClipEnd(item, info, item->endPos().frames(m_document->fps()), false, resizeCommand);
+ ++itemcount;
}
}
-
- // check keyframes
- ClipItem *clip = static_cast < ClipItem * >(m_dragItem);
- QDomDocument doc;
- QDomElement root = doc.createElement("list");
- doc.appendChild(root);
- QList <int> indexes;
- for (int i = 0; i < clip->effectsCount(); i++) {
- QDomElement effect = clip->effectAt(i);
- if (EffectsList::hasKeyFrames(effect)) {
- doc.appendChild(doc.importNode(effect, true));
- indexes.append(i);
- }
- }
-
- if (clip->checkEffectsKeyframesPos((m_dragItemInfo.cropStart + m_dragItemInfo.endPos - m_dragItemInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) {
- // Keyframes were modified, updateClip
- QDomNodeList effs = doc.elementsByTagName("effect");
- // Hack:
- // Since we must always resize clip before updating the keyframes, we
- // put a resize command before & after checking keyframes so that
- // we are sure the resize is performed before whenever we do or undo the action
-
- new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
- for (int i = 0; i < indexes.count(); i++) {
- new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, resizeCommand);
- updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i));
- }
- new ResizeClipCommand(this, m_dragItemInfo, info, false, true, resizeCommand);
- emit clipItemSelected(clip);
- } else new ResizeClipCommand(this, m_dragItemInfo, info, false, false, resizeCommand);
-
m_commandStack->push(resizeCommand);
- updatePositionEffects(clip, m_dragItemInfo);
- } else {
- m_dragItem->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
- 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
- transition->resizeEnd((int) m_dragItemInfo.endPos.frames(m_document->fps()));
- emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
- } else {
- MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
- m_commandStack->push(command);
}
+ } else {
+ prepareResizeClipEnd(m_dragItem, m_dragItemInfo, m_dragItem->endPos().frames(m_document->fps()));
}
- if (m_dragItem->parentItem() && m_dragItem->parentItem() != m_selectionGroup) {
- // Item was resized, rebuild group;
- AbstractGroupItem *group = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
- QList <QGraphicsItem *> children = group->childItems();
- m_document->clipManager()->removeGroup(group);
- scene()->destroyItemGroup(group);
- for (int i = 0; i < children.count(); i++) {
- children.at(i)->setSelected(true);
- }
- groupSelectedItems(false, true);
- }
- //m_document->renderer()->doRefresh();
} else if (m_operationMode == FADEIN) {
// resize fade in effect
ClipItem * item = static_cast <ClipItem *>(m_dragItem);
val = (br.bottom() - val) * maxh;
int start = item->cropStart().frames(m_document->fps());
int end = (item->cropStart() + item->cropDuration()).frames(m_document->fps()) - 1;
+
if ((val < -50 || val > 150) && item->editedKeyFramePos() != start && item->editedKeyFramePos() != end) {
//delete keyframe
- kDebug() << "// DELETE KFR: " << item->editedKeyFramePos();
item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), -1, 0);
- } else item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue());
+ } else {
+ item->movedKeyframe(item->getEffectAt(item->selectedEffectIndex()), item->selectedKeyFramePos(), item->editedKeyFramePos(), item->editedKeyFrameValue());
+ }
+
QDomElement newEffect = item->selectedEffect().cloneNode().toElement();
//item->updateKeyframeEffect();
//QString next = item->keyframes(item->selectedEffectIndex());
{
QList<QGraphicsItem *> itemList = scene()->selectedItems();
GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
- for (int i = 0; i < itemList.count(); i++) {
+ QList <QGraphicsItem *> skipList;
+ for (int i = 0; i < itemList.count(); ++i) {
+ if (skipList.indexOf(itemList.at(i)) != -1)
+ continue;
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
if (item->parentItem() && item->parentItem() != m_selectionGroup) {
- emit displayMessage(i18n("Cannot cut a clip in a group"), ErrorMessage);
- } else if (currentPos > item->startPos() && currentPos < item->endPos()) {
+ skipList.append(item->parentItem()->childItems());
+ razorGroup((AbstractGroupItem *)item->parentItem(), currentPos);
+ } else if (currentPos > item->startPos() && currentPos < item->endPos()) {
RazorClipCommand *command = new RazorClipCommand(this, item->info(), currentPos);
m_commandStack->push(command);
}
+ } else if (itemList.at(i)->type() == GROUPWIDGET && itemList.at(i) != m_selectionGroup) {
+ skipList.append(itemList.at(i)->childItems());
+ razorGroup((AbstractGroupItem *)itemList.at(i), currentPos);
}
}
}
+void CustomTrackView::razorGroup(AbstractGroupItem* group, GenTime cutPos)
+{
+ if (group) {
+ QList <QGraphicsItem *> children = group->childItems();
+ QList <ItemInfo> clips1, transitions1;
+ QList <ItemInfo> clipsCut, transitionsCut;
+ QList <ItemInfo> clips2, transitions2;
+ for (int i = 0; i < children.count(); ++i) {
+ children.at(i)->setSelected(false);
+ AbstractClipItem *child = static_cast <AbstractClipItem *>(children.at(i));
+ if (child->type() == AVWIDGET) {
+ if (cutPos > child->endPos())
+ clips1 << child->info();
+ else if (cutPos < child->startPos())
+ clips2 << child->info();
+ else
+ clipsCut << child->info();
+ } else {
+ if (cutPos > child->endPos())
+ transitions1 << child->info();
+ else if (cutPos < child->startPos())
+ transitions2 << child->info();
+ else
+ transitionsCut << child->info();
+ }
+ }
+ if (clipsCut.isEmpty() && transitionsCut.isEmpty() && ((clips1.isEmpty() && transitions1.isEmpty()) || (clips2.isEmpty() && transitions2.isEmpty())))
+ return;
+ RazorGroupCommand *command = new RazorGroupCommand(this, clips1, transitions1, clipsCut, transitionsCut, clips2, transitions2, cutPos);
+ m_commandStack->push(command);
+ }
+}
+
+void CustomTrackView::slotRazorGroup(QList <ItemInfo> clips1, QList <ItemInfo> transitions1, QList <ItemInfo> clipsCut, QList <ItemInfo> transitionsCut, QList <ItemInfo> clips2, QList <ItemInfo> 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 <AbstractGroupItem *>(clip->parentItem());
+ QList <QGraphicsItem *> children = group->childItems();
+ QList <ItemInfo> groupClips;
+ QList <ItemInfo> 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 <ItemInfo>() << clips1 << clipsCut << clips2, QList <ItemInfo>() << transitions1 << transitionsCut << transitions2, true);
+ }
+}
+
void CustomTrackView::groupClips(bool group)
{
QList<QGraphicsItem *> itemList = scene()->selectedItems();
ItemInfo info = item->info();
int tracknumber = m_document->tracksCount() - info.track - 1;
bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
- if (isLocked) item->setItemLocked(true);
- else if (item->isItemLocked()) item->setItemLocked(false);
+ if (isLocked)
+ item->setItemLocked(true);
+ else if (item->isItemLocked())
+ item->setItemLocked(false);
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
info.track = m_document->tracksCount() - info.track;
Mlt::Producer *prod;
- if (clip->isAudioOnly()) prod = clip->baseClip()->audioProducer(info.track);
- else if (clip->isVideoOnly()) prod = clip->baseClip()->videoProducer();
- else prod = clip->baseClip()->producer(info.track);
+ 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);
} else if (item->type() == TRANSITIONWIDGET) {
Transition *tr = static_cast <Transition*>(item);
int newTrack;
- if (!tr->forcedTrack()) newTrack = getPreviousVideoTrack(info.track);
- else {
+ if (!tr->forcedTrack()) {
+ newTrack = getPreviousVideoTrack(info.track);
+ } else {
newTrack = tr->transitionEndTrack() + trackOffset;
if (newTrack < 0 || newTrack > m_document->tracksCount()) newTrack = getPreviousVideoTrack(info.track);
}
m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_document->tracksCount() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
+ if (!reverseMove)
+ rebuildGroup(m_selectionGroup);
resetSelectionGroup(false);
KdenliveSettings::setSnaptopoints(snap);
m_document->renderer()->doRefresh();
setDocumentModified();
}
+void CustomTrackView::prepareResizeClipStart(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check, QUndoCommand *command)
+{
+ if (pos == oldInfo.startPos.frames(m_document->fps()))
+ return;
+ bool snap = KdenliveSettings::snaptopoints();
+ if (check) {
+ KdenliveSettings::setSnaptopoints(false);
+ item->resizeStart(pos);
+ if (item->startPos().frames(m_document->fps()) != pos) {
+ item->resizeStart(oldInfo.startPos.frames(m_document->fps()));
+ emit displayMessage(i18n("Not possible to resize"), ErrorMessage);
+ KdenliveSettings::setSnaptopoints(snap);
+ return;
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ }
+
+ bool hasParentCommand = false;
+ if (command) {
+ hasParentCommand = true;
+ } else {
+ command = new QUndoCommand();
+ command->setText(i18n("Resize clip start"));
+ }
+
+ // do this here, too, because otherwise undo won't update the group
+ if (item->parentItem() && item->parentItem() != m_selectionGroup)
+ new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command);
+
+ ItemInfo info = item->info();
+ if (item->type() == AVWIDGET) {
+ ItemInfo resizeinfo = oldInfo;
+ resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
+ bool success = m_document->renderer()->mltResizeClipStart(resizeinfo, item->startPos() - oldInfo.startPos);
+ if (success) {
+ // Check if there is an automatic transition on that clip (lower track)
+ Transition *transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track);
+ if (transition && transition->isAutomatic()) {
+ ItemInfo trInfo = transition->info();
+ ItemInfo newTrInfo = trInfo;
+ newTrInfo.startPos = item->startPos();
+ if (newTrInfo.startPos < newTrInfo.endPos)
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, command);
+ }
+ // Check if there is an automatic transition on that clip (upper track)
+ transition = getTransitionItemAtStart(oldInfo.startPos, oldInfo.track - 1);
+ if (transition && transition->isAutomatic() && (m_document->tracksCount() - transition->transitionEndTrack()) == oldInfo.track) {
+ ItemInfo trInfo = transition->info();
+ ItemInfo newTrInfo = trInfo;
+ newTrInfo.startPos = item->startPos();
+ ClipItem * upperClip = getClipItemAt(oldInfo.startPos, oldInfo.track - 1);
+ if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.startPos < newTrInfo.endPos)
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, command);
+ }
+
+ ClipItem *clip = static_cast < ClipItem * >(item);
+ updatePositionEffects(clip, oldInfo);
+
+ // check keyframes
+ QDomDocument doc;
+ QDomElement root = doc.createElement("list");
+ doc.appendChild(root);
+ QList <int> indexes;
+ for (int i = 0; i < clip->effectsCount(); i++) {
+ QDomElement effect = clip->effectAt(i);
+ if (EffectsList::hasKeyFrames(effect)) {
+ doc.appendChild(doc.importNode(effect, true));
+ indexes.append(i);
+ }
+ }
+
+ if (clip->checkEffectsKeyframesPos(oldInfo.cropStart.frames(m_document->fps()), clip->cropStart().frames(m_document->fps()), true)) {
+ // Keyframes were modified, updateClip
+ QDomNodeList effs = doc.elementsByTagName("effect");
+ // Hack:
+ // Since we must always resize clip before updating the keyframes, we
+ // put a resize command before & after checking keyframes so that
+ // we are sure the resize is performed before whenever we do or undo the action
+
+ new ResizeClipCommand(this, oldInfo, info, false, true, command);
+ for (int i = 0; i < indexes.count(); i++) {
+ new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, command);
+ updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i));
+ }
+ new ResizeClipCommand(this, oldInfo, info, false, true, command);
+ emit clipItemSelected(clip);
+ } else {
+ new ResizeClipCommand(this, oldInfo, info, false, false, command);
+ }
+ } else {
+ KdenliveSettings::setSnaptopoints(false);
+ item->resizeStart((int) oldInfo.startPos.frames(m_document->fps()));
+ KdenliveSettings::setSnaptopoints(snap);
+ emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
+ }
+ } else if (item->type() == TRANSITIONWIDGET) {
+ Transition *transition = static_cast <Transition *>(item);
+ if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) {
+ // Cannot resize transition
+ KdenliveSettings::setSnaptopoints(false);
+ transition->resizeStart((int) oldInfo.startPos.frames(m_document->fps()));
+ KdenliveSettings::setSnaptopoints(snap);
+ emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
+ } else {
+ MoveTransitionCommand *moveCommand = new MoveTransitionCommand(this, oldInfo, info, false, command);
+ if (command == NULL)
+ m_commandStack->push(moveCommand);
+ }
+
+ }
+ if (item->parentItem() && item->parentItem() != m_selectionGroup)
+ new RebuildGroupCommand(this, item->info().track, item->endPos() - GenTime(1, m_document->fps()), command);
+
+ if (!hasParentCommand)
+ m_commandStack->push(command);
+}
+
+void CustomTrackView::prepareResizeClipEnd(AbstractClipItem* item, ItemInfo oldInfo, int pos, bool check, QUndoCommand *command)
+{
+ if (pos == oldInfo.endPos.frames(m_document->fps()))
+ return;
+ bool snap = KdenliveSettings::snaptopoints();
+ if (check) {
+ KdenliveSettings::setSnaptopoints(false);
+ item->resizeEnd(pos);
+ if (item->endPos().frames(m_document->fps()) != pos) {
+ item->resizeEnd(oldInfo.endPos.frames(m_document->fps()));
+ emit displayMessage(i18n("Not possible to resize"), ErrorMessage);
+ KdenliveSettings::setSnaptopoints(snap);
+ return;
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ }
+
+ bool hasParentCommand = false;
+ if (command) {
+ hasParentCommand = true;
+ } else {
+ command = new QUndoCommand();
+ command->setText(i18n("Resize clip end"));
+ }
+
+ // do this here, too, because otherwise undo won't update the group
+ if (item->parentItem() && item->parentItem() != m_selectionGroup)
+ new RebuildGroupCommand(this, item->info().track, item->startPos(), command);
+
+ ItemInfo info = item->info();
+ if (item->type() == AVWIDGET) {
+ ItemInfo resizeinfo = info;
+ resizeinfo.track = m_document->tracksCount() - resizeinfo.track;
+ bool success = m_document->renderer()->mltResizeClipEnd(resizeinfo, resizeinfo.endPos - resizeinfo.startPos);
+ if (success) {
+ // Check if there is an automatic transition on that clip (lower track)
+ Transition *tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track);
+ if (tr && tr->isAutomatic()) {
+ ItemInfo trInfo = tr->info();
+ ItemInfo newTrInfo = trInfo;
+ newTrInfo.endPos = item->endPos();
+ if (newTrInfo.endPos > newTrInfo.startPos)
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, command);
+ }
+
+ // Check if there is an automatic transition on that clip (upper track)
+ tr = getTransitionItemAtEnd(oldInfo.endPos, oldInfo.track - 1);
+ if (tr && tr->isAutomatic() && (m_document->tracksCount() - tr->transitionEndTrack()) == oldInfo.track) {
+ ItemInfo trInfo = tr->info();
+ ItemInfo newTrInfo = trInfo;
+ newTrInfo.endPos = item->endPos();
+ ClipItem * upperClip = getClipItemAtEnd(oldInfo.endPos, oldInfo.track - 1);
+ if ((!upperClip || !upperClip->baseClip()->isTransparent()) && newTrInfo.endPos > newTrInfo.startPos)
+ new MoveTransitionCommand(this, trInfo, newTrInfo, true, command);
+
+ }
+
+ // check keyframes
+ ClipItem *clip = static_cast < ClipItem * >(item);
+ QDomDocument doc;
+ QDomElement root = doc.createElement("list");
+ doc.appendChild(root);
+ QList <int> indexes;
+ for (int i = 0; i < clip->effectsCount(); i++) {
+ QDomElement effect = clip->effectAt(i);
+ if (EffectsList::hasKeyFrames(effect)) {
+ doc.appendChild(doc.importNode(effect, true));
+ indexes.append(i);
+ }
+ }
+
+ if (clip->checkEffectsKeyframesPos((oldInfo.cropStart + oldInfo.endPos - oldInfo.startPos).frames(m_document->fps()) - 1, (clip->cropStart() + clip->cropDuration()).frames(m_document->fps()) - 1, false)) {
+ // Keyframes were modified, updateClip
+ QDomNodeList effs = doc.elementsByTagName("effect");
+ // Hack:
+ // Since we must always resize clip before updating the keyframes, we
+ // put a resize command before & after checking keyframes so that
+ // we are sure the resize is performed before whenever we do or undo the action
+
+ new ResizeClipCommand(this, oldInfo, info, false, true, command);
+ for (int i = 0; i < indexes.count(); i++) {
+ new EditEffectCommand(this, m_document->tracksCount() - clip->track(), clip->startPos(), effs.at(i).cloneNode().toElement(), clip->effectAt(indexes.at(i)), indexes.at(i), false, command);
+ updateEffect(m_document->tracksCount() - clip->track(), clip->startPos(), clip->effectAt(indexes.at(i)), indexes.at(i));
+ }
+ new ResizeClipCommand(this, oldInfo, info, false, true, command);
+ emit clipItemSelected(clip);
+ } else {
+ new ResizeClipCommand(this, oldInfo, info, false, false, command);
+ }
+
+ updatePositionEffects(clip, oldInfo);
+ } else {
+ KdenliveSettings::setSnaptopoints(false);
+ item->resizeEnd((int) oldInfo.endPos.frames(m_document->fps()));
+ KdenliveSettings::setSnaptopoints(true);
+ emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
+ }
+ } else if (item->type() == TRANSITIONWIDGET) {
+ Transition *transition = static_cast <Transition *>(item);
+ if (!m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_document->tracksCount() - oldInfo.track), (int)(m_document->tracksCount() - oldInfo.track), transition->transitionEndTrack(), oldInfo.startPos, oldInfo.endPos, info.startPos, info.endPos)) {
+ // Cannot resize transition
+ KdenliveSettings::setSnaptopoints(false);
+ transition->resizeEnd((int) oldInfo.endPos.frames(m_document->fps()));
+ KdenliveSettings::setSnaptopoints(true);
+ emit displayMessage(i18n("Cannot resize transition"), ErrorMessage);
+ } else {
+ MoveTransitionCommand *moveCommand = new MoveTransitionCommand(this, oldInfo, info, false, command);
+ if (command == NULL)
+ m_commandStack->push(moveCommand);
+ }
+ }
+ if (item->parentItem() && item->parentItem() != m_selectionGroup)
+ new RebuildGroupCommand(this, item->info().track, item->startPos(), command);
+
+ if (!hasParentCommand)
+ m_commandStack->push(command);
+}
+
void CustomTrackView::updatePositionEffects(ClipItem * item, ItemInfo info)
{
int end = item->fadeIn();
QDomElement oldeffect = item->effectAt(effectPos);
int start = item->cropStart().frames(m_document->fps());
int max = start + item->cropDuration().frames(m_document->fps());
+ if (start < 0) {
+ max -= start;
+ start = 0;
+ }
oldeffect.setAttribute("in", start);
oldeffect.setAttribute("out", max);
if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - item->track(), item->startPos(), item->getEffectArgs(oldeffect)))
QMatrix newmatrix;
newmatrix = newmatrix.scale(scaleFactor, verticalScale);
m_scene->setScale(scaleFactor, verticalScale);
- if (m_visualTip) {
- scene()->removeItem(m_visualTip);
- m_animationTimer->stop();
- delete m_animation;
- m_animation = NULL;
- delete m_visualTip;
- m_visualTip = NULL;
- }
+ removeTipAnimation();
double verticalPos = mapToScene(QPoint(0, viewport()->height() / 2)).y();
bool adjust = false;
if (verticalScale != matrix().m22()) adjust = true;
int diff = sceneRect().width() - m_projectDuration;
if (diff * newmatrix.m11() < 50) {
- if (newmatrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height());
- else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
+ if (newmatrix.m11() < 0.4)
+ setSceneRect(0, 0, (m_projectDuration + 100 / newmatrix.m11()), sceneRect().height());
+ else
+ setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
}
centerOn(QPointF(cursorPos(), verticalPos));
}
void CustomTrackView::slotRefreshGuides()
{
if (KdenliveSettings::showmarkers()) {
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); i++)
m_guides.at(i)->update();
- }
}
}
TrackInfo info = m_document->trackInfoAt(maxTrack - i - 1);
if (info.isLocked || info.type == AUDIOTRACK || i == m_selectedTrack) {
const QRectF track(min, m_tracksHeight * i + 1, max - min, m_tracksHeight - 1);
- if (i == m_selectedTrack) painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color());
- else painter->fillRect(track, info.isLocked ? lockedColor : audioColor);
+ if (i == m_selectedTrack)
+ painter->fillRect(track, scheme.background(KColorScheme::ActiveBackground).color());
+ else
+ painter->fillRect(track, info.isLocked ? lockedColor : audioColor);
}
painter->drawLine(QPointF(min, m_tracksHeight *(i + 1)), QPointF(max, m_tracksHeight *(i + 1)));
}
}
// add guides
- for (int i = 0; i < m_guides.count(); i++) {
+ for (int i = 0; i < m_guides.count(); i++)
m_searchPoints.append(m_guides.at(i)->info());
- }
qSort(m_searchPoints);
}
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
- if (item->clipProducer() == clipId) {
+ if (item->clipProducer() == clipId)
matchingInfo << item->info();
- }
}
}
return matchingInfo;
return;
}
}
- ItemInfo startInfo = clip->info();
- ItemInfo endInfo = startInfo;
- endInfo.startPos = GenTime(m_cursorPos, m_document->fps());
- if (endInfo.startPos >= startInfo.endPos || endInfo.startPos < startInfo.startPos - startInfo.cropStart) {
- // Check for invalid resize
- emit displayMessage(i18n("Invalid action"), ErrorMessage);
- return;
- } else if (endInfo.startPos < startInfo.startPos) {
- int length = m_document->renderer()->mltGetSpaceLength(endInfo.startPos, m_document->tracksCount() - startInfo.track, false);
- if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (
- (clip->type() == AVWIDGET) && length < (startInfo.startPos - endInfo.startPos).frames(m_document->fps()))) {
- emit displayMessage(i18n("Invalid action"), ErrorMessage);
- return;
- }
- }
- if (clip->type() == TRANSITIONWIDGET) {
- m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
- } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false));
+ prepareResizeClipStart(clip, clip->info(), m_cursorPos, true);
}
void CustomTrackView::setOutPoint()
return;
}
}
- ItemInfo startInfo = clip->info();
- ItemInfo endInfo = clip->info();
- endInfo.endPos = GenTime(m_cursorPos, m_document->fps());
- CLIPTYPE type = (CLIPTYPE) static_cast <ClipItem *>(clip)->clipType();
- if (endInfo.endPos <= startInfo.startPos || (type != IMAGE && type != COLOR && type != TEXT && endInfo.endPos > startInfo.startPos + clip->maxDuration() - startInfo.cropStart)) {
- // Check for invalid resize
- emit displayMessage(i18n("Invalid action"), ErrorMessage);
- return;
- } else if (endInfo.endPos > startInfo.endPos) {
- int length = m_document->renderer()->mltGetSpaceLength(startInfo.endPos, m_document->tracksCount() - startInfo.track, false);
- if ((clip->type() == TRANSITIONWIDGET && itemCollision(clip, endInfo) == true) || (clip->type() == AVWIDGET && length != -1 && length < (endInfo.endPos - startInfo.endPos).frames(m_document->fps()))) {
- kDebug() << " RESIZE ERROR, BLNK: " << length << ", RESIZE: " << (endInfo.endPos - startInfo.endPos).frames(m_document->fps());
- emit displayMessage(i18n("Invalid action"), ErrorMessage);
- return;
- }
- }
-
-
- if (clip->type() == TRANSITIONWIDGET) {
- m_commandStack->push(new MoveTransitionCommand(this, startInfo, endInfo, true));
- } else m_commandStack->push(new ResizeClipCommand(this, startInfo, endInfo, true, false));
+ prepareResizeClipEnd(clip, clip->info(), m_cursorPos, true);
}
void CustomTrackView::slotUpdateAllThumbs()
void CustomTrackView::slotInsertTrack(int ix)
{
TrackDialog d(m_document, parentWidget());
+ d.comboTracks->setCurrentIndex(ix);
d.label->setText(i18n("Insert track"));
- d.track_nb->setMaximum(m_document->tracksCount() - 1);
- d.track_nb->setValue(ix);
d.setWindowTitle(i18n("Insert New Track"));
- d.slotUpdateName(ix);
if (d.exec() == QDialog::Accepted) {
- ix = d.track_nb->value();
- if (d.before_select->currentIndex() == 1) {
+ ix = d.comboTracks->currentIndex();
+ if (d.before_select->currentIndex() == 1)
ix++;
- }
TrackInfo info;
+ info.isMute = false;
+ info.isLocked = false;
if (d.video_track->isChecked()) {
info.type = VIDEOTRACK;
- info.isMute = false;
info.isBlind = false;
- info.isLocked = false;
} else {
info.type = AUDIOTRACK;
- info.isMute = false;
info.isBlind = true;
- info.isLocked = false;
}
AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true);
m_commandStack->push(addTrack);
{
if (m_document->tracksCount() < 2) return;
TrackDialog d(m_document, parentWidget());
+ d.comboTracks->setCurrentIndex(ix);
d.label->setText(i18n("Delete track"));
d.before_select->setHidden(true);
- d.track_nb->setMaximum(m_document->tracksCount() - 1);
- d.track_nb->setValue(ix);
- d.slotUpdateName(ix);
d.setWindowTitle(i18n("Delete Track"));
d.video_track->setHidden(true);
d.audio_track->setHidden(true);
if (d.exec() == QDialog::Accepted) {
- ix = d.track_nb->value();
+ ix = d.comboTracks->currentIndex();
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
setDocumentModified();
m_cursorLine->setPen(pen1);
}
}
+
+void CustomTrackView::removeTipAnimation()
+{
+ if (m_visualTip) {
+ scene()->removeItem(m_visualTip);
+ m_animationTimer->stop();
+ delete m_animation;
+ m_animation = NULL;
+ delete m_visualTip;
+ m_visualTip = NULL;
+ }
+}
+
+void CustomTrackView::setTipAnimation(AbstractClipItem *clip, OPERATIONTYPE mode, const double size)
+{
+ if (m_visualTip == NULL) {
+ QRectF rect = clip->sceneBoundingRect();
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setTimeLine(m_animationTimer);
+ m_animation->setScaleAt(1, 1, 1);
+ QPolygon polygon;
+ switch (mode) {
+ case FADEIN:
+ case FADEOUT:
+ m_visualTip = new QGraphicsEllipseItem(-size, -size, size * 2, size * 2);
+ ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ if (mode == FADEIN)
+ m_visualTip->setPos(rect.x() + ((ClipItem *) clip)->fadeIn(), rect.y());
+ else
+ m_visualTip->setPos(rect.right() - ((ClipItem *) clip)->fadeOut(), rect.y());
+
+ m_animation->setScaleAt(.5, 2, 2);
+ break;
+ case RESIZESTART:
+ case RESIZEEND:
+ polygon << QPoint(0, - size * 2);
+ if (mode == RESIZESTART)
+ polygon << QPoint(size * 2, 0);
+ else
+ polygon << QPoint(- size * 2, 0);
+ polygon << QPoint(0, size * 2);
+ polygon << QPoint(0, - size * 2);
+
+ m_visualTip = new QGraphicsPolygonItem(polygon);
+ ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+ if (mode == RESIZESTART)
+ m_visualTip->setPos(rect.x(), rect.y() + rect.height() / 2);
+ else
+ m_visualTip->setPos(rect.right(), rect.y() + rect.height() / 2);
+
+ m_animation->setScaleAt(.5, 2, 1);
+ break;
+ case TRANSITIONSTART:
+ case TRANSITIONEND:
+ polygon << QPoint(0, - size * 2);
+ if (mode == TRANSITIONSTART)
+ polygon << QPoint(size * 2, 0);
+ else
+ polygon << QPoint(- size * 2, 0);
+ polygon << QPoint(0, 0);
+ polygon << QPoint(0, - size * 2);
+
+ m_visualTip = new QGraphicsPolygonItem(polygon);
+ ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+ if (mode == TRANSITIONSTART)
+ m_visualTip->setPos(rect.x(), rect.bottom());
+ else
+ m_visualTip->setPos(rect.right(), rect.bottom());
+
+ m_animation->setScaleAt(.5, 2, 2);
+ break;
+ default:
+ delete m_animation;
+ return;
+ }
+
+ m_visualTip->setFlags(QGraphicsItem::ItemIgnoresTransformations);
+ m_visualTip->setZValue(100);
+ scene()->addItem(m_visualTip);
+ m_animation->setItem(m_visualTip);
+ m_animationTimer->start();
+ }
+}
+
+bool CustomTrackView::hasAudio(int track) const
+{
+ QRectF rect(0, (double)(track * m_tracksHeight + 1), (double) sceneRect().width(), (double)(m_tracksHeight - 1));
+ QList<QGraphicsItem *> collisions = scene()->items(rect, Qt::IntersectsItemBoundingRect);
+ QGraphicsItem *item;
+ for (int i = 0; i < collisions.count(); i++) {
+ item = collisions.at(i);
+ if (!item->isEnabled()) continue;
+ if (item->type() == AVWIDGET) {
+ ClipItem *clip = static_cast <ClipItem *>(item);
+ if (!clip->isVideoOnly() && (clip->clipType() == AUDIO || clip->clipType() == AV || clip->clipType() == PLAYLIST)) return true;
+ }
+ }
+ return false;
+}
projects / kdenlive / blobdiff