mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 00:24:12 +02:00
Code Issues Releases Wiki Activity

allow everything that can be drag'n' dropped to also be entered via the menu - load xspf (will be renamed)

Browse Source
This commit is contained in:
Stefan Derkits
2013-09-30 18:44:17 +02:00
parent a471c5c6e6
commit 23628343e8
2 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/tomahawk/TomahawkWindow.cpp
View File

@@ -77,6 +77,7 @@
#include "TomahawkTrayIcon.h" #include "TomahawkTrayIcon.h"
#include "TomahawkApp.h" #include "TomahawkApp.h"
#include "LoadXSPFDialog.h" #include "LoadXSPFDialog.h"
#include "DropJob.h"
#include "utils/ImageRegistry.h" #include "utils/ImageRegistry.h"
#include "utils/Logger.h" #include "utils/Logger.h"
@@ -985,12 +986,8 @@ TomahawkWindow::loadSpiff()
if ( !safe.isNull() && ret == QDialog::Accepted ) if ( !safe.isNull() && ret == QDialog::Accepted )
{ {
QUrl url = QUrl::fromUserInput( safe.data()->xspfUrl() ); QUrl url = QUrl::fromUserInput( safe.data()->xspfUrl() );
bool autoUpdate = safe.data()->autoUpdate();
XSPFLoader* loader = new XSPFLoader( true, autoUpdate ); handleUrlInput( url );
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 );
} }
#endif #endif
} }
@@ -1004,17 +1001,31 @@ TomahawkWindow::loadXspfFinished( int ret )
if ( ret == QDialog::Accepted ) if ( ret == QDialog::Accepted )
{ {
QUrl url = QUrl::fromUserInput( d->xspfUrl() ); QUrl url = QUrl::fromUserInput( d->xspfUrl() );
bool autoUpdate = d->autoUpdate();
XSPFLoader* loader = new XSPFLoader( true, autoUpdate ); handleUrlInput( url );
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 );
} }
d->deleteLater(); 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 void
TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl ) TomahawkWindow::onXSPFOk( const Tomahawk::playlist_ptr& pl )
{ {

2
src/tomahawk/TomahawkWindow.h
View File

@@ -158,6 +158,8 @@ private:
void setupShortcuts(); void setupShortcuts();
void setupUpdateCheck(); void setupUpdateCheck();
void handleUrlInput( const QUrl& url );
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
bool setupWindowsButtons(); bool setupWindowsButtons();
const unsigned int m_buttonCreatedID; const unsigned int m_buttonCreatedID;