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

List:       kde-commits
Subject:    [kdenlive/Applications/16.12] /: Fix broken generators (mimetype not added on non KDE Desktop)
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-12-07 9:40:36
Message-ID: E1cEYiK-0003aa-Rs () code ! kde ! org
[Download RAW message or body]

Git commit f8696c813c9952274c0f5c416688abab5c4a1193 by Jean-Baptiste Mardelle.
Committed on 07/12/2016 at 09:40.
Pushed by mardelle into branch 'Applications/16.12'.

Fix broken generators (mimetype not added on non KDE Desktop)
BUG: 371798

M  +1    -1    data/westley.xml
M  +11   -1    src/bin/generators/generators.cpp
M  +2    -5    src/project/projectmanager.cpp

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

diff --git a/data/westley.xml b/data/westley.xml
index e419150d9..27f32502f 100644
--- a/data/westley.xml
+++ b/data/westley.xml
@@ -3,7 +3,7 @@
   <mime-type type="video/mlt-playlist">
     <comment>MLT video playlist</comment>
     <sub-class-of type="application/xml"/>
-    <glob pattern="*.westley"/>
     <glob pattern="*.mlt"/>
+    <glob pattern="*.westley"/>
   </mime-type>
 </mime-info>
diff --git a/src/bin/generators/generators.cpp b/src/bin/generators/generators.cpp
index 03f14793b..9c316b4dc 100644
--- a/src/bin/generators/generators.cpp
+++ b/src/bin/generators/generators.cpp
@@ -161,7 +161,17 @@ QUrl Generators::getSavedClip(QString clipFolder)
     if (clipFolder.isEmpty()) {
         clipFolder = QDir::homePath();
     }
-    QUrl url = QFileDialog::getSaveFileUrl(this, i18n("Save clip"), \
QUrl::fromLocalFile(clipFolder), i18n("MLT playlist (*.mlt)")); +    QFileDialog \
fd(this); +    fd.setDirectory(clipFolder);
+    fd.setNameFilter(i18n("MLT playlist (*.mlt)"));
+    fd.setAcceptMode(QFileDialog::AcceptSave);
+    fd.setFileMode(QFileDialog::AnyFile);
+    fd.setDefaultSuffix(QStringLiteral("mlt"));
+    if (fd.exec() != QDialog::Accepted || fd.selectedUrls().isEmpty()) {
+        return QUrl();
+    }
+    QUrl url = fd.selectedUrls().first();
+
     if (url.isValid()) {
 #if KXMLGUI_VERSION_MINOR < 23 && KXMLGUI_VERSION_MAJOR == 5
     // Since Plasma 5.7 (release at same time as KF 5.23, 
diff --git a/src/project/projectmanager.cpp b/src/project/projectmanager.cpp
index 4f52cf70e..9897cec89 100644
--- a/src/project/projectmanager.cpp
+++ b/src/project/projectmanager.cpp
@@ -341,13 +341,10 @@ bool ProjectManager::saveFileAs()
     fd.setAcceptMode(QFileDialog::AcceptSave);
     fd.setFileMode(QFileDialog::AnyFile);
     fd.setDefaultSuffix(QStringLiteral("kdenlive"));
-    if (fd.exec() != QDialog::Accepted) {
+    if (fd.exec() != QDialog::Accepted || fd.selectedFiles().isEmpty()) {
         return false;
     }
-    if (fd.selectedFiles().isEmpty()) {
-        return false;
-    }
-    QString outputFile = fd.selectedFiles().at(0);
+    QString outputFile = fd.selectedFiles().first();
 
 #if KXMLGUI_VERSION_MINOR < 23 && KXMLGUI_VERSION_MAJOR == 5
     // Since Plasma 5.7 (release at same time as KF 5.23, 


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