[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [Amarok]  Replace all instances of Append to Playlist with A
From:       Bart Cerneels <bart.cerneels () kde ! org>
Date:       2009-08-31 20:30:10
Message-ID: 200908312030.n7VKUAce000505 () Wurst ! kollide ! net
[Download RAW message or body]

commit ca0b8220f32363485badcd5f5552295679029515
Author:     Bart Cerneels <bart.cerneels@kde.org>
AuthorDate: Mon Aug 31 22:26:51 2009 +0200
Commit:     Bart Cerneels <bart.cerneels@kde.org>
CommitDate: Mon Aug 31 22:26:51 2009 +0200

    Replace all instances of Append to Playlist with Add to Playlist.
    
    Correct me if i'm wrong but didn't we agree to this during the sprint?

diff --git a/src/Systray.cpp b/src/Systray.cpp
index 95999a2..bfbf85c 100644
--- a/src/Systray.cpp
+++ b/src/Systray.cpp
@@ -238,8 +238,8 @@ Amarok::TrayIcon::event( QEvent *e )
             if( !list.isEmpty() )
             {
                 KMenu *popup = new KMenu;
-                popup->addAction( KIcon( "media-track-add-amarok" ), i18n( "&Append \
                to Playlist" ), this, SLOT( appendDrops() ) );
-                popup->addAction( KIcon( "media-track-add-amarok" ), i18n( "Append \
&& &Play" ), this, SLOT( appendAndPlayDrops() ) ); +                popup->addAction( \
KIcon( "media-track-add-amarok" ), i18n( "&Add to Playlist" ), this, SLOT( \
appendDrops() ) ); +                popup->addAction( KIcon( "media-track-add-amarok" \
), i18n( "Add && &Play" ), this, SLOT( appendAndPlayDrops() ) );  if( \
                The::playlist()->activeRow() >= 0 )
                     popup->addAction( KIcon( "go-next-amarok" ), i18n( "&Queue \
Track" ), this, SLOT( queueDrops() ) );  
diff --git a/src/browsers/CollectionTreeView.cpp \
b/src/browsers/CollectionTreeView.cpp index b56f3bf..9a73f3e 100644
--- a/src/browsers/CollectionTreeView.cpp
+++ b/src/browsers/CollectionTreeView.cpp
@@ -814,7 +814,7 @@ QActionList CollectionTreeView::createBasicActions( const \
QModelIndexList & indi  {
         if( m_appendAction == 0 )
         {
-            m_appendAction = new QAction( KIcon( "media-track-add-amarok" ), i18n( \
"&Append to Playlist" ), this ); +            m_appendAction = new QAction( KIcon( \
                "media-track-add-amarok" ), i18n( "&Add to Playlist" ), this );
             m_appendAction->setProperty( "popupdropper_svg_id", "append" );
             connect( m_appendAction, SIGNAL( triggered() ), this, SLOT( \
slotAppendChildTracks() ) );  }
diff --git a/src/browsers/filebrowser/MyDirOperator.cpp \
b/src/browsers/filebrowser/MyDirOperator.cpp index 471a329..b152266 100644
--- a/src/browsers/filebrowser/MyDirOperator.cpp
+++ b/src/browsers/filebrowser/MyDirOperator.cpp
@@ -267,7 +267,7 @@ MyDirOperator::createBasicActions()
 {
     QList<QAction*> actions;
 
-    QAction* appendAction = new QAction( KIcon( "media-track-add-amarok" ), i18n( \
"&Append to Playlist" ), this ); +    QAction* appendAction = new QAction( KIcon( \
                "media-track-add-amarok" ), i18n( "&Add to Playlist" ), this );
     QAction* loadAction = new QAction( KIcon( "folder-open" ), i18nc( "Replace the \
                currently loaded tracks with these", "&Replace Playlist" ), this );
     QAction* editAction = new QAction( KIcon( "media-track-edit-amarok" ), i18n( \
"Edit Track Details" ), this );  
diff --git a/src/browsers/playlistbrowser/PodcastModel.cpp \
b/src/browsers/playlistbrowser/PodcastModel.cpp index 6e6bfbb..c7b49f3 100644
--- a/src/browsers/playlistbrowser/PodcastModel.cpp
+++ b/src/browsers/playlistbrowser/PodcastModel.cpp
@@ -685,7 +685,7 @@ PlaylistBrowserNS::PodcastModel::createCommonActions( \
QModelIndexList indices )  {
         m_appendAction = new QAction(
             KIcon( "media-track-add-amarok" ),
-            i18n( "&Append to Playlist" ),
+            i18n( "&Add to Playlist" ),
             this
         );
         m_appendAction->setProperty( "popupdropper_svg_id", "append" );
diff --git a/src/browsers/playlistbrowser/UserPlaylistModel.cpp \
b/src/browsers/playlistbrowser/UserPlaylistModel.cpp index 95613de..2fdb757 100644
--- a/src/browsers/playlistbrowser/UserPlaylistModel.cpp
+++ b/src/browsers/playlistbrowser/UserPlaylistModel.cpp
@@ -534,7 +534,7 @@ PlaylistBrowserNS::UserModel::createCommonActions( \
QModelIndexList indices )  
     if ( m_appendAction == 0 )
     {
-        m_appendAction = new QAction( KIcon( "media-track-add-amarok" ), i18n( \
"&Append to Playlist" ), this ); +        m_appendAction = new QAction( KIcon( \
"media-track-add-amarok" ), i18n( "&Add to Playlist" ), this );  \
                m_appendAction->setProperty( "popupdropper_svg_id", "append" );
         connect( m_appendAction, SIGNAL( triggered() ), this, SLOT( slotAppend() ) \
);  }
diff --git a/src/context/applets/albums/AlbumsView.cpp \
b/src/context/applets/albums/AlbumsView.cpp index 000e51c..59a1f9b 100644
--- a/src/context/applets/albums/AlbumsView.cpp
+++ b/src/context/applets/albums/AlbumsView.cpp
@@ -107,8 +107,8 @@ AlbumsView::itemClicked( const QModelIndex &index )
 void
 AlbumsView::contextMenuEvent( QGraphicsSceneContextMenuEvent *event )
 {
-    KAction *appendAction = new KAction( KIcon( "media-track-add-amarok" ), i18n( \
                "&Append to Playlist" ), this );
-    KAction *loadAction   = new KAction( KIcon( "folder-open" ), i18nc( "Replace the \
currently loaded tracks with these", "&Load" ), this ); +    KAction *appendAction = \
new KAction( KIcon( "media-track-add-amarok" ), i18n( "&Add to Playlist" ), this ); + \
KAction *loadAction   = new KAction( KIcon( "folder-open" ), i18nc( "Replace the \
                currently loaded tracks with these", "&Replace Playlist" ), this );
     KAction *queueAction  = new KAction( KIcon( "media-track-queue-amarok" ), i18n( \
                "&Queue" ), this );
     KAction *editAction   = new KAction( KIcon( "media-track-edit-amarok" ), i18n( \
"Edit Track Details" ), this );  
diff --git a/src/context/applets/videoclip/VideoItemButton.cpp \
b/src/context/applets/videoclip/VideoItemButton.cpp index 4bd8ea1..bcb7b78 100644
--- a/src/context/applets/videoclip/VideoItemButton.cpp
+++ b/src/context/applets/videoclip/VideoItemButton.cpp
@@ -78,7 +78,7 @@ void VideoItemButton::mouseDoubleClickEvent(QMouseEvent* )
 void VideoItemButton::myMenu(QPoint point)
 {
     DEBUG_BLOCK
-    KAction *appendAction = new KAction( KIcon( "media-track-add-amarok" ), i18n( \
"&Append to playlist" ), this ); +    KAction *appendAction = new KAction( KIcon( \
                "media-track-add-amarok" ), i18n( "&Add to playlist" ), this );
     KAction *queueAction  = new KAction( KIcon( "media-track-queue-amarok" ), i18n( \
                "&Queue" ), this );
     KAction *appendPlayAction   = new KAction( KIcon( "music-amarok" ), i18n( \
"Append and &Play" ), this );  
diff --git a/src/services/lastfm/LastFmTreeView.cpp \
b/src/services/lastfm/LastFmTreeView.cpp index 81bcb51..48895bc 100644
--- a/src/services/lastfm/LastFmTreeView.cpp
+++ b/src/services/lastfm/LastFmTreeView.cpp
@@ -109,7 +109,7 @@ QActionList LastFmTreeView::createBasicActions( const \
QModelIndexList & indices  {
             if ( m_appendAction == 0 )
             {
-                m_appendAction = new QAction ( KIcon ( "media-track-add-amarok" ), \
i18n ( "&Append to Playlist" ), this ); +                m_appendAction = new QAction \
                ( KIcon ( "media-track-add-amarok" ), i18n ( "&Add to Playlist" ), \
                this );
                 m_appendAction->setProperty( "popupdropper_svg_id", "append" );
                 connect ( m_appendAction, SIGNAL ( triggered() ), this, SLOT ( \
slotAppendChildTracks() ) );  }


[prev in list] [next in list] [prev in thread] [next in thread]