removed fix from Aleksei for big copying file because doesn't work with audio/video/flash element on mac

preferencesAboutTextFull
Claudio Valerio 12 years ago
parent e8f05c99bb
commit ae8dcde816
  1. BIN
      resources/etc/Tutorial/tutorial_en/CSS/._grid.css
  2. BIN
      resources/etc/Tutorial/tutorial_en/CSS/._reset.css
  3. BIN
      resources/etc/Tutorial/tutorial_en/CSS/._typography.css
  4. BIN
      resources/etc/Tutorial/tutorial_en/images/._logo_open_sankore.png
  5. BIN
      resources/etc/Tutorial/tutorial_en/images/._manuel.png
  6. BIN
      resources/etc/Tutorial/tutorial_en/images/._pedago.png
  7. BIN
      resources/etc/Tutorial/tutorial_en/images/._tech.png
  8. BIN
      resources/etc/Tutorial/tutorial_en/images/._video.png
  9. BIN
      resources/etc/Tutorial/tutorial_fr/CSS/._grid.css
  10. BIN
      resources/etc/Tutorial/tutorial_fr/CSS/._reset.css
  11. BIN
      resources/etc/Tutorial/tutorial_fr/CSS/._typography.css
  12. BIN
      resources/etc/Tutorial/tutorial_fr/images/._logo_open_sankore.png
  13. BIN
      resources/etc/Tutorial/tutorial_fr/images/._manuel.png
  14. BIN
      resources/etc/Tutorial/tutorial_fr/images/._pedago.png
  15. BIN
      resources/etc/Tutorial/tutorial_fr/images/._tech.png
  16. BIN
      resources/etc/Tutorial/tutorial_fr/images/._video.png
  17. 42
      src/board/UBBoardController.cpp

@ -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
{ {

Loading…
Cancel
Save