Commit 14a9ecc6 authored by Clément Stenac's avatar Clément Stenac

Add a tristate for WX playlist mode (normal/embedded/both).

For the moment, defaults to normal. (Closes:#494)
parent 1d001afc
......@@ -669,7 +669,7 @@ void Interface::CreateOurToolBar()
#define HELP_PLAY N_("Play")
#define HELP_PAUSE N_("Pause")
#define HELP_PLO N_("Playlist")
#define HELP_SPLO N_("Small playlist")
#define HELP_SPLO N_("Embedded playlist")
#define HELP_PLP N_("Previous playlist item")
#define HELP_PLN N_("Next playlist item")
#define HELP_SLOW N_("Play slower")
......@@ -711,8 +711,10 @@ void Interface::CreateOurToolBar()
toolbar->AddTool( NextStream_Event, wxT(""), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) );
toolbar->AddSeparator();
if( config_GetInt( p_intf, "wx-playlist-view" ) != 1 )
toolbar->AddTool( Playlist_Event, wxT(""), wxBitmap( playlist_xpm ),
wxU(_(HELP_PLO)) );
if( config_GetInt( p_intf, "wx-playlist-view" ) >= 1 )
toolbar->AddTool( PlaylistSmall_Event, wxT(""),
wxBitmap( playlist_small_xpm ), wxU(_(HELP_SPLO)) );
}
......
......@@ -100,6 +100,17 @@ private:
#define SYSTRAY_TEXT N_("Show systray icon")
#define SYSTRAY_LONGTEXT N_("Show systray icon")
#define PLAYLIST_TEXT N_("Playlist view" )
#define PLAYLIST_LONGTEXT N_("There are two possible playlist views in the " \
"interface : the normal playlist (separate window), or an " \
"embedded playlist (within the main interface, but with " \
"less features. You can select which one will be available " \
"on the toolbar (or both)." )
static int pi_playlist_views[] = { 0,1,2 };
static char *psz_playlist_views[] = { N_("Normal" ), N_("Embedded" ) ,
N_("Both") };
vlc_module_begin();
#ifdef WIN32
int i_score = 150;
......@@ -134,6 +145,9 @@ vlc_module_begin();
add_deprecated( "wxwin-minimal", VLC_FALSE); /*Deprecated since 0.8.4*/
add_bool( "wx-autosize", 1, NULL,
SIZE_TO_VIDEO_TEXT, SIZE_TO_VIDEO_LONGTEXT, VLC_TRUE );
add_integer( "wx-playlist-view", 0, NULL, PLAYLIST_TEXT, PLAYLIST_LONGTEXT,
VLC_FALSE );
change_integer_list( pi_playlist_views, psz_playlist_views, 0 );
add_deprecated( "wxwin-autosize", VLC_FALSE); /*Deprecated since 0.8.4*/
/* wxCocoa pretends to support this, but at least 2.6.x doesn't */
#ifndef __APPLE__
......
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