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) {
+ if ((event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL) || event->modifiers() == Qt::ShiftModifier) {
QGraphicsView::mouseMoveEvent(event);
m_moveOpMode = NONE;
return;
// check item under mouse
QList<QGraphicsItem *> collisionList = items(event->pos());
- if (event->modifiers() == Qt::ControlModifier && collisionList.count() == 0) {
+ if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) {
setDragMode(QGraphicsView::ScrollHandDrag);
QGraphicsView::mousePressEvent(event);
m_blockRefresh = false;
}
m_operationMode = NONE;
displayContextMenu(event->globalPos(), m_dragItem);
- m_menuPosition = event->pos();
+ m_menuPosition = m_clickEvent;
m_dragItem = NULL;
event->accept();
return;
event->accept();
emit clipItemSelected(NULL);
if (m_tool == SPACERTOOL) {
- // Select all items on track after click position
- int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
- QList<QGraphicsItem *> selection = items(event->pos().x(), track * m_tracksHeight + 1, sceneRect().width() - event->pos().x(), m_tracksHeight - 2);
+ QList<QGraphicsItem *> selection;
+ if (event->modifiers() == Qt::ControlModifier) {
+ // Ctrl + click, select all items on track after click position
+ int track = (int)(mapToScene(m_clickEvent).y() / m_tracksHeight);
+ selection = items(m_clickEvent.x(), track * m_tracksHeight + 1, sceneRect().width() - m_clickEvent.x(), m_tracksHeight - 2);
+ } else {
+ // Select all items on all tracks after click position
+ selection = items(event->pos().x(), 1, sceneRect().width() - event->pos().x(), sceneRect().height());
+ }
m_selectionGroup = new AbstractGroupItem(m_document->fps());
scene()->addItem(m_selectionGroup);
m_spacerStart = -1;
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);
AbstractClipItem *item = static_cast <AbstractClipItem *>(selection.at(i));
itemStart = item->startPos().frames(m_document->fps());
if (m_spacerStart == -1 || itemStart < m_spacerStart)
}
}
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);
- //kDebug()<<"// SPACER START GRP: "<<m_spacerStart;
m_operationMode = SPACER;
} else setCursorPos((int)(mapToScene(event->x(), 0).x()));
return;
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());
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);
}
- 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);
-
// Move graphic items
- m_selectionGroup->setPos(m_selectionGroup->pos().x(), m_selectionGroup->pos().y() + m_tracksHeight);
+ m_selectionGroup->translate(0, m_tracksHeight);
// adjust track number
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
}
}
}
- resetSelectionGroup();
+ resetSelectionGroup(false);
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
+ viewport()->update();
//setFixedHeight(50 * m_tracksCount);
}
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);
}
-
- 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);
-
// Move graphic items
- m_selectionGroup->setPos(m_selectionGroup->pos().x(), m_selectionGroup->pos().y() - m_tracksHeight);
+ qreal ydiff = 0 - (int) m_tracksHeight;
+ m_selectionGroup->translate(0, ydiff);
// adjust track number
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
- kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
+ //kDebug() << "// FOUND CLIPS TO MOVE: " << children.count();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == AVWIDGET) {
ClipItem *clip = static_cast <ClipItem *>(children.at(i));
}
}
}
- resetSelectionGroup();
+ resetSelectionGroup(false);
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
setSceneRect(0, 0, sceneRect().width(), m_tracksHeight * m_document->tracksCount());
verticalScrollBar()->setMaximum(m_tracksHeight * m_document->tracksCount());
QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
+ viewport()->update();
}
void CustomTrackView::changeTrack(int ix, TrackInfo type) {
m_commandStack->push(command);
}
-void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime duration, bool add) {
+void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime duration) {
int diff = duration.frames(m_document->fps());
- if (!add) diff = -diff;
QList<QGraphicsItem *> itemList;
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);
scene()->addItem(m_selectionGroup);
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
- /*AbstractClipItem *item = static_cast <AbstractClipItem *> (itemList.at(i));
- if (item->endPos() > pos)*/
m_selectionGroup->addToGroup(itemList.at(i));
- //item->moveBy(diff, 0);
+ itemList.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
}
}
- 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_selectionGroup->moveBy(diff, 0);
- resetSelectionGroup();
+
+ m_selectionGroup->translate(diff, 0);
+ resetSelectionGroup(false);
if (track != -1) track = m_document->tracksCount() - track;
- if (!add) m_document->renderer()->mltInsertSpace(pos, track, GenTime() - duration);
- else m_document->renderer()->mltInsertSpace(pos, track, duration);
+ m_document->renderer()->mltInsertSpace(pos, track, duration);
}
void CustomTrackView::deleteClip(const QString &clipId) {
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);
+ if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) {
+ // We are moving all tracks
+ track = -1;
+ }
ClipItem *item = getClipItemAt(mappedClick, track);
if (item) mappedClick = item->startPos().frames(m_document->fps());
int diff = m_selectionGroup->pos().x() - m_spacerStart;//endClick - mappedClick;
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_document->tracksCount() - track;
+ if (track != -1) track = m_document->tracksCount() - track;
m_document->renderer()->mltInsertSpace(GenTime(mappedClick, m_document->fps()), track, GenTime(diff, m_document->fps()));
- resetSelectionGroup();
+ resetSelectionGroup(false);
m_operationMode = NONE;
} else if (m_operationMode == RUBBERSELECTION) {
resetSelectionGroup();
new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveClips);
m_commandStack->push(moveClips);
+
+ QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
+ //QPointF oldpos = m_selectionGroup->scenePos();
+ //kDebug()<<"SELECTION GRP POS: "<<m_selectionGroup->scenePos()<<", TOP: "<<top;
+ m_selectionGroup->setPos(top);
m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
}
}
void CustomTrackView::moveClip(const ItemInfo start, const ItemInfo end) {
+ if (m_selectionGroup) resetSelectionGroup(false);
ClipItem *item = getClipItemAt((int) start.startPos.frames(m_document->fps()) + 1, start.track);
if (!item) {
emit displayMessage(i18n("Cannot move clip at time: %1 on track %2", m_document->timecode().getTimecodeFromFrames(start.startPos.frames(m_document->fps())), start.track), ErrorMessage);
bool success = m_document->renderer()->mltMoveClip((int)(m_document->tracksCount() - start.track), (int)(m_document->tracksCount() - end.track), (int) start.startPos.frames(m_document->fps()), (int)end.startPos.frames(m_document->fps()), item->baseClip()->producer(end.track));
if (success) {
item->setPos((int) end.startPos.frames(m_document->fps()), (int)(end.track * m_tracksHeight + 1));
+ m_scene->clearSelection();
+ item->setSelected(true);
if (item->baseClip()->isTransparent()) {
// Also move automatic transition
Transition *tr = getTransitionItemAt((int) start.startPos.frames(m_document->fps()), start.track);
qreal posx = pos.x() + offset.frames(m_document->fps());
qreal posy = pos.y() + trackOffset * (qreal) m_tracksHeight;
m_selectionGroup->setPos(posx, posy);
- m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
- m_selectionGroupInfo.track = m_selectionGroup->track();
- kDebug() << "// Current GRUOP POS: " << pos.y() << ", TK OFF: " << trackOffset << ", TK HG: " << m_tracksHeight << ", POS: " << posx << "x" << posy;
- /*QPointF top = m_selectionGroup->boundingRect().topLeft();
- const int width = m_selectionGroup->boundingRect().width();
- const int height = m_selectionGroup->boundingRect().height();
+ QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
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_selectionGroupInfo.track = m_selectionGroup->track();
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
for (int i = 0; i < children.count(); i++) {
void CustomTrackView::slotUpdateAllThumbs() {
QList<QGraphicsItem *> itemList = items();
+ //if (itemList.isEmpty()) return;
ClipItem *item;
- Transition *transitionitem;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
item = static_cast <ClipItem *>(itemList.at(i));
info.isMute = false;
info.isBlind = true;
}
- addTimelineTrack(ix, info);
+ AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true);
+ m_commandStack->push(addTrack);
m_document->setModified(true);
- /*AddTrackCommand* command = new AddTrackCommand(this, ix, info, true, true);
- m_commandStack->push(command);*/
}
}
}
}
-void CustomTrackView::addTimelineTrack(int ix, TrackInfo trackinfo) {
- double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
- QRectF r(0, startY, sceneRect().width(), sceneRect().height() - startY);
- QList<QGraphicsItem *> selection = m_scene->items(r);
- kDebug() << "// TRK RECT: " << r << ", ITEMS: " << selection.count();
- AddTrackCommand *addTrack = new AddTrackCommand(this, ix, trackinfo, true, true, addTrack);
- m_commandStack->push(addTrack);
-}
void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo) {
double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
projects / kdenlive / blobdiff