Commit d03df884 authored by hartman's avatar hartman

* string review

parent 923649f9
......@@ -2,7 +2,7 @@
* ncurses.c : NCurses plugin for vlc
*****************************************************************************
* Copyright (C) 2001-2004 VideoLAN
* $Id: ncurses.c,v 1.13 2004/01/11 19:48:45 garf Exp $
* $Id: ncurses.c,v 1.14 2004/01/25 03:29:02 hartman Exp $
*
* Authors: Sam Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir@via.ecp.fr>
......@@ -807,7 +807,7 @@ static void Redraw ( intf_thread_t *p_intf, time_t *t_last_refresh )
{
/* Info box */
int l = 0;
DrawBox( p_sys->w, y++, 0, h, COLS, " Informations " );
DrawBox( p_sys->w, y++, 0, h, COLS, " Information " );
if( p_input )
{
......
/*****************************************************************************
* dialogs.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: dialogs.cpp,v 1.13 2004/01/05 13:00:39 zorglub Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: dialogs.cpp,v 1.14 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -277,7 +277,7 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
}
if( p_file_dialog == NULL )
p_file_dialog = new wxFileDialog( this, wxU(_("Open file")),
p_file_dialog = new wxFileDialog( this, wxU(_("Open File")),
wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
if( p_file_dialog && p_file_dialog->ShowModal() == wxID_OK )
......
/*****************************************************************************
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001,2003 VideoLAN
* $Id: fileinfo.cpp,v 1.22 2003/12/27 14:36:30 gbazin Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: fileinfo.cpp,v 1.23 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -28,7 +28,6 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#include <wx/treectrl.h>
/*****************************************************************************
* Event Table.
......
/*****************************************************************************
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001, 2003 VideoLAN
* $Id: interface.cpp,v 1.84 2004/01/22 15:00:10 sigmunau Exp $
* Copyright (C) 2000-2004, 2003 VideoLAN
* $Id: interface.cpp,v 1.85 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -49,8 +49,6 @@
#include "bitmaps/fast.xpm"
#include "bitmaps/slow.xpm"
#include <wx/listctrl.h>
#define TOOLBAR_BMP_WIDTH 36
#define TOOLBAR_BMP_HEIGHT 36
......@@ -311,7 +309,7 @@ void Interface::CreateOurMenuBar()
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
file_menu->Append( OpenFileSimple_Event, wxU(_("Quick &Open ...")),
file_menu->Append( OpenFileSimple_Event, wxU(_("Quick &Open File...")),
wxU(_(HELP_SIMPLE)) );
file_menu->AppendSeparator();
......@@ -358,7 +356,7 @@ void Interface::CreateOurMenuBar()
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
help_menu->Append( About_Event, wxU(_("&About...")), wxU(_(HELP_ABOUT)) );
help_menu->Append( About_Event, wxU(_("About VLC media player")), wxU(_(HELP_ABOUT)) );
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
......@@ -384,11 +382,11 @@ void Interface::CreateOurMenuBar()
void Interface::CreateOurToolBar()
{
#define HELP_STOP N_("Stop current playlist item")
#define HELP_STOP N_("Stop")
#define HELP_PLAY N_("Play current playlist item")
#define HELP_PAUSE N_("Pause current playlist item")
#define HELP_PLO N_("Open playlist")
#define HELP_PLAY N_("Play")
#define HELP_PAUSE N_("Pause")
#define HELP_PLO N_("Playlist")
#define HELP_PLP N_("Previous playlist item")
#define HELP_PLN N_("Next playlist item")
#define HELP_SLOW N_("Play slower")
......@@ -402,15 +400,15 @@ void Interface::CreateOurToolBar()
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
toolbar->AddTool( OpenFileSimple_Event, wxU(_("Quick")),
toolbar->AddTool( OpenFileSimple_Event, wxU(_("Quick Open File...")),
wxBitmap( file_xpm ), wxU(_(HELP_SIMPLE)) );
toolbar->AddSeparator();
toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ),
toolbar->AddTool( OpenFile_Event, wxU(_("Open File...")), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) );
toolbar->AddTool( OpenDisc_Event, wxU(_("Disc")), wxBitmap( disc_xpm ),
toolbar->AddTool( OpenDisc_Event, wxU(_("Open Disc...")), wxBitmap( disc_xpm ),
wxU(_(HELP_DISC)) );
toolbar->AddTool( OpenNet_Event, wxU(_("Net")), wxBitmap( net_xpm ),
toolbar->AddTool( OpenNet_Event, wxU(_("Open Network Stream...")), wxBitmap( net_xpm ),
wxU(_(HELP_NET)) );
toolbar->AddSeparator();
......@@ -422,7 +420,7 @@ void Interface::CreateOurToolBar()
toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, wxU(_("Playlist")),
wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
toolbar->AddTool( PrevStream_Event, wxU(_("Prev")),
toolbar->AddTool( PrevStream_Event, wxU(_("Previous")),
wxBitmap( previous_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( NextStream_Event, wxU(_("Next")), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) );
......@@ -490,6 +488,7 @@ void Interface::CreateOurSlider()
void Interface::CreateOurExtraPanel()
{
char *psz_filters;
vlc_value_t val;
extra_frame = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize );
extra_frame->SetAutoLayout( TRUE );
......@@ -497,7 +496,7 @@ void Interface::CreateOurExtraPanel()
/* Create static box to surround the adjust controls */
wxStaticBox *adjust_box =
new wxStaticBox( extra_frame, -1, wxU(_("Image adjust")) );
new wxStaticBox( extra_frame, -1, wxU(_("Adjust Image")) );
/* Create the size for the frame */
wxStaticBoxSizer *adjust_sizer =
......@@ -585,7 +584,7 @@ void Interface::CreateOurExtraPanel()
wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticText *ratio_text = new wxStaticText( extra_frame, -1,
wxU(_("Ratio")) );
wxU(_("Aspect Ratio")) );
ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""),
wxDefaultPosition, wxSize(120,-1),
......@@ -603,7 +602,7 @@ void Interface::CreateOurExtraPanel()
wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL );
wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event,
wxU(_("Visualisation")) );
wxU(_("Visualisations")) );
visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0);
visual_sizer->Layout();
......@@ -677,7 +676,7 @@ void Interface::CreateOurExtraPanel()
if( f_value > 0 && f_value < 2 )
brightness_slider->SetValue( (int)(100 * f_value) );
f_value = config_GetFloat( p_intf, "gamma" );
if (f_value > 0 && f_value < 10 )
if( f_value > 0 && f_value < 10 )
gamma_slider->SetValue( (int)(10 * f_value) );
extra_frame->Hide();
......@@ -887,7 +886,7 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
wxString msg;
msg.Printf( wxString(wxT("VLC media player " VERSION)) +
wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(c) 1996-2003 - the VideoLAN Team\n\n")) +
wxU(_("(c) 1996-2004 - the VideoLAN Team\n\n")) +
wxU( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) );
......@@ -1051,23 +1050,22 @@ void Interface::OnEnableAdjust(wxCommandEvent& event)
void Interface::OnHueUpdate( wxScrollEvent& event)
{
config_PutInt( p_intf , "hue" , event.GetPosition() );
config_PutInt( p_intf , "hue" , event.GetPosition() );
}
void Interface::OnSaturationUpdate( wxScrollEvent& event)
{
config_PutFloat( p_intf , "saturation" , (float)event.GetPosition()/100 );
config_PutFloat( p_intf , "saturation" , (float)event.GetPosition()/100 );
}
void Interface::OnBrightnessUpdate( wxScrollEvent& event)
{
config_PutFloat( p_intf , "brightness", (float)event.GetPosition()/100 );
config_PutFloat( p_intf , "brightness", (float)event.GetPosition()/100 );
}
void Interface::OnContrastUpdate(wxScrollEvent& event)
{
config_PutFloat( p_intf , "contrast" , (float)event.GetPosition()/100 );
config_PutFloat( p_intf , "contrast" , (float)event.GetPosition()/100 );
}
void Interface::OnGammaUpdate(wxScrollEvent& event)
......
/*****************************************************************************
* iteminfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: iteminfo.cpp,v 1.6 2004/01/05 13:00:39 zorglub Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: iteminfo.cpp,v 1.7 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Clment Stenac <zorglub@videolan.org>
*
......@@ -31,20 +31,7 @@
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h>
#include <vlc/intf.h>
......@@ -84,7 +71,7 @@ END_EVENT_TABLE()
ItemInfoDialog::ItemInfoDialog( intf_thread_t *_p_intf,
playlist_item_t *_p_item,
wxWindow* _p_parent ):
wxDialog( _p_parent, -1, wxU(_("Playlist item options")),
wxDialog( _p_parent, -1, wxU(_("Playlist item info")),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -147,7 +134,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
/* Create a box to surround the controls */
wxStaticBox *panel_box = new wxStaticBox( info_panel, -1,
wxU(_("Item informations")) );
wxU(_("Item Info")) );
wxStaticBoxSizer *box_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL );
......@@ -225,14 +212,14 @@ wxPanel *ItemInfoDialog::GroupPanel( wxWindow* parent )
wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
wxDefaultSize );
wxStaticBox *panel_box = new wxStaticBox( panel, -1,
wxU(_("Group info")) );
wxU(_("Group Info")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL);
wxBoxSizer *subpanel_sizer;
group_subpanel = new wxPanel( panel, -1 );
subpanel_sizer = new wxBoxSizer( wxVERTICAL) ;
enabled_checkbox = new wxCheckBox( group_subpanel,
-1, wxU(_("Item enabled")) );
-1, wxU(_("Item Enabled")) );
enabled_checkbox->SetValue( p_item->b_enabled);
......
/*****************************************************************************
* menus.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: menus.cpp,v 1.29 2003/12/08 19:50:21 gbazin Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: menus.cpp,v 1.30 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -33,7 +33,6 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#include <wx/listctrl.h>
class wxMenuItemExt: public wxMenuItem
{
......@@ -90,7 +89,7 @@ END_EVENT_TABLE()
wxMenu *OpenStreamMenu( intf_thread_t *p_intf )
{
wxMenu *menu = new wxMenu;
menu->Append( OpenFileSimple_Event, wxU(_("Simple &Open ...")) );
menu->Append( OpenFileSimple_Event, wxU(_("Quick &Open File...")) );
menu->Append( OpenFile_Event, wxU(_("Open &File...")) );
menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")) );
menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")) );
......@@ -217,7 +216,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
#if 1
/* Add static entries */
popupmenu.AppendSeparator();
popupmenu.Append( MenuDummy_Event, wxU("Open"),
popupmenu.Append( MenuDummy_Event, wxU("Open..."),
OpenStreamMenu( p_intf ), wxT("") );
#endif
......
/*****************************************************************************
* playlist.cpp : wxWindows plugin for vlc
* messages.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: messages.cpp,v 1.19 2003/12/27 14:36:30 gbazin Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: messages.cpp,v 1.20 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -33,7 +33,6 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#include <wx/textctrl.h>
/*****************************************************************************
* Event Table.
......
/*****************************************************************************
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000, 2001, 2003 VideoLAN
* $Id: open.cpp,v 1.62 2004/01/05 13:00:39 zorglub Exp $
* Copyright (C) 2000-2004 VideoLAN
* $Id: open.cpp,v 1.63 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -31,27 +31,13 @@
#include <vlc/vlc.h>
#ifdef WIN32 /* mingw32 hack */
#undef Yield
#undef CreateDialog
#endif
/* Let vlc take care of the i18n stuff */
#define WXINTL_NO_GETTEXT_MACRO
#include <wx/wxprec.h>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h>
#include <wx/tokenzr.h>
#include <vlc/intf.h>
#include "wxwindows.h"
#include "preferences_widgets.h"
#ifndef wxRB_SINGLE
......@@ -219,7 +205,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog,
*****************************************************************************/
OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
int i_access_method, int i_arg ):
wxFrame( _p_parent, -1, wxU(_("Open Target")), wxDefaultPosition,
wxFrame( _p_parent, -1, wxU(_("Open...")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
OpenDialog( _p_intf, _p_parent, i_access_method, i_arg, OPEN_NORMAL );
......@@ -227,7 +213,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
int i_access_method, int i_arg, int _i_method ):
wxFrame( _p_parent, -1, wxU(_("Open Target")), wxDefaultPosition,
wxFrame( _p_parent, -1, wxU(_("Open...")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -256,7 +242,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
wxHORIZONTAL );
wxStaticText *mrl_label = new wxStaticText( panel, -1,
wxU(_("Open Target:")) );
wxU(_("Open :")) );
mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
wxPoint(20,25), wxSize(120, -1),
0, NULL );
......@@ -285,7 +271,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
wxU(_("Stream output")) );
sout_checkbox->SetToolTip( wxU(_("Use VLC as a stream server")) );
sout_checkbox->SetToolTip( wxU(_("Use VLC as a server of streams")) );
sout_sizer->Add( sout_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
sout_button = new wxButton( panel, SoutSettings_Event,
......@@ -432,9 +418,8 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
/* Create Subtitles File checkox */
wxFlexGridSizer *subsfile_sizer = new wxFlexGridSizer( 2, 1, 20 );
subsfile_checkbox = new wxCheckBox( panel, SubsFileEnable_Event,
wxU(_("Subtitles file")) );
subsfile_checkbox->SetToolTip( wxU(_("Load an additional subtitles file. "
"Currently only works with AVI files.")) );
wxU(_("Subtitle options")) );
subsfile_checkbox->SetToolTip( wxU(_("Force options for seperate subtitle files.")) );
subsfile_sizer->Add( subsfile_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subsfile_button = new wxButton( panel, SubsFileSettings_Event,
......@@ -977,7 +962,7 @@ void OpenDialog::OnFilePanelChange( wxCommandEvent& WXUNUSED(event) )
void OpenDialog::OnFileBrowse( wxCommandEvent& WXUNUSED(event) )
{
if( file_dialog == NULL )
file_dialog = new wxFileDialog( this, wxU(_("Open file")),
file_dialog = new wxFileDialog( this, wxU(_("Open File")),
wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
if( file_dialog && file_dialog->ShowModal() == wxID_OK )
......@@ -1057,7 +1042,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
if( !b_disc_device_changed )
{
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
disc_title_label->SetLabel ( wxT("Title") );
disc_title_label->SetLabel ( wxU(_("Title")) );
}
disc_title->SetRange( i_selection, 255 );
disc_title->SetValue( i_selection );
......@@ -1080,11 +1065,11 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
*/
#ifdef HAVE_VCDX
disc_title_label->SetLabel ( config_GetInt( p_intf, "vcdx-PBC" )
? wxT("PBC LID") : wxT("Entry") );
? wxU(_("PBC LID")_) : wxU(_("Entry")) );
disc_title->SetRange( 0, 999 );
i_selection = 0;
#else
disc_title_label->SetLabel ( wxT("Track") );
disc_title_label->SetLabel ( wxU(_("Track")) );
disc_title->SetRange( 1, 98 );
#endif
disc_title->SetValue( i_selection );
......@@ -1096,7 +1081,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
{
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
}
disc_title_label->SetLabel ( wxT("Track") );
disc_title_label->SetLabel ( wxU(_("Track")) );
#ifdef HAVE_CDDAX
i_selection = 0;
#endif
......@@ -1157,7 +1142,7 @@ void OpenDialog::OnV4LPanelChange( wxCommandEvent& WXUNUSED(event) )
void OpenDialog::OnV4LTypeChange( wxCommandEvent& WXUNUSED(event) )
{
video_device->SetValue( wxU( "/dev/video" ) );
video_device->SetValue( wxT( "/dev/video" ) );
v4l_button->Enable();
video_channel->Disable();
......
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2004 VideoLAN
* $Id: playlist.cpp,v 1.38 2004/01/16 00:01:19 gbazin Exp $
* $Id: playlist.cpp,v 1.39 2004/01/25 03:29:01 hartman Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -28,7 +28,6 @@
#include <vlc/intf.h>
#include "wxwindows.h"
#include <wx/listctrl.h>
/* Callback prototype */
int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
......@@ -179,12 +178,9 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
i_group_sorted = 0;
var_Create( p_intf, "random", VLC_VAR_BOOL );
var_Change( p_intf, "random", VLC_VAR_INHERITVALUE, & val, NULL );
var_Create( p_intf, "loop", VLC_VAR_BOOL );
var_Create( p_intf, "loop", VLC_VAR_BOOL );
var_Change( p_intf, "repeat", VLC_VAR_INHERITVALUE, & val, NULL );
var_Change( p_intf, "repeat", VLC_VAR_INHERITVALUE, & val, NULL );
var_Create( p_intf, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_intf, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_intf, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );;
/* Create our "Manage" menu */
wxMenu *manage_menu = new wxMenu;
......@@ -202,12 +198,12 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
sort_menu->Append( RSortTitle_Event, wxU(_("&Reverse sort by title")) );
sort_menu->AppendSeparator();
sort_menu->Append( SortAuthor_Event, wxU(_("Sort by &author")) );
sort_menu->Append( RSortAuthor_Event, wxU(_("&Reverse sort by author")) );
sort_menu->Append( RSortAuthor_Event, wxU(_("Reverse sort by author")) );
sort_menu->AppendSeparator();
sort_menu->Append( SortGroup_Event, wxU(_("Sort by &group")) );
sort_menu->Append( RSortGroup_Event, wxU(_("&Reverse sort by group")) );
sort_menu->Append( RSortGroup_Event, wxU(_("Reverse sort by group")) );
sort_menu->AppendSeparator();
sort_menu->Append( Randomize_Event, wxU(_("&Randomize Playlist")) );
sort_menu->Append( Randomize_Event, wxU(_("&Shuffle Playlist")) );
/* Create our "Selection" menu */
wxMenu *selection_menu = new wxMenu;
......@@ -215,7 +211,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
selection_menu->Append( DisableSelection_Event, wxU(_("&Disable")) );
selection_menu->AppendSeparator();
selection_menu->Append( InvertSelection_Event, wxU(_("&Invert")) );
selection_menu->Append( DeleteSelection_Event, wxU(_("&Delete")) );
selection_menu->Append( DeleteSelection_Event, wxU(_("D&elete")) );
selection_menu->Append( SelectAll_Event, wxU(_("&Select All")) );
/* Create our "Group" menu */
......@@ -236,10 +232,10 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
/* Create the popup menu */
popup_menu = new wxMenu;
popup_menu->Append( PopupPlay_Event, wxU(_("Play item")) );
popup_menu->Append( PopupDel_Event, wxU(_("Delete item")) );
popup_menu->Append( PopupPlay_Event, wxU(_("Play")) );
popup_menu->Append( PopupDel_Event, wxU(_("Delete")) );
popup_menu->Append( PopupEna_Event, wxU(_("Toggle enabled")) );
popup_menu->Append( PopupInfo_Event, wxU(_("Info on item")) );
popup_menu->Append( PopupInfo_Event, wxU(_("Info")) );
/* Create a panel to put everything in */
wxPanel *playlist_panel = new wxPanel( this, -1 );
......@@ -254,14 +250,14 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
/* Create the Loop Checkbox */
wxCheckBox *loop_checkbox =
new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Loop")) );
new wxCheckBox( playlist_panel, Loop_Event, wxU(_("Repeat All")) );
var_Get( p_intf, "loop", &val );
int b_loop = val.b_bool ;
loop_checkbox->SetValue( b_loop );
/* Create the Repeat one checkbox */
wxCheckBox *repeat_checkbox =
new wxCheckBox( playlist_panel, Repeat_Event, wxU(_("Repeat one")) );
new wxCheckBox( playlist_panel, Repeat_Event, wxU(_("Repeat One")) );
var_Get( p_intf, "repeat", &val );
int b_repeat = val.b_bool ;
repeat_checkbox->SetValue( b_repeat );
......@@ -395,6 +391,8 @@ Playlist::~Playlist()
delete iteminfo_dialog;
var_DelCallback( p_playlist, "item-change", ItemChanged, this );
var_DelCallback( p_playlist, "playlist-current", PlaylistNext, this );
var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
vlc_object_release( p_playlist );
}
......@@ -727,22 +725,22 @@ void Playlist::OnSort( wxCommandEvent& event )
switch( event.GetId() )
{
case SortTitle_Event:
playlist_SortTitle( p_playlist , 0 );
playlist_SortTitle( p_playlist , ORDER_NORMAL );
break;
case RSortTitle_Event:
playlist_SortTitle( p_playlist , 1 );
playlist_SortTitle( p_playlist , ORDER_REVERSE );
break;
case SortAuthor_Event:
playlist_SortAuthor(p_playlist , 0 );
playlist_SortAuthor(p_playlist , ORDER_NORMAL );
break;
case RSortAuthor_Event:
playlist_SortAuthor( p_playlist , 1 );
playlist_SortAuthor( p_playlist , ORDER_REVERSE );
break;
case SortGroup_Event:
playlist_SortGroup( p_playlist , 0 );
playlist_SortGroup( p_playlist , ORDER_NORMAL );
break;
case RSortGroup_Event:
playlist_SortGroup( p_playlist , 1 );
playlist_SortGroup( p_playlist , ORDER_REVERSE );
break;
case Randomize_Event:
playlist_Sort( p_playlist , SORT_RANDOM, ORDER_NORMAL );
......@@ -769,36 +767,36 @@ void Playlist::OnColSelect( wxListEvent& event )
case 0:
if( i_title_sorted != 1 )
{
playlist_SortTitle( p_playlist, 0 );
playlist_SortTitle( p_playlist, ORDER_NORMAL );
i_title_sorted = 1;
}
else
{
playlist_SortTitle( p_playlist, 1 );
playlist_SortTitle( p_playlist, ORDER_REVERSE );
i_title_sorted = -1;
}
break;
case 1:
if( i_author_sorted != 1 )
{
playlist_SortAuthor( p_playlist, 0 );
playlist_SortAuthor( p_playlist, ORDER_NORMAL );
i_author_sorted = 1;
}