From 3a890ee929f5d19e5c6051565cb300480cbf3b9d Mon Sep 17 00:00:00 2001 From: Leo Franchi Date: Wed, 10 Aug 2011 22:52:50 -0400 Subject: [PATCH] Use QStackedLayout instead of show/hide for play/pause widget. Fixes flicker. Extra 2px of spacing i can't get rid of... will work harder. TWK-128 --- src/libtomahawk/globalactionmanager.cpp | 10 ++++++++++ src/libtomahawk/globalactionmanager.h | 3 +++ src/tomahawkapp.cpp | 2 ++ 3 files changed, 15 insertions(+) diff --git a/src/libtomahawk/globalactionmanager.cpp b/src/libtomahawk/globalactionmanager.cpp index a60a01918..5b79b9c3a 100644 --- a/src/libtomahawk/globalactionmanager.cpp +++ b/src/libtomahawk/globalactionmanager.cpp @@ -909,3 +909,13 @@ GlobalActionManager::openSpotifyLink( const QString& link ) return true; } + +bool +GlobalActionManager::openRdioLink( const QString& link ) +{ +// RdioParser* rdio = new RdioParser( link, this ); +// connect( spot, SIGNAL( track( Tomahawk::query_ptr ) ), this, SLOT( handleOpenTrack( Tomahawk::query_ptr ) ) ); + + return true; +} + diff --git a/src/libtomahawk/globalactionmanager.h b/src/libtomahawk/globalactionmanager.h index 725e8c959..c06561b3f 100644 --- a/src/libtomahawk/globalactionmanager.h +++ b/src/libtomahawk/globalactionmanager.h @@ -44,6 +44,9 @@ public: /// Takes a spotify link and performs the default open action on it bool openSpotifyLink( const QString& link ); + /// Takes a spotify link and performs the default open action on it + bool openRdioLink( const QString& link ); + void copyToClipboard( const Tomahawk::query_ptr& query ) const; QString copyPlaylistToClipboard( const Tomahawk::dynplaylist_ptr& playlist ); void savePlaylistToFile( const Tomahawk::playlist_ptr& playlist, const QString& filename ); diff --git a/src/tomahawkapp.cpp b/src/tomahawkapp.cpp index 612fa3d08..6fd9af544 100644 --- a/src/tomahawkapp.cpp +++ b/src/tomahawkapp.cpp @@ -525,6 +525,8 @@ TomahawkApp::loadUrl( const QString& url ) return GlobalActionManager::instance()->parseTomahawkLink( url ); else if ( url.contains( "open.spotify.com" ) || url.contains( "spotify:track" ) ) return GlobalActionManager::instance()->openSpotifyLink( url ); + else if ( url.contains( "www.rdio.com" ) ) + return GlobalActionManager::instance()->openRdioLink( url ); else { QFile f( url );