[vlc-commits] commit: Qt: reorganize playlist actions, rename "Delete" to " Remove Selected" (Jakob Leben )

[git version control]

vlc | branch: master | Jakob Leben <jleben at videolan.org> | Thu Mar  4 14:33:32 2010 +0100| [47fba51d8b831e57548cfbfe32f5e76087e845ee] | committer: Jakob Leben 

Qt: reorganize playlist actions, rename "Delete" to "Remove Selected"

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=47fba51d8b831e57548cfbfe32f5e76087e845ee
---

 include/vlc_intf_strings.h                         |    2 +-
 .../gui/qt4/components/playlist/playlist_model.cpp |    7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/include/vlc_intf_strings.h b/include/vlc_intf_strings.h
index 9f6367f..cd532b5 100644
--- a/include/vlc_intf_strings.h
+++ b/include/vlc_intf_strings.h
@@ -64,7 +64,7 @@
 /* Playlist popup */
 #define I_POP_PLAY N_("Play")
 #define I_POP_PREPARSE N_("Fetch Information")
-#define I_POP_DEL N_("Delete")
+#define I_POP_DEL N_("Remove Selected")
 #define I_POP_INFO N_("Information...")
 #define I_POP_SORT N_("Sort")
 #define I_POP_NEWFOLDER I_DIR_OR_FOLDER( N_("Create Directory..."), \
diff --git a/modules/gui/qt4/components/playlist/playlist_model.cpp b/modules/gui/qt4/components/playlist/playlist_model.cpp
index ed70f4b..f3d2955 100644
--- a/modules/gui/qt4/components/playlist/playlist_model.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_model.cpp
@@ -921,16 +921,13 @@ bool PLModel::popup( const QModelIndex & index, const QPoint &point, const QMode
     if( i_popup_item > -1 )
     {
         menu.addAction( QIcon( ":/menu/play" ), qtr(I_POP_PLAY), this, SLOT( popupPlay() ) );
-        menu.addAction( QIcon( ":/buttons/playlist/playlist_remove" ),
-                        qtr(I_POP_DEL), this, SLOT( popupDel() ) );
-        menu.addSeparator();
         menu.addAction( QIcon( ":/menu/stream" ),
                         qtr(I_POP_STREAM), this, SLOT( popupStream() ) );
         menu.addAction( qtr(I_POP_SAVE), this, SLOT( popupSave() ) );
-        menu.addSeparator();
         menu.addAction( QIcon( ":/menu/info" ), qtr(I_POP_INFO), this, SLOT( popupInfo() ) );
         menu.addAction( QIcon( ":/type/folder-grey" ),
                         qtr( I_POP_EXPLORE ), this, SLOT( popupExplore() ) );
+        menu.addSeparator();
     }
     if( canEdit() )
     {
@@ -953,6 +950,8 @@ bool PLModel::popup( const QModelIndex & index, const QPoint &point, const QMode
     }
     if( i_popup_item > -1 )
     {
+        menu.addAction( QIcon( ":/buttons/playlist/playlist_remove" ),
+                        qtr(I_POP_DEL), this, SLOT( popupDel() ) );
         menu.addSeparator();
         if( !sortingMenu )
         {