From 478b60b2bfd9d5fc8daafe38626a32ee84449dff Mon Sep 17 00:00:00 2001 From: Teo Mrnjavac Date: Fri, 5 Apr 2013 10:39:36 +0200 Subject: [PATCH] Add proper Load/Rename Station strings. This fixes TWK-1291. --- src/libtomahawk/ActionCollection.cpp | 2 ++ src/sourcetree/SourceTreeView.cpp | 17 +++++++++++++++-- 2 files changed, 17 insertions(+), 2 deletions(-) diff --git a/src/libtomahawk/ActionCollection.cpp b/src/libtomahawk/ActionCollection.cpp index 7306bb13c..e835d635d 100644 --- a/src/libtomahawk/ActionCollection.cpp +++ b/src/libtomahawk/ActionCollection.cpp @@ -75,7 +75,9 @@ ActionCollection::initActions() connect( m_actionCollection[ "togglePrivacy" ], SIGNAL( triggered() ), SLOT( togglePrivateListeningMode() ), Qt::UniqueConnection ); m_actionCollection[ "loadPlaylist" ] = new QAction( tr( "&Load Playlist" ), this ); + m_actionCollection[ "loadStation" ] = new QAction( tr( "&Load Station" ), this ); m_actionCollection[ "renamePlaylist" ] = new QAction( tr( "&Rename Playlist" ), this ); + m_actionCollection[ "renameStation" ] = new QAction( tr( "&Rename Station" ), this ); m_actionCollection[ "copyPlaylist" ] = new QAction( tr( "&Copy Playlist Link" ), this ); m_actionCollection[ "playPause" ] = new QAction( tr( "&Play" ), this ); m_actionCollection[ "playPause" ]->setIcon( ImageRegistry::instance()->icon( RESPATH "images/play-rest.svg" ) ); diff --git a/src/sourcetree/SourceTreeView.cpp b/src/sourcetree/SourceTreeView.cpp index 41a572e1c..60c8d8f3d 100644 --- a/src/sourcetree/SourceTreeView.cpp +++ b/src/sourcetree/SourceTreeView.cpp @@ -195,9 +195,22 @@ SourceTreeView::setupMenus() } } - QAction* loadPlaylistAction = ActionCollection::instance()->getAction( "loadPlaylist" ); + QAction* loadPlaylistAction; + QAction* renamePlaylistAction; + + if ( type == SourcesModel::Station ) + { + loadPlaylistAction = ActionCollection::instance()->getAction( "loadStation" ); + renamePlaylistAction = ActionCollection::instance()->getAction( "renameStation" ); + + } + else + { + loadPlaylistAction = ActionCollection::instance()->getAction( "loadPlaylist" ); + renamePlaylistAction = ActionCollection::instance()->getAction( "renamePlaylist" ); + } + m_playlistMenu.addAction( loadPlaylistAction ); - QAction* renamePlaylistAction = ActionCollection::instance()->getAction( "renamePlaylist" ); m_playlistMenu.addAction( renamePlaylistAction ); m_playlistMenu.addSeparator();