Drag and drop support from Safari done

src/board/UBBoardController.cpp

@@ -1886,6 +1886,19 @@ void UBBoardController::processMimeData(const QMimeData* pMimeData, const QPoint
         if("" != pMimeData->text()){
             mActiveScene->addText(pMimeData->text(), pPos);
         }
+        else{
+#ifdef Q_WS_MACX
+                //  With Safari, in 95% of the drops, the mime datas are hidden in Apple Web Archive pasteboard type.
+                //  This is due to the way Safari is working so we have to dig into the pasteboard in order to retrieve
+                //  the data.
+                QString qsUrl = UBPlatformUtils::urlFromClipboard();
+                if("" != qsUrl){
+                    // We finally got the url of the dropped ressource! Let's import it!
+                    downloadURL(qsUrl, pPos);
+                    return;
+                }
+#endif
+        }
     }
 }
 

src/frameworks/UBPlatformUtils.h

@@ -90,44 +90,31 @@ class UBPlatformUtils
         UBPlatformUtils();
         virtual ~UBPlatformUtils();
 
-		static void initializeKeyboardLayouts();
-		static void destroyKeyboardLayouts();
-		static int nKeyboardLayouts;
-		static UBKeyboardLocale** keyboardLayouts;
+        static void initializeKeyboardLayouts();
+        static void destroyKeyboardLayouts();
+        static int nKeyboardLayouts;
+        static UBKeyboardLocale** keyboardLayouts;
 
     public:
         static void init();
-		static void destroy();
-
+        static void destroy();
         static QString applicationResourcesDirectory();
-
         static void hideFile(const QString &filePath);
         static void setFileType(const QString &filePath, unsigned long fileType);
-
         static void fadeDisplayOut();
         static void fadeDisplayIn();
-
         static QString preferredTranslation();
         static QString preferredLanguage();
-
         static bool hasVirtualKeyboard();
         //static void showVirtualKeyboard();
-
         static void runInstaller(const QString &installerFilePath);
-
         static void bringPreviousProcessToFront();
-
         static QString osUserLoginName();
-
         static void setDesktopMode(bool desktop);
-
-		static void setWindowNonActivableFlag(QWidget* widget, bool nonAcivable);
-
+        static void setWindowNonActivableFlag(QWidget* widget, bool nonAcivable);
         static QString computerName();
-
-		static UBKeyboardLocale** getKeyboardLayouts(int& nCount);
-
-
+        static UBKeyboardLocale** getKeyboardLayouts(int& nCount);
+        static QString urlFromClipboard();
 };
 
 

src/frameworks/UBPlatformUtils_linux.cpp

@@ -331,3 +331,12 @@ void UBPlatformUtils::destroyKeyboardLayouts()
 	delete [] keyboardLayouts;
 	keyboardLayouts = NULL;
 }
+
+QString UBPlatformUtils::urlFromClipboard()
+{
+    QString qsRet;
+
+    // Not used on Linux
+
+    return qsRet;
+}

src/frameworks/UBPlatformUtils_mac.mm

@@ -12,6 +12,8 @@
 #import <Foundation/NSAutoreleasePool.h>
 #import <Carbon/Carbon.h>
 #import <APELite.h>
+#import <WebKit/WebKit.h>
+#import <AppKit/AppKit.h>
 
 
 NSString* bundleShortVersion(NSBundle *bundle)
@@ -537,3 +539,17 @@ void UBPlatformUtils::initializeKeyboardLayouts()
 
 void UBPlatformUtils::destroyKeyboardLayouts()
 {}
+
+QString UBPlatformUtils::urlFromClipboard()
+{
+    QString qsRet;
+
+    NSPasteboard* pPasteboard = [NSPasteboard pasteboardWithName:@"Apple CFPasteboard drag"];
+    WebArchive* pArchive = [[WebArchive alloc] initWithData:[pPasteboard dataForType:@"com.apple.webarchive"]];
+
+    qsRet = [[[[pArchive mainResource] URL] absoluteString] UTF8String];
+
+    [pArchive release];
+
+    return qsRet;
+}

src/frameworks/UBPlatformUtils_win.cpp

@@ -368,3 +368,10 @@ void UBPlatformUtils::destroyKeyboardLayouts()
 	delete [] keyboardLayouts;
 	keyboardLayouts = NULL;
 }
+
+QString UBPlatformUtils::urlFromClipboard()
+{
+    QString qsRet;
+    //  Not implemented yet
+    return qsRet;
+}

src/gui/UBLibraryWidget.cpp

@@ -27,6 +27,7 @@
 #include "core/UBDownloadManager.h"
 
 #include "frameworks/UBFileSystemUtils.h"
+#include "frameworks/UBPlatformUtils.h"
 
 #include "core/memcheck.h"
 
@@ -389,6 +390,19 @@ void UBLibraryWidget::dropEvent(QDropEvent *event)
                 mLibraryController->importItemOnLibrary(filePath);
                 bDropAccepted = true;
             }
+            else{
+#ifdef Q_WS_MACX
+                //  With Safari, in 95% of the drops, the mime datas are hidden in Apple Web Archive pasteboard type.
+                //  This is due to the way Safari is working so we have to dig into the pasteboard in order to retrieve
+                //  the data.
+                QString qsUrl = UBPlatformUtils::urlFromClipboard();
+                if("" != qsUrl){
+                    // We finally got the url of the dropped ressource! Let's import it!
+                    mLibraryController->importItemOnLibrary(qsUrl);
+                    bDropAccepted = true;
+                }
+#endif
+            }
         }
         else if (pMimeData->hasImage()){
             qDebug() << "hasImage";

src/gui/UBLibraryWidget.h

@@ -79,6 +79,7 @@ private:
     void refreshView();
     void generateItems();
     void appendChainedElement(UBChainedLibElement* element, UBChainedLibElement* toElem);
+
     UBLibElement* elementAt(QPoint p);
     UBLibElement* elementFromFilePath(const QString& filePath);
     UBLibraryController* mLibraryController;