- Limit number of points in curve widget as they are limited in frei0r

[kdenlive] / src / customtrackview.cpp

diff --git a/src/customtrackview.cpp b/src/customtrackview.cpp
index b69ddd2873890002934aee9f765b54d575e1c1fc..8e931d50edb0e245f4d67edeb7cddf6b2ffdd74b 100644 (file)
--- a/src/customtrackview.cpp
+++ b/src/customtrackview.cpp
@@ -199,6 +199,7 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     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);
@@ -229,6 +230,17 @@ void CustomTrackView::setContextMenu(QMenu *timeline, QMenu *clip, QMenu *transi
     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();
@@ -2138,7 +2150,12 @@ void CustomTrackView::deleteTransition(ItemInfo transitionInfo, int endTrack, QD
 void CustomTrackView::slotTransitionUpdated(Transition *tr, QDomElement old)
 {
     //kDebug() << "TRANS UPDATE, TRACKS: " << old.attribute("transition_btrack") << ", NEW: " << tr->toXML().attribute("transition_btrack");
-    EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, tr->toXML(), false);
+    QDomElement xml = tr->toXML();
+    if (old.isNull() || xml.isNull()) {
+        emit displayMessage(i18n("Cannot update transition"), ErrorMessage);
+        return;
+    }
+    EditTransitionCommand *command = new EditTransitionCommand(this, tr->track(), tr->startPos(), old, xml, false);
     m_commandStack->push(command);
     setDocumentModified();
 }
@@ -4488,6 +4505,18 @@ int CustomTrackView::hasGuide(int pos, int offset)
     return -1;
 }
 
+void CustomTrackView::buildGuidesMenu(QMenu *goMenu) const
+{
+    QAction *act;
+    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()));
+    }
+    goMenu->setEnabled(!m_guides.isEmpty());
+}
+
 void CustomTrackView::editGuide(const GenTime oldPos, const GenTime pos, const QString &comment)
 {
     if (oldPos > GenTime() && pos > GenTime()) {
@@ -4886,7 +4915,7 @@ void CustomTrackView::pasteClip()
     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;
         }
@@ -5807,6 +5836,31 @@ int CustomTrackView::selectedTrack() const
     return m_selectedTrack;
 }
 
+QStringList CustomTrackView::selectedClips() const
+{
+    QStringList clipIds;
+    QList<QGraphicsItem *> selection = m_scene->selectedItems();
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            ClipItem *item = (ClipItem *)selection.at(i);
+            clipIds << item->clipProducer();
+        }
+    }
+    return clipIds;
+}
+
+QList<ClipItem *> CustomTrackView::selectedClipItems() const
+{
+    QList<ClipItem *> clips;
+    QList<QGraphicsItem *> selection = m_scene->selectedItems();
+    for (int i = 0; i < selection.count(); i++) {
+        if (selection.at(i)->type() == AVWIDGET) {
+            clips.append((ClipItem *)selection.at(i));
+        }
+    }
+    return clips;
+}
+
 void CustomTrackView::slotSelectTrack(int ix)
 {
     m_selectedTrack = qMax(0, ix);
@@ -5893,6 +5947,7 @@ void CustomTrackView::checkTrackSequence(int track)
 
 void CustomTrackView::insertZoneOverwrite(QStringList data, int in)
 {
+    if (data.isEmpty()) return;
     DocClipBase *clip = m_document->getBaseClip(data.at(0));
     ItemInfo info;
     info.startPos = GenTime(in, m_document->fps());