for (int i = 0; i < list.count(); i++) {
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);
+ else if (list.at(i)->data().toString() == "A") m_audioActions.append(list.at(i));
+ else if (list.at(i)->data().toString() == "A+V") m_avActions.append(list.at(i));
}
m_timelineContextTransitionMenu = transition;
m_dragGuide = NULL;
if (m_tool != RAZORTOOL) activateMonitor();
- else if (m_document->renderer()->playSpeed() != 0.0) {
+ else if (m_document->renderer()->isPlaying()) {
m_document->renderer()->pause();
return;
}
if (selected == false) {
m_dragItem = NULL;
}
- groupSelectedItems(QList <QGraphicsItem*>(), false, false, true);
+ groupSelectedItems(QList <QGraphicsItem*>(), false, true);
if (m_dragItem) {
ClipItem *clip = static_cast <ClipItem *>(m_dragItem);
updateClipTypeActions(dragGroup == NULL ? clip : NULL);
group->removeFromGroup(children.at(i));
}*/
scene()->destroyItemGroup(group);
- groupSelectedItems(children, false, true, true);
+ groupSelectedItems(children, true, true);
}
}
}
}
-void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool force, bool createNewGroup, bool selectNewGroup)
+void CustomTrackView::groupSelectedItems(QList <QGraphicsItem *> selection, bool createNewGroup, bool selectNewGroup)
{
if (m_selectionGroup) {
kDebug() << "///// ERROR, TRYING TO OVERRIDE EXISTING GROUP";
}
}
if (itemsList.isEmpty() && groupsList.isEmpty()) return;
- if (itemsList.count() == 1) {
+ if (itemsList.count() == 1 && groupsList.isEmpty()) {
// only one item selected:
QSetIterator<QGraphicsItem *> it(itemsList);
m_dragItem = static_cast<AbstractClipItem *>(it.next());
m_dragItem->setSelected(true);
+ return;
}
-
+
QRectF rectUnion;
// Find top left position of selection
foreach (const QGraphicsItemGroup *value, groupsList) {
foreach (const QGraphicsItem *value, itemsList) {
rectUnion = rectUnion.united(value->sceneBoundingRect());
}
- if (force || selection.count() > 1) {
- bool snap = KdenliveSettings::snaptopoints();
- KdenliveSettings::setSnaptopoints(false);
- if (createNewGroup) {
- AbstractGroupItem *newGroup = m_document->clipManager()->createGroup();
- newGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
- QPointF diff = newGroup->pos();
- newGroup->translate(-diff.x(), -diff.y());
- //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1);
-
- scene()->addItem(newGroup);
- // Check if we are trying to include a group in a group
- foreach (QGraphicsItemGroup *value, groupsList) {
- QList<QGraphicsItem *> children = value->childItems();
- for (int i = 0; i < children.count(); i++) {
- if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)
- itemsList.insert(children.at(i));
- }
- AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(value);
- m_document->clipManager()->removeGroup(grp);
- scene()->destroyItemGroup(grp);
+ bool snap = KdenliveSettings::snaptopoints();
+ KdenliveSettings::setSnaptopoints(false);
+ if (createNewGroup) {
+ AbstractGroupItem *newGroup = m_document->clipManager()->createGroup();
+ newGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
+ QPointF diff = newGroup->pos();
+ newGroup->translate(-diff.x(), -diff.y());
+ //newGroup->translate((int) -rectUnion.left(), (int) -rectUnion.top() + 1);
+
+ scene()->addItem(newGroup);
+ // Check if we are trying to include a group in a group
+ foreach (QGraphicsItemGroup *value, groupsList) {
+ QList<QGraphicsItem *> children = value->childItems();
+ for (int i = 0; i < children.count(); i++) {
+ if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET)
+ itemsList.insert(children.at(i));
}
+ AbstractGroupItem *grp = static_cast<AbstractGroupItem *>(value);
+ m_document->clipManager()->removeGroup(grp);
+ scene()->destroyItemGroup(grp);
+ }
- foreach (QGraphicsItem *value, itemsList) {
- newGroup->addItem(value);
- }
- KdenliveSettings::setSnaptopoints(snap);
- if (selectNewGroup) newGroup->setSelected(true);
- } else {
- m_selectionGroup = new AbstractGroupItem(m_document->fps());
- m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
- QPointF diff = m_selectionGroup->pos();
- //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1);
- m_selectionGroup->translate(- diff.x(), -diff.y());
+ foreach (QGraphicsItem *value, itemsList) {
+ newGroup->addItem(value);
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ if (selectNewGroup) newGroup->setSelected(true);
+ } else {
+ m_selectionGroup = new AbstractGroupItem(m_document->fps());
+ m_selectionGroup->setPos(rectUnion.left(), rectUnion.top() - 1);
+ QPointF diff = m_selectionGroup->pos();
+ //m_selectionGroup->translate((int) - rectUnion.left(), (int) -rectUnion.top() + 1);
+ m_selectionGroup->translate(- diff.x(), -diff.y());
- scene()->addItem(m_selectionGroup);
- foreach (QGraphicsItemGroup *value, groupsList) {
- m_selectionGroup->addItem(value);
- }
- foreach (QGraphicsItem *value, itemsList) {
- m_selectionGroup->addItem(value);
- }
- KdenliveSettings::setSnaptopoints(snap);
- if (m_selectionGroup) {
- m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
- m_selectionGroupInfo.track = m_selectionGroup->track();
- if (selectNewGroup) m_selectionGroup->setSelected(true);
- }
+ scene()->addItem(m_selectionGroup);
+ foreach (QGraphicsItemGroup *value, groupsList) {
+ m_selectionGroup->addItem(value);
+ }
+ foreach (QGraphicsItem *value, itemsList) {
+ m_selectionGroup->addItem(value);
+ }
+ KdenliveSettings::setSnaptopoints(snap);
+ if (m_selectionGroup) {
+ m_selectionGroupInfo.startPos = GenTime(m_selectionGroup->scenePos().x(), m_document->fps());
+ m_selectionGroupInfo.track = m_selectionGroup->track();
+ if (selectNewGroup) m_selectionGroup->setSelected(true);
}
- } else resetSelectionGroup();
+ }
}
void CustomTrackView::mouseDoubleClickEvent(QMouseEvent *event)
//build go to marker menu
if (item->baseClip()) {
QList <CommentedTime> markers = item->baseClip()->commentedSnapMarkers();
- int offset = item->startPos().frames(m_document->fps());
+ int offset = (item->startPos()- item->cropStart()).frames(m_document->fps());
if (!markers.isEmpty()) {
for (int i = 0; i < markers.count(); i++) {
int pos = (int) markers.at(i).time().frames(m_document->timecode().fps());
m_document->updateClip(item->baseClip()->getId());
setDocumentModified();
KdenliveSettings::setSnaptopoints(snap);
- if (execute && item->isSelected())
- emit clipItemSelected(item);
+ if (execute && item->isSelected()) {
+ m_scene->clearSelection();
+ dup->setSelected(true);
+ m_dragItem = dup;
+ emit clipItemSelected(dup);
+ }
return dup;
} else {
// uncut clip
if (item->baseClip()->isTransparent() && getTransitionItemAtStart(info.startPos, info.track) == NULL) {
// add transparency transition
- QDomElement trans = MainWindow::transitions.getEffectByTag("composite", "composite").cloneNode().toElement();
+ QDomElement trans = MainWindow::transitions.getEffectByTag("affine", QString()).cloneNode().toElement();
new AddTransitionCommand(this, info, getPreviousVideoTrack(info.track), trans, false, true, addCommand);
}
item->setSelected(true);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
if (items.count() > 1) {
- groupSelectedItems(items, true);
+ groupSelectedItems(items);
} else if (items.count() == 1) {
m_dragItem = static_cast <AbstractClipItem *>(items.at(0));
emit clipItemSelected((ClipItem*) m_dragItem, false);
resetSelectionGroup();
QList<QGraphicsItem *> itemList = items();
QUndoCommand *deleteCommand = new QUndoCommand();
+ new RefreshMonitorCommand(this, false, true, deleteCommand);
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) {
- count++;
+ count++;
if (item->parentItem()) {
- // Clip is in a group, destroy the group
- new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, deleteCommand);
+ // Clip is in a group, destroy the group
+ new GroupClipsCommand(this, QList<ItemInfo>() << item->info(), QList<ItemInfo>(), false, deleteCommand);
}
new AddTimelineClipCommand(this, item->xml(), item->clipProducer(), item->info(), item->effectList(), false, false, true, true, deleteCommand);
}
}
}
- deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count));
if (count == 0) {
delete deleteCommand;
} else {
+ deleteCommand->setText(i18np("Delete timeline clip", "Delete timeline clips", count));
+ new RefreshMonitorCommand(this, true, false, deleteCommand);
updateTrackDuration(-1, deleteCommand);
- new RefreshMonitorCommand(this, false, deleteCommand);
m_commandStack->push(deleteCommand);
}
- m_document->renderer()->doRefresh();
}
void CustomTrackView::seekCursorPos(int pos)
}
scene()->clearSelection();
QUndoCommand *deleteSelected = new QUndoCommand();
+ new RefreshMonitorCommand(this, false, true, deleteSelected);
int groupCount = 0;
int clipCount = 0;
deleteSelected->setText(i18np("Delete selected transition", "Delete selected transitions", transitionCount));
else deleteSelected->setText(i18n("Delete selected items"));
updateTrackDuration(-1, deleteSelected);
- new RefreshMonitorCommand(this, false, deleteSelected);
+ new RefreshMonitorCommand(this, true, false, deleteSelected);
m_commandStack->push(deleteSelected);
- m_document->renderer()->doRefresh();
}
//clip->setSelected(true);
}
}
- groupSelectedItems(list, false, true, true);
+ groupSelectedItems(list, true, true);
setDocumentModified();
}
m_document->renderer()->mltAddEffect(info.track, info.startPos, getEffectArgs(item->effect(i)), false);
}
setDocumentModified();
- if (refresh)
+ if (refresh) {
m_document->renderer()->doRefresh();
+ }
if (!baseclip->isPlaceHolder())
m_waitingThumbs.append(item);
m_thumbsTimer.start();
}
QUndoCommand *pasteClips = new QUndoCommand();
pasteClips->setText("Paste clips");
+ new RefreshMonitorCommand(this, false, true, pasteClips);
for (int i = 0; i < m_copiedItems.count(); i++) {
// parse all clip names
}
}
updateTrackDuration(-1, pasteClips);
- new RefreshMonitorCommand(this, false, pasteClips);
+ new RefreshMonitorCommand(this, false, false, pasteClips);
m_commandStack->push(pasteClips);
}
if (clip) list.append(clip);//clip->setSelected(true);
}
}
- groupSelectedItems(list, false, true);
+ groupSelectedItems(list, true);
}
}
videoIx++;
}
}
- groupSelectedItems(QList <QGraphicsItem*>()<<clip<<audioClip, false, true);
+ groupSelectedItems(QList <QGraphicsItem*>()<<clip<<audioClip, true);
}
}
} else {
void CustomTrackView::updateClipTypeActions(ClipItem *clip)
{
+ bool hasAudio;
+ bool hasAV;
if (clip == NULL || (clip->clipType() != AV && clip->clipType() != PLAYLIST)) {
m_clipTypeGroup->setEnabled(false);
+ hasAudio = clip != NULL && clip->clipType() == AUDIO;
+ hasAV = false;
} else {
+ switch (clip->clipType()) {
+ case AV:
+ case PLAYLIST:
+ hasAudio = true;
+ hasAV = true;
+ break;
+ case AUDIO:
+ hasAudio = true;
+ hasAV = false;
+ break;
+ default:
+ hasAudio = false;
+ hasAV = false;
+ }
m_clipTypeGroup->setEnabled(true);
QList <QAction *> actions = m_clipTypeGroup->actions();
QString lookup;
}
}
}
+
+ for (int i = 0; i < m_audioActions.count(); i++) {
+ m_audioActions.at(i)->setEnabled(hasAudio);
+ }
+ for (int i = 0; i < m_avActions.count(); i++) {
+ m_avActions.at(i)->setEnabled(hasAV);
+ }
}
void CustomTrackView::slotGoToMarker(QAction *action)
children.at(j)->setSelected(true);
}
}*/
- groupSelectedItems(children, true, true);
+ groupSelectedItems(children, true);
} else if (itemList.at(i)->type() == GUIDEITEM) {
Guide *g = static_cast<Guide *>(itemList.at(i));
g->updatePos();
list.append(selection.at(i));
}
}
- groupSelectedItems(list, false, false, true);
+ groupSelectedItems(list, false, true);
}
void CustomTrackView::slotSelectAllClips()
{
m_scene->clearSelection();
resetSelectionGroup();
- groupSelectedItems(m_scene->items(), false, false, true);
+ groupSelectedItems(m_scene->items(), false, true);
}
void CustomTrackView::selectClip(bool add, bool group, int track, int pos)
{
QMap<int, QDomElement> effects = item->adjustEffectsToDuration(m_document->width(), m_document->height(), oldInfo);
- if (effects.count()) {
+ if (!effects.isEmpty()) {
QMap<int, QDomElement>::const_iterator i = effects.constBegin();
while (i != effects.constEnd()) {
new EditEffectCommand(this, m_document->tracksCount() - item->track(), item->startPos(), i.value(), item->effect(i.key()), i.value().attribute("kdenlive_ix").toInt(), true, true, command);
projects / kdenlive / blobdiff