Commit 842d4437 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Qt4 - Fix Advanced preferences images location...

parent 5a9b7f9d
...@@ -60,13 +60,13 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : ...@@ -60,13 +60,13 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn ); setHorizontalScrollBarPolicy ( Qt::ScrollBarAlwaysOn );
#define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b )) #define BI( a,b) QIcon a##_icon = QIcon( QPixmap( b ))
BI( audio, ":/pixmaps/vlc_advprefs_audio.png" ); BI( audio, ":/pixmaps/advprefs_audio.png" );
BI( video, ":/pixmaps/vlc_advprefs_video.png" ); BI( video, ":/pixmaps/advprefs_video.png" );
BI( input, ":/pixmaps/vlc_advprefs_codec.png" ); BI( input, ":/pixmaps/advprefs_codec.png" );
BI( sout, ":/pixmaps/vlc_advprefs_sout.png" ); BI( sout, ":/pixmaps/advprefs_sout.png" );
BI( advanced, ":/pixmaps/vlc_advprefs_extended.png" ); BI( advanced, ":/pixmaps/advprefs_extended.png" );
BI( playlist, ":/pixmaps/vlc_advprefs_playlist.png" ); BI( playlist, ":/pixmaps/advprefs_playlist.png" );
BI( interface, ":/pixmaps/vlc_advprefs_intf.png" ); BI( interface, ":/pixmaps/advprefs_intf.png" );
#undef BI #undef BI
/* Build the tree for the main module */ /* Build the tree for the main module */
...@@ -132,6 +132,8 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : ...@@ -132,6 +132,8 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
break; break;
case CONFIG_SUBCATEGORY: case CONFIG_SUBCATEGORY:
if( p_item->value.i == -1 ) break; if( p_item->value.i == -1 ) break;
/* Special cases: move the main subcategories to the parent cat*/
if( data && if( data &&
( p_item->value.i == SUBCAT_VIDEO_GENERAL || ( p_item->value.i == SUBCAT_VIDEO_GENERAL ||
p_item->value.i == SUBCAT_ADVANCED_MISC || p_item->value.i == SUBCAT_ADVANCED_MISC ||
...@@ -155,6 +157,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) : ...@@ -155,6 +157,7 @@ PrefsTree::PrefsTree( intf_thread_t *_p_intf, QWidget *_parent ) :
QVariant::fromValue( data ) ); QVariant::fromValue( data ) );
continue; continue;
} }
data = new PrefsItemData(); data = new PrefsItemData();
data->name = QString( qtr( config_CategoryNameGet( data->name = QString( qtr( config_CategoryNameGet(
p_item->value.i)) ); p_item->value.i)) );
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment