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

List:       kde-commits
Subject:    [kdenlive] src: Merge branch 'Applications/15.12'
From:       Vincent Pinon <vpinon () kde ! org>
Date:       2015-11-27 5:08:47
Message-ID: E1a2BH5-0007Zt-Om () scm ! kde ! org
[Download RAW message or body]

Git commit ffd63af80699e4f100fd51472ed4c73e1b1b6d7a by Vincent Pinon.
Committed on 27/11/2015 at 05:04.
Pushed by vpinon into branch 'master'.

Merge branch 'Applications/15.12'

M  +23   -4    src/bin/projectclip.cpp
M  +23   -17   src/doc/documentchecker.cpp
M  +2    -1    src/doc/kdenlivedoc.cpp
M  +3    -3    src/mainwindow.cpp
M  +1    -1    src/mltcontroller/clipcontroller.cpp
M  +3    -25   src/timeline/clipitem.cpp

http://commits.kde.org/kdenlive/ffd63af80699e4f100fd51472ed4c73e1b1b6d7a

diff --cc src/doc/documentchecker.cpp
index c0146d7,fb3c7c1..0b03c5e
--- a/src/doc/documentchecker.cpp
+++ b/src/doc/documentchecker.cpp
@@@ -300,19 -301,19 +301,19 @@@ bool DocumentChecker::hasErrorInClips(
          for (int i = 0; i < max; ++i) {
              e = missingSources.at(i).toElement();
              QString clipType;
 -            QString realPath = EffectsList::property(e, "kdenlive:originalurl");
 -            QString id = e.attribute("id");
 +            QString realPath = EffectsList::property(e, \
QStringLiteral("kdenlive:originalurl"));  +            QString id = \
e.attribute(QStringLiteral("id"));  // Tell Kdenlive the source is missing
 -            e.setAttribute("_missingsource", "1");
 +            e.setAttribute(QStringLiteral("_missingsource"), QStringLiteral("1"));
              QTreeWidgetItem *subitem = new QTreeWidgetItem(item, QStringList() << \
i18n("Source clip"));  //qDebug()<<"// Adding missing source clip: "<<realPath;
-             subitem->setIcon(0, QIcon::fromTheme(QStringLiteral("dialog-close")));
+             subitem->setIcon(0, KoIconUtils::themedIcon("dialog-close"));
              subitem->setText(1, realPath);
 -            subitem->setData(0, hashRole, EffectsList::property(e, \
                "kdenlive:file_hash"));
 -            subitem->setData(0, sizeRole, EffectsList::property(e, \
"kdenlive:file_size"));  +            subitem->setData(0, hashRole, \
EffectsList::property(e, QStringLiteral("kdenlive:file_hash")));  +            \
subitem->setData(0, sizeRole, EffectsList::property(e, \
QStringLiteral("kdenlive:file_size")));  subitem->setData(0, statusRole, \
CLIPMISSING);  //int t = e.attribute("type").toInt();
 -            subitem->setData(0, typeRole, EffectsList::property(e, "mlt_service"));
 +            subitem->setData(0, typeRole, EffectsList::property(e, \
QStringLiteral("mlt_service")));  subitem->setData(0, idRole, id);
          }
      }
diff --cc src/mainwindow.cpp
index bcb1f2c,eaff279..1f1e499
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@@ -1306,11 -1307,11 +1306,11 @@@ void MainWindow::readOptions(
  
      if (KdenliveSettings::defaultprojectfolder().isEmpty()) {
          QDir dir(QDir::homePath());
 -        if (!dir.mkdir("kdenlive")) {
 +        if (!dir.mkdir(QStringLiteral("kdenlive"))) {
              qDebug() << "/// ERROR CREATING PROJECT FOLDER: ";
          } else {
-             dir.cd(QStringLiteral("kdenlive"));
-             KdenliveSettings::setDefaultprojectfolder(dir.path());
+             dir.cd("kdenlive");
+             KdenliveSettings::setDefaultprojectfolder(dir.absolutePath());
          }
      }
  


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