#include "groupclipscommand.h"
#include "splitaudiocommand.h"
#include "changecliptypecommand.h"
+#include "trackdialog.h"
#include <KDebug>
#include <KLocale>
verticalScrollBar()->setMaximum(maxWidth);
m_cursorLine = projectscene->addLine(0, 0, 0, maxWidth);
m_cursorLine->setZValue(1000);
+ /*QPen pen1;
+ pen1.setWidthF(1.0);
+ pen1.setCosmetic(true);
+ m_cursorLine->setPen(pen1);*/
KIcon razorIcon("edit-cut");
m_razorCursor = QCursor(razorIcon.pixmap(22, 22));
// virtual
void CustomTrackView::mousePressEvent(QMouseEvent * event)
{
- //kDebug() << "mousePressEvent STARTED";
setFocus(Qt::MouseFocusReason);
m_menuPosition = QPoint();
}
if (event->modifiers() & Qt::ShiftModifier) {
+ // Rectangle selection
setDragMode(QGraphicsView::RubberBandDrag);
if (!(event->modifiers() & Qt::ControlModifier)) {
resetSelectionGroup();
QList<QGraphicsItem *> collisionList = items(m_clickEvent);
if (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL && collisionList.count() == 0) {
+ // Pressing Ctrl + left mouse button in an empty area scrolls the timeline
setDragMode(QGraphicsView::ScrollHandDrag);
QGraphicsView::mousePressEvent(event);
m_blockRefresh = false;
}
ct++;
}
- if (!found) m_dragItem = NULL;
+ if (!found) {
+ if (m_dragItem) emit clipItemSelected(NULL);
+ m_dragItem = NULL;
+ }
if (m_dragItem && m_dragItem->type() == TRANSITIONWIDGET) {
// update transition menu action
setCursor(Qt::ArrowCursor);
m_scene->clearSelection();
//event->accept();
- emit clipItemSelected(NULL);
updateClipTypeActions(NULL);
if (m_tool == SPACERTOOL) {
QList<QGraphicsItem *> selection;
return;
}
- if (dragGroup == NULL) updateSnapPoints(m_dragItem);
+ bool itemSelected = false;
+ if (m_dragItem->isSelected()) itemSelected = true;
+ else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true;
+ else if (dragGroup && dragGroup->isSelected()) itemSelected = true;
+
+ if (event->modifiers() == Qt::ControlModifier || itemSelected == false) {
+ if (event->modifiers() != Qt::ControlModifier) {
+ m_scene->clearSelection();
+ resetSelectionGroup(false);
+ } else resetSelectionGroup();
+ 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);
+ updateClipTypeActions(dragGroup == NULL ? clip : NULL);
+ m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
+ }
+
+ // Update snap points
+ if (m_selectionGroup == NULL) updateSnapPoints(m_dragItem);
else {
QList <GenTime> offsetList;
- QList<QGraphicsItem *> children = dragGroup->childItems();
+ QList<QGraphicsItem *> children = m_selectionGroup->childItems();
for (int i = 0; i < children.count(); i++) {
if (children.at(i)->type() == AVWIDGET || children.at(i)->type() == TRANSITIONWIDGET) {
AbstractClipItem *item = static_cast <AbstractClipItem *>(children.at(i));
}
}
- bool itemSelected = false;
- if (m_dragItem->isSelected()) itemSelected = true;
- else if (m_dragItem->parentItem() && m_dragItem->parentItem()->isSelected()) itemSelected = true;
- else if (dragGroup && dragGroup->isSelected()) itemSelected = true;
- if (event->modifiers() == Qt::ControlModifier || itemSelected == false) {
- if (event->modifiers() != Qt::ControlModifier) m_scene->clearSelection();
- resetSelectionGroup();
- 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);
- updateClipTypeActions(dragGroup == NULL ? clip : NULL);
- m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
- }
-
if (collisionClip != NULL || m_dragItem == NULL) {
if (m_dragItem && m_dragItem->type() == AVWIDGET && !m_dragItem->isItemLocked()) {
- kDebug() << "//////// CLIP ITEM SELECTED, TRANSMITTING . . . . . . .";
ClipItem *selected = static_cast <ClipItem*>(m_dragItem);
emit clipItemSelected(selected);
} else emit clipItemSelected(NULL);
setDocumentModified();
}
-void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params)
+void CustomTrackView::addTransition(ItemInfo transitionInfo, int endTrack, QDomElement params, bool refresh)
{
Transition *tr = new Transition(transitionInfo, endTrack, m_document->fps(), params, true);
//kDebug() << "---- ADDING transition " << params.attribute("value");
- if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML())) {
+ if (m_document->renderer()->mltAddTransition(tr->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, tr->toXML(), refresh)) {
scene()->addItem(tr);
setDocumentModified();
} else {
}
}
-void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/)
+void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QDomElement /*params*/, bool refresh)
{
Transition *item = getTransitionItemAt(transitionInfo.startPos, transitionInfo.track);
if (!item) {
emit displayMessage(i18n("Select clip to delete"), ErrorMessage);
return;
}
- m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML());
+ m_document->renderer()->mltDeleteTransition(item->transitionTag(), endTrack, m_document->tracksCount() - transitionInfo.track, transitionInfo.startPos, transitionInfo.endPos, item->toXML(), refresh);
if (m_dragItem == item) m_dragItem = NULL;
delete item;
emit transitionItemSelected(NULL);
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
- viewport()->update();
+ //viewport()->update();
+ emit trackHeightChanged();
+ //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
//setFixedHeight(50 * m_tracksCount);
}
}
m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), maxHeight);
setSceneRect(0, 0, sceneRect().width(), maxHeight);
- QTimer::singleShot(300, this, SIGNAL(trackHeightChanged()));
- viewport()->update();
+ //viewport()->update();
+ emit trackHeightChanged();
+ //QTimer::singleShot(500, this, SIGNAL(trackHeightChanged()));
}
void CustomTrackView::changeTrack(int ix, TrackInfo type)
m_operationMode = NONE;
}
-void CustomTrackView::deleteClip(ItemInfo info)
+void CustomTrackView::deleteClip(ItemInfo info, bool refresh)
{
ClipItem *item = getClipItemAt((int) info.startPos.frames(m_document->fps()), info.track);
delete tr;
}
}*/
- scene()->removeItem(item);
m_waitingThumbs.removeAll(item);
if (m_dragItem == item) m_dragItem = NULL;
+ scene()->removeItem(item);
delete item;
item = NULL;
setDocumentModified();
- m_document->renderer()->doRefresh();
+ if (refresh) m_document->renderer()->doRefresh();
}
void CustomTrackView::deleteSelectedClips()
setDocumentModified();
}
-void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects)
+void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo info, EffectsList effects, bool refresh)
{
DocClipBase *baseclip = m_document->clipManager()->getClipById(clipId);
if (baseclip == NULL) {
m_document->renderer()->mltAddEffect(info.track, info.startPos, item->getEffectArgs(item->effectAt(i)), false);
}
setDocumentModified();
- m_document->renderer()->doRefresh();
+ if (refresh) m_document->renderer()->doRefresh();
m_waitingThumbs.append(item);
m_thumbsTimer.start();
}
void CustomTrackView::drawBackground(QPainter * painter, const QRectF &rect)
{
- QRectF r = rect;
- r.setWidth(r.width() + 1);
+ QRectF r = rect.adjusted(0, 0, 1, 0);
painter->setClipRect(r);
painter->drawLine(r.left(), 0, r.right(), 0);
uint max = m_document->tracksCount();
QColor audioColor = palette().alternateBase().color();
QColor base = scheme.background(KColorScheme::NormalBackground).color();
for (uint i = 0; i < max; i++) {
- if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(lockedColor));
- else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, QBrush(audioColor));
+ if (m_document->trackInfoAt(max - i - 1).isLocked == true) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, lockedColor);
+ else if (m_document->trackInfoAt(max - i - 1).type == AUDIOTRACK) painter->fillRect(r.left(), m_tracksHeight * i + 1, r.right() - r.left() + 1, m_tracksHeight - 1, audioColor);
painter->drawLine(r.left(), m_tracksHeight *(i + 1), r.right(), m_tracksHeight *(i + 1));
}
int lowerLimit = m_tracksHeight * m_document->tracksCount() + 1;
if (height() > lowerLimit)
- painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), QBrush(base));
+ painter->fillRect(QRectF(r.left(), lowerLimit, r.width(), height() - lowerLimit), base);
}
bool CustomTrackView::findString(const QString &text)
void CustomTrackView::slotInsertTrack(int ix)
{
- kDebug() << "// INSERTING TRK: " << ix;
- QDialog d(parentWidget());
- Ui::AddTrack_UI view;
- view.setupUi(&d);
- view.track_nb->setMaximum(m_document->tracksCount() - 1);
- view.track_nb->setValue(ix);
- d.setWindowTitle(i18n("Insert Track"));
+ TrackDialog d(m_document, parentWidget());
+ d.view.label->setText(i18n("Insert track"));
+ d.view.track_nb->setMaximum(m_document->tracksCount() - 1);
+ d.view.track_nb->setValue(ix);
+ d.setWindowTitle(i18n("Insert New Track"));
+ d.slotUpdateName(ix);
if (d.exec() == QDialog::Accepted) {
- ix = view.track_nb->value();
- if (view.before_select->currentIndex() == 1) {
+ ix = d.view.track_nb->value();
+ if (d.view.before_select->currentIndex() == 1) {
ix++;
}
TrackInfo info;
- if (view.video_track->isChecked()) {
+ if (d.view.video_track->isChecked()) {
info.type = VIDEOTRACK;
info.isMute = false;
info.isBlind = false;
void CustomTrackView::slotDeleteTrack(int ix)
{
- bool ok;
- ix = QInputDialog::getInteger(this, i18n("Remove Track"), i18n("Track"), ix, 0, m_document->tracksCount() - 1, 1, &ok);
- if (ok) {
+ TrackDialog d(m_document, parentWidget());
+ d.view.label->setText(i18n("Delete track"));
+ d.view.before_select->setHidden(true);
+ d.view.track_nb->setMaximum(m_document->tracksCount() - 1);
+ d.view.track_nb->setValue(ix);
+ d.slotUpdateName(ix);
+ d.setWindowTitle(i18n("Delete Track"));
+ d.view.video_track->setHidden(true);
+ d.view.audio_track->setHidden(true);
+ if (d.exec() == QDialog::Accepted) {
+ ix = d.view.track_nb->value();
TrackInfo info = m_document->trackInfoAt(m_document->tracksCount() - ix - 1);
deleteTimelineTrack(ix, info);
setDocumentModified();
void CustomTrackView::slotChangeTrack(int ix)
{
- QDialog d(parentWidget());
- Ui::AddTrack_UI view;
- view.setupUi(&d);
- view.label->setText(i18n("Change track"));
- view.before_select->setHidden(true);
- view.track_nb->setMaximum(m_document->tracksCount() - 1);
- view.track_nb->setValue(ix);
+ TrackDialog d(m_document, parentWidget());
+ d.view.label->setText(i18n("Change track"));
+ d.view.before_select->setHidden(true);
+ d.view.track_nb->setMaximum(m_document->tracksCount() - 1);
+ d.view.track_nb->setValue(ix);
+ d.slotUpdateName(ix);
d.setWindowTitle(i18n("Change Track Type"));
if (m_document->trackInfoAt(m_document->tracksCount() - ix - 1).type == VIDEOTRACK)
- view.video_track->setChecked(true);
+ d.view.video_track->setChecked(true);
else
- view.audio_track->setChecked(true);
+ d.view.audio_track->setChecked(true);
if (d.exec() == QDialog::Accepted) {
TrackInfo info;
info.isLocked = false;
info.isMute = false;
- ix = view.track_nb->value();
+ ix = d.view.track_nb->value();
- if (view.video_track->isChecked()) {
+ if (d.view.video_track->isChecked()) {
info.type = VIDEOTRACK;
info.isBlind = false;
} else {
}
}
- selection = m_scene->items();
new AddTrackCommand(this, ix, trackinfo, false, deleteTrack);
m_commandStack->push(deleteTrack);
}
projects / kdenlive / blobdiff