1
0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-09-08 05:00:50 +02:00

Compare commits

...

1 Commits

2 changed files with 23 additions and 10 deletions

View File

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

View File

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