From 83fb33511475ce86a30d565e8f925830784d54b3 Mon Sep 17 00:00:00 2001 From: Ilkka Ollakka Date: Mon, 12 May 2008 14:29:42 +0300 Subject: [PATCH] Show utf-8 as utf-8, eg translations in playlistpanel. also add _("ID") instead of empty label on first label (seems that it's id) --- modules/gui/qt4/components/playlist/playlist_item.cpp | 4 ++-- modules/gui/qt4/components/playlist/sorting.h | 2 +- modules/gui/qt4/components/playlist/standardpanel.cpp | 3 +-- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp index dcb598cb34..fd25e3efef 100644 --- a/modules/gui/qt4/components/playlist/playlist_item.cpp +++ b/modules/gui/qt4/components/playlist/playlist_item.cpp @@ -116,7 +116,7 @@ void PLItem::updateColumnHeaders() for( uint32_t i_index=1; i_index < COLUMN_END; i_index <<= 1 ) { if( i_showflags & i_index ) - item_col_strings.append( psz_column_title( i_index ) ); + item_col_strings.append( qfu( psz_column_title( i_index ) ) ); } } @@ -187,7 +187,7 @@ void PLItem::update( playlist_item_t *p_item, bool iscurrent ) if( parentItem->i_showflags & i_index ) { char *psz = psz_column_meta( p_item->p_input, i_index ); - item_col_strings.append( psz ); + item_col_strings.append( qfu( psz ) ); free( psz ); } } diff --git a/modules/gui/qt4/components/playlist/sorting.h b/modules/gui/qt4/components/playlist/sorting.h index d226040045..78cda9b2ed 100644 --- a/modules/gui/qt4/components/playlist/sorting.h +++ b/modules/gui/qt4/components/playlist/sorting.h @@ -43,7 +43,7 @@ static const char * psz_column_title( uint32_t i_column ) { switch( i_column ) { - case COLUMN_NUMBER: return ""; + case COLUMN_NUMBER: return _("ID"); case COLUMN_TITLE: return VLC_META_TITLE; case COLUMN_DURATION: return _("Duration"); case COLUMN_ARTIST: return VLC_META_ARTIST; diff --git a/modules/gui/qt4/components/playlist/standardpanel.cpp b/modules/gui/qt4/components/playlist/standardpanel.cpp index d420ac0e51..a8b0cf09e0 100644 --- a/modules/gui/qt4/components/playlist/standardpanel.cpp +++ b/modules/gui/qt4/components/playlist/standardpanel.cpp @@ -267,9 +267,8 @@ void StandardPLPanel::popupSelectColumn( QPoint pos ) QMenu selectColMenu; - char *psz_title; #define ADD_META_ACTION( meta ) { \ - QAction* option = selectColMenu.addAction( psz_column_title( meta ) ); \ + QAction* option = selectColMenu.addAction( qfu( psz_column_title( meta ) ) ); \ option->setCheckable( true ); \ option->setChecked( model->shownFlags() & meta ); \ ContextUpdateMapper->setMapping( option, meta ); \ -- 2.39.2