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

List:       kde-commits
Subject:    [kdenlive/Applications/16.08] src/project/dialogs: Fix error message (cannot create directory) when 
From:       Jean-Baptiste Mardelle <jb () kdenlive ! org>
Date:       2016-11-08 0:16:00
Message-ID: E1c3u52-0002Mm-R2 () code ! kde ! org
[Download RAW message or body]

Git commit 084294034dd909caaffa87893c36b3fe37e5bae4 by Jean-Baptiste Mardelle.
Committed on 08/11/2016 at 00:14.
Pushed by mardelle into branch 'Applications/16.08'.

Fix error message (cannot create directory) when opening archived project

M  +6    -10   src/project/dialogs/archivewidget.cpp

http://commits.kde.org/kdenlive/084294034dd909caaffa87893c36b3fe37e5bae4

diff --git a/src/project/dialogs/archivewidget.cpp \
b/src/project/dialogs/archivewidget.cpp index b824569..7ae2949 100644
--- a/src/project/dialogs/archivewidget.cpp
+++ b/src/project/dialogs/archivewidget.cpp
@@ -29,7 +29,6 @@
 #include <KGuiItem>
 #include <KTar>
 #include <QDebug>
-#include <KIO/MkdirJob>
 #include <KJobWidgets>
 #include <kio/directorysizejob.h>
 #include <KMessageWidget>
@@ -541,9 +540,8 @@ bool ArchiveWidget::slotStartArchiving(bool firstPass)
                 QUrl slideFolder = QUrl::fromLocalFile(archive_url->url().path() + \
                "/slideshows");
                 if (isArchive) m_foldersList.append(QStringLiteral("slideshows"));
                 else {
-                    KIO::MkdirJob *job = KIO::mkdir(slideFolder);
-                    KJobWidgets::setWindow(job, QApplication::activeWindow());
-                    if (!job->exec()) {
+                    QDir dir(slideFolder.path());
+                    if (!dir.mkpath(QStringLiteral("."))) {
                         KMessageBox::sorry(this, i18n("Cannot create directory %1", \
slideFolder.path()));  }
                 }
@@ -623,9 +621,8 @@ bool ArchiveWidget::slotStartArchiving(bool firstPass)
         slotStartArchiving(false);
     }
     else {
-        KIO::MkdirJob *job = KIO::mkdir(destUrl);
-        KJobWidgets::setWindow(job, QApplication::activeWindow());
-        if (!job->exec()) {
+        QDir dir(destUrl.path());
+        if (!dir.mkpath(QStringLiteral("."))) {
             KMessageBox::sorry(this, i18n("Cannot create directory %1", \
destUrl.path()));  }
         m_copyJob = KIO::copy (files, destUrl, KIO::HideProgressInfo);
@@ -876,9 +873,8 @@ void ArchiveWidget::slotStartExtracting()
     }
     QFileInfo f(m_extractUrl.path());
     m_requestedSize = f.size();
-    KIO::MkdirJob *job = KIO::mkdir(archive_url->url());
-    KJobWidgets::setWindow(job, QApplication::activeWindow());
-    if (!job->exec()) {
+    QDir dir(archive_url->url().path());
+    if (!dir.mkpath(QStringLiteral("."))) {
         KMessageBox::sorry(this, i18n("Cannot create directory %1", \
archive_url->url().path()));  }
     slotDisplayMessage(QStringLiteral("system-run"), i18n("Extracting..."));


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