Fix most issues with spacer tool. Tool now applies to all tracks by default, CTRL...

http://www.kdenlive.org:80/mantis/view.php?id=271

svn path=/branches/KDE4/; revision=2778

diff --git a/src/clipproperties.cpp b/src/clipproperties.cpp
index 03f686b69ea3f9388f93b7bd28ab920f95f340dc..d1adbba1ccb4bb5ed61e1b12ab0a21d9bcbfa791 100644 (file)
--- a/src/clipproperties.cpp
+++ b/src/clipproperties.cpp
@@ -427,7 +427,7 @@ void ClipProperties::parseFolder() {
 void ClipProperties::slotCheckMaxLength() {
     int duration = m_tc.getFrameCount(m_view.clip_duration->text(), m_fps);
     if (duration > m_clip->maxDuration().frames(m_fps)) {
-       m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration(), m_fps));
+        m_view.clip_duration->setText(m_tc.getTimecode(m_clip->maxDuration(), m_fps));
     }
 }
 

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index a9e6cdb1e538f4cd8d139460c67c22810a3534e7..bb6a36bd37e9df40c247bd8ef4ae5b2367919538 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -230,7 +230,7 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event) {
     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;
@@ -525,7 +525,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
     // 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;
@@ -579,7 +579,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         }
         m_operationMode = NONE;
         displayContextMenu(event->globalPos(), m_dragItem);
-        m_menuPosition = event->pos();
+        m_menuPosition = m_clickEvent;
         m_dragItem = NULL;
         event->accept();
         return;
@@ -593,9 +593,15 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
         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;
@@ -603,6 +609,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
             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)
@@ -610,11 +617,8 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event) {
                 }
             }
             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;
@@ -750,8 +754,6 @@ void CustomTrackView::groupSelectedItems() {
 
         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());
@@ -1339,15 +1341,10 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) {
         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();
@@ -1370,7 +1367,7 @@ void CustomTrackView::addTrack(TrackInfo type, int ix) {
                 }
             }
         }
-        resetSelectionGroup();
+        resetSelectionGroup(false);
 
     }
     m_cursorLine->setLine(m_cursorLine->line().x1(), 0, m_cursorLine->line().x1(), m_tracksHeight * m_document->tracksCount());
@@ -1396,20 +1393,15 @@ void CustomTrackView::removeTrack(int ix) {
     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));
@@ -1429,7 +1421,7 @@ void CustomTrackView::removeTrack(int ix) {
             }
         }
     }
-    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());
@@ -1512,9 +1504,8 @@ void CustomTrackView::slotInsertSpace() {
     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);
@@ -1523,22 +1514,15 @@ void CustomTrackView::insertSpace(const GenTime &pos, int track, const GenTime d
     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) {
@@ -1615,6 +1599,10 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
         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;
@@ -1622,9 +1610,9 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
         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();
@@ -1728,6 +1716,11 @@ void CustomTrackView::mouseReleaseEvent(QMouseEvent * event) {
 
                 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();
             }
@@ -2073,17 +2066,11 @@ void CustomTrackView::moveGroup(QList <ItemInfo> startClip, QList <ItemInfo> sta
         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++) {
@@ -2822,7 +2809,7 @@ void CustomTrackView::slotInsertTrack(int ix) {
             info.isBlind = true;
         }
         AddTrackCommand *addTrack = new AddTrackCommand(this, ix, info, true, true);
-       m_commandStack->push(addTrack);
+        m_commandStack->push(addTrack);
         m_document->setModified(true);
     }
 }

diff --git a/src/customtrackview.h b/src/customtrackview.h
index 5bee9d2099f1e020f294074bda663de740043896..4df54f43e974ae01466d9662d5a5390dfa3b4f18 100644 (file)
--- a/src/customtrackview.h
+++ b/src/customtrackview.h
@@ -100,7 +100,7 @@ public:
     void setOutPoint();
     void slotInsertSpace();
     void slotRemoveSpace();
-    void insertSpace(const GenTime &pos, int track, const GenTime duration, bool add);
+    void insertSpace(const GenTime &pos, int track, const GenTime duration);
     ClipItem *getActiveClipUnderCursor(bool allowOutsideCursor = false) const;
     void deleteTimelineTrack(int ix, TrackInfo trackinfo);
     void changeTimelineTrack(int ix, TrackInfo trackinfo);

diff --git a/src/insertspacecommand.cpp b/src/insertspacecommand.cpp
index 5d43b1259853ee07ecad4281353e9fee83c69846..a114950268934f3d1cfc2b19bd223615d58d886d 100644 (file)
--- a/src/insertspacecommand.cpp
+++ b/src/insertspacecommand.cpp
@@ -29,13 +29,13 @@ InsertSpaceCommand::InsertSpaceCommand(CustomTrackView *view, const GenTime &pos
 // virtual
 void InsertSpaceCommand::undo() {
     // kDebug()<<"----  undoing action";
-    m_view->insertSpace(m_pos, m_track, m_duration, false);
+    m_view->insertSpace(m_pos + m_duration, m_track, GenTime() - m_duration);
 }
 // virtual
 void InsertSpaceCommand::redo() {
     // kDebug() << "----  redoing action cut: " << m_cutTime.frames(25);
     if (m_doIt)
-        m_view->insertSpace(m_pos, m_track, m_duration, true);
+        m_view->insertSpace(m_pos, m_track, m_duration);
     m_doIt = true;
 }
 

diff --git a/src/renderer.cpp b/src/renderer.cpp
index 92735756b7aeed11fd84a043ba31601d191b1dca..e31731eff9cd9d1dcee457b9bd920defbb04d866 100644 (file)
--- a/src/renderer.cpp
+++ b/src/renderer.cpp
@@ -1499,7 +1499,7 @@ void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration
         if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
         else {
             int position = trackPlaylist.clip_start(clipIndex);
-            trackPlaylist.remove_region(position, -diff - 1);
+            trackPlaylist.remove_region(position + diff, -diff - 1);
         }
         trackPlaylist.consolidate_blanks(0);
 
@@ -1534,7 +1534,7 @@ void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration
             if (diff > 0) trackPlaylist.insert_blank(clipIndex, diff - 1);
             else {
                 int position = trackPlaylist.clip_start(clipIndex);
-                trackPlaylist.remove_region(position, -diff - 1);
+                trackPlaylist.remove_region(position + diff, -diff - 1);
             }
             trackPlaylist.consolidate_blanks(0);
             trackNb--;
@@ -1562,6 +1562,7 @@ void Render::mltInsertSpace(const GenTime pos, int track, const GenTime duration
         }
     }
     mlt_service_unlock(service.get_service());
+    mltCheckLength();
 }
 
 int Render::mltChangeClipSpeed(ItemInfo info, double speed, double oldspeed, Mlt::Producer *prod) {