From 23628343e8e22577f328438ee3a8f7537ae8c1ef Mon Sep 17 00:00:00 2001
From: Stefan Derkits <stefan@derkits.at>
Date: Mon, 30 Sep 2013 18:44:17 +0200
Subject: [PATCH] allow everything that can be drag'n' dropped to also be
 entered via the menu - load xspf (will be renamed)

---
 src/tomahawk/TomahawkWindow.cpp | 31 +++++++++++++++++++++----------
 src/tomahawk/TomahawkWindow.h   |  2 ++
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/tomahawk/TomahawkWindow.cpp b/src/tomahawk/TomahawkWindow.cpp
index 9123b7c7c..4fcf824ea 100644
--- a/src/tomahawk/TomahawkWindow.cpp
+++ b/src/tomahawk/TomahawkWindow.cpp
@@ -77,6 +77,7 @@
 #include "TomahawkTrayIcon.h"
 #include "TomahawkApp.h"
 #include "LoadXSPFDialog.h"
+#include "DropJob.h"
 #include "utils/ImageRegistry.h"
 #include "utils/Logger.h"
 
@@ -985,12 +986,8 @@ TomahawkWindow::loadSpiff()
     if ( !safe.isNull() && ret == QDialog::Accepted )
     {
         QUrl url = QUrl::fromUserInput( safe.data()->xspfUrl() );
-        bool autoUpdate = safe.data()->autoUpdate();
 
-        XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
-        connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
-        connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
-        loader->load( url );
+        handleUrlInput( url );
     }
 #endif
 }
@@ -1004,17 +1001,31 @@ TomahawkWindow::loadXspfFinished( int ret )
     if ( ret == QDialog::Accepted )
     {
         QUrl url = QUrl::fromUserInput( d->xspfUrl() );
-        bool autoUpdate = d->autoUpdate();
 
-        XSPFLoader* loader = new XSPFLoader( true, autoUpdate );
-        connect( loader, SIGNAL( error( XSPFLoader::XSPFErrorCode ) ), SLOT( onXSPFError( XSPFLoader::XSPFErrorCode ) ) );
-        connect( loader, SIGNAL( ok( Tomahawk::playlist_ptr ) ), SLOT( onXSPFOk( Tomahawk::playlist_ptr ) ) );
-        loader->load( url );
+        handleUrlInput( url );
     }
     d->deleteLater();
 }
 
 
+void
+TomahawkWindow::handleUrlInput( const QUrl& url )
+{
+    QMimeData* data = new QMimeData( );
+    data->setData( "text/plain" , url.toEncoded() );
+    if ( DropJob::isDropType( DropJob::Playlist, data  ) )
+    {
+        qDebug() << Q_FUNC_INFO << "Current Event";
+        DropJob* dropThis = new DropJob;
+        dropThis->setDropTypes( DropJob::Playlist );
+        dropThis->setDropAction( DropJob::Create );
+        dropThis->parseMimeData( data );
+
+        // Don't add it to the playlist under drop, it's a new playlist now
+    }
+}
+
+
 void
 TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl )
 {
diff --git a/src/tomahawk/TomahawkWindow.h b/src/tomahawk/TomahawkWindow.h
index bbf910e1c..8243367e7 100644
--- a/src/tomahawk/TomahawkWindow.h
+++ b/src/tomahawk/TomahawkWindow.h
@@ -158,6 +158,8 @@ private:
     void setupShortcuts();
     void setupUpdateCheck();
 
+    void handleUrlInput( const QUrl& url );
+
 #ifdef Q_OS_WIN
     bool setupWindowsButtons();
     const unsigned int m_buttonCreatedID;