Qt Imageset update.

[vlc] / modules / gui / qt4 / components / playlist / playlist_item.cpp

diff --git a/modules/gui/qt4/components/playlist/playlist_item.cpp b/modules/gui/qt4/components/playlist/playlist_item.cpp
index dcb598cb34ab50dd7456ff34540b11ed9d9e236f..d9f97e56e254c03e300f4c381efb03645823487d 100644 (file)
--- a/modules/gui/qt4/components/playlist/playlist_item.cpp
+++ b/modules/gui/qt4/components/playlist/playlist_item.cpp
@@ -32,8 +32,6 @@
 #include "components/playlist/playlist_model.hpp"
 #include <vlc_intf_strings.h>
 
-#include "pixmaps/type_unknown.xpm"
-
 #include <QSettings>
 
 #include "sorting.h"
@@ -73,7 +71,10 @@ void PLItem::init( int _i_id, int _i_input_id, PLItem *parent, PLModel *m )
             QSettings settings( "vlc", "vlc-qt-interface" );
             i_showflags = settings.value( "qt-pl-showflags", 39 ).toInt();
             if( i_showflags < 1)
-                i_showflags = 39; //reasonable default to show something;
+                i_showflags = 39; /* reasonable default to show something; */
+            else if ( i_showflags >= COLUMN_END )
+                i_showflags = COLUMN_END - 1; /* show everything */
+
             updateColumnHeaders();
         }
     }
@@ -116,7 +117,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 +188,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 );
         }
     }