[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-20 12:56:23
Message-ID: E1cUYjv-0004uo-RE () code ! kde ! org
[Download RAW message or body]

Git commit ccf21435d5a9b54846c5e4cad49bce449af337fb by Jean-Baptiste Mardelle.
Committed on 20/01/2017 at 12:54.
Pushed by mardelle into branch 'master'.

Merge branch '16.12'

M  +4    -4    src/monitor/monitor.cpp
M  +1    -1    src/monitor/monitor.h
M  +1    -1    src/timeline/customtrackview.cpp

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

diff --cc src/monitor/monitor.cpp
index fa5bf91b1,ba43215ca..076d0e13e
--- a/src/monitor/monitor.cpp
+++ b/src/monitor/monitor.cpp
@@@ -1014,21 -981,19 +1014,21 @@@ void Monitor::slotExtractCurrentFrame(Q
          // Finally, the frame number is added to this suggestion, prefixed
          // with "-f", so we get something like clip-f#.png.
          QString suggestedImageName = QFileInfo(currentController()
 -                                        ? currentController()->clipName()
 -                                        : \
                pCore->projectManager()->current()->url().isValid()
 -                                            ? \
                pCore->projectManager()->current()->url().fileName()
 -                                            : i18n("untitled")
 -                                    ).completeBaseName()
 -                                    + QStringLiteral("-f")
 -                                    + QString::number(render->seekFramePosition())
 -                                    + ".png";
 +                                               ? currentController()->clipName()
 +                                               : \
pCore->projectManager()->current()->url().isValid()  +                                \
? pCore->projectManager()->current()->url().fileName()  +                             \
: i18n("untitled")  +                                              \
).completeBaseName()  +                                     + QStringLiteral("-f")
 +                                     + QString::number(render->seekFramePosition())
 +                                     + ".png";
-         path = QFileInfo(path, suggestedImageName).absoluteFilePath();
+         frameName = QFileInfo(frameName, suggestedImageName).fileName();
      }
  
 -    QString framesFolder = KRecentDirs::dir(":KdenliveFramesFolder");
 -    if (framesFolder.isEmpty()) framesFolder = QDir::homePath();
 +    QString framesFolder = \
KRecentDirs::dir(QStringLiteral(":KdenliveFramesFolder"));  +    if \
(framesFolder.isEmpty()) {  +        framesFolder = QDir::homePath();
 +    }
      QPointer<QFileDialog> fs = new QFileDialog(this, addToProject ? i18n("Save \
                Image") : i18n("Save Image to Project"), framesFolder);
      fs->setMimeTypeFilters(QStringList() << QStringLiteral("image/png"));
      fs->setAcceptMode(QFileDialog::AcceptSave);


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