Check & update clip length in timeline when doing a "clip reload" from project tree...

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index fd3ac7ae0796bc60ab20e1aa6a5ddd01e4801c37..c74204daabbfb2cb824379bd8a76c3f71b096fcf 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -283,8 +283,9 @@ void CustomTrackView::mouseMoveEvent(QMouseEvent * event)
     int pos = event->x();
     int mappedXPos = (int)(mapToScene(event->pos()).x() + 0.5);
     emit mousePosition(mappedXPos);
+
     if (event->buttons() & Qt::MidButton) return;
-    if ((event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL) || event->modifiers() == Qt::ShiftModifier) {
+    if (m_operationMode == RUBBERSELECTION || (event->modifiers() == Qt::ControlModifier && m_tool != SPACERTOOL)) {
         QGraphicsView::mouseMoveEvent(event);
         m_moveOpMode = NONE;
         return;
@@ -2636,6 +2637,7 @@ void CustomTrackView::deleteClip(ItemInfo info)
     scene()->removeItem(item);
     if (m_dragItem == item) m_dragItem = NULL;
     delete item;
+    m_document->setModified(true);
     m_document->renderer()->doRefresh();
 }
 
@@ -2681,6 +2683,7 @@ void CustomTrackView::deleteSelectedClips()
             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);
+            emit clipItemSelected(NULL);
         } else if (itemList.at(i)->type() == TRANSITIONWIDGET) {
             Transition *item = static_cast <Transition *>(itemList.at(i));
             if (item->parentItem()) resetGroup = true;
@@ -2689,8 +2692,10 @@ void CustomTrackView::deleteSelectedClips()
             info.endPos = item->endPos();
             info.track = item->track();
             new AddTransitionCommand(this, info, item->transitionEndTrack(), item->toXML(), true, true, deleteSelected);
+            emit transitionItemSelected(NULL);
         }
     }
+
     m_commandStack->push(deleteSelected);
 }
 
@@ -2846,6 +2851,8 @@ void CustomTrackView::addClip(QDomElement xml, const QString &clipId, ItemInfo i
     }
     ClipItem *item = new ClipItem(baseclip, info, m_document->fps(), xml.attribute("speed", "1").toDouble());
     item->setEffectList(effects);
+    if (xml.hasAttribute("audio_only")) item->setAudioOnly(true);
+    else if (xml.hasAttribute("video_only")) item->setVideoOnly(true);
     scene()->addItem(item);
 
     int tracknumber = m_document->tracksCount() - info.track - 1;
@@ -2887,7 +2894,7 @@ void CustomTrackView::slotUpdateClip(const QString &clipId)
         if (list.at(i)->type() == AVWIDGET) {
             clip = static_cast <ClipItem *>(list.at(i));
             if (clip->clipProducer() == clipId) {
-                clip->refreshClip();
+                clip->refreshClip(true);
                 ItemInfo info = clip->info();
                 info.track = m_document->tracksCount() - clip->track();
                 m_document->renderer()->mltUpdateClip(info, clip->xml(), clip->baseClip()->producer());
@@ -3978,7 +3985,7 @@ void CustomTrackView::slotUpdateAllThumbs()
                     }
                 }
             }
-            item->refreshClip();
+            item->refreshClip(false);
             qApp->processEvents();
         }
     }
@@ -4450,4 +4457,5 @@ void CustomTrackView::updateClipTypeActions(ClipItem *clip)
     }
 }
 
+
 #include "customtrackview.moc"