[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdenlive/refactoring_timeline] src/timeline2: Fix qml view to adapt to model changes
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2017-01-31 21:18:12
Message-ID: E1cYfoa-00005U-T0 () code ! kde ! org
[Download RAW message or body]

Git commit 6cb4ecdfe8fbc130c789586af03f686ce0e2a22e by Jean-Baptiste Mardelle.
Committed on 31/01/2017 at 21:17.
Pushed by mardelle into branch 'refactoring_timeline'.

Fix qml view to adapt to model changes

M  +1    -0    src/timeline2/model/timelinemodel.cpp
M  +1    -0    src/timeline2/view/qml/Clip.qml
M  +4    -2    src/timeline2/view/qml/Track.qml
M  +1    -0    src/timeline2/view/qml/timeline.qml
M  +1    -1    src/timeline2/view/timelinewidget.cpp

https://commits.kde.org/kdenlive/6cb4ecdfe8fbc130c789586af03f686ce0e2a22e

diff --git a/src/timeline2/model/timelinemodel.cpp b/src/timeline2/model/timelinemodel.cpp
index 186452dd7..1fa88022e 100644
--- a/src/timeline2/model/timelinemodel.cpp
+++ b/src/timeline2/model/timelinemodel.cpp
@@ -49,6 +49,7 @@ std::shared_ptr<TimelineModel> TimelineModel::construct(bool populate)
         Mlt::Profile profile;
         std::shared_ptr<Mlt::Producer> prod(new Mlt::Producer(profile,"color", "red"));
         prod->set("length", 100);
+        prod->set("out", 99);
         int ix = TrackModel::construct(ptr);
         int ix2 = TrackModel::construct(ptr);
         int clipId = ClipModel::construct(ptr, prod);
diff --git a/src/timeline2/view/qml/Clip.qml b/src/timeline2/view/qml/Clip.qml
index 1cb166fbe..b3e5581c3 100644
--- a/src/timeline2/view/qml/Clip.qml
+++ b/src/timeline2/view/qml/Clip.qml
@@ -75,6 +75,7 @@ Rectangle {
         parent = track
         isAudio = track.isAudio
         height = track.height
+        y = track.y
         //generateWaveform()
     }
 
diff --git a/src/timeline2/view/qml/Track.qml b/src/timeline2/view/qml/Track.qml
index 7fd857810..459278be5 100644
--- a/src/timeline2/view/qml/Track.qml
+++ b/src/timeline2/view/qml/Track.qml
@@ -73,7 +73,8 @@ Column{
             isTransition: false //model.isTransition
             audioLevels: false //model.audioLevels
             width: model.duration * timeScale
-            height: trackRoot.height
+            height: parent.height
+            x: model.start * timeScale
             trackIndex: trackRoot.DelegateModel.itemsIndex
             fadeIn: 0 //model.fadeIn
             fadeOut: 0 //model.fadeOut
@@ -199,8 +200,9 @@ Column{
         }
     }
 
-    Row {
+    Item {
         id: clipRow
+        height: trackRoot.height
         Repeater { id: repeater; model: trackModel }
     }
 
diff --git a/src/timeline2/view/qml/timeline.qml b/src/timeline2/view/qml/timeline.qml
index cd03bfe8a..1728c1e2e 100644
--- a/src/timeline2/view/qml/timeline.qml
+++ b/src/timeline2/view/qml/timeline.qml
@@ -330,6 +330,7 @@ Rectangle {
             model: multitrack
             rootIndex: trackDelegateModel.modelIndex(index)
             height: trackHeight
+            width: timeline.duration * timeScale
             isAudio: audio
             isCurrentTrack: currentTrack === index
             timeScale: timeline.scaleFactor
diff --git a/src/timeline2/view/timelinewidget.cpp b/src/timeline2/view/timelinewidget.cpp
index 77eb677ec..75a67b1f5 100644
--- a/src/timeline2/view/timelinewidget.cpp
+++ b/src/timeline2/view/timelinewidget.cpp
@@ -36,7 +36,7 @@ TimelineWidget::TimelineWidget(QWidget *parent)
     rootContext()->setContextProperty("multitrack", &*m_model);
     rootContext()->setContextProperty("timeline", this);
     setSource(QUrl(QStringLiteral("qrc:/qml/timeline.qml")));
-    connect(&*m_model, SIGNAL(seeked(int)), this, SLOT(onSeeked(int)));
+    //connect(&*m_model, SIGNAL(seeked(int)), this, SLOT(onSeeked(int)));
 }
 
 void TimelineWidget::setSelection(QList<int> newSelection, int trackIndex, bool isMultitrack)
[prev in list] [next in list] [prev in thread] [next in thread]