Merge branch 'release-candidate' of github.com:Sankore/Sankore-3.1 into release-candidate

src/board/UBBoardController.cpp

@@ -996,32 +996,30 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c
                 || contentType.startsWith("application/widget")
                 || contentType.startsWith("application/vnd.apple-widget");
 
-
+       if (shouldLoadFileData)
-        // TODO: claudio Fix it because it doesn't work with audio/video/flash items dropped from the teacher bar
+       {
-//        if (shouldLoadFileData)
-//        {
             QFile file(fileName);
             file.open(QIODevice::ReadOnly);
             downloadFinished(true, formedUrl, QUrl(), contentType, file.readAll(), pPos, pSize, isBackground, internalData);
             file.close();
-//        }
+       }
-//        else
+       else
-//        {
+       {
-//            // media items should be copyed in separate thread
+           // media items should be copyed in separate thread
-
+
-//            sDownloadFileDesc desc;
+           sDownloadFileDesc desc;
-//            desc.modal = false;
+           desc.modal = false;
-//            desc.srcUrl = sUrl;
+           desc.srcUrl = sUrl;
-//            desc.originalSrcUrl = contentSourceUrl;
+           desc.originalSrcUrl = contentSourceUrl;
-//            desc.currentSize = 0;
+           desc.currentSize = 0;
-//            desc.name = QFileInfo(url.toString()).fileName();
+           desc.name = QFileInfo(url.toString()).fileName();
-//            desc.totalSize = 0; // The total size will be retrieved during the download
+           desc.totalSize = 0; // The total size will be retrieved during the download
-//            desc.pos = pPos;
+           desc.pos = pPos;
-//            desc.size = pSize;
+           desc.size = pSize;
-//            desc.isBackground = isBackground;
+           desc.isBackground = isBackground;
-
+
-//            UBDownloadManager::downloadManager()->addFileToDownload(desc);
+           UBDownloadManager::downloadManager()->addFileToDownload(desc);
-//        }
+       }
     }
     else
     {

src/core/UBDownloadManager.cpp

@@ -33,19 +33,18 @@ UBAsyncLocalFileDownloader::UBAsyncLocalFileDownloader(sDownloadFileDesc desc, Q
 
 UBAsyncLocalFileDownloader *UBAsyncLocalFileDownloader::download()
 {
-    if (!QFile::exists(QUrl(mDesc.srcUrl).toLocalFile())) {
-        qDebug() << "file" << mDesc.srcUrl << "does not present in fs";
-        return this;
-    }
-
     start();
-
     return this;
 }
 
 void UBAsyncLocalFileDownloader::run()
 {
 
+    if(mDesc.srcUrl.startsWith("file://"))
+        mDesc.srcUrl = QUrl(mDesc.srcUrl).toLocalFile();
+    else
+        mDesc.srcUrl = QUrl::fromLocalFile(mDesc.srcUrl).toLocalFile();
+
     QString mimeType = UBFileSystemUtils::mimeTypeFromFileName(mDesc.srcUrl);
 
     int position=mimeType.indexOf(";");
@@ -67,7 +66,7 @@ void UBAsyncLocalFileDownloader::run()
 
     QString uuid = QUuid::createUuid();
     UBPersistenceManager::persistenceManager()->addFileToDocument(UBApplication::boardController->selectedDocument(), 
-        QUrl(mDesc.srcUrl).toLocalFile(),
+        mDesc.srcUrl,
         destDirectory,
         uuid,
         mTo,