int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5);
emit mousePosition(mappedXPos);
if (event->buttons() & Qt::MidButton) return;
+ if (event->modifiers() == Qt::ControlModifier || event->modifiers() == Qt::ShiftModifier) {
+ QGraphicsView::mouseMoveEvent(event);
+ m_moveOpMode = NONE;
+ return;
+ }
+
if (event->buttons() != Qt::NoButton) {
bool move = (event->pos() - m_clickEvent).manhattanLength() >= QApplication::startDragDistance();
if (m_dragItem && m_tool == SELECTTOOL) {
m_operationMode = MOVEGUIDE;
// deselect all clips so that only the guide will move
m_scene->clearSelection();
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
updateSnapPoints(NULL);
QGraphicsView::mousePressEvent(event);
return;
if (m_dragItem) {
if (!m_dragItem->isSelected()) {
m_scene->clearSelection();
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
m_dragItem->setSelected(true);
}
}
// No item under click
if (m_dragItem == NULL || m_tool == SPACERTOOL) {
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
setCursor(Qt::ArrowCursor);
m_scene->clearSelection();
event->accept();
return;
}
updateSnapPoints(m_dragItem);
- if (m_dragItem && m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
+ if (m_dragItem->type() == AVWIDGET) emit clipItemSelected((ClipItem*) m_dragItem);
else emit clipItemSelected(NULL);
- if (m_selectionGroup) {
- // delete selection group
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
-
- if (m_dragItem && m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
-
- QList<QGraphicsItem *> selection = m_scene->selectedItems();
- if (selection.count() > 1) {
- m_selectionGroup = new AbstractGroupItem(m_document->fps());
- scene()->addItem(m_selectionGroup);
- for (int i = 0; i < selection.count(); i++) {
- if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET)
- m_selectionGroup->addToGroup(selection.at(i));
+ if (event->modifiers() != Qt::ControlModifier && (m_dragItem->group() || m_dragItem->isSelected())) {
+ // If clicked item is selected, allow move
+ event->accept();
+ if (m_selectionGroup) m_selectionGroup->setSelected(true);
+ if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
+ } else {
+ resetSelectionGroup();
+ if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
+ m_dragItem->setSelected(!m_dragItem->isSelected());
+ QList<QGraphicsItem *> selection = m_scene->selectedItems();
+ if (selection.count() > 1) {
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ scene()->addItem(m_selectionGroup);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ }
+ }
+ if (m_selectionGroup) {
+ QPointF top = m_selectionGroup->boundingRect().topLeft();
+ const int width = m_selectionGroup->boundingRect().width();
+ const int height = m_selectionGroup->boundingRect().height();
+ m_selectionGroup->setPos(top);
+ m_selectionGroup->translate(-top.x(), -top.y() + 1);
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
}
- QPointF top = m_selectionGroup->boundingRect().topLeft();
- const int width = m_selectionGroup->boundingRect().width();
- const int height = m_selectionGroup->boundingRect().height();
- m_selectionGroup->setPos(top);
- m_selectionGroup->translate(-top.x(), -top.y() + 1);
- m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
- m_selectionGroupInfo.track = m_selectionGroup->track();
}
m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
//QGraphicsView::mousePressEvent(event);
}
+void CustomTrackView::resetSelectionGroup() {
+ if (m_selectionGroup) {
+ // delete selection group
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ children.at(i)->setSelected(true);
+ }
+ scene()->destroyItemGroup(m_selectionGroup);
+ m_selectionGroup = NULL;
+ }
+}
+
void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event) {
kDebug() << "++++++++++++ DBL CLK";
if (m_dragItem && m_dragItem->hasKeyFrames()) {
void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
if (event->mimeData()->hasFormat("kdenlive/clip")) {
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";");
m_selectionGroup = new AbstractGroupItem(m_document->fps());
} else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";");
m_scene->clearSelection();
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
QPoint pos = QPoint();
m_blockRefresh = false;
return;
}
+ if (m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, cutTime) == false) {
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", cutTime.frames(m_document->fps()), info.track), ErrorMessage);
+ return;
+ }
kDebug() << "// UNCUTTING CLIPS: ITEM 1 (" << item->startPos().frames(25) << "x" << item->endPos().frames(25) << ")";
kDebug() << "// UNCUTTING CLIPS: ITEM 2 (" << dup->startPos().frames(25) << "x" << dup->endPos().frames(25) << ")";
m_document->updateClip(dup->baseClip()->getId());
scene()->removeItem(dup);
delete dup;
- m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, cutTime);
ItemInfo clipinfo = item->info();
clipinfo.track = m_scene->m_tracksList.count() - clipinfo.track;
if (m_selectionGroup) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
m_scene->clearSelection();
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
for (int i = 0; i < items.count(); i++) {
ClipItem *item = static_cast <ClipItem *>(items.at(i));
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false);
m_document->renderer()->mltChangeTrackState(tracknumber, m_scene->m_tracksList.at(tracknumber - 1).isMute, m_scene->m_tracksList.at(tracknumber - 1).isBlind);
}
+void CustomTrackView::slotRemoveSpace() {
+ GenTime pos;
+ int track = 0;
+ if (m_menuPosition.isNull()) {
+ pos = GenTime(cursorPos(), m_document->fps());
+ bool ok;
+ track = QInputDialog::getInteger(this, i18n("Remove Space"), i18n("Track"), 0, 0, m_scene->m_tracksList.count() - 1, 1, &ok);
+ if (!ok) return;
+ } else {
+ pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
+ track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight);
+ }
+ ClipItem *item = getClipItemAt(pos, track);
+ if (item) {
+ emit displayMessage(i18n("You must be in an empty space to remove space."), ErrorMessage);
+ return;
+ }
+ int length = m_document->renderer()->mltGetSpaceLength(pos, m_scene->m_tracksList.count() - track);
+ if (length <= 0) {
+ emit displayMessage(i18n("You must be in an empty space to remove space."), ErrorMessage);
+ return;
+ }
+ InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, GenTime(-length, m_document->fps()), true);
+ m_commandStack->push(command);
+}
+
void CustomTrackView::slotInsertSpace() {
GenTime pos;
int track = 0;
if (d.exec() != QDialog::Accepted) return;
GenTime spaceDuration = d.selectedDuration();
track = d.selectedTrack();
+ ClipItem *item = getClipItemAt(pos, track);
+ if (item) pos = item->startPos();
+
InsertSpaceCommand *command = new InsertSpaceCommand(this, pos, track, spaceDuration, true);
m_commandStack->push(command);
}
int diff = duration.frames(m_document->fps());
if (!add) diff = -diff;
QList<QGraphicsItem *> itemList;
- if (track == -1) itemList = items();
+ if (track == -1) itemList = scene()->items(pos.frames(m_document->fps()) , 1, sceneRect().width() - pos.frames(m_document->fps()), sceneRect().height());
else itemList = scene()->items(pos.frames(m_document->fps()) , track * m_tracksHeight + 1, sceneRect().width() - pos.frames(m_document->fps()), m_tracksHeight - 2);
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
for (int i = 0; i < itemList.count(); i++) {
m_selectionGroup->setPos(top);
m_selectionGroup->translate(-top.x(), -top.y() + 1);
m_selectionGroup->moveBy(diff, 0);
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
if (track != -1) track = m_scene->m_tracksList.count() - track;
if (!add) m_document->renderer()->mltInsertSpace(pos, track, GenTime() - duration);
else m_document->renderer()->mltInsertSpace(pos, track, duration);
} else if (m_operationMode == SPACER) {
int endClick = (int)(mapToScene(event->pos()).x() + 0.5);
int mappedClick = (int)(mapToScene(m_clickEvent).x() + 0.5);
+ int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
+ ClipItem *item = getClipItemAt(mappedClick, track);
+ if (item) mappedClick = item->startPos().frames(m_document->fps());
int diff = m_selectionGroup->pos().x() - m_spacerStart;//endClick - mappedClick;
kDebug() << "// MOVING SPACER DIFF:" << diff;
- int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
if (diff < 0) mappedClick += diff;
InsertSpaceCommand *command = new InsertSpaceCommand(this, GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()), false);
m_commandStack->push(command);
track = m_scene->m_tracksList.count() - track;
m_document->renderer()->mltInsertSpace(GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()));
- if (m_selectionGroup) {
- scene()->destroyItemGroup(m_selectionGroup);
- m_selectionGroup = NULL;
- }
+ resetSelectionGroup();
m_operationMode = NONE;
}
GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track;
- //kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "x" << trackOffset;
+ // kDebug() << "&DROPPED GRPOUP:" << timeOffset.frames(25) << "TRK OFF: " << trackOffset;
if (timeOffset != GenTime() || trackOffset != 0) {
QUndoCommand *moveClips = new QUndoCommand();
moveClips->setText("Move clips");
for (int i = 0; i < items.count(); i++) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
- /*info.startPos = info.startPos - timeOffset;
- info.endPos = info.endPos - timeOffset;
- info.track = info.track - trackOffset;*/
- //kDebug() << "REM CLP:" << i << ", START:" << info.startPos.frames(25);
if (item->type() == AVWIDGET) {
- ClipItem *clip = static_cast <ClipItem*>(item);
- new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips);
- m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos);
+ if (m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos) == false) {
+ // error, clip cannot be removed from playlist
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
+ } else {
+ // clip removed from playlist, create command
+ ClipItem *clip = static_cast <ClipItem*>(item);
+ new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, true, moveClips);
+ }
} else {
Transition *tr = static_cast <Transition*>(item);
- new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, true, moveClips);
+ new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), true, false, moveClips);
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
for (int i = 0; i < items.count(); i++) {
// re-add items in correct place
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
+ item->updateItem();
ItemInfo info = item->info();
- info.startPos = info.startPos + timeOffset;
+ /*info.startPos = info.startPos + timeOffset;
info.endPos = info.endPos + timeOffset;
- info.track = info.track + trackOffset;
+ info.track = info.track + trackOffset;*/
if (item->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem*>(item);
new AddTimelineClipCommand(this, clip->xml(), clip->clipProducer(), info, clip->effectList(), false, false, moveClips);
m_document->renderer()->mltInsertClip(info, clip->xml(), clip->baseClip()->producer(info.track));
} else {
Transition *tr = static_cast <Transition*>(item);
- ItemInfo transitionInfo = tr->info();
- new AddTransitionCommand(this, info, tr->transitionEndTrack(), tr->toXML(), false, false, moveClips);
- m_document->renderer()->mltAddTransition(tr->transitionTag(), tr->transitionEndTrack() + trackOffset, m_scene->m_tracksList.count() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML());
+ int newTrack = tr->transitionEndTrack();
+ if (!tr->forcedTrack()) {
+ newTrack += trackOffset;
+ if (newTrack < 0 || newTrack > m_scene->m_tracksList.count()) newTrack = getPreviousVideoTrack(info.track);
+ }
+ new AddTransitionCommand(this, info, newTrack, tr->toXML(), false, false, moveClips);
+
+ m_document->renderer()->mltAddTransition(tr->transitionTag(), newTrack, m_scene->m_tracksList.count() - info.track, info.startPos, info.endPos, tr->toXML());
}
}
m_commandStack->push(moveClips);
void CustomTrackView::deleteClip(ItemInfo info) {
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
- if (!item) {
- kDebug() << "---------------- ERROR, CANNOT find clip to delete at...";// << rect.x();
+
+ if (!item || m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos) == false) {
+ emit displayMessage(i18n("Error removing clip at %1 on track %2", info.startPos.frames(m_document->fps()), info.track), ErrorMessage);
return;
}
if (item->isSelected()) emit clipItemSelected(NULL);
scene()->removeItem(item);
if (m_dragItem == item) m_dragItem = NULL;
delete item;
- m_document->renderer()->mltRemoveClip(m_scene->m_tracksList.count() - info.track, info.startPos);
m_document->renderer()->doRefresh();
}
}
void CustomTrackView::doChangeClipSpeed(ItemInfo info, const double speed, const double oldspeed, const QString &id) {
-
DocClipBase *baseclip = m_document->clipManager()->getClipById(id);
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()) + 1, info.track);
info.track = m_scene->m_tracksList.count() - item->track();
item->updateRectGeometry();
if (item->cropDuration().frames(m_document->fps()) > endPos)
item->AbstractClipItem::resizeEnd(info.startPos.frames(m_document->fps()) + endPos, speed);
+ m_document->setModified(true);
}
void CustomTrackView::cutSelectedClips() {
}
}
-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;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) return;
- GenTime pos = GenTime(m_cursorPos, m_document->fps());
- if (item->startPos() > pos || item->endPos() < pos) return;
- ClipItem *clip = (ClipItem *) item;
- QString id = clip->baseClip()->getId();
- GenTime position = pos - item->startPos() + item->cropStart();
- CommentedTime marker(position, i18n("Marker"));
- MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), i18n("Add Marker"), this);
- if (d.exec() == QDialog::Accepted) {
- slotAddClipMarker(id, d.newMarker().time(), d.newMarker().comment());
- }
-}
-
void CustomTrackView::slotAddClipMarker(const QString &id, GenTime t, QString c) {
QString oldcomment = m_document->clipManager()->getClipById(id)->markerComment(t);
AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, c, id, t, true);
m_commandStack->push(command);
}
-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;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) {
- emit displayMessage(i18n("No clip selected"), ErrorMessage);
- return;
- }
- GenTime pos = GenTime(m_cursorPos, m_document->fps());
- if (item->startPos() > pos || item->endPos() < pos) {
- emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage);
- return;
- }
- ClipItem *clip = (ClipItem *) item;
- QString id = clip->baseClip()->getId();
- GenTime position = pos - item->startPos() + item->cropStart();
- QString comment = clip->baseClip()->markerComment(position);
- if (comment.isEmpty()) {
- emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage);
- return;
- }
+void CustomTrackView::slotDeleteClipMarker(const QString &comment, const QString &id, const GenTime &position) {
AddMarkerCommand *command = new AddMarkerCommand(this, comment, QString(), id, position, true);
m_commandStack->push(command);
}
-void CustomTrackView::slotDeleteAllClipMarkers() {
- 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;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) {
- emit displayMessage(i18n("No clip selected"), ErrorMessage);
- return;
- }
-
- ClipItem *clip = static_cast <ClipItem *>(item);
- QList <CommentedTime> markers = clip->baseClip()->commentedSnapMarkers();
+void CustomTrackView::slotDeleteAllClipMarkers(const QString &id) {
+ DocClipBase *base = m_document->clipManager()->getClipById(id);
+ QList <CommentedTime> markers = base->commentedSnapMarkers();
if (markers.isEmpty()) {
emit displayMessage(i18n("Clip has no markers"), ErrorMessage);
return;
}
- QString id = clip->baseClip()->getId();
QUndoCommand *deleteMarkers = new QUndoCommand();
deleteMarkers->setText("Delete clip markers");
m_commandStack->push(deleteMarkers);
}
-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;
- }
- AbstractClipItem *item = (AbstractClipItem *)itemList.at(0);
- if (item->type() != AVWIDGET) {
- emit displayMessage(i18n("No clip at cursor time"), ErrorMessage);
- return;
- }
- GenTime pos = GenTime(m_cursorPos, m_document->fps());
- if (item->startPos() > pos || item->endPos() < pos) {
- emit displayMessage(i18n("No selected clip at cursor time"), ErrorMessage);
- return;
- }
- ClipItem *clip = (ClipItem *) item;
- QString id = clip->baseClip()->getId();
- GenTime position = pos - item->startPos() + item->cropStart();
- QString oldcomment = clip->baseClip()->markerComment(position);
- if (oldcomment.isEmpty()) {
- emit displayMessage(i18n("No marker found at cursor time"), ErrorMessage);
- return;
- }
-
- CommentedTime marker(position, oldcomment);
- MarkerDialog d(clip->baseClip(), marker, m_document->timecode(), i18n("Edit Marker"), this);
- if (d.exec() == QDialog::Accepted) {
- if (d.newMarker().time() == position) {
- // marker position was not changed, only text
- AddMarkerCommand *command = new AddMarkerCommand(this, oldcomment, d.newMarker().comment(), id, position, true);
- m_commandStack->push(command);
- } else {
- // marker text and position were changed, remove previous marker and add new one
- AddMarkerCommand *command1 = new AddMarkerCommand(this, oldcomment, QString(), id, position, true);
- AddMarkerCommand *command2 = new AddMarkerCommand(this, QString(), d.newMarker().comment(), id, d.newMarker().time(), true);
- m_commandStack->push(command1);
- m_commandStack->push(command2);
- }
- }
-}
-
void CustomTrackView::addMarker(const QString &id, const GenTime &pos, const QString comment) {
DocClipBase *base = m_document->clipManager()->getClipById(id);
if (!comment.isEmpty()) base->addSnapMarker(pos, comment);
return NULL;
}
-ClipItem *CustomTrackView::getActiveClipUnderCursor() const {
+ClipItem *CustomTrackView::getActiveClipUnderCursor(bool allowOutsideCursor) const {
QList<QGraphicsItem *> clips = scene()->selectedItems();
if (clips.isEmpty()) {
return getClipUnderCursor();
if (clips.at(i)->type() != AVWIDGET) clips.removeAt(i);
else i++;
}
- if (clips.count() == 1) return static_cast < ClipItem *>(clips.at(0));
+ if (clips.count() == 1 && allowOutsideCursor) return static_cast < ClipItem *>(clips.at(0));
for (int i = 0; i < clips.count(); ++i) {
if (clips.at(i)->type() == AVWIDGET)
item = static_cast < ClipItem *>(clips.at(i));
}
void CustomTrackView::setInPoint() {
- ClipItem *clip = getActiveClipUnderCursor();
+ ClipItem *clip = getActiveClipUnderCursor(true);
if (clip == NULL) {
emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
return;
}
void CustomTrackView::setOutPoint() {
- ClipItem *clip = getActiveClipUnderCursor();
+ ClipItem *clip = getActiveClipUnderCursor(true);
if (clip == NULL) {
emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
return;
}
}
+void CustomTrackView::slotInsertTrack() {
+}
+
+void CustomTrackView::slotDeleteTrack() {
+}
+
#include "customtrackview.moc"
projects / kdenlive / blobdiff