From 572bb698797ac526cd128152be5514a0fa28a6c0 Mon Sep 17 00:00:00 2001
From: Claudio Valerio <claudio@Mac-mini.local>
Date: Thu, 23 Aug 2012 13:59:25 +0200
Subject: [PATCH] fixed issue on dnd of media and audio to the board
---
src/board/UBBoardController.cpp | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/board/UBBoardController.cpp b/src/board/UBBoardController.cpp
index 2474e755..1fe4b154 100644
--- a/src/board/UBBoardController.cpp
+++ b/src/board/UBBoardController.cpp
@@ -913,7 +913,7 @@ void UBBoardController::downloadURL(const QUrl& url, const QPointF& pPos, const
else if (sUrl.startsWith("file://") || sUrl.startsWith("/"))
{
QString fileName = url.toLocalFile();
-
+ QUrl formedUrl = sUrl.startsWith("file://") ? sUrl : QUrl::fromLocalFile(sUrl);
QString contentType = UBFileSystemUtils::mimeTypeFromFileName(fileName);
bool shouldLoadFileData =
@@ -926,7 +926,7 @@ void UBBoardController::downloadURL(const QUrl& url, const QPointF& pPos, const
if (shouldLoadFileData)
file.open(QIODevice::ReadOnly);
- downloadFinished(true, url, contentType, file.readAll(), pPos, pSize, isBackground, internalData);
+ downloadFinished(true, formedUrl, contentType, file.readAll(), pPos, pSize, isBackground, internalData);
if (shouldLoadFileData)
file.close();
@@ -955,6 +955,8 @@ UBItem *UBBoardController::downloadFinished(bool pSuccess, QUrl sourceUrl, QStri
{
QString mimeType = pContentTypeHeader;
+ qDebug() << sourceUrl.toString();
+
// In some cases "image/jpeg;charset=" is retourned by the drag-n-drop. That is
// why we will check if an ; exists and take the first part (the standard allows this kind of mimetype)
if(mimeType.isEmpty())
@@ -1948,7 +1950,7 @@ UBGraphicsMediaItem* UBBoardController::addVideo(const QUrl& pSourceUrl, bool st
QString destFile;
bool b = UBPersistenceManager::persistenceManager()->addFileToDocument(selectedDocument(),
- pSourceUrl.toLocalFile(),
+ pSourceUrl.toLocalFile(),
UBPersistenceManager::videoDirectory,
uuid,
destFile);