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

List:       kde-commits
Subject:    [kdenlive] src: Merge branch '16.12'
From:       Jean-Baptiste Mardelle <null () kde ! org>
Date:       2017-01-05 17:42:14
Message-ID: E1cPC3K-0004Tq-R2 () code ! kde ! org
[Download RAW message or body]

Git commit 56fc5643e342c71a274fadd79b1e5fa5b9e88196 by Jean-Baptiste Mardelle.
Committed on 05/01/2017 at 17:42.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +7    -6    src/doc/documentchecker.cpp
M  +1    -0    src/onmonitoritems/rotoscoping/rotowidget.cpp
M  +6    -6    src/simplekeyframes/simplekeyframewidget.cpp
M  +6    -12   src/simplekeyframes/simpletimelinewidget.cpp

https://commits.kde.org/kdenlive/56fc5643e342c71a274fadd79b1e5fa5b9e88196

diff --cc src/doc/documentchecker.cpp
index a2e1e1cfa,744872eb0..8fc7b39b8
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@@ -298,13 -295,13 +299,13 @@@ bool DocumentChecker::hasErrorInClips(
          QString clipType;
          ClipType type;
          int status = CLIPMISSING;
-         QString resource = EffectsList::property(e, QStringLiteral("resource"));
+ 	const QString service = EffectsList::property(e, QStringLiteral("mlt_service"));
 -        QString resource = service == QLatin1String("timewarp") ? \
EffectsList::property(e, "warp_resource") : EffectsList::property(e, "resource"); ++  \
QString resource = service == QLatin1String("timewarp") ? EffectsList::property(e, \
QStringLiteral("warp_resource")) : EffectsList::property(e, \
                QStringLiteral("resource"));
          bool slideshow = resource.contains(QStringLiteral("/.all.")) || \
                resource.contains(QStringLiteral("?")) || \
                resource.contains(QStringLiteral("%"));
-         QString service = EffectsList::property(e, QStringLiteral("mlt_service"));
-         if (service == QLatin1String("avformat") || service == \
QLatin1String("avformat-novalidate") || service == QLatin1String("framebuffer") || \
                service == QLatin1String("timewarp")) {
-             clipType = i18n("Video clip");
+ 	if (service == QLatin1String("avformat") || service == \
QLatin1String("avformat-novalidate") || service == QLatin1String("framebuffer") || \
service == QLatin1String("timewarp")) { + 	    clipType = i18n("Video clip");
              type = AV;
 -	} else if (service == QLatin1String("qimage") || service == \
QLatin1String("pixbuf")) {  +        } else if (service == QLatin1String("qimage") || \
service == QLatin1String("pixbuf")) {  if (slideshow) {
                  clipType = i18n("Slideshow clip");
                  type = SlideShow;
diff --cc src/onmonitoritems/rotoscoping/rotowidget.cpp
index 01fe649cd,ab778f02f..e33bbafc9
--- a/src/onmonitoritems/rotoscoping/rotowidget.cpp
+++ b/src/onmonitoritems/rotoscoping/rotowidget.cpp
@@@ -264,10 -256,10 +264,11 @@@ void RotoWidget::slotAddKeyframe(int po
          m_data = QVariant(map);
      }
  
 -    if (pos < 0)
 +    if (pos < 0) {
          m_keyframeWidget->addKeyframe();
 +    }
      slotUpdateDataPoints(m_monitor->effectRoto(), pos);
+     slotPositionChanged(pos, false);
  }
  
  void RotoWidget::slotRemoveKeyframe(int pos)
diff --cc src/simplekeyframes/simpletimelinewidget.cpp
index 4387488ab,29dc470fd..ff086574d
--- a/src/simplekeyframes/simpletimelinewidget.cpp
+++ b/src/simplekeyframes/simpletimelinewidget.cpp
@@@ -294,14 -278,11 +290,11 @@@ void SimpleTimelineWidget::paintEvent(Q
          tmp.translate(pos * m_scale, 0);
          if (pos == m_currentKeyframe || pos == m_hoverKeyframe) {
              p.setBrush(m_colSelected);
 -	} else {
 -	    p.setBrush(m_colKeyframe);
 -	}
++        } else {
++            p.setBrush(m_colKeyframe);
 +        }
- 
          p.drawConvexPolygon(tmp);
          p.drawLine(QLineF(0, -1, 0, 5).translated(pos * m_scale, 0));
- 
-         if (pos == m_currentKeyframe || pos == m_hoverKeyframe) {
-             p.setBrush(m_colKeyframeBg);
-         }
      }
  
      p.setPen(palette().dark().color());


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