Commit ae8dcde8 authored by Claudio Valerio's avatar Claudio Valerio

removed fix from Aleksei for big copying file because doesn't work with...

removed fix from Aleksei for big copying file because doesn't work with audio/video/flash element on mac
parent e8f05c99
...@@ -996,30 +996,32 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c ...@@ -996,30 +996,32 @@ void UBBoardController::downloadURL(const QUrl& url, QString contentSourceUrl, c
|| contentType.startsWith("application/widget") || contentType.startsWith("application/widget")
|| contentType.startsWith("application/vnd.apple-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); QFile file(fileName);
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
downloadFinished(true, formedUrl, QUrl(), contentType, file.readAll(), pPos, pSize, isBackground, internalData); downloadFinished(true, formedUrl, QUrl(), contentType, file.readAll(), pPos, pSize, isBackground, internalData);
file.close(); 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 else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment