#include "insertspacecommand.h"
#include "spacerdialog.h"
#include "addtrackcommand.h"
-#include "changetrackcommand.h"
#include "movegroupcommand.h"
#include "ui_addtrack_ui.h"
#include "initeffects.h"
#include "splitaudiocommand.h"
#include "changecliptypecommand.h"
#include "trackdialog.h"
+#include "tracksconfigdialog.h"
+#include "configtrackscommand.h"
#include <KDebug>
#include <KLocale>
setLineWidth(0);
//setCacheMode(QGraphicsView::CacheBackground);
//setViewportUpdateMode(QGraphicsView::FullViewportUpdate);
+ setViewportUpdateMode(QGraphicsView::SmartViewportUpdate);
+ pixmapCache = new KPixmapCache("kdenlive-thumbs");
KdenliveSettings::setTrackheight(m_tracksHeight);
m_animationTimer = new QTimeLine(800);
m_animationTimer->setFrameRange(0, 5);
m_timelineContextMenu = timeline;
m_timelineContextClipMenu = clip;
m_clipTypeGroup = clipTypeGroup;
+ connect(m_timelineContextMenu, SIGNAL(aboutToHide()), this, SLOT(slotResetMenuPosition()));
m_markerMenu = new QMenu(i18n("Go to marker..."), this);
m_markerMenu->setEnabled(false);
m_timelineContextMenu->addAction(m_editGuide);
}
+void CustomTrackView::slotDoResetMenuPosition()
+{
+ m_menuPosition = QPoint();
+}
+
+void CustomTrackView::slotResetMenuPosition()
+{
+ // after a short time (so that the action is triggered / or menu is closed, we reset the menu pos
+ QTimer::singleShot(300, this, SLOT(slotDoResetMenuPosition()));
+}
+
void CustomTrackView::checkAutoScroll()
{
m_autoScroll = KdenliveSettings::autoscroll();
while (!m_dragGuide && ct < collisionList.count()) {
if (collisionList.at(ct)->type() == AVWIDGET || collisionList.at(ct)->type() == TRANSITIONWIDGET) {
collisionClip = static_cast <AbstractClipItem *>(collisionList.at(ct));
- if (collisionClip == m_dragItem) {
+ if (collisionClip->isItemLocked())
+ break;
+ if (collisionClip == m_dragItem)
collisionClip = NULL;
- } else m_dragItem = collisionClip;
+ else
+ m_dragItem = collisionClip;
found = true;
m_dragItemInfo = m_dragItem->info();
if (m_dragItem->parentItem() && m_dragItem->parentItem()->type() == GROUPWIDGET && m_dragItem->parentItem() != m_selectionGroup) {
AddTimelineClipCommand *command = new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), pasteInfo, EffectsList(), m_scene->editMode() == OVERWRITEEDIT, m_scene->editMode() == INSERTEDIT, true, false);
m_commandStack->push(command);
+
+ selectClip(true, false);
+ // Automatic audio split
+ if (KdenliveSettings::splitaudio())
+ splitAudio();
}
bool CustomTrackView::insertDropClips(const QMimeData *data, const QPoint pos)
if (transitionClip && transitionClip->baseClip()) {
QString size = transitionClip->baseClip()->getProperty("frame_size");
double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+ if (factor == 0) factor = 1.0;
p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
p.setY(size.section('x', 1, 1).toInt());
}
brokenClips.clear();
if (addCommand->childCount() > 0) m_commandStack->push(addCommand);
else delete addCommand;
+
+ // Automatic audio split
+ if (KdenliveSettings::splitaudio())
+ splitAudio();
setDocumentModified();
/*
//QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
}
-void CustomTrackView::changeTrack(int ix, TrackInfo type)
+void CustomTrackView::configTracks(QList < TrackInfo > trackInfos)
{
- int tracknumber = m_document->tracksCount() - ix;
- m_document->setTrackType(tracknumber - 1, type);
- m_document->renderer()->mltChangeTrackState(tracknumber, m_document->trackInfoAt(tracknumber - 1).isMute, m_document->trackInfoAt(tracknumber - 1).isBlind);
+ for (int i = 0; i < trackInfos.count(); ++i) {
+ m_document->setTrackType(i, trackInfos.at(i));
+ m_document->renderer()->mltChangeTrackState(i + 1, m_document->trackInfoAt(i).isMute, m_document->trackInfoAt(i).isBlind);
+ }
+
QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
viewport()->update();
}
-
void CustomTrackView::slotSwitchTrackAudio(int ix)
{
/*for (int i = 0; i < m_document->tracksCount(); i++)
int tracknumber = m_document->tracksCount() - ix - 1;
m_document->switchTrackLock(tracknumber, lock);
emit doTrackLock(ix, lock);
+ AbstractClipItem *clip = NULL;
QList<QGraphicsItem *> selection = m_scene->items(0, ix * m_tracksHeight + m_tracksHeight / 2, sceneRect().width(), m_tracksHeight / 2 - 2);
for (int i = 0; i < selection.count(); i++) {
if (selection.at(i)->type() == AVWIDGET) emit clipItemSelected(NULL);
else emit transitionItemSelected(NULL);
}
- static_cast <AbstractClipItem *>(selection.at(i))->setItemLocked(lock);
+ clip = static_cast <AbstractClipItem *>(selection.at(i));
+ clip->setItemLocked(lock);
+ if (clip == m_dragItem)
+ m_dragItem = NULL;
}
kDebug() << "NEXT TRK STATE: " << m_document->trackInfoAt(tracknumber).isLocked;
viewport()->update();
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight);
}
+ if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) {
+ emit displayMessage(i18n("Cannot remove space in a locked track"), ErrorMessage);
+ return;
+ }
+
ClipItem *item = getClipItemAt(pos, track);
if (item) {
emit displayMessage(i18n("You must be in an empty space to remove space (time: %1, track: %2)", m_document->timecode().getTimecodeFromFrames(mapToScene(m_menuPosition).x()), track), ErrorMessage);
pos = GenTime((int)(mapToScene(m_menuPosition).x()), m_document->fps());
track = (int)(mapToScene(m_menuPosition).y() / m_tracksHeight) + 1;
}
- SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount(), this);
+ SpacerDialog d(GenTime(65, m_document->fps()), m_document->timecode(), track, m_document->tracksCount() + 1, this);
if (d.exec() != QDialog::Accepted) return;
GenTime spaceDuration = d.selectedDuration();
track = d.selectedTrack();
+ // TODO: Make "All Tracks" work
+ if (track == -1)
+ return;
+
+ if (m_document->isTrackLocked(m_document->tracksCount() - track - 1)) {
+ emit displayMessage(i18n("Cannot insert space in a locked track"), ErrorMessage);
+ return;
+ }
+
ClipItem *item = getClipItemAt(pos, track);
if (item) pos = item->startPos();
if (transitionClip && transitionClip->baseClip()) {
QString size = transitionClip->baseClip()->getProperty("frame_size");
double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+ if (factor == 0) factor = 1.0;
p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
p.setY(size.section('x', 1, 1).toInt());
}
if (itemList.at(i)->type() == GROUPWIDGET) {
groupCount++;
QList<QGraphicsItem *> children = itemList.at(i)->childItems();
- itemList += children;
QList <ItemInfo> clipInfos;
QList <ItemInfo> transitionInfos;
GenTime currentPos = GenTime(m_cursorPos, m_document->fps());
AbstractClipItem *clip = static_cast <AbstractClipItem *>(children.at(j));
if (!clip->isItemLocked()) transitionInfos.append(clip->info());
}
+ if (itemList.contains(children.at(j))) {
+ children.removeAt(j);
+ j--;
+ }
}
- if (clipInfos.count() > 0) {
+ itemList += children;
+ if (clipInfos.count() > 0)
new GroupClipsCommand(this, clipInfos, transitionInfos, false, deleteSelected);
- }
- }
+
+ } else if (itemList.at(i)->parentItem() && itemList.at(i)->parentItem()->type() == GROUPWIDGET)
+ itemList.insert(i + 1, itemList.at(i)->parentItem());
}
for (int i = 0; i < itemList.count(); i++) {
if (transitionClip && transitionClip->baseClip()) {
QString size = transitionClip->baseClip()->getProperty("frame_size");
double factor = transitionClip->baseClip()->getProperty("aspect_ratio").toDouble();
+ if (factor == 0) factor = 1.0;
p.setX((int)(size.section('x', 0, 0).toInt() * factor + 0.5));
p.setY(size.section('x', 1, 1).toInt());
}
goMenu->clear();
double fps = m_document->fps();
for (int i = 0; i < m_guides.count(); i++) {
- act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
- act->setData(m_guides.at(i)->position().frames(m_document->fps()));
+ act = goMenu->addAction(m_guides.at(i)->label() + "/" + Timecode::getStringTimecode(m_guides.at(i)->position().frames(fps), fps));
+ act->setData(m_guides.at(i)->position().frames(m_document->fps()));
}
goMenu->setEnabled(!m_guides.isEmpty());
}
QPoint position;
if (m_menuPosition.isNull()) {
position = mapFromGlobal(QCursor::pos());
- if (!underMouse() || position.y() > m_tracksHeight * m_document->tracksCount()) {
+ if (!contentsRect().contains(position) || mapToScene(position).y() / m_tracksHeight > m_document->tracksCount()) {
emit displayMessage(i18n("Cannot paste selected clips"), ErrorMessage);
return;
}
}
}
-void CustomTrackView::slotChangeTrack(int ix)
+void CustomTrackView::slotConfigTracks(int ix)
{
- TrackDialog d(m_document, parentWidget());
- d.label->setText(i18n("Change track"));
- d.before_select->setHidden(true);
- d.track_nb->setMaximum(m_document->tracksCount() - 1);
- d.track_nb->setValue(ix);
- d.slotUpdateName(ix);
- d.setWindowTitle(i18n("Change Track Type"));
-
- TrackInfo oldInfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
- if (oldInfo.type == VIDEOTRACK)
- d.video_track->setChecked(true);
- else
- d.audio_track->setChecked(true);
-
+ TracksConfigDialog d(m_document, ix, parentWidget());
if (d.exec() == QDialog::Accepted) {
- TrackInfo info;
- info.isLocked = false;
- info.isMute = false;
- info.trackName = oldInfo.trackName;
- ix = d.track_nb->value();
-
- if (d.video_track->isChecked()) {
- info.type = VIDEOTRACK;
- info.isBlind = false;
- } else {
- info.type = AUDIOTRACK;
- info.isBlind = true;
- }
- changeTimelineTrack(ix, info);
+ ConfigTracksCommand *configTracks = new ConfigTracksCommand(this, m_document->tracksList(), d.tracksList());
+ m_commandStack->push(configTracks);
setDocumentModified();
}
}
-
void CustomTrackView::deleteTimelineTrack(int ix, TrackInfo trackinfo)
{
double startY = ix * m_tracksHeight + 1 + m_tracksHeight / 2;
m_commandStack->push(deleteTrack);
}
-void CustomTrackView::changeTimelineTrack(int ix, TrackInfo trackinfo)
-{
- TrackInfo oldinfo = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
- ChangeTrackCommand *changeTrack = new ChangeTrackCommand(this, ix, oldinfo, trackinfo);
- m_commandStack->push(changeTrack);
-}
-
void CustomTrackView::autoTransition()
{
QList<QGraphicsItem *> itemList = scene()->selectedItems();
}
}
-
void CustomTrackView::loadGroups(const QDomNodeList groups)
{
for (int i = 0; i < groups.count(); i++) {
resetSelectionGroup();
QList<QGraphicsItem *> selection = scene()->selectedItems();
if (selection.isEmpty()) {
- emit displayMessage(i18n("You must select one clip for this action"), ErrorMessage);
+ emit displayMessage(i18n("You must select at least one clip for this action"), ErrorMessage);
return;
}
QUndoCommand *splitCommand = new QUndoCommand();
}
}
}
- m_commandStack->push(splitCommand);
+ if (splitCommand->childCount() > 0)
+ m_commandStack->push(splitCommand);
}
void CustomTrackView::doSplitAudio(const GenTime &pos, int track, bool split)
int freetrack = m_document->tracksCount() - track - 1;
for (; freetrack > 0; freetrack--) {
kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
- if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK) {
+ if (m_document->trackInfoAt(freetrack - 1).type == AUDIOTRACK && !m_document->trackInfoAt(freetrack - 1).isLocked) {
kDebug() << "// CHK DOC TRK:" << freetrack << ", DUR:" << m_document->renderer()->mltTrackDuration(freetrack);
if (m_document->renderer()->mltTrackDuration(freetrack) < start || m_document->renderer()->mltGetSpaceLength(pos, freetrack, false) >= clip->cropDuration().frames(m_document->fps())) {
kDebug() << "FOUND SPACE ON TRK: " << freetrack;
viewport()->update();
}
-void CustomTrackView::selectClip(bool add, bool group)
+void CustomTrackView::selectClip(bool add, bool group, int track, int pos)
{
- QRectF rect(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1);
+ QRectF rect;
+ if (track != -1 && pos != -1)
+ rect = QRectF(pos, track * m_tracksHeight + m_tracksHeight / 2, 1, 1);
+ else
+ rect = QRectF(m_cursorPos, m_selectedTrack * m_tracksHeight + m_tracksHeight / 2, 1, 1);
QList<QGraphicsItem *> selection = m_scene->items(rect);
resetSelectionGroup(group);
if (!group) m_scene->clearSelection();
adjustTimelineClips(OVERWRITEEDIT, NULL, info, addCommand);
new AddTimelineClipCommand(this, clip->toXML(), clip->getId(), info, EffectsList(), true, false, true, false, addCommand);
m_commandStack->push(addCommand);
+
+ selectClip(true, false, m_selectedTrack, in);
+ // Automatic audio split
+ if (KdenliveSettings::splitaudio())
+ splitAudio();
}
void CustomTrackView::clearSelection()
projects / kdenlive / blobdiff