mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-07-31 03:10:12 +02:00
Code Issues Releases Wiki Activity

Merge pull request #177 from xhochy/fix/twk-1172

Browse Source 
Escape ampersands in menu entry strings
This commit is contained in:
Christian Muehlhaeuser
2013-03-23 19:26:37 -07:00
parent e82c56fff0 6c08a27b3a
commit 1ba2e094bc
1 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
src/libtomahawk/ContextMenu.cpp
View File

@@ -135,13 +135,18 @@ ContextMenu::setQueries( const QList<Tomahawk::query_ptr>& queries )
if ( m_supportedActions & ActionPage && itemCount() == 1 ) if ( m_supportedActions & ActionPage && itemCount() == 1 )
{ {
// Ampersands need to be escaped as they indicate a keyboard shortcut
const QString track = m_queries.first()->track().replace( QString( "&" ), QString( "&&" ) );
m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/track-icon.svg" ), m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/track-icon.svg" ),
tr( "&Go to \"%1\"" ).arg( m_queries.first()->track() ) ), ActionTrackPage ); tr( "&Go to \"%1\"" ).arg( track ) ), ActionTrackPage );
if ( !m_queries.first()->album().isEmpty() ) if ( !m_queries.first()->album().isEmpty() ) {
const QString album = m_queries.first()->album().replace( QString( "&" ), QString( "&&" ) );
m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/album-icon.svg" ), m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/album-icon.svg" ),
tr( "Go to \"%1\"" ).arg( m_queries.first()->album() ) ), ActionAlbumPage ); tr( "Go to \"%1\"" ).arg( album ) ), ActionAlbumPage );
}
const QString artist = m_queries.first()->artist().replace( QString( "&" ), QString( "&&" ) );
m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/artist-icon.svg" ), m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/artist-icon.svg" ),
tr( "Go to \"%1\"" ).arg( m_queries.first()->artist() ) ), ActionArtistPage ); tr( "Go to \"%1\"" ).arg( artist ) ), ActionArtistPage );
} }
addSeparator(); addSeparator();
@@ -193,10 +198,12 @@ ContextMenu::setAlbums( const QList<Tomahawk::album_ptr>& albums )
if ( m_supportedActions & ActionPage && itemCount() == 1 ) if ( m_supportedActions & ActionPage && itemCount() == 1 )
{ {
const QString album = m_albums.first()->name().replace( QString( "&" ), QString( "&&" ) );
m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/album-icon.svg" ), m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/album-icon.svg" ),
tr( "&Go to \"%1\"" ).arg( m_albums.first()->name() ) ), ActionAlbumPage ); tr( "&Go to \"%1\"" ).arg( album ) ), ActionAlbumPage );
const QString artist = m_albums.first()->artist()->name().replace( QString( "&" ), QString( "&&" ) );
m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/artist-icon.svg" ), m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/artist-icon.svg" ),
tr( "Go to \"%1\"" ).arg( m_albums.first()->artist()->name() ) ), ActionArtistPage ); tr( "Go to \"%1\"" ).arg( artist ) ), ActionArtistPage );
} }
//m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist ); //m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist );
@@ -240,9 +247,11 @@ ContextMenu::setArtists( const QList<Tomahawk::artist_ptr>& artists )
addSeparator(); addSeparator();
if ( m_supportedActions & ActionPage && itemCount() == 1 ) if ( m_supportedActions & ActionPage && itemCount() == 1 ) {
const QString artist = m_artists.first()->name().replace( QString( "&" ), QString( "&&" ) );
m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/artist-icon.svg" ), m_sigmap->setMapping( addAction( ImageRegistry::instance()->icon( RESPATH "images/artist-icon.svg" ),
tr( "&Go to \"%1\"" ).arg( m_artists.first()->name() ) ), ActionArtistPage ); tr( "&Go to \"%1\"" ).arg( artist ) ), ActionArtistPage );
}
//m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist ); //m_sigmap->setMapping( addAction( tr( "&Add to Playlist" ) ), ActionAddToPlaylist );