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

List:       kde-commits
Subject:    [kdenlive] src: Merge remote-tracking branch 'origin/Applications/16.12'
From:       Montel Laurent <montel () kde ! org>
Date:       2016-12-06 16:27:53
Message-ID: E1cEIav-000130-Ay () code ! kde ! org
[Download RAW message or body]

Git commit d68176ff42f280fbdcc7184555e60b9d19c8a468 by Montel Laurent.
Committed on 06/12/2016 at 16:27.
Pushed by mlaurent into branch 'master'.

Merge remote-tracking branch 'origin/Applications/16.12'

M  +0    -1    src/bin/projectclip.cpp
M  +1    -2    src/dialogs/clipcreationdialog.cpp
M  +1    -1    src/doc/kdenlivedoc.cpp
M  +8    -8    src/main.cpp
M  +1    -1    src/project/dialogs/projectsettings.cpp
M  +1    -1    src/project/projectmanager.cpp
M  +1    -1    src/timeline/clipitem.cpp
M  +1    -1    src/timeline/timeline.cpp

https://commits.kde.org/kdenlive/d68176ff42f280fbdcc7184555e60b9d19c8a468

diff --cc src/bin/projectclip.cpp
index 35d32a248,9dfda9cc3..2ef554e2a
--- a/src/bin/projectclip.cpp
+++ b/src/bin/projectclip.cpp
@@@ -888,11 -849,8 +888,10 @@@ void ProjectClip::slotQueryIntraThumbs(
  void ProjectClip::doExtractIntra()
  {
      Mlt::Producer *prod = thumbProducer();
 -    if (prod == NULL || !prod->is_valid()) return;
 +    if (prod == Q_NULLPTR || !prod->is_valid()) {
 +        return;
 +    }
      int fullWidth = 150 * prod->profile()->dar() + 0.5;
-     double dar = prod->profile()->dar();
      int max = prod->get_length();
      int pos;
      while (!m_intraThumbs.isEmpty()) {
diff --cc src/dialogs/clipcreationdialog.cpp
index 1ef69bc3c,9700ef78a..9ce9cc9cc
--- a/src/dialogs/clipcreationdialog.cpp
+++ b/src/dialogs/clipcreationdialog.cpp
@@@ -419,8 -422,8 +419,8 @@@ void ClipCreationDialog::createClipsCom
          QDomDocument xml;
          QDomElement prod = xml.createElement(QStringLiteral("producer"));
          xml.appendChild(prod);
 -        QMap <QString, QString> properties;
 +        QMap<QString, QString> properties;
-         properties.insert(QStringLiteral("resource"), file.path());
+         properties.insert(QStringLiteral("resource"), file.toLocalFile());
          if (!groupInfo.isEmpty()) {
              properties.insert(QStringLiteral("kdenlive:folderid"), \
groupInfo.at(0));  }
diff --cc src/main.cpp
index c8742d51c,1defb5c88..a04285f92
--- a/src/main.cpp
+++ b/src/main.cpp
@@@ -59,14 -59,12 +59,12 @@@ int main(int argc, char *argv[]
      KConfigGroup initialGroup(config, "version");
      if (!initialGroup.exists()) {
          QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
-         if (env.contains(QStringLiteral("XDG_CURRENT_DESKTOP"))) {
-             if (env.value(QStringLiteral("XDG_CURRENT_DESKTOP")).toLower() != \
                QLatin1String("kde")) {
-                 // We are not on a KDE desktop, force breeze icon theme
-                 grp.writeEntry("force_breeze", true);
-                 qCDebug(KDENLIVE_LOG)<<"Non KDE Desktop detected, forcing Breeze \
                icon theme";
-             } else {
-                 qCDebug(KDENLIVE_LOG)<<"KDE Desktop detected, using system icons";
-             }
+         if (env.contains(QStringLiteral("XDG_CURRENT_DESKTOP")) && \
                env.value(QStringLiteral("XDG_CURRENT_DESKTOP")).toLower() == \
                QLatin1String("kde")) {
 -            qDebug()<<"KDE Desktop detected, using system icons";
++            qCDebug(KDENLIVE_LOG)<<"KDE Desktop detected, using system icons";
+         } else {
+             // We are not on a KDE desktop, force breeze icon theme
+             grp.writeEntry("force_breeze", true);
 -            qDebug()<<"Non KDE Desktop detected, forcing Breeze icon theme";
++            qCDebug(KDENLIVE_LOG)<<"Non KDE Desktop detected, forcing Breeze icon \
theme";  }
      }
  
@@@ -102,9 -100,11 +100,11 @@@
      // Register about data
      KAboutData::setApplicationData(aboutData);
  
+ #ifndef __MINGW32__
      // Add rcc stored icons to the search path so that we always find our icons
      KIconLoader *loader = KIconLoader::global();
 -    loader->reconfigure("kdenlive", QStringList() << QStringLiteral(":/pics"));
 +    loader->reconfigure(QStringLiteral("kdenlive"), QStringList() << \
QStringLiteral(":/pics")); + #endif
  
      // Set app stuff from about data
      app.setApplicationDisplayName(aboutData.displayName());
diff --cc src/project/dialogs/projectsettings.cpp
index a6ac992ef,783c77f99..692ee54b5
--- a/src/project/dialogs/projectsettings.cpp
+++ b/src/project/dialogs/projectsettings.cpp
@@@ -57,7 -57,7 +57,7 @@@ class NoEditDelegate: public QStyledIte
      }
  };
  
- ProjectSettings::ProjectSettings(KdenliveDoc *doc, QMap<QString, QString> metadata, \
const QStringList &lumas, int videotracks, int audiotracks, const QString \
                &projectPath, bool readOnlyTracks, bool savedProject, QWidget * \
                parent) :
 -ProjectSettings::ProjectSettings(KdenliveDoc *doc, QMap <QString, QString> \
metadata, const QStringList &lumas, int videotracks, int audiotracks, const QString \
&/*projectPath*/, bool readOnlyTracks, bool savedProject, QWidget * parent) : \
++ProjectSettings::ProjectSettings(KdenliveDoc *doc, QMap<QString, QString> metadata, \
const QStringList &lumas, int videotracks, int audiotracks, const QString \
&/*projectPath*/, bool readOnlyTracks, bool savedProject, QWidget * parent) :  \
QDialog(parent)  ,m_savedProject(savedProject)
      ,m_lumas(lumas)
diff --cc src/timeline/clipitem.cpp
index 03c150826,fac975ab8..3b578406a
--- a/src/timeline/clipitem.cpp
+++ b/src/timeline/clipitem.cpp
@@@ -1941,7 -1822,8 +1941,7 @@@ QMap<int, QDomElement> ClipItem::adjust
      return effects;
  }
  
- bool ClipItem::updateAnimatedKeyframes(int ix, const QDomElement &parameter, const \
                ItemInfo &oldInfo)
 -
 -bool ClipItem::updateAnimatedKeyframes(int /*ix*/, QDomElement parameter, const \
ItemInfo &oldInfo) ++bool ClipItem::updateAnimatedKeyframes(int /*ix*/, const \
QDomElement &parameter, const ItemInfo &oldInfo)  {
      int in = cropStart().frames(m_fps);
      int out = (cropStart() + cropDuration()).frames(m_fps) - 1;


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