[vlc-commits] Qt, locationBar: translate Input->Name

Jean-Baptiste Kempf git at videolan.org
Tue Apr 26 02:34:44 CEST 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Apr 26 02:33:37 2011 +0200| [f2c859caff626610e52c21d38f79941f3de96ac8] | committer: Jean-Baptiste Kempf

Qt, locationBar: translate Input->Name

Here, input_item_GetTitleFbName fails us, since we need to translate
Name, but not Title (I think)
Close  #4551

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

 modules/gui/qt4/components/playlist/playlist.cpp |   13 ++++++++++---
 1 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/gui/qt4/components/playlist/playlist.cpp b/modules/gui/qt4/components/playlist/playlist.cpp
index 76ba459..7fc0f58 100644
--- a/modules/gui/qt4/components/playlist/playlist.cpp
+++ b/modules/gui/qt4/components/playlist/playlist.cpp
@@ -261,9 +261,16 @@ void LocationBar::setIndex( const QModelIndex &index )
     while( true )
     {
         PLItem *item = model->getItem( i );
+        QString text;
 
-        char *fb_name = input_item_GetTitleFbName( item->inputItem() );
-        QString text = qfu(fb_name);
+        char *fb_name = input_item_GetTitle( item->inputItem() );
+        if( !EMPTY_STR( fb_name ) )
+             text = qfu(fb_name);
+        else
+        {
+            fb_name = input_item_GetName( item->inputItem() );
+            text = qtr(fb_name);
+        }
         free(fb_name);
 
         QAbstractButton *btn = new LocationButton( text, first, !first, this );



More information about the vlc-commits mailing list