int pos = event->x();
emit mousePosition((int)(mapToScene(event->pos()).x() / m_scale));
if (event->buttons() & Qt::MidButton) return;
- {
+ if (event->buttons() != Qt::NoButton) {
if (m_dragItem && m_tool == SELECTTOOL) { //event->button() == Qt::LeftButton) {
// a button was pressed, delete visual tips
if (m_operationMode == MOVE && (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance()) {
} else if (m_operationMode == FADEOUT) {
int pos = (int)(mapToScene(event->pos()).x() / m_scale);
((ClipItem*) m_dragItem)->setFadeOut((int)(m_dragItem->endPos().frames(m_document->fps()) - pos), m_scale);
+ } else if (m_operationMode == KEYFRAME) {
+ GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+ m_dragItem->updateKeyFramePos(keyFramePos, mapToScene(event->pos()).toPoint().y());
}
if (m_animation) delete m_animation;
QGraphicsView::mouseMoveEvent(event);
return;
}
+ }
- if (m_tool == RAZORTOOL) {
- setCursor(m_razorCursor);
- QGraphicsView::mouseMoveEvent(event);
- return;
- }
+ if (m_tool == RAZORTOOL) {
+ setCursor(m_razorCursor);
+ QGraphicsView::mouseMoveEvent(event);
+ return;
+ }
- QList<QGraphicsItem *> itemList = items(event->pos());
- QGraphicsRectItem *item = NULL;
- OPERATIONTYPE opMode = NONE;
+ QList<QGraphicsItem *> itemList = items(event->pos());
+ QGraphicsRectItem *item = NULL;
+ OPERATIONTYPE opMode = NONE;
- if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) {
- opMode = MOVEGUIDE;
- } else for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
- item = (QGraphicsRectItem*) itemList.at(i);
- break;
- }
+ if (itemList.count() == 1 && itemList.at(0)->type() == GUIDEITEM) {
+ opMode = MOVEGUIDE;
+ } else for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
+ item = (QGraphicsRectItem*) itemList.at(i);
+ break;
}
+ }
- if (item && event->buttons() == Qt::NoButton) {
- AbstractClipItem *clip = (AbstractClipItem*) item;
- opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
- double size = 8;
-
- if (opMode == m_moveOpMode) {
- QGraphicsView::mouseMoveEvent(event);
- return;
- } else {
- if (m_visualTip) {
- if (m_animation) delete m_animation;
- m_animation = NULL;
- m_animationTimer->stop();
- delete m_visualTip;
- m_visualTip = NULL;
- }
- }
- m_moveOpMode = opMode;
-
- if (opMode == MOVE) {
- setCursor(Qt::OpenHandCursor);
- } else if (opMode == RESIZESTART) {
- setCursor(KCursor("left_side", Qt::SizeHorCursor));
- kDebug() << "******** RESIZE CLIP START; WIDTH: " << size;
- if (m_visualTip == NULL) {
- QPolygon polygon;
- polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
- polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
- polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
- polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
-
- m_visualTip = new QGraphicsPolygonItem(polygon);
- ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, 1);
- m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
- scale = 1.0;
- m_animation->setScaleAt(1, scale, 1);
- m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- } else if (opMode == RESIZEEND) {
- setCursor(KCursor("right_side", Qt::SizeHorCursor));
- if (m_visualTip == NULL) {
- QPolygon polygon;
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
- polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
-
- m_visualTip = new QGraphicsPolygonItem(polygon);
- ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
-
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, 1);
- m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0));
- scale = 1.0;
- m_animation->setScaleAt(1, scale, 1);
- m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- } else if (opMode == FADEIN) {
- if (m_visualTip == NULL) {
- ClipItem *item = (ClipItem *) clip;
- m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale));
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
- m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- setCursor(Qt::PointingHandCursor);
- } else if (opMode == FADEOUT) {
- if (m_visualTip == NULL) {
- ClipItem *item = (ClipItem *) clip;
- m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(0, 0);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale));
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
- m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- setCursor(Qt::PointingHandCursor);
- } else if (opMode == TRANSITIONSTART) {
- if (m_visualTip == NULL) {
- m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- setCursor(Qt::PointingHandCursor);
- } else if (opMode == TRANSITIONEND) {
- if (m_visualTip == NULL) {
- m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
- ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
- ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
- m_visualTip->setZValue(100);
- m_animation = new QGraphicsItemAnimation;
- m_animation->setItem(m_visualTip);
- m_animation->setTimeLine(m_animationTimer);
- m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12);
- double scale = 2.0;
- m_animation->setScaleAt(.5, scale, scale);
- scale = 1.0;
- m_animation->setScaleAt(1, scale, scale);
- scene()->addItem(m_visualTip);
- m_animationTimer->start();
- }
- setCursor(Qt::PointingHandCursor);
- }
- } else if (opMode == MOVEGUIDE) {
- m_moveOpMode = opMode;
- setCursor(Qt::SplitHCursor);
+ if (item && event->buttons() == Qt::NoButton) {
+ AbstractClipItem *clip = (AbstractClipItem*) item;
+ opMode = clip->operationMode(mapToScene(event->pos()), m_scale);
+ double size = 8;
+ if (opMode == m_moveOpMode) {
+ QGraphicsView::mouseMoveEvent(event);
+ return;
} else {
- m_moveOpMode = NONE;
- if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
- setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
- }
if (m_visualTip) {
if (m_animation) delete m_animation;
- m_animationTimer->stop();
m_animation = NULL;
+ m_animationTimer->stop();
delete m_visualTip;
m_visualTip = NULL;
-
}
- setCursor(Qt::ArrowCursor);
}
+ m_moveOpMode = opMode;
+ if (opMode == MOVE) {
+ setCursor(Qt::OpenHandCursor);
+ } else if (opMode == RESIZESTART) {
+ setCursor(KCursor("left_side", Qt::SizeHorCursor));
+ if (m_visualTip == NULL) {
+ QPolygon polygon;
+ polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+ polygon << QPoint((int)(clip->rect().x() + size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
+ polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
+ polygon << QPoint((int)clip->rect().x(), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+
+ m_visualTip = new QGraphicsPolygonItem(polygon);
+ ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setZValue(100);
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setItem(m_visualTip);
+ m_animation->setTimeLine(m_animationTimer);
+ m_visualTip->setPos(0, 0);
+ double scale = 2.0;
+ m_animation->setScaleAt(.5, scale, 1);
+ m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+ scale = 1.0;
+ m_animation->setScaleAt(1, scale, 1);
+ m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+ scene()->addItem(m_visualTip);
+ m_animationTimer->start();
+ }
+ } else if (opMode == RESIZEEND) {
+ setCursor(KCursor("right_side", Qt::SizeHorCursor));
+ if (m_visualTip == NULL) {
+ QPolygon polygon;
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width() - size * 2), (int)(clip->rect().y() + clip->rect().height() / 2));
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 + size * 2));
+ polygon << QPoint((int)(clip->rect().x() + clip->rect().width()), (int)(clip->rect().y() + clip->rect().height() / 2 - size * 2));
+
+ m_visualTip = new QGraphicsPolygonItem(polygon);
+ ((QGraphicsPolygonItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsPolygonItem*) m_visualTip)->setPen(m_tipPen);
+
+ m_visualTip->setZValue(100);
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setItem(m_visualTip);
+ m_animation->setTimeLine(m_animationTimer);
+ m_visualTip->setPos(0, 0);
+ double scale = 2.0;
+ m_animation->setScaleAt(.5, scale, 1);
+ m_animation->setPosAt(.5, QPointF(clip->rect().x() - clip->rect().x() * scale - clip->rect().width(), 0));
+ scale = 1.0;
+ m_animation->setScaleAt(1, scale, 1);
+ m_animation->setPosAt(1, QPointF(clip->rect().x() - clip->rect().x() * scale, 0));
+ scene()->addItem(m_visualTip);
+ m_animationTimer->start();
+ }
+ } else if (opMode == FADEIN) {
+ if (m_visualTip == NULL) {
+ ClipItem *item = (ClipItem *) clip;
+ m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->fadeIn() * m_scale - size, item->rect().y() - 8, size * 2, 16);
+ ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setZValue(100);
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setItem(m_visualTip);
+ m_animation->setTimeLine(m_animationTimer);
+ m_visualTip->setPos(0, 0);
+ double scale = 2.0;
+ m_animation->setScaleAt(.5, scale, scale);
+ m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->fadeIn() * m_scale, item->rect().y() - item->rect().y() * scale));
+ scale = 1.0;
+ m_animation->setScaleAt(1, scale, scale);
+ m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
+ scene()->addItem(m_visualTip);
+ m_animationTimer->start();
+ }
+ setCursor(Qt::PointingHandCursor);
+ } else if (opMode == FADEOUT) {
+ if (m_visualTip == NULL) {
+ ClipItem *item = (ClipItem *) clip;
+ m_visualTip = new QGraphicsEllipseItem(item->rect().x() + item->rect().width() - item->fadeOut() * m_scale - size, item->rect().y() - 8, size*2, 16);
+ ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setZValue(100);
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setItem(m_visualTip);
+ m_animation->setTimeLine(m_animationTimer);
+ m_visualTip->setPos(0, 0);
+ double scale = 2.0;
+ m_animation->setScaleAt(.5, scale, scale);
+ m_animation->setPosAt(.5, QPointF(item->rect().x() - item->rect().x() * scale - item->rect().width() + item->fadeOut() * m_scale, item->rect().y() - item->rect().y() * scale));
+ scale = 1.0;
+ m_animation->setScaleAt(1, scale, scale);
+ m_animation->setPosAt(1, QPointF(item->rect().x() - item->rect().x() * scale, item->rect().y() - item->rect().y() * scale));
+ scene()->addItem(m_visualTip);
+ m_animationTimer->start();
+ }
+ setCursor(Qt::PointingHandCursor);
+ } else if (opMode == TRANSITIONSTART) {
+ if (m_visualTip == NULL) {
+ m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
+ ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setZValue(100);
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setItem(m_visualTip);
+ m_animation->setTimeLine(m_animationTimer);
+ m_visualTip->setPos(clip->rect().x() + 10, clip->rect().y() + clip->rect().height() / 2 + 12);
+ double scale = 2.0;
+ m_animation->setScaleAt(.5, scale, scale);
+ scale = 1.0;
+ m_animation->setScaleAt(1, scale, scale);
+ scene()->addItem(m_visualTip);
+ m_animationTimer->start();
+ }
+ setCursor(Qt::PointingHandCursor);
+ } else if (opMode == TRANSITIONEND) {
+ if (m_visualTip == NULL) {
+ m_visualTip = new QGraphicsEllipseItem(-5, -5 , 10, 10);
+ ((QGraphicsEllipseItem*) m_visualTip)->setBrush(m_tipColor);
+ ((QGraphicsEllipseItem*) m_visualTip)->setPen(m_tipPen);
+ m_visualTip->setZValue(100);
+ m_animation = new QGraphicsItemAnimation;
+ m_animation->setItem(m_visualTip);
+ m_animation->setTimeLine(m_animationTimer);
+ m_visualTip->setPos(clip->rect().x() + clip->rect().width() - 10 , clip->rect().y() + clip->rect().height() / 2 + 12);
+ double scale = 2.0;
+ m_animation->setScaleAt(.5, scale, scale);
+ scale = 1.0;
+ m_animation->setScaleAt(1, scale, scale);
+ scene()->addItem(m_visualTip);
+ m_animationTimer->start();
+ }
+ setCursor(Qt::PointingHandCursor);
+ } else if (opMode == KEYFRAME) {
+ setCursor(Qt::PointingHandCursor);
+ }
+ } // no clip under mouse
+ else if (opMode == MOVEGUIDE) {
+ m_moveOpMode = opMode;
+ setCursor(Qt::SplitHCursor);
+ } else {
+ m_moveOpMode = NONE;
+ if (event->buttons() != Qt::NoButton && event->modifiers() == Qt::NoModifier) {
+ setCursorPos((int)(mapToScene(event->pos().x(), 0).x() / m_scale));
+ }
+ if (m_visualTip) {
+ if (m_animation) delete m_animation;
+ m_animationTimer->stop();
+ m_animation = NULL;
+ delete m_visualTip;
+ m_visualTip = NULL;
+
+ }
+ setCursor(Qt::ArrowCursor);
}
QGraphicsView::mouseMoveEvent(event);
}
return;
} else {
bool collision = false;
- m_dragItem = NULL;
QList<QGraphicsItem *> collisionList = items(event->pos());
if (collisionList.count() == 1 && collisionList.at(0)->type() == GUIDEITEM) {
// a guide item was pressed
m_dragItemInfo.track = m_dragItem->track();
m_operationMode = m_dragItem->operationMode(item->mapFromScene(mapToScene(event->pos())), m_scale);
- if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
+ if (m_operationMode == KEYFRAME) {
+ m_dragItem->updateSelectedKeyFrame();
+ return;
+ } else if (m_operationMode == MOVE) setCursor(Qt::ClosedHandCursor);
else if (m_operationMode == TRANSITIONSTART) {
ItemInfo info;
info.startPos = m_dragItem->startPos();
break;
}
}
- emit clipItemSelected((m_dragItem && m_dragItem->type() == AVWIDGET) ? (ClipItem*) m_dragItem : NULL);
-
if (!collision) {
kDebug() << "//////// NO ITEM FOUND ON CLICK";
m_dragItem = NULL;
displayContextMenu(event->globalPos(), m_dragItem);
m_dragItem = NULL;
}
+ if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
+ else emit clipItemSelected(NULL);
}
//kDebug()<<pos;
//QGraphicsView::mousePressEvent(event);
}
+void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) {
+ if (m_dragItem && m_dragItem->hasKeyFrames()) {
+ GenTime keyFramePos = GenTime((int)(mapToScene(event->pos()).x() / m_scale), m_document->fps()) - m_dragItem->startPos() + m_dragItem->cropStart();
+ m_dragItem->addKeyFrame(keyFramePos, mapToScene(event->pos()).toPoint().y());
+ ClipItem * item = (ClipItem *) m_dragItem;
+ item->updateKeyframeEffect();
+ updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
+ }
+}
+
void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
if (clip == NULL) m_timelineContextMenu->popup(pos);
else if (clip->type() == AVWIDGET) m_timelineContextClipMenu->popup(pos);
if (itemList.isEmpty()) {
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track);
if (clip) itemList.append(clip);
- else kDebug() << "------ wrning, clip eff not found";
+ 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();
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
- // the kdenlive_ix int is used to identify an effect in mlt's playlist, should
- // not be changed
- if (effect.attribute("kdenlive_ix").toInt() == 0)
- effect.setAttribute("kdenlive_ix", QString::number(item->effectsCounter()));
+ item->initEffect(effect);
AddEffectCommand *command = new AddEffectCommand(this, m_tracksList.count() - item->track(), item->startPos(), effect, true);
m_commandStack->push(command);
}
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
- kDebug() << "+++++++++++++ DRAG MOVE, : " << mapToScene(event->pos()).x() << ", SCAL: " << m_scale;
if (m_dropItem) {
int track = (int)(mapToScene(event->pos()).y() / m_tracksHeight); //) * (m_scale * 50) + m_scale;
m_dropItem->moveTo((int)(mapToScene(event->pos()).x() / m_scale), m_scale, (int)((track - m_dropItem->track()) * m_tracksHeight), track);
if (m_operationMode == MOVE) {
setCursor(Qt::OpenHandCursor);
// move clip
- if (m_dragItem->type() == AVWIDGET && m_dragItemInfo.startPos != info.startPos) {
+ if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
MoveClipCommand *command = new MoveClipCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
m_document->renderer()->mltMoveClip((int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), (int) m_dragItemInfo.startPos.frames(m_document->fps()), (int)(m_dragItem->startPos().frames(m_document->fps())));
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
MoveTransitionCommand *command = new MoveTransitionCommand(this, m_dragItemInfo, info, false);
m_commandStack->push(command);
- //kDebug()<<"/// MOVING TRS FROM: "<<(int)(m_tracksList.count() - m_startPos.y())<<", OFFSET: "<<(int) (m_dragItem->track() - m_startPos.y());
Transition *transition = (Transition *) m_dragItem;
transition->updateTransitionEndTrack(getPreviousVideoTrack(m_dragItem->track()));
m_document->renderer()->mltMoveTransition(transition->transitionTag(), (int)(m_tracksList.count() - m_dragItemInfo.track), (int)(m_tracksList.count() - m_dragItem->track()), transition->transitionEndTrack(), m_dragItemInfo.startPos, m_dragItemInfo.endPos, info.startPos, info.endPos);
}
- } else if (m_operationMode == RESIZESTART) {
+ } else if (m_operationMode == RESIZESTART && m_dragItem->startPos() != m_dragItemInfo.startPos) {
// resize start
if (m_dragItem->type() == AVWIDGET) {
m_document->renderer()->mltResizeClipStart(m_tracksList.count() - m_dragItem->track(), m_dragItem->endPos(), m_dragItem->startPos(), m_dragItemInfo.startPos, m_dragItem->cropStart(), m_dragItem->cropStart() + m_dragItem->endPos() - m_dragItem->startPos());
}
//m_document->renderer()->doRefresh();
- } else if (m_operationMode == RESIZEEND) {
+ } else if (m_operationMode == RESIZEEND && m_dragItem->endPos() != m_dragItemInfo.endPos) {
// resize end
if (m_dragItem->type() == AVWIDGET) {
ResizeClipCommand *command = new ResizeClipCommand(this, m_dragItemInfo, info, false);
EffectsList::setParameter(effect, "out", QString::number(end));
slotAddEffect(effect, m_dragItem->startPos(), m_dragItem->track());
}
+ } else if (m_operationMode == KEYFRAME) {
+ // update the MLT effect
+ ClipItem * item = (ClipItem *) m_dragItem;
+ item->updateKeyframeEffect();
+ updateEffect(m_tracksList.count() - item->track(), item->startPos(), item->selectedEffect());
}
-
emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) ? (Transition*) m_dragItem : NULL);
m_document->setModified(true);
m_operationMode = NONE;
- m_dragItem = NULL;
}
void CustomTrackView::deleteClip(ItemInfo info) {
void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
+ emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to move at.. ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
void CustomTrackView::moveTransition(const ItemInfo start, const ItemInfo end) {
Transition *item = getTransitionItemAt((int)start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
+ emit displayMessage(i18n("Cannot move transition at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find transition to move... ";// << startPos.x() * m_scale * FRAME_SIZE + 1 << ", " << startPos.y() * m_tracksHeight + m_tracksHeight / 2;
return;
}
else offset = -1;
ClipItem *item = getClipItemAt((int)(start.startPos.frames(m_document->fps()) + offset), start.track);
if (!item) {
+ emit displayMessage(i18n("Cannot move clip at time: %1s on track %2", start.startPos.seconds(), start.track), ErrorMessage);
kDebug() << "---------------- ERROR, CANNOT find clip to resize at... "; // << startPos;
return;
}
void CustomTrackView::slotAddClipMarker() {
QList<QGraphicsItem *> itemList = scene()->selectedItems();
if (itemList.count() != 1) {
+ emit displayMessage(i18n("Cannot add marker if more than one clip is selected"), ErrorMessage);
kDebug() << "// CANNOT ADD MARKER IF MORE TAN ONE CLIP IS SELECTED....";
return;
}
void CustomTrackView::slotDeleteClipMarker() {
QList<QGraphicsItem *> itemList = scene()->selectedItems();
if (itemList.count() != 1) {
+ emit displayMessage(i18n("Cannot delete marker if more than one clip is selected"), ErrorMessage);
kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
return;
}
void CustomTrackView::slotEditClipMarker() {
QList<QGraphicsItem *> itemList = scene()->selectedItems();
if (itemList.count() != 1) {
+ emit displayMessage(i18n("Cannot edit marker if more than one clip is selected"), ErrorMessage);
kDebug() << "// CANNOT DELETE MARKER IF MORE TAN ONE CLIP IS SELECTED....";
return;
}
}
void CustomTrackView::slotDeleteGuide() {
- GenTime pos = GenTime(m_cursorPos, m_document->fps());
- for (int i = 0; i < m_guides.count(); i++) {
- if (m_guides.at(i)->position() == pos) {
- EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true);
- m_commandStack->push(command);
+ GenTime pos = GenTime(m_cursorPos, m_document->fps());
+ for (int i = 0; i < m_guides.count(); i++) {
+ if (m_guides.at(i)->position() == pos) {
+ EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true);
+ m_commandStack->push(command);
break;
}
- }
+ }
}
void CustomTrackView::setTool(PROJECTTOOL tool) {
void CustomTrackView::setScale(double scaleFactor) {
//scale(scaleFactor, scaleFactor);
+ m_animationTimer->stop();
+ if (m_visualTip) {
+ delete m_visualTip;
+ m_visualTip = NULL;
+ }
+ if (m_animation) {
+ delete m_animation;
+ m_animation = NULL;
+ }
double pos = cursorPos() / m_scale;
m_scale = scaleFactor;
int vert = verticalScrollBar()->value();
m_guides.at(i)->updatePosition(m_scale);
}
+ setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
updateCursorPos();
centerOn(QPointF(cursorPos(), m_tracksHeight));
- setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
verticalScrollBar()->setValue(vert);
}
e.setAttribute("comment", m_guides.at(i)->label());
guides.appendChild(e);
}
- return guides;
+ return guides;
}
/*
projects / kdenlive / blobdiff