* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include <QMouseEvent>
-#include <QStylePainter>
-#include <QGraphicsItem>
-#include <QDomDocument>
-#include <QScrollBar>
-#include <QApplication>
-#include <QInputDialog>
-
-#include <KDebug>
-#include <KLocale>
-#include <KUrl>
-#include <KIcon>
-#include <KCursor>
#include "customtrackview.h"
#include "customtrackscene.h"
#include "razorclipcommand.h"
#include "kdenlivesettings.h"
#include "transition.h"
-#include "clipitem.h"
-#include "customtrackview.h"
#include "clipmanager.h"
#include "renderer.h"
#include "markerdialog.h"
#include "ui_addtrack_ui.h"
#include "initeffects.h"
#include "locktrackcommand.h"
+#include "groupclipscommand.h"
+
+#include <KDebug>
+#include <KLocale>
+#include <KUrl>
+#include <KIcon>
+#include <KCursor>
+
+#include <QMouseEvent>
+#include <QStylePainter>
+#include <QGraphicsItem>
+#include <QDomDocument>
+#include <QScrollBar>
+#include <QApplication>
+#include <QInputDialog>
+
//TODO:
// disable animation if user asked it in KDE's global settings
// const int duration = animate ? 1500 : 1;
CustomTrackView::CustomTrackView(KdenliveDoc *doc, CustomTrackScene* projectscene, QWidget *parent)
- : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL) {
+ : QGraphicsView(projectscene, parent), m_scene(projectscene), m_cursorPos(0), m_cursorLine(NULL), m_operationMode(NONE), m_dragItem(NULL), m_visualTip(NULL), m_moveOpMode(NONE), m_animation(NULL), m_projectDuration(0), m_clickPoint(QPoint()), m_document(doc), m_autoScroll(KdenliveSettings::autoscroll()), m_tracksHeight(KdenliveSettings::trackheight()), m_tool(SELECTTOOL), m_dragGuide(NULL), m_findIndex(0), m_menuPosition(QPoint()), m_blockRefresh(false), m_selectionGroup(NULL), m_selectedTrack(0), m_copiedItems(QList<AbstractClipItem *> ()), m_scrollOffset(0), m_changeSpeedAction(NULL), m_pasteEffectsAction(NULL), m_ungroupAction(NULL), m_clipDrag(false) {
if (doc) m_commandStack = doc->commandStack();
- else m_commandStack == NULL;
+ else m_commandStack = NULL;
setMouseTracking(true);
setAcceptDrops(true);
m_animationTimer = new QTimeLine(800);
for (int i = 0; i < list.count(); i++) {
if (list.at(i)->data().toString() == "change_speed") m_changeSpeedAction = list.at(i);
else if (list.at(i)->data().toString() == "paste_effects") m_pasteEffectsAction = list.at(i);
+ else if (list.at(i)->data().toString() == "ungroup_clip") m_ungroupAction = list.at(i);
}
m_timelineContextTransitionMenu = transition;
} else if (m_operationMode == RESIZESTART && move) {
double snappedPos = getSnapPointForPos(mappedXPos);
+ m_document->renderer()->pause();
m_dragItem->resizeStart((int)(snappedPos));
} else if (m_operationMode == RESIZEEND && move) {
double snappedPos = getSnapPointForPos(mappedXPos);
+ m_document->renderer()->pause();
m_dragItem->resizeEnd((int)(snappedPos));
} else if (m_operationMode == FADEIN && move) {
((ClipItem*) m_dragItem)->setFadeIn((int)(mappedXPos - m_dragItem->startPos().frames(m_document->fps())));
return;
}
- if (event->modifiers() == Qt::ShiftModifier && collisionList.count() == 0) {
+ if (event->modifiers() & Qt::ShiftModifier && collisionList.count() == 0) {
setDragMode(QGraphicsView::RubberBandDrag);
+ if (!event->modifiers() & Qt::ControlModifier) {
+ resetSelectionGroup();
+ scene()->clearSelection();
+ }
QGraphicsView::mousePressEvent(event);
m_blockRefresh = false;
m_operationMode = RUBBERSELECTION;
return;
}
- // Find first clip or transition under mouse
- int i = 0;
+ // Find first clip, transition or group under mouse
+ int ct = 0;
m_dragItem = NULL;
- while (i < collisionList.count()) {
- if (collisionList.at(i)->type() == AVWIDGET || collisionList.at(i)->type() == TRANSITIONWIDGET) {
- m_dragItem = static_cast <AbstractClipItem *>(collisionList.at(i));
+ AbstractGroupItem *dragGroup = NULL;
+ while (ct < collisionList.count()) {
+ if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
+ m_dragItem = static_cast <AbstractClipItem *>(collisionList.at(ct));
m_dragItemInfo = m_dragItem->info();
+ if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
+ //kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect();
+ dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ }
break;
}
- i++;
+ ct++;
}
if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
// context menu requested
if (event->button() == Qt::RightButton) {
if (m_dragItem) {
- if (!m_dragItem->isSelected()) {
+ if (dragGroup) dragGroup->setSelected(true);
+ else if (!m_dragItem->isSelected()) {
resetSelectionGroup(false);
m_scene->clearSelection();
m_dragItem->setSelected(true);
}
}
m_operationMode = NONE;
- displayContextMenu(event->globalPos(), m_dragItem);
+ displayContextMenu(event->globalPos(), m_dragItem, dragGroup);
m_menuPosition = m_clickEvent;
m_dragItem = NULL;
event->accept();
}
// Razor tool
- if (m_tool == RAZORTOOL) {
+ if (m_tool == RAZORTOOL && m_dragItem) {
if (m_dragItem->type() == TRANSITIONWIDGET) {
emit displayMessage(i18n("Cannot cut a transition"), ErrorMessage);
event->accept();
}
AbstractClipItem *clip = static_cast <AbstractClipItem *>(m_dragItem);
RazorClipCommand* command = new RazorClipCommand(this, clip->info(), GenTime((int)(mapToScene(event->pos()).x()), m_document->fps()), true);
+ m_document->renderer()->pause();
m_commandStack->push(command);
m_document->setModified(true);
m_dragItem = NULL;
return;
}
-
- if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
- else emit clipItemSelected(NULL);
-
- 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());
- groupSelectedItems();
- ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
- m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO);
- m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
- }
-
- if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem);
+ if (dragGroup == NULL) updateSnapPoints(m_dragItem);
else {
QList <GenTime> offsetList;
- QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ QList<QGraphicsItem *> children = dragGroup->childItems();
for (int i = 0; i < children.count(); i++) {
- AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
- offsetList.append(item->startPos());
- offsetList.append(item->endPos());
+ if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+ AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
+ offsetList.append(item->startPos());
+ offsetList.append(item->endPos());
+ }
}
if (!offsetList.isEmpty()) {
qSort(offsetList);
}
}
+ if (m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) emit clipItemSelected((ClipItem*) m_dragItem);
+ else emit clipItemSelected(NULL);
+
+ if (event->modifiers() != Qt::ControlModifier && (m_dragItem->isSelected() || dragGroup && dragGroup->isSelected())) {
+ // If clicked item is selected, allow move
+ if (dragGroup) dragGroup->setSelected(true);
+ //event->accept();
+ if (m_operationMode == NONE) QGraphicsView::mousePressEvent(event);
+ } else {
+ resetSelectionGroup();
+ if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
+ dragGroup = NULL;
+ if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET) {
+ //kDebug()<<"// KLIK FOUND GRP: "<<m_dragItem->sceneBoundingRect();
+ dragGroup = static_cast <AbstractGroupItem *>(m_dragItem->parentItem());
+ }
+ bool selected = !m_dragItem->isSelected();
+ if (dragGroup) dragGroup->setSelected(selected);
+ else m_dragItem->setSelected(selected);
+ groupSelectedItems();
+ ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
+ m_changeSpeedAction->setEnabled(clip->clipType() == AV || clip->clipType() == VIDEO);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ }
+
m_clickPoint = QPoint((int)(mapToScene(event->pos()).x() - m_dragItem->startPos().frames(m_document->fps())), (int)(event->pos().y() - m_dragItem->pos().y()));
m_operationMode = m_dragItem->operationMode(mapToScene(event->pos()));
return;
} else if (m_operationMode == MOVE) {
setCursor(Qt::ClosedHandCursor);
- } else if (m_operationMode == TRANSITIONSTART) {
+ } else if (m_operationMode == TRANSITIONSTART && event->modifiers() != Qt::ControlModifier) {
ItemInfo info;
info.startPos = m_dragItem->startPos();
info.track = m_dragItem->track();
}
if (transitionAccepted) slotAddTransition((ClipItem *) m_dragItem, info, transitiontrack);
else emit displayMessage(i18n("Cannot add transition"), ErrorMessage);
- } else if (m_operationMode == TRANSITIONEND) {
+ } else if (m_operationMode == TRANSITIONEND && event->modifiers() != Qt::ControlModifier) {
ItemInfo info;
info.endPos = GenTime(m_dragItem->endPos().frames(m_document->fps()), m_document->fps());
info.track = m_dragItem->track();
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ QPointF selectionPos = m_selectionGroup->scenePos();
scene()->destroyItemGroup(m_selectionGroup);
+ kDebug() << "DESTROY SEL GRP, ITEMS: " << children.count();
for (int i = 0; i < children.count(); i++) {
- if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+ if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
+ if (!static_cast <AbstractClipItem *>(children.at(i))->isItemLocked()) {
+ children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ children.at(i)->setSelected(selectItems);
+ }
+ } else if (children.at(i)->type() == GROUPWIDGET) {
children.at(i)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
children.at(i)->setSelected(selectItems);
+
+ // Rebuild groups or they get corrupted (because of translate / move issues)
+ QGraphicsItemGroup *group = static_cast <QGraphicsItemGroup *>(children.at(i));
+ //kDebug()<<"// GRP POS:"<<group->scenePos()<<", SELECT:"<<selectionPos;
+ if (group->scenePos() != selectionPos)
+ group->translate(selectionPos.x(), selectionPos.y());
+ //group->setPos(-selectionPos.x(), -selectionPos.y());
+ QList<QGraphicsItem *> selection = group->childItems();
+ scene()->destroyItemGroup(group);
+ if (!selection.isEmpty()) {
+ QPointF top = selection.at(0)->sceneBoundingRect().topLeft();
+
+ // Find top left position of selection
+ for (int j = 1; j < selection.count(); j++) {
+ if (selection.at(j)->type() == AVWIDGET || selection.at(j)->type() == TRANSITIONWIDGET) {
+ selection.at(j)->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ QPointF currenttop = selection.at(j)->sceneBoundingRect().topLeft();
+ //kDebug()<<"// GRP ITEM POS:"<<currenttop;
+ if (currenttop.x() < top.x()) top.setX(currenttop.x());
+ if (currenttop.y() < top.y()) top.setY(currenttop.y());
+ }
+ }
+
+ AbstractGroupItem *newGroup = new AbstractGroupItem(m_document->fps());
+ newGroup->translate(-top.x(), -top.y() + 1);
+ newGroup->setPos(top.x(), top.y() - 1);
+ scene()->addItem(newGroup);
+
+ for (int j = 0; j < selection.count(); j++) {
+ if (selection.at(j)->type() == AVWIDGET || selection.at(j)->type() == TRANSITIONWIDGET) {
+ newGroup->addToGroup(selection.at(j));
+ //kDebug()<<"// ADDING ITEM:"<<selection.at(j)->sceneBoundingRect();
+ selection.at(j)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ }
+ }
}
}
m_selectionGroup = NULL;
}
}
-void CustomTrackView::groupSelectedItems(bool force) {
+void CustomTrackView::groupSelectedItems(bool force, bool createNewGroup) {
if (m_selectionGroup) {
kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
return;
}
QList<QGraphicsItem *> selection = m_scene->selectedItems();
- QGraphicsItemGroup *group = m_scene->createItemGroup(selection);
- scene()->addItem(group);
- QPointF top = group->sceneBoundingRect().topLeft();
- m_scene->destroyItemGroup(group);
+ if (selection.isEmpty()) return;
+ QPointF top = selection.at(0)->sceneBoundingRect().topLeft();
+ // Find top left position of selection
+ for (int i = 1; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ QPointF currenttop = selection.at(i)->sceneBoundingRect().topLeft();
+ if (currenttop.x() < top.x()) top.setX(currenttop.x());
+ if (currenttop.y() < top.y()) top.setY(currenttop.y());
+ }
+ }
+
if (force || selection.count() > 1) {
bool snap = KdenliveSettings::snaptopoints();
KdenliveSettings::setSnaptopoints(false);
- m_selectionGroup = new AbstractGroupItem(m_document->fps());
- m_selectionGroup->translate(-top.x(), -top.y() + 1);
- m_selectionGroup->setPos(top.x(), top.y() - 1);
- 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 (createNewGroup) {
+ AbstractGroupItem *newGroup = new AbstractGroupItem(m_document->fps());
+ newGroup->translate(-top.x(), -top.y() + 1);
+ newGroup->setPos(top.x(), top.y() - 1);
+ scene()->addItem(newGroup);
+
+ // CHeck if we are trying to include a group in a group
+ QList <QGraphicsItemGroup *> groups;
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == GROUPWIDGET && !groups.contains(static_cast<QGraphicsItemGroup *>(selection.at(i)))) {
+ groups.append(static_cast<QGraphicsItemGroup *>(selection.at(i)));
+ } else if (selection.at(i)->parentItem() && !groups.contains(static_cast<QGraphicsItemGroup *>(selection.at(i)->parentItem()))) groups.append(static_cast<QGraphicsItemGroup *>(selection.at(i)->parentItem()));
+ }
+ if (!groups.isEmpty()) {
+ // ungroup previous groups
+ while (!groups.isEmpty()) {
+ QGraphicsItemGroup *grp = groups.takeFirst();
+ scene()->destroyItemGroup(grp);
+ }
+ selection = m_scene->selectedItems();
}
- }
- KdenliveSettings::setSnaptopoints(snap);
- if (m_selectionGroup) {
- /*bool snap = KdenliveSettings::snaptopoints();
- KdenliveSettings::setSnaptopoints(false);
- QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
- // kDebug()<<"SEL GRP TOP: "<<top;
- // Fix group item position
- m_selectionGroup->translate(-top.x(), -top.y());
- m_selectionGroup->setPos(top);*/
- m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
- m_selectionGroupInfo.track = m_selectionGroup->track();
- //KdenliveSettings::setSnaptopoints(snap);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET) {
+ newGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ } else {
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ m_selectionGroup->translate(-top.x(), -top.y() + 1);
+ m_selectionGroup->setPos(top.x(), top.y() - 1);
+ scene()->addItem(m_selectionGroup);
+ for (int i = 0; i < selection.count(); i++) {
+ if (selection.at(i)->parentItem() == NULL && (selection.at(i)->type() == AVWIDGET || selection.at(i)->type() == TRANSITIONWIDGET || selection.at(i)->type() == GROUPWIDGET)) {
+ m_selectionGroup->addToGroup(selection.at(i));
+ selection.at(i)->setFlags(QGraphicsItem::ItemIsSelectable);
+ }
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ if (m_selectionGroup) {
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
+ }
}
} else resetSelectionGroup();
}
}
-void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip) {
+void CustomTrackView::displayContextMenu(QPoint pos, AbstractClipItem *clip, AbstractGroupItem *group) {
if (clip == NULL) m_timelineContextMenu->popup(pos);
- else if (clip->type() == AVWIDGET) {
- ClipItem *item = static_cast <ClipItem*>(clip);
- m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO);
+ else if (group != NULL) {
+ m_changeSpeedAction->setEnabled(false);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ m_ungroupAction->setEnabled(true);
m_timelineContextClipMenu->popup(pos);
- } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+ } else {
+ m_ungroupAction->setEnabled(false);
+ if (clip->type() == AVWIDGET) {
+ ClipItem *item = static_cast <ClipItem*>(clip);
+ m_changeSpeedAction->setEnabled(item->clipType() == AV || item->clipType() == VIDEO);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ m_timelineContextClipMenu->popup(pos);
+ } else if (clip->type() == TRANSITIONWIDGET) m_timelineContextTransitionMenu->popup(pos);
+ }
}
void CustomTrackView::activateMonitor() {
void CustomTrackView::dragEnterEvent(QDragEnterEvent * event) {
if (event->mimeData()->hasFormat("kdenlive/clip")) {
+ m_clipDrag = true;
resetSelectionGroup();
- QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(";");
+ QStringList list = QString(event->mimeData()->data("kdenlive/clip")).split(';');
m_selectionGroup = new AbstractGroupItem(m_document->fps());
QPoint pos = QPoint();
DocClipBase *clip = m_document->getBaseClip(list.at(0));
scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
} else if (event->mimeData()->hasFormat("kdenlive/producerslist")) {
- QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(";");
+ m_clipDrag = true;
+ QStringList ids = QString(event->mimeData()->data("kdenlive/producerslist")).split(';');
m_scene->clearSelection();
resetSelectionGroup(false);
updateSnapPoints(NULL, offsetList);
scene()->addItem(m_selectionGroup);
event->acceptProposedAction();
- } else QGraphicsView::dragEnterEvent(event);
+ } else {
+ // the drag is not a clip (may be effect, ...)
+ m_clipDrag = false;
+ QGraphicsView::dragEnterEvent(event);
+ }
}
}
}
+void CustomTrackView::slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group) {
+ QList<QGraphicsItem *> itemList = group->childItems();
+ QUndoCommand *effectCommand = new QUndoCommand();
+ QString effectName;
+ QDomNode namenode = effect.elementsByTagName("name").item(0);
+ if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+ else effectName = i18n("effect");
+ effectCommand->setText(i18n("Add %1", effectName));
+ int count = 0;
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ ClipItem *item = (ClipItem *)itemList.at(i);
+ if (item->hasEffect(effect.attribute("tag"), effect.attribute("id")) != -1 && effect.attribute("unique", "0") != "0") {
+ emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
+ continue;
+ }
+ if (item->isItemLocked()) {
+ continue;
+ }
+ item->initEffect(effect);
+ if (effect.attribute("tag") == "ladspa") {
+ QString ladpsaFile = m_document->getLadspaFile();
+ initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect));
+ effect.setAttribute("src", ladpsaFile);
+ }
+ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
+ count++;
+ }
+ }
+ if (count > 0) {
+ m_commandStack->push(effectCommand);
+ m_document->setModified(true);
+ } else delete effectCommand;
+}
+
void CustomTrackView::slotAddEffect(QDomElement effect, GenTime pos, int track) {
QList<QGraphicsItem *> itemList;
+ QUndoCommand *effectCommand = new QUndoCommand();
+ QString effectName;
+ QDomNode namenode = effect.elementsByTagName("name").item(0);
+ if (!namenode.isNull()) effectName = i18n(namenode.toElement().text().toUtf8().data());
+ else effectName = i18n("effect");
+ effectCommand->setText(i18n("Add %1", effectName));
+ int count = 0;
if (track == -1) itemList = scene()->selectedItems();
if (itemList.isEmpty()) {
ClipItem *clip = getClipItemAt((int)pos.frames(m_document->fps()) + 1, track);
emit displayMessage(i18n("Effect already present in clip"), ErrorMessage);
continue;
}
+ if (item->isItemLocked()) {
+ continue;
+ }
item->initEffect(effect);
if (effect.attribute("tag") == "ladspa") {
QString ladpsaFile = m_document->getLadspaFile();
initEffects::ladspaEffectFile(ladpsaFile, effect.attribute("ladspaid").toInt(), getLadspaParams(effect));
effect.setAttribute("src", ladpsaFile);
}
- AddEffectCommand *command = new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true);
- m_commandStack->push(command);
+ new AddEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), effect, true, effectCommand);
+ count++;
}
}
- m_document->setModified(true);
+ if (count > 0) {
+ m_commandStack->push(effectCommand);
+ m_document->setModified(true);
+ } else delete effectCommand;
}
void CustomTrackView::slotDeleteEffect(ClipItem *clip, QDomElement effect) {
}
if (effectParams.paramValue("disabled") == "1") {
if (m_document->renderer()->mltRemoveEffect(track, pos, effectParams.paramValue("kdenlive_ix"), false)) {
- kDebug() << "////// DISABLING EFFECT: " << index << ", CURRENTLA: " << clip->selectedEffectIndex();
+ kDebug() << "////// DISABLING EFFECT: " << ix << ", CURRENTLA: " << clip->selectedEffectIndex();
} else emit displayMessage(i18n("Problem deleting effect"), ErrorMessage);
} else if (!m_document->renderer()->mltEditEffect(m_document->tracksCount() - clip->track(), clip->startPos(), effectParams))
emit displayMessage(i18n("Problem editing effect"), ErrorMessage);
if (dup->checkKeyFrames()) slotRefreshEffects(dup);
item->baseClip()->addReference();
m_document->updateClip(item->baseClip()->getId());
+ m_document->setModified(true);
kDebug() << "///////// CUTTING CLIP RESULT: (" << item->startPos().frames(25) << "-" << item->endPos().frames(25) << "), DUP: (" << dup->startPos().frames(25) << "-" << dup->endPos().frames(25) << ")" << ", CUT: " << cutTime.frames(25);
kDebug() << "// CUTTING CLIP dONE";
} else {
bool success = m_document->renderer()->mltResizeClipEnd(clipinfo, info.endPos - info.startPos);
if (success) {
item->resizeEnd((int) info.endPos.frames(m_document->fps()));
+ m_document->setModified(true);
} else
emit displayMessage(i18n("Error when resizing clip"), ErrorMessage);
}
}
-void CustomTrackView::slotAddTransition(ClipItem* clip, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
+void CustomTrackView::slotAddTransition(ClipItem* /*clip*/, ItemInfo transitionInfo, int endTrack, QDomElement transition) {
if (transitionInfo.startPos >= transitionInfo.endPos) {
emit displayMessage(i18n("Invalid transition"), ErrorMessage);
return;
}
}
-void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement params) {
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/) {
Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
if (!item) {
emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
void CustomTrackView::dragMoveEvent(QDragMoveEvent * event) {
event->setDropAction(Qt::IgnoreAction);
const QPointF pos = mapToScene(event->pos());
- if (m_selectionGroup) {
+ if (m_selectionGroup && m_clipDrag) {
m_selectionGroup->setPos(pos.x(), pos.y());
event->setDropAction(Qt::MoveAction);
- if (event->mimeData()->hasFormat("kdenlive/producerslist") || event->mimeData()->hasFormat("kdenlive/clip")) {
- event->acceptProposedAction();
- }
+ event->acceptProposedAction();
} else {
QGraphicsView::dragMoveEvent(event);
}
}
void CustomTrackView::dragLeaveEvent(QDragLeaveEvent * event) {
- if (m_selectionGroup) {
+ if (m_selectionGroup && m_clipDrag) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
qDeleteAll(items);
scene()->destroyItemGroup(m_selectionGroup);
}
void CustomTrackView::dropEvent(QDropEvent * event) {
- if (m_selectionGroup) {
+ if (m_selectionGroup && m_clipDrag) {
QList<QGraphicsItem *> items = m_selectionGroup->childItems();
resetSelectionGroup();
m_scene->clearSelection();
m_changeSpeedAction->setEnabled(hasVideoClip);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
groupSelectedItems(true);
- m_document->setModified(true);
} else QGraphicsView::dropEvent(event);
setFocus();
}
}
void CustomTrackView::setDuration(int duration) {
- if (duration > sceneRect().width())
- setSceneRect(0, 0, (duration + 100), sceneRect().height());
+ int diff = qAbs(duration - sceneRect().width());
+ if (diff * matrix().m11() > -50) {
+ if (matrix().m11() < 0.4) setSceneRect(0, 0, (duration + 100 / matrix().m11()), sceneRect().height());
+ else setSceneRect(0, 0, (duration + 300), sceneRect().height());
+ }
m_projectDuration = duration;
}
void CustomTrackView::deleteClip(const QString &clipId) {
QList<QGraphicsItem *> itemList = items();
+ QUndoCommand *deleteCommand = new QUndoCommand();
+ deleteCommand->setText(i18n("Delete timeline clips"));
+ int count = 0;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = (ClipItem *)itemList.at(i);
if (item->clipProducer() == clipId) {
- AddTimelineClipCommand *command = new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true);
- m_commandStack->push(command);
+ count++;
+ new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteCommand);
//delete item;
}
}
}
+
}
void CustomTrackView::setCursorPos(int pos, bool seek) {
m_dragItem = NULL;
return;
} 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);
if (m_selectionGroup->sceneBoundingRect().height() > m_tracksHeight) {
// We are moving all tracks
if (m_operationMode == MOVE) {
setCursor(Qt::OpenHandCursor);
- if (m_selectionGroup == NULL) {
+ if (m_dragItem->parentItem() == 0) {
// we are moving one clip, easy
if (m_dragItem->type() == AVWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
ClipItem *item = static_cast <ClipItem *>(m_dragItem);
m_commandStack->push(command);
emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(m_dragItemInfo.startPos.frames(m_document->fps()))), ErrorMessage);
}
+ m_document->setModified(true);
}
if (m_dragItem->type() == TRANSITIONWIDGET && (m_dragItemInfo.startPos != info.startPos || m_dragItemInfo.track != info.track)) {
Transition *transition = static_cast <Transition *>(m_dragItem);
} else {
// Moving several clips. We need to delete them and readd them to new position,
// or they might overlap each other during the move
-
- QList<QGraphicsItem *> items = m_selectionGroup->childItems();
+ QGraphicsItemGroup *group = static_cast <QGraphicsItemGroup *>(m_dragItem->parentItem());
+ QList<QGraphicsItem *> items = group->childItems();
QList<ItemInfo> clipsToMove = QList<ItemInfo> ();
QList<ItemInfo> transitionsToMove = QList<ItemInfo> ();
- GenTime timeOffset = GenTime(m_selectionGroup->scenePos().x(), m_document->fps()) - m_selectionGroupInfo.startPos;
- const int trackOffset = m_selectionGroup->track() - m_selectionGroupInfo.track;
+ GenTime timeOffset = GenTime(m_dragItem->scenePos().x(), m_document->fps()) - m_dragItemInfo.startPos;
+ const int trackOffset = m_dragItem->track() - m_dragItemInfo.track;
+ kDebug() << "// MOVED SEVERAL CLIPS" << timeOffset.frames(25);
if (timeOffset != GenTime() || trackOffset != 0) {
- QUndoCommand *moveClips = new QUndoCommand();
- moveClips->setText(i18n("Move group"));
// remove items in MLT playlist
+
+ // Expand groups
+ int max = items.count();
+ for (int i = 0; i < max; i++) {
+ if (items.at(i)->type() == GROUPWIDGET) {
+ items += items.at(i)->childItems();
+ }
+ }
+
for (int i = 0; i < items.count(); i++) {
+ if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
ItemInfo info = item->info();
if (item->type() == AVWIDGET) {
for (int i = 0; i < items.count(); i++) {
// re-add items in correct place
+ if (items.at(i)->type() != AVWIDGET && items.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(items.at(i));
item->updateItem();
ItemInfo info = item->info();
int tracknumber = m_document->tracksCount() - info.track - 1;
bool isLocked = m_document->trackInfoAt(tracknumber).isLocked;
if (isLocked) {
- m_selectionGroup->removeFromGroup(item);
+ group->removeFromGroup(item);
item->setItemLocked(true);
}
}
}
- new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false, moveClips);
- m_commandStack->push(moveClips);
+ MoveGroupCommand *move = new MoveGroupCommand(this, clipsToMove, transitionsToMove, timeOffset, trackOffset, false);
+ m_commandStack->push(move);
- QPointF top = m_selectionGroup->sceneBoundingRect().topLeft();
+ //QPointF top = group->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();
+ //group->setPos(top);
+ //TODO: get rid of the 3 lines below
+ if (m_selectionGroup) {
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
+ }
+ m_document->setModified(true);
}
}
}
emit transitionItemSelected((m_dragItem && m_dragItem->type() == TRANSITIONWIDGET && m_dragItem->isSelected()) ? static_cast <Transition *>(m_dragItem) : NULL);
- m_document->setModified(true);
+ if (m_operationMode != NONE && m_operationMode != MOVE) m_document->setModified(true);
m_operationMode = NONE;
}
}
QUndoCommand *deleteSelected = new QUndoCommand();
deleteSelected->setText(i18n("Delete selected items"));
+ bool resetGroup = false;
for (int i = 0; i < itemList.count(); i++) {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
+ if (item->parentItem()) resetGroup = true;
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), true, true, deleteSelected);
} else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
Transition *item = static_cast <Transition *>(itemList.at(i));
+ if (item->parentItem()) resetGroup = true;
ItemInfo info;
info.startPos = item->startPos();
info.endPos = item->endPos();
}
}
m_commandStack->push(deleteSelected);
+ if (resetGroup) resetSelectionGroup();
}
void CustomTrackView::changeClipSpeed() {
if (itemList.at(i)->type() == AVWIDGET) {
ClipItem *item = static_cast <ClipItem *>(itemList.at(i));
ItemInfo info = item->info();
- if (percent == -1) percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 300, 1, &ok);
+ if (percent == -1) percent = QInputDialog::getInteger(this, i18n("Edit Clip Speed"), i18n("New speed (percents)"), item->speed() * 100, 1, 10000, 1, &ok);
if (!ok) break;
double speed = (double) percent / 100.0;
if (item->speed() != speed && (item->clipType() == VIDEO || item->clipType() == AV)) {
}
info.track = m_document->tracksCount() - item->track();
int endPos = m_document->renderer()->mltChangeClipSpeed(info, speed, oldspeed, baseclip->producer());
- kDebug() << "//CH CLIP SPEED: " << speed << "x" << oldspeed << ", END POS: " << endPos;
- item->setSpeed(speed);
- 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);
+ if (endPos >= 0) {
+ item->setSpeed(speed);
+ 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);
+ } else emit displayMessage(i18n("Invalid clip"), ErrorMessage);
}
void CustomTrackView::cutSelectedClips() {
}
}
+void CustomTrackView::groupClips(bool group) {
+ QList<QGraphicsItem *> itemList = scene()->selectedItems();
+ QList <ItemInfo> clipInfos;
+ QList <ItemInfo> transitionInfos;
+ GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
+
+ // Expand groups
+ int max = itemList.count();
+ for (int i = 0; i < max; i++) {
+ if (itemList.at(i)->type() == GROUPWIDGET) {
+ itemList += itemList.at(i)->childItems();
+ }
+ }
+
+ for (int i = 0; i < itemList.count(); i++) {
+ if (itemList.at(i)->type() == AVWIDGET) {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
+ if (!clip->isItemLocked()) clipInfos.append(clip->info());
+ } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
+ AbstractClipItem *clip = static_cast <AbstractClipItem *>(itemList.at(i));
+ if (!clip->isItemLocked()) transitionInfos.append(clip->info());
+ }
+ }
+ if (clipInfos.count() > 0) {
+ GroupClipsCommand *command = new GroupClipsCommand(this, clipInfos, transitionInfos, group, true);
+ m_commandStack->push(command);
+ }
+}
+
+void CustomTrackView::doGroupClips(QList <ItemInfo> clipInfos, QList <ItemInfo> transitionInfos, bool group) {
+ resetSelectionGroup();
+ m_scene->clearSelection();
+ if (!group) {
+ for (int i = 0; i < clipInfos.count(); i++) {
+ ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
+ if (clip == NULL) continue;
+ if (clip->parentItem()) scene()->destroyItemGroup(static_cast <QGraphicsItemGroup *>(clip->parentItem()));
+ clip->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ }
+ for (int i = 0; i < transitionInfos.count(); i++) {
+ Transition *tr = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
+ if (tr == NULL) continue;
+ if (tr->parentItem()) scene()->destroyItemGroup(static_cast <QGraphicsItemGroup *>(tr->parentItem()));
+ tr->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+ }
+ m_document->setModified(true);
+ return;
+ }
+
+ QList <QGraphicsItemGroup *> groups;
+ for (int i = 0; i < clipInfos.count(); i++) {
+ ClipItem *clip = getClipItemAt(clipInfos.at(i).startPos, clipInfos.at(i).track);
+ if (clip) {
+ clip->setSelected(true);
+ }
+ }
+ for (int i = 0; i < transitionInfos.count(); i++) {
+ Transition *clip = getTransitionItemAt(transitionInfos.at(i).startPos, transitionInfos.at(i).track);
+ if (clip) {
+ clip->setSelected(true);
+ }
+ }
+
+ groupSelectedItems(false, true);
+ m_document->setModified(true);
+}
+
void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects) {
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
if (baseclip == NULL) {
for (int i = 0; i < item->effectsCount(); i++) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
}
+ m_document->setModified(true);
m_document->renderer()->doRefresh();
}
}
}
KdenliveSettings::setSnaptopoints(snap);
+ m_document->setModified(true);
} else {
// undo last move and emit error message
emit displayMessage(i18n("Cannot move clip to position %1", m_document->timecode().getTimecodeFromFrames(end.startPos.frames(m_document->fps()))), ErrorMessage);
kDebug() << "// GROUP MOVE; OFFSET: " << offset.frames(25) << ", TK OFF: " << trackOffset;
resetSelectionGroup();
m_scene->clearSelection();
+ QList <QGraphicsItemGroup *> groups;
for (int i = 0; i < startClip.count(); i++) {
if (reverseMove) {
startClip[i].startPos = startClip.at(i).startPos - offset;
ClipItem *clip = getClipItemAt(startClip.at(i).startPos, startClip.at(i).track);
if (clip) {
clip->setItemLocked(false);
- clip->setSelected(true);
+ if (clip->parentItem()) clip->parentItem()->setSelected(true);
+ else clip->setSelected(true);
m_document->renderer()->mltRemoveClip(m_document->tracksCount() - startClip.at(i).track, startClip.at(i).startPos);
}
}
Transition *tr = getTransitionItemAt(startTransition.at(i).startPos, startTransition.at(i).track);
if (tr) {
tr->setItemLocked(false);
- tr->setSelected(true);
+ if (tr->parentItem()) tr->parentItem()->setSelected(true);
+ else tr->setSelected(true);
m_document->renderer()->mltDeleteTransition(tr->transitionTag(), tr->transitionEndTrack(), m_document->tracksCount() - startTransition.at(i).track, startTransition.at(i).startPos, startTransition.at(i).endPos, tr->toXML());
}
}
- groupSelectedItems();
+ groupSelectedItems(true);
if (m_selectionGroup) {
QPointF pos = m_selectionGroup->pos();
qreal posx = pos.x() + offset.frames(m_document->fps());
m_selectionGroupInfo.track = m_selectionGroup->track();
QList<QGraphicsItem *> children = m_selectionGroup->childItems();
+ kDebug() << "// GRP MOVE; FOUND CHILDREN:" << children.count();
+
+ // Expand groups
+ int max = children.count();
+ for (int i = 0; i < max; i++) {
+ if (children.at(i)->type() == GROUPWIDGET) {
+ children += children.at(i)->childItems();
+ }
+ }
for (int i = 0; i < children.count(); i++) {
// re-add items in correct place
+ if (children.at(i)->type() != AVWIDGET && children.at(i)->type() != TRANSITIONWIDGET) continue;
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
item->updateItem();
ItemInfo info = item->info();
QUndoCommand *deleteAll = new QUndoCommand();
deleteAll->setText("Delete all guides");
for (int i = 0; i < m_guides.count(); i++) {
- EditGuideCommand *command = new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll);
+ new EditGuideCommand(this, m_guides.at(i)->position(), m_guides.at(i)->label(), GenTime(), QString(), true, deleteAll);
}
m_commandStack->push(deleteAll);
}
delete m_animation;
m_animation = NULL;
}
- /*double pos = cursorPos() / m_scale;
- m_scale = scaleFactor;
- m_scene->setScale(m_scale);
- int vert = verticalScrollBar()->value();
- kDebug() << " HHHHHHHH SCALING: " << m_scale;
- QList<QGraphicsItem *> itemList = items();
- for (int i = 0; i < itemList.count(); i++) {
- if (itemList.at(i)->type() == AVWIDGET || itemList.at(i)->type() == TRANSITIONWIDGET) {
- AbstractClipItem *clip = (AbstractClipItem *)itemList.at(i);
- clip->setRect(0, 0, (qreal) clip->duration().frames(m_document->fps()) * m_scale - .5, clip->rect().height());
- clip->setPos((qreal) clip->startPos().frames(m_document->fps()) * m_scale, clip->pos().y());
- }
- }
- for (int i = 0; i < m_guides.count(); i++) {
- m_guides.at(i)->updatePosition(m_scale);
+ //setSceneRect(0, 0, m_projectDuration + 100 * scaleFactor, sceneRect().height());
+ setMatrix(matrix);
+ int diff = sceneRect().width() - m_projectDuration;
+ if (diff * matrix.m11() < 50) {
+ if (matrix.m11() < 0.4) setSceneRect(0, 0, (m_projectDuration + 100 / matrix.m11()), sceneRect().height());
+ else setSceneRect(0, 0, (m_projectDuration + 300), sceneRect().height());
}
- setSceneRect(0, 0, (m_projectDuration + 100) * m_scale, sceneRect().height());
- updateCursorPos();*/
- setMatrix(matrix);
centerOn(QPointF(cursorPos(), m_tracksHeight));
//verticalScrollBar()->setValue(vert);*/
}
}
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)
+ if (clips.at(i)->type() == AVWIDGET) {
item = static_cast < ClipItem *>(clips.at(i));
- if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos) return item;
+ if (item->startPos().frames(m_document->fps()) <= m_cursorPos && item->endPos().frames(m_document->fps()) >= m_cursorPos)
+ return item;
+ }
}
}
return NULL;
projects / kdenlive / blobdiff