Summary: | Various "Saved Playlists" incorrect right-click pop-up actions. | ||
---|---|---|---|
Product: | [Applications] amarok | Reporter: | Pierre Dumuid <pmdumuid> |
Component: | Playlists/Saved Playlists | Assignee: | Amarok Developers <amarok-bugs-dist> |
Status: | RESOLVED DUPLICATE | ||
Severity: | normal | CC: | bart.cerneels |
Priority: | NOR | ||
Version: | 2.3-GIT | ||
Target Milestone: | --- | ||
Platform: | Gentoo Packages | ||
OS: | Linux | ||
Latest Commit: | Version Fixed In: | ||
Sentry Crash Report: |
Description
Pierre Dumuid
2010-02-16 02:29:26 UTC
Hm, didn't Bart fix that yesterday? Fixed yesterday. I did not bother to check all the claims in the bug report nor read it all, please report each one separate if they persist. *** This bug has been marked as a duplicate of bug 226954 *** OK, I've gone through and verified all the above, and it seems to be working. I actually tested after it was said on IRC that things were fixed (c70953630c37a252) but it seems there must have been fixes that followed this. One other bug but I'll file a report when i get around to it. (basically, right clicking an "internal database" TRACK in a PLAYLIST says 'Remove from "<PrettyDateNow>"' rather than the actual name of the PLAYLIST. Pierre (In reply to comment #3) > One other bug but I'll file a report when i get around to it. (basically, right > clicking an "internal database" TRACK in a PLAYLIST says 'Remove from > "<PrettyDateNow>"' rather than the actual name of the PLAYLIST. > > Pierre That is a real bug and I just confirmed it. If you want to keep track to know when it's solved go ahead and create a bug report. commit 57b0ce4931d441c0e55b2fafb1721d874e3f3bf5 Author: Bart Cerneels <bart.cerneels@kde.org> Date: Tue Feb 16 15:06:30 2010 +0100 Fix the remove-action text. Caching the QAction does have the concequence of having to change the text when reused. I'm reusing a translated string from services/ampache/AmpacheConfigWidget.ui:98 This can be changed to something indicating multiple playlists if it turns out this is not clear enough. CCBUG:227112 diff --git a/src/playlistmanager/file/PlaylistFileProvider.cpp b/src/playlistmanager/file/PlaylistFileProvider.cpp index dd91186..a3ccc7d 100644 --- a/src/playlistmanager/file/PlaylistFileProvider.cpp +++ b/src/playlistmanager/file/PlaylistFileProvider.cpp @@ -131,6 +131,12 @@ PlaylistFileProvider::trackActions( Meta::PlaylistPtr playlist, int trackIndex ) m_removeTrackAction->setProperty( "popupdropper_svg_id", "delete" ); connect( m_removeTrackAction, SIGNAL( triggered() ), SLOT( slotRemove() ) ); } + else + { + m_removeTrackAction->setText( i18nc( "Remove a track from a saved playlist", + "Remove From \"%1\"" ).arg( playlist->name() ) ); + } + //Add the playlist/track combination to a QMultiMap that is stored in the action. //In the slot we use this data to remove that track from the playlist. PlaylistTrackMap playlistMap = m_removeTrackAction->data().value<PlaylistTrackMap>(); @@ -144,6 +150,9 @@ PlaylistFileProvider::trackActions( Meta::PlaylistPtr playlist, int trackIndex ) } m_removeTrackAction->setData( QVariant::fromValue( playlistMap ) ); + if( playlistMap.keys().count() > 1 ) + m_removeTrackAction->setText( i18n( "Remove" ) ); + actions << m_removeTrackAction; return actions; |