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

support and fix search tomahawk link

Browse Source
This commit is contained in:
Leo Franchi
2011-10-30 18:19:32 -04:00
parent 7829be0936
commit cd04d027a0
1 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/libtomahawk/globalactionmanager.cpp
View File

@@ -50,6 +50,7 @@
#include "utils/spotifyparser.h" #include "utils/spotifyparser.h"
#include "utils/shortenedlinkparser.h" #include "utils/shortenedlinkparser.h"
#include "utils/rdioparser.h" #include "utils/rdioparser.h"
#include "widgets/searchwidget.h"
GlobalActionManager* GlobalActionManager::s_instance = 0; GlobalActionManager* GlobalActionManager::s_instance = 0;
@@ -500,6 +501,11 @@ bool
GlobalActionManager::handleSearchCommand( const QUrl& url ) GlobalActionManager::handleSearchCommand( const QUrl& url )
{ {
// open the super collection and set this as the search filter // open the super collection and set this as the search filter
QString queryStr;
if ( url.hasQueryItem( "query" ) )
queryStr = url.queryItemValue( "query" );
else
{
QStringList query; QStringList query;
if( url.hasQueryItem( "artist" ) ) if( url.hasQueryItem( "artist" ) )
query << url.queryItemValue( "artist" ); query << url.queryItemValue( "artist" );
@@ -507,13 +513,14 @@ GlobalActionManager::handleSearchCommand( const QUrl& url )
query << url.queryItemValue( "album" ); query << url.queryItemValue( "album" );
if( url.hasQueryItem( "title" ) ) if( url.hasQueryItem( "title" ) )
query << url.queryItemValue( "title" ); query << url.queryItemValue( "title" );
QString queryStr = query.join( " " ); queryStr = query.join( " " );
}
if( queryStr.isEmpty() ) if( queryStr.trimmed().isEmpty() )
return false; return false;
ViewManager::instance()->showSuperCollection(); ViewManager::instance()->show( new SearchWidget( queryStr.trimmed() ) );
// ViewManager::instance()->topbar()->setFilter( queryStr );
return true; return true;
} }