Commit d03df884 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

* string review

parent 923649f9
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* ncurses.c : NCurses plugin for vlc * ncurses.c : NCurses plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2004 VideoLAN * 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> * Authors: Sam Hocevar <sam@zoy.org>
* Laurent Aimar <fenrir@via.ecp.fr> * Laurent Aimar <fenrir@via.ecp.fr>
...@@ -807,7 +807,7 @@ static void Redraw ( intf_thread_t *p_intf, time_t *t_last_refresh ) ...@@ -807,7 +807,7 @@ static void Redraw ( intf_thread_t *p_intf, time_t *t_last_refresh )
{ {
/* Info box */ /* Info box */
int l = 0; int l = 0;
DrawBox( p_sys->w, y++, 0, h, COLS, " Informations " ); DrawBox( p_sys->w, y++, 0, h, COLS, " Information " );
if( p_input ) if( p_input )
{ {
......
/***************************************************************************** /*****************************************************************************
* dialogs.cpp : wxWindows plugin for vlc * dialogs.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: dialogs.cpp,v 1.13 2004/01/05 13:00:39 zorglub Exp $ * $Id: dialogs.cpp,v 1.14 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -277,7 +277,7 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event ) ...@@ -277,7 +277,7 @@ void DialogsProvider::OnOpenFileSimple( wxCommandEvent& event )
} }
if( p_file_dialog == NULL ) 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 ); wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
if( p_file_dialog && p_file_dialog->ShowModal() == wxID_OK ) if( p_file_dialog && p_file_dialog->ShowModal() == wxID_OK )
......
/***************************************************************************** /*****************************************************************************
* fileinfo.cpp : wxWindows plugin for vlc * fileinfo.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001,2003 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: fileinfo.cpp,v 1.22 2003/12/27 14:36:30 gbazin Exp $ * $Id: fileinfo.cpp,v 1.23 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no> * Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
* *
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include <wx/treectrl.h>
/***************************************************************************** /*****************************************************************************
* Event Table. * Event Table.
......
/***************************************************************************** /*****************************************************************************
* interface.cpp : wxWindows plugin for vlc * interface.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001, 2003 VideoLAN * Copyright (C) 2000-2004, 2003 VideoLAN
* $Id: interface.cpp,v 1.84 2004/01/22 15:00:10 sigmunau Exp $ * $Id: interface.cpp,v 1.85 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -49,8 +49,6 @@ ...@@ -49,8 +49,6 @@
#include "bitmaps/fast.xpm" #include "bitmaps/fast.xpm"
#include "bitmaps/slow.xpm" #include "bitmaps/slow.xpm"
#include <wx/listctrl.h>
#define TOOLBAR_BMP_WIDTH 36 #define TOOLBAR_BMP_WIDTH 36
#define TOOLBAR_BMP_HEIGHT 36 #define TOOLBAR_BMP_HEIGHT 36
...@@ -311,7 +309,7 @@ void Interface::CreateOurMenuBar() ...@@ -311,7 +309,7 @@ void Interface::CreateOurMenuBar()
/* Create the "File" menu */ /* Create the "File" menu */
wxMenu *file_menu = new wxMenu; 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)) ); wxU(_(HELP_SIMPLE)) );
file_menu->AppendSeparator(); file_menu->AppendSeparator();
...@@ -358,7 +356,7 @@ void Interface::CreateOurMenuBar() ...@@ -358,7 +356,7 @@ void Interface::CreateOurMenuBar()
/* Create the "Help" menu */ /* Create the "Help" menu */
wxMenu *help_menu = new wxMenu; 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... */ /* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE ); wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
...@@ -384,11 +382,11 @@ void Interface::CreateOurMenuBar() ...@@ -384,11 +382,11 @@ void Interface::CreateOurMenuBar()
void Interface::CreateOurToolBar() 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_PLAY N_("Play")
#define HELP_PAUSE N_("Pause current playlist item") #define HELP_PAUSE N_("Pause")
#define HELP_PLO N_("Open playlist") #define HELP_PLO N_("Playlist")
#define HELP_PLP N_("Previous playlist item") #define HELP_PLP N_("Previous playlist item")
#define HELP_PLN N_("Next playlist item") #define HELP_PLN N_("Next playlist item")
#define HELP_SLOW N_("Play slower") #define HELP_SLOW N_("Play slower")
...@@ -402,15 +400,15 @@ void Interface::CreateOurToolBar() ...@@ -402,15 +400,15 @@ void Interface::CreateOurToolBar()
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) ); 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)) ); wxBitmap( file_xpm ), wxU(_(HELP_SIMPLE)) );
toolbar->AddSeparator(); toolbar->AddSeparator();
toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ), toolbar->AddTool( OpenFile_Event, wxU(_("Open File...")), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) ); 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)) ); 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)) ); wxU(_(HELP_NET)) );
toolbar->AddSeparator(); toolbar->AddSeparator();
...@@ -422,7 +420,7 @@ void Interface::CreateOurToolBar() ...@@ -422,7 +420,7 @@ void Interface::CreateOurToolBar()
toolbar->AddSeparator(); toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, wxU(_("Playlist")), toolbar->AddTool( Playlist_Event, wxU(_("Playlist")),
wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) ); wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
toolbar->AddTool( PrevStream_Event, wxU(_("Prev")), toolbar->AddTool( PrevStream_Event, wxU(_("Previous")),
wxBitmap( previous_xpm ), wxU(_(HELP_PLP)) ); wxBitmap( previous_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( NextStream_Event, wxU(_("Next")), wxBitmap( next_xpm ), toolbar->AddTool( NextStream_Event, wxU(_("Next")), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) ); wxU(_(HELP_PLN)) );
...@@ -490,6 +488,7 @@ void Interface::CreateOurSlider() ...@@ -490,6 +488,7 @@ void Interface::CreateOurSlider()
void Interface::CreateOurExtraPanel() void Interface::CreateOurExtraPanel()
{ {
char *psz_filters; char *psz_filters;
vlc_value_t val;
extra_frame = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize ); extra_frame = new wxPanel( this, -1, wxDefaultPosition, wxDefaultSize );
extra_frame->SetAutoLayout( TRUE ); extra_frame->SetAutoLayout( TRUE );
...@@ -497,7 +496,7 @@ void Interface::CreateOurExtraPanel() ...@@ -497,7 +496,7 @@ void Interface::CreateOurExtraPanel()
/* Create static box to surround the adjust controls */ /* Create static box to surround the adjust controls */
wxStaticBox *adjust_box = 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 */ /* Create the size for the frame */
wxStaticBoxSizer *adjust_sizer = wxStaticBoxSizer *adjust_sizer =
...@@ -585,7 +584,7 @@ void Interface::CreateOurExtraPanel() ...@@ -585,7 +584,7 @@ void Interface::CreateOurExtraPanel()
wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *ratio_sizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticText *ratio_text = new wxStaticText( extra_frame, -1, wxStaticText *ratio_text = new wxStaticText( extra_frame, -1,
wxU(_("Ratio")) ); wxU(_("Aspect Ratio")) );
ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""), ratio_combo = new wxComboBox( extra_frame, Ratio_Event, wxT(""),
wxDefaultPosition, wxSize(120,-1), wxDefaultPosition, wxSize(120,-1),
...@@ -603,7 +602,7 @@ void Interface::CreateOurExtraPanel() ...@@ -603,7 +602,7 @@ void Interface::CreateOurExtraPanel()
wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer *visual_sizer = new wxBoxSizer( wxHORIZONTAL );
wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event, wxCheckBox *visual_checkbox = new wxCheckBox( extra_frame, Visual_Event,
wxU(_("Visualisation")) ); wxU(_("Visualisations")) );
visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0); visual_sizer->Add( visual_checkbox, 0, wxEXPAND, 0);
visual_sizer->Layout(); visual_sizer->Layout();
...@@ -677,7 +676,7 @@ void Interface::CreateOurExtraPanel() ...@@ -677,7 +676,7 @@ void Interface::CreateOurExtraPanel()
if( f_value > 0 && f_value < 2 ) if( f_value > 0 && f_value < 2 )
brightness_slider->SetValue( (int)(100 * f_value) ); brightness_slider->SetValue( (int)(100 * f_value) );
f_value = config_GetFloat( p_intf, "gamma" ); 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) ); gamma_slider->SetValue( (int)(10 * f_value) );
extra_frame->Hide(); extra_frame->Hide();
...@@ -887,7 +886,7 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) ) ...@@ -887,7 +886,7 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
wxString msg; wxString msg;
msg.Printf( wxString(wxT("VLC media player " VERSION)) + msg.Printf( wxString(wxT("VLC media player " VERSION)) +
wxU(_(" (wxWindows interface)\n\n")) + 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( vlc_wraptext(INTF_ABOUT_MSG,WRAPCOUNT,ISUTF8) ) + wxT("\n\n") +
wxU(_("The VideoLAN team <videolan@videolan.org>\n" wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) ); "http://www.videolan.org/\n\n")) );
...@@ -1067,7 +1066,6 @@ void Interface::OnBrightnessUpdate( wxScrollEvent& event) ...@@ -1067,7 +1066,6 @@ void Interface::OnBrightnessUpdate( wxScrollEvent& event)
void Interface::OnContrastUpdate(wxScrollEvent& event) 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) void Interface::OnGammaUpdate(wxScrollEvent& event)
......
/***************************************************************************** /*****************************************************************************
* iteminfo.cpp : wxWindows plugin for vlc * iteminfo.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: iteminfo.cpp,v 1.6 2004/01/05 13:00:39 zorglub Exp $ * $Id: iteminfo.cpp,v 1.7 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Clment Stenac <zorglub@videolan.org> * Authors: Clment Stenac <zorglub@videolan.org>
* *
...@@ -31,20 +31,7 @@ ...@@ -31,20 +31,7 @@
#include <vlc/vlc.h> #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/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <vlc/intf.h> #include <vlc/intf.h>
...@@ -84,7 +71,7 @@ END_EVENT_TABLE() ...@@ -84,7 +71,7 @@ END_EVENT_TABLE()
ItemInfoDialog::ItemInfoDialog( intf_thread_t *_p_intf, ItemInfoDialog::ItemInfoDialog( intf_thread_t *_p_intf,
playlist_item_t *_p_item, playlist_item_t *_p_item,
wxWindow* _p_parent ): wxWindow* _p_parent ):
wxDialog( _p_parent, -1, wxU(_("Playlist item options")), wxDialog( _p_parent, -1, wxU(_("Playlist item info")),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE ) wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{ {
/* Initializations */ /* Initializations */
...@@ -147,7 +134,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent ) ...@@ -147,7 +134,7 @@ wxPanel *ItemInfoDialog::InfoPanel( wxWindow* parent )
/* Create a box to surround the controls */ /* Create a box to surround the controls */
wxStaticBox *panel_box = new wxStaticBox( info_panel, -1, wxStaticBox *panel_box = new wxStaticBox( info_panel, -1,
wxU(_("Item informations")) ); wxU(_("Item Info")) );
wxStaticBoxSizer *box_sizer = new wxStaticBoxSizer( panel_box, wxStaticBoxSizer *box_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL ); wxVERTICAL );
...@@ -225,14 +212,14 @@ wxPanel *ItemInfoDialog::GroupPanel( wxWindow* parent ) ...@@ -225,14 +212,14 @@ wxPanel *ItemInfoDialog::GroupPanel( wxWindow* parent )
wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition, wxPanel *panel = new wxPanel( parent, -1, wxDefaultPosition,
wxDefaultSize ); wxDefaultSize );
wxStaticBox *panel_box = new wxStaticBox( panel, -1, wxStaticBox *panel_box = new wxStaticBox( panel, -1,
wxU(_("Group info")) ); wxU(_("Group Info")) );
wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box, wxStaticBoxSizer *panel_sizer = new wxStaticBoxSizer( panel_box,
wxVERTICAL); wxVERTICAL);
wxBoxSizer *subpanel_sizer; wxBoxSizer *subpanel_sizer;
group_subpanel = new wxPanel( panel, -1 ); group_subpanel = new wxPanel( panel, -1 );
subpanel_sizer = new wxBoxSizer( wxVERTICAL) ; subpanel_sizer = new wxBoxSizer( wxVERTICAL) ;
enabled_checkbox = new wxCheckBox( group_subpanel, enabled_checkbox = new wxCheckBox( group_subpanel,
-1, wxU(_("Item enabled")) ); -1, wxU(_("Item Enabled")) );
enabled_checkbox->SetValue( p_item->b_enabled); enabled_checkbox->SetValue( p_item->b_enabled);
......
/***************************************************************************** /*****************************************************************************
* menus.cpp : wxWindows plugin for vlc * menus.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: menus.cpp,v 1.29 2003/12/08 19:50:21 gbazin Exp $ * $Id: menus.cpp,v 1.30 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include <wx/listctrl.h>
class wxMenuItemExt: public wxMenuItem class wxMenuItemExt: public wxMenuItem
{ {
...@@ -90,7 +89,7 @@ END_EVENT_TABLE() ...@@ -90,7 +89,7 @@ END_EVENT_TABLE()
wxMenu *OpenStreamMenu( intf_thread_t *p_intf ) wxMenu *OpenStreamMenu( intf_thread_t *p_intf )
{ {
wxMenu *menu = new wxMenu; 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( OpenFile_Event, wxU(_("Open &File...")) );
menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")) ); menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")) );
menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")) ); menu->Append( OpenNet_Event, wxU(_("Open &Network Stream...")) );
...@@ -217,7 +216,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent, ...@@ -217,7 +216,7 @@ void PopupMenu( intf_thread_t *p_intf, wxWindow *p_parent,
#if 1 #if 1
/* Add static entries */ /* Add static entries */
popupmenu.AppendSeparator(); popupmenu.AppendSeparator();
popupmenu.Append( MenuDummy_Event, wxU("Open"), popupmenu.Append( MenuDummy_Event, wxU("Open..."),
OpenStreamMenu( p_intf ), wxT("") ); OpenStreamMenu( p_intf ), wxT("") );
#endif #endif
......
/***************************************************************************** /*****************************************************************************
* playlist.cpp : wxWindows plugin for vlc * messages.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: messages.cpp,v 1.19 2003/12/27 14:36:30 gbazin Exp $ * $Id: messages.cpp,v 1.20 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Olivier Teulire <ipkiss@via.ecp.fr> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* *
...@@ -33,7 +33,6 @@ ...@@ -33,7 +33,6 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include <wx/textctrl.h>
/***************************************************************************** /*****************************************************************************
* Event Table. * Event Table.
......
/***************************************************************************** /*****************************************************************************
* open.cpp : wxWindows plugin for vlc * open.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000, 2001, 2003 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: open.cpp,v 1.62 2004/01/05 13:00:39 zorglub Exp $ * $Id: open.cpp,v 1.63 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -31,27 +31,13 @@ ...@@ -31,27 +31,13 @@
#include <vlc/vlc.h> #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/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/tokenzr.h> #include <wx/tokenzr.h>
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include "preferences_widgets.h" #include "preferences_widgets.h"
#ifndef wxRB_SINGLE #ifndef wxRB_SINGLE
...@@ -219,7 +205,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog, ...@@ -219,7 +205,7 @@ AutoBuiltPanel::AutoBuiltPanel( wxWindow *parent, OpenDialog *dialog,
*****************************************************************************/ *****************************************************************************/
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_access_method, int i_arg ):
wxFrame( _p_parent, -1, wxU(_("Open Target")), wxDefaultPosition, wxFrame( _p_parent, -1, wxU(_("Open...")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE ) wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{ {
OpenDialog( _p_intf, _p_parent, i_access_method, i_arg, OPEN_NORMAL ); 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, ...@@ -227,7 +213,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
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 ): 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 ) wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{ {
/* Initializations */ /* Initializations */
...@@ -256,7 +242,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -256,7 +242,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box, wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
wxHORIZONTAL ); wxHORIZONTAL );
wxStaticText *mrl_label = new wxStaticText( panel, -1, wxStaticText *mrl_label = new wxStaticText( panel, -1,
wxU(_("Open Target:")) ); wxU(_("Open :")) );
mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""), mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
wxPoint(20,25), wxSize(120, -1), wxPoint(20,25), wxSize(120, -1),
0, NULL ); 0, NULL );
...@@ -285,7 +271,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent, ...@@ -285,7 +271,7 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, wxWindow *_p_parent,
sout_checkbox = new wxCheckBox( panel, SoutEnable_Event, sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
wxU(_("Stream output")) ); 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, sout_sizer->Add( sout_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
sout_button = new wxButton( panel, SoutSettings_Event, sout_button = new wxButton( panel, SoutSettings_Event,
...@@ -432,9 +418,8 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent ) ...@@ -432,9 +418,8 @@ wxPanel *OpenDialog::FilePanel( wxWindow* parent )
/* Create Subtitles File checkox */ /* Create Subtitles File checkox */
wxFlexGridSizer *subsfile_sizer = new wxFlexGridSizer( 2, 1, 20 ); wxFlexGridSizer *subsfile_sizer = new wxFlexGridSizer( 2, 1, 20 );
subsfile_checkbox = new wxCheckBox( panel, SubsFileEnable_Event, subsfile_checkbox = new wxCheckBox( panel, SubsFileEnable_Event,
wxU(_("Subtitles file")) ); wxU(_("Subtitle options")) );
subsfile_checkbox->SetToolTip( wxU(_("Load an additional subtitles file. " subsfile_checkbox->SetToolTip( wxU(_("Force options for seperate subtitle files.")) );
"Currently only works with AVI files.")) );
subsfile_sizer->Add( subsfile_checkbox, 0, subsfile_sizer->Add( subsfile_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL ); wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
subsfile_button = new wxButton( panel, SubsFileSettings_Event, subsfile_button = new wxButton( panel, SubsFileSettings_Event,
...@@ -977,7 +962,7 @@ void OpenDialog::OnFilePanelChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -977,7 +962,7 @@ void OpenDialog::OnFilePanelChange( wxCommandEvent& WXUNUSED(event) )
void OpenDialog::OnFileBrowse( wxCommandEvent& WXUNUSED(event) ) void OpenDialog::OnFileBrowse( wxCommandEvent& WXUNUSED(event) )
{ {
if( file_dialog == NULL ) 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 ); wxT(""), wxT(""), wxT("*"), wxOPEN | wxMULTIPLE );
if( file_dialog && file_dialog->ShowModal() == wxID_OK ) if( file_dialog && file_dialog->ShowModal() == wxID_OK )
...@@ -1057,7 +1042,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1057,7 +1042,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
if( !b_disc_device_changed ) if( !b_disc_device_changed )
{ {
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") ); 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->SetRange( i_selection, 255 );
disc_title->SetValue( i_selection ); disc_title->SetValue( i_selection );
...@@ -1080,11 +1065,11 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1080,11 +1065,11 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
*/ */
#ifdef HAVE_VCDX #ifdef HAVE_VCDX
disc_title_label->SetLabel ( config_GetInt( p_intf, "vcdx-PBC" ) 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 ); disc_title->SetRange( 0, 999 );
i_selection = 0; i_selection = 0;
#else #else
disc_title_label->SetLabel ( wxT("Track") ); disc_title_label->SetLabel ( wxU(_("Track")) );
disc_title->SetRange( 1, 98 ); disc_title->SetRange( 1, 98 );
#endif #endif
disc_title->SetValue( i_selection ); disc_title->SetValue( i_selection );
...@@ -1096,7 +1081,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1096,7 +1081,7 @@ void OpenDialog::OnDiscTypeChange( wxCommandEvent& WXUNUSED(event) )
{ {
disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") ); disc_device->SetValue( psz_device ? wxL2U(psz_device) : wxT("") );
} }
disc_title_label->SetLabel ( wxT("Track") ); disc_title_label->SetLabel ( wxU(_("Track")) );
#ifdef HAVE_CDDAX #ifdef HAVE_CDDAX
i_selection = 0; i_selection = 0;
#endif #endif
...@@ -1157,7 +1142,7 @@ void OpenDialog::OnV4LPanelChange( wxCommandEvent& WXUNUSED(event) ) ...@@ -1157,7 +1142,7 @@ void OpenDialog::OnV4LPanelChange( wxCommandEvent& WXUNUSED(event) )
void OpenDialog::OnV4LTypeChange( wxCommandEvent& WXUNUSED(event) ) void OpenDialog::OnV4LTypeChange( wxCommandEvent& WXUNUSED(event) )
{ {
video_device->SetValue( wxU( "/dev/video" ) ); video_device->SetValue( wxT( "/dev/video" ) );
v4l_button->Enable(); v4l_button->Enable();
video_channel->Disable(); video_channel->Disable();
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc * playlist.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2004 VideoLAN * 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> * Authors: Olivier Teulire <ipkiss@via.ecp.fr>
* *
...@@ -28,7 +28,6 @@ ...@@ -28,7 +28,6 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include <wx/listctrl.h>
/* Callback prototype */ /* Callback prototype */
int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, 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 ): ...@@ -179,12 +178,9 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
i_group_sorted = 0; i_group_sorted = 0;
var_Create( p_intf, "random", VLC_VAR_BOOL ); var_Create( p_intf, "random", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Change( p_intf, "random", VLC_VAR_INHERITVALUE, & val, NULL ); var_Create( p_intf, "loop", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );
var_Create( p_intf, "loop", VLC_VAR_BOOL ); var_Create( p_intf, "repeat", VLC_VAR_BOOL | VLC_VAR_DOINHERIT );;
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 );
/* Create our "Manage" menu */ /* Create our "Manage" menu */
wxMenu *manage_menu = new wxMenu; wxMenu *manage_menu = new wxMenu;
...@@ -202,12 +198,12 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -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->Append( RSortTitle_Event, wxU(_("&Reverse sort by title")) );
sort_menu->AppendSeparator(); sort_menu->AppendSeparator();
sort_menu->Append( SortAuthor_Event, wxU(_("Sort by &author")) ); 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->AppendSeparator();
sort_menu->Append( SortGroup_Event, wxU(_("Sort by &group")) ); 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->AppendSeparator();
sort_menu->Append( Randomize_Event, wxU(_("&Randomize Playlist")) ); sort_menu->Append( Randomize_Event, wxU(_("&Shuffle Playlist")) );
/* Create our "Selection" menu */ /* Create our "Selection" menu */
wxMenu *selection_menu = new wxMenu; wxMenu *selection_menu = new wxMenu;
...@@ -215,7 +211,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -215,7 +211,7 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
selection_menu->Append( DisableSelection_Event, wxU(_("&Disable")) ); selection_menu->Append( DisableSelection_Event, wxU(_("&Disable")) );
selection_menu->AppendSeparator(); selection_menu->AppendSeparator();
selection_menu->Append( InvertSelection_Event, wxU(_("&Invert")) ); 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")) ); selection_menu->Append( SelectAll_Event, wxU(_("&Select All")) );
/* Create our "Group" menu */ /* Create our "Group" menu */
...@@ -236,10 +232,10 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -236,10 +232,10 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
/* Create the popup menu */ /* Create the popup menu */
popup_menu = new wxMenu; popup_menu = new wxMenu;
popup_menu->Append( PopupPlay_Event, wxU(_("Play item")) ); popup_menu->Append( PopupPlay_Event, wxU(_("Play")) );
popup_menu->Append( PopupDel_Event, wxU(_("Delete item")) ); popup_menu->Append( PopupDel_Event, wxU(_("Delete")) );
popup_menu->Append( PopupEna_Event, wxU(_("Toggle enabled")) ); 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 */ /* Create a panel to put everything in */
wxPanel *playlist_panel = new wxPanel( this, -1 ); wxPanel *playlist_panel = new wxPanel( this, -1 );
...@@ -254,14 +250,14 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ): ...@@ -254,14 +250,14 @@ Playlist::Playlist( intf_thread_t *_p_intf, wxWindow *p_parent ):
/* Create the Loop Checkbox */ /* Create the Loop Checkbox */
wxCheckBox *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 ); var_Get( p_intf, "loop", &val );
int b_loop = val.b_bool ; int b_loop = val.b_bool ;
loop_checkbox->SetValue( b_loop ); loop_checkbox->SetValue( b_loop );
/* Create the Repeat one checkbox */ /* Create the Repeat one checkbox */
wxCheckBox *repeat_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 ); var_Get( p_intf, "repeat", &val );
int b_repeat = val.b_bool ; int b_repeat = val.b_bool ;
repeat_checkbox->SetValue( b_repeat ); repeat_checkbox->SetValue( b_repeat );
...@@ -395,6 +391,8 @@ Playlist::~Playlist() ...@@ -395,6 +391,8 @@ Playlist::~Playlist()
delete iteminfo_dialog; 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 ); var_DelCallback( p_playlist, "intf-change", PlaylistChanged, this );
vlc_object_release( p_playlist ); vlc_object_release( p_playlist );
} }
...@@ -727,22 +725,22 @@ void Playlist::OnSort( wxCommandEvent& event ) ...@@ -727,22 +725,22 @@ void Playlist::OnSort( wxCommandEvent& event )
switch( event.GetId() ) switch( event.GetId() )
{ {
case SortTitle_Event: case SortTitle_Event:
playlist_SortTitle( p_playlist , 0 ); playlist_SortTitle( p_playlist , ORDER_NORMAL );
break; break;
case RSortTitle_Event: case RSortTitle_Event:
playlist_SortTitle( p_playlist , 1 ); playlist_SortTitle( p_playlist , ORDER_REVERSE );
break; break;
case SortAuthor_Event: case SortAuthor_Event:
playlist_SortAuthor(p_playlist , 0 ); playlist_SortAuthor(p_playlist , ORDER_NORMAL );
break; break;
case RSortAuthor_Event: case RSortAuthor_Event:
playlist_SortAuthor( p_playlist , 1 ); playlist_SortAuthor( p_playlist , ORDER_REVERSE );
break; break;
case SortGroup_Event: case SortGroup_Event:
playlist_SortGroup( p_playlist , 0 ); playlist_SortGroup( p_playlist , ORDER_NORMAL );
break; break;
case RSortGroup_Event: case RSortGroup_Event:
playlist_SortGroup( p_playlist , 1 ); playlist_SortGroup( p_playlist , ORDER_REVERSE );
break; break;
case Randomize_Event: case Randomize_Event:
playlist_Sort( p_playlist , SORT_RANDOM, ORDER_NORMAL ); playlist_Sort( p_playlist , SORT_RANDOM, ORDER_NORMAL );
...@@ -769,36 +767,36 @@ void Playlist::OnColSelect( wxListEvent& event ) ...@@ -769,36 +767,36 @@ void Playlist::OnColSelect( wxListEvent& event )
case 0: case 0:
if( i_title_sorted != 1 ) if( i_title_sorted != 1 )
{ {
playlist_SortTitle( p_playlist, 0 ); playlist_SortTitle( p_playlist, ORDER_NORMAL );
i_title_sorted = 1; i_title_sorted = 1;
} }
else else
{ {
playlist_SortTitle( p_playlist, 1 ); playlist_SortTitle( p_playlist, ORDER_REVERSE );
i_title_sorted = -1; i_title_sorted = -1;
} }
break; break;
case 1: case 1:
if( i_author_sorted != 1 ) if( i_author_sorted != 1 )
{ {
playlist_SortAuthor( p_playlist, 0 ); playlist_SortAuthor( p_playlist, ORDER_NORMAL );
i_author_sorted = 1; i_author_sorted = 1;
} }
else else
{ {
playlist_SortAuthor( p_playlist, 1 ); playlist_SortAuthor( p_playlist, ORDER_REVERSE );
i_author_sorted = -1; i_author_sorted = -1;
} }
break; break;
case 2: case 2:
if( i_group_sorted != 1 ) if( i_group_sorted != 1 )
{ {
playlist_SortGroup( p_playlist, 0 ); playlist_SortGroup( p_playlist, ORDER_NORMAL );
i_group_sorted = 1; i_group_sorted = 1;
} }
else else
{ {
playlist_SortGroup( p_playlist, 1 ); playlist_SortGroup( p_playlist, ORDER_REVERSE );
i_group_sorted = -1; i_group_sorted = -1;
} }
break; break;
...@@ -1193,10 +1191,10 @@ NewGroup::NewGroup( intf_thread_t *_p_intf, wxWindow *_p_parent ): ...@@ -1193,10 +1191,10 @@ NewGroup::NewGroup( intf_thread_t *_p_intf, wxWindow *_p_parent ):
wxStaticText *group_label = wxStaticText *group_label =
new wxStaticText( panel , -1, new wxStaticText( panel , -1,
wxU(_("Enter a name for the new group"))); wxU(_("Enter a name for the new group:")));
groupname = new wxTextCtrl(panel, -1, wxU(""),wxDefaultPosition, groupname = new wxTextCtrl(panel, -1, wxU(""),wxDefaultPosition,
wxSize(80,27),wxTE_PROCESS_ENTER); wxSize(100,27),wxTE_PROCESS_ENTER);
wxButton *ok_button = new wxButton(panel, wxID_OK, wxU(_("OK")) ); wxButton *ok_button = new wxButton(panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault(); ok_button->SetDefault();
......
/***************************************************************************** /*****************************************************************************
* preferences.cpp : wxWindows plugin for vlc * preferences.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: preferences.cpp,v 1.45 2004/01/11 00:45:06 zorglub Exp $ * $Id: preferences.cpp,v 1.46 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -36,12 +36,9 @@ ...@@ -36,12 +36,9 @@
#include "wxwindows.h" #include "wxwindows.h"
#include "preferences_widgets.h" #include "preferences_widgets.h"
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h> #include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <wx/treectrl.h>
#include <wx/clntdata.h> #include <wx/clntdata.h>
#include <wx/dynarray.h> #include <wx/dynarray.h>
...@@ -273,9 +270,9 @@ void PrefsDialog::OnSave( wxCommandEvent& WXUNUSED(event) ) ...@@ -273,9 +270,9 @@ void PrefsDialog::OnSave( wxCommandEvent& WXUNUSED(event) )
void PrefsDialog::OnResetAll( wxCommandEvent& WXUNUSED(event) ) void PrefsDialog::OnResetAll( wxCommandEvent& WXUNUSED(event) )
{ {
wxMessageDialog dlg( this, wxMessageDialog dlg( this,
wxU(_("Beware this will reset your VLC Media Player config file.\n" wxU(_("Beware this will reset your VLC media player preferences.\n"
"Are you sure you want to continue?")), "Are you sure you want to continue?")),
wxU(_("Reset config file")), wxYES_NO|wxNO_DEFAULT|wxCENTRE ); wxU(_("Reset Preferences")), wxYES_NO|wxNO_DEFAULT|wxCENTRE );
if ( dlg.ShowModal() == wxID_YES ) if ( dlg.ShowModal() == wxID_YES )
{ {
...@@ -421,8 +418,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf, ...@@ -421,8 +418,8 @@ PrefsTreeCtrl::PrefsTreeCtrl( wxWindow *_p_parent, intf_thread_t *_p_intf,
config_data->i_object_id = PLUGIN_ID; config_data->i_object_id = PLUGIN_ID;
config_data->psz_help = wraptext( PLUGIN_HELP, 72, ISUTF8 ); config_data->psz_help = wraptext( PLUGIN_HELP, 72, ISUTF8 );
config_data->psz_section = strdup( PLUGIN_TITLE ); config_data->psz_section = strdup( PLUGIN_TITLE );
plugins_item = AppendItem( root_item, wxU(_("Plugins")), plugins_item = AppendItem( root_item, wxU(_("Modules")),
-1,-1,config_data ); -1, -1,config_data );
for( i_index = 0; i_index < p_list->i_count; i_index++ ) for( i_index = 0; i_index < p_list->i_count; i_index++ )
{ {
......
/***************************************************************************** /*****************************************************************************
* preferences_widgets.cpp : wxWindows plugin for vlc * preferences_widgets.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: preferences_widgets.cpp,v 1.21 2004/01/24 12:30:32 gbazin Exp $ * $Id: preferences_widgets.cpp,v 1.22 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* Sigmund Augdal <sigmunau@idi.ntnu.no> * Sigmund Augdal <sigmunau@idi.ntnu.no>
......
/***************************************************************************** /*****************************************************************************
* streamout.cpp : wxWindows plugin for vlc * streamout.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: streamout.cpp,v 1.41 2003/12/22 02:24:52 sam Exp $ * $Id: streamout.cpp,v 1.42 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -33,10 +33,7 @@ ...@@ -33,10 +33,7 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include <wx/notebook.h>
#include <wx/textctrl.h>
#include <wx/combobox.h> #include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#ifndef wxRB_SINGLE #ifndef wxRB_SINGLE
......
/***************************************************************************** /*****************************************************************************
* stream.cpp : wxWindows plugin for vlc * stream.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: streamwizard.cpp,v 1.4 2004/01/05 13:00:39 zorglub Exp $ * $Id: streamwizard.cpp,v 1.5 2004/01/25 03:29:01 hartman Exp $
* *
* Authors: Clment Stenac <zorglub@videolan.org> * Authors: Clment Stenac <zorglub@videolan.org>
* *
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
#include <wx/statline.h> #include <wx/statline.h>
#define STREAM_INTRO N_( "Stream with VLC in three steps" ) #define STREAM_INTRO N_( "Stream with VLC in three steps." )
#define STREAM_STEP1 N_( "Step 1: select what to stream" ) #define STREAM_STEP1 N_( "Step 1: Select what to stream." )
#define STREAM_STEP2 N_( "Step 2: define streaming method" ) #define STREAM_STEP2 N_( "Step 2: Define streaming method." )
#define STREAM_STEP3 N_( "Step 3: start streaming" ) #define STREAM_STEP3 N_( "Step 3: Start streaming." )
/***************************************************************************** /*****************************************************************************
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* subtitles.cpp : wxWindows plugin for vlc * subtitles.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2001 VideoLAN
* $Id: subtitles.cpp,v 1.9 2003/12/22 15:42:44 gbazin Exp $ * $Id: subtitles.cpp,v 1.10 2004/01/25 03:29:02 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -33,9 +33,7 @@ ...@@ -33,9 +33,7 @@
#include <vlc/intf.h> #include <vlc/intf.h>
#include "wxwindows.h" #include "wxwindows.h"
#include <wx/textctrl.h>
#include <wx/combobox.h> #include <wx/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#ifndef wxRB_SINGLE #ifndef wxRB_SINGLE
...@@ -64,7 +62,7 @@ END_EVENT_TABLE() ...@@ -64,7 +62,7 @@ END_EVENT_TABLE()
* Constructor. * Constructor.
*****************************************************************************/ *****************************************************************************/
SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): SubsFileDialog::SubsFileDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
wxDialog( _p_parent, -1, wxU(_("Open subtitles file")), wxDialog( _p_parent, -1, wxU(_("Subtitle options")),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE ) wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{ {
/* Initializations */ /* Initializations */
......
/***************************************************************************** /*****************************************************************************
* v4l.cpp : wxWindows plugin for vlc * v4l.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2003 VideoLAN
* $Id: v4l.cpp,v 1.6 2003/12/22 02:24:52 sam Exp $ * $Id: v4l.cpp,v 1.7 2004/01/25 03:29:02 hartman Exp $
* *
* Authors: Mohammed Adnne Trojette <adn@via.ecp.fr> * Authors: Mohammed Adnne Trojette <adn@via.ecp.fr>
* *
...@@ -36,15 +36,7 @@ ...@@ -36,15 +36,7 @@
#undef CreateDialog #undef CreateDialog
#endif #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/combobox.h>
#include <wx/spinctrl.h>
#include <wx/statline.h> #include <wx/statline.h>
#include <vlc/intf.h> #include <vlc/intf.h>
...@@ -127,7 +119,7 @@ V4LDialog::V4LDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ): ...@@ -127,7 +119,7 @@ V4LDialog::V4LDialog( intf_thread_t *_p_intf, wxWindow* _p_parent ):
mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""), mrl_combo = new wxComboBox( panel, MRL_Event, wxT(""),
wxPoint(20,25), wxSize(200, -1), 0, NULL ); wxPoint(20,25), wxSize(200, -1), 0, NULL );
mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing " mrl_combo->SetToolTip( wxU(_("You can use this field directly by typing "
"the full MRL you want to open.\n""Alternatively, the field will be " "the full MRL you want to open.\n Alternatively, the field will be "
"filled automatically when you use the controls below")) ); "filled automatically when you use the controls below")) );
mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 ); mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 );
...@@ -294,7 +286,7 @@ wxPanel *V4LDialog::CommonPanel( wxWindow* parent ) ...@@ -294,7 +286,7 @@ wxPanel *V4LDialog::CommonPanel( wxWindow* parent )
WXSIZEOF(norm_array), norm_array, WXSIZEOF(norm_array), norm_array,
wxCB_READONLY ); wxCB_READONLY );
norm_combo->SetSelection(1); norm_combo->SetSelection(1);
norm_combo->SetToolTip( wxU(_( "Standard of the analogic signal" )) ); norm_combo->SetToolTip( wxU(_( "Standard of the analog signal" )) );
subpanel_sizer->Add( norm_checkbox, 0, wxALIGN_LEFT | subpanel_sizer->Add( norm_checkbox, 0, wxALIGN_LEFT |
wxALIGN_CENTER_VERTICAL ); wxALIGN_CENTER_VERTICAL );
subpanel_sizer->Add( norm_combo, 0, wxALIGN_RIGHT | subpanel_sizer->Add( norm_combo, 0, wxALIGN_RIGHT |
...@@ -302,10 +294,10 @@ wxPanel *V4LDialog::CommonPanel( wxWindow* parent ) ...@@ -302,10 +294,10 @@ wxPanel *V4LDialog::CommonPanel( wxWindow* parent )
frequency_checkbox = new wxCheckBox( common_subpanel, frequency_checkbox = new wxCheckBox( common_subpanel,
FrequencyEnable_Event, FrequencyEnable_Event,
wxU(_("Frequency")) ); wxU(_("Frequency (kHz)")) );
frequency = new wxSpinCtrl( common_subpanel, Frequency_Event, frequency = new wxSpinCtrl( common_subpanel, Frequency_Event,
wxT("479250") ); wxT("479250") );
frequency->SetToolTip( wxU(_("The frequency in kHz" )) ); frequency->SetToolTip( wxU(_("The channel frequency in kHz" )) );
subpanel_sizer->Add( frequency_checkbox, 0, wxALIGN_LEFT | subpanel_sizer->Add( frequency_checkbox, 0, wxALIGN_LEFT |
wxALIGN_CENTER_VERTICAL ); wxALIGN_CENTER_VERTICAL );
...@@ -355,7 +347,7 @@ wxPanel *V4LDialog::AudioPanel( wxWindow* parent ) ...@@ -355,7 +347,7 @@ wxPanel *V4LDialog::AudioPanel( wxWindow* parent )
audio_device->SetToolTip( wxU(_("Audio device")) ); audio_device->SetToolTip( wxU(_("Audio device")) );
label = new wxStaticText( audio_subpanel, -1, wxU(_("Channel")) ); label = new wxStaticText( audio_subpanel, -1, wxU(_("Channel")) );
audio_channel = new wxSpinCtrl( audio_subpanel, AudioChannel_Event, audio_channel = new wxSpinCtrl( audio_subpanel, AudioChannel_Event,
wxT("0") ); wxT("1") );
audio_channel->SetToolTip( wxU(_("Usually 0 is for mono " audio_channel->SetToolTip( wxU(_("Usually 0 is for mono "
"and 1 for stereo")) ); "and 1 for stereo")) );
subpanel_sizer->Add( audio_checkbox, 0, wxALIGN_RIGHT | subpanel_sizer->Add( audio_checkbox, 0, wxALIGN_RIGHT |
...@@ -410,6 +402,7 @@ wxPanel *V4LDialog::BitratePanel( wxWindow* parent ) ...@@ -410,6 +402,7 @@ wxPanel *V4LDialog::BitratePanel( wxWindow* parent )
MaxBitrateEnable_Event, MaxBitrateEnable_Event,
wxU(_("Maximum bitrate")) ); wxU(_("Maximum bitrate")) );
maxbitrate = new wxSpinCtrl( bitrate_subpanel, MaxBitrate_Event, wxT("3000") ); maxbitrate = new wxSpinCtrl( bitrate_subpanel, MaxBitrate_Event, wxT("3000") );
maxbitrate->SetToolTip( wxU(_("The maximum bitrate of the stream")) );
subpanel_sizer->Add( maxbitrate_checkbox, 0, wxALIGN_LEFT | subpanel_sizer->Add( maxbitrate_checkbox, 0, wxALIGN_LEFT |
wxALIGN_CENTER_VERTICAL ); wxALIGN_CENTER_VERTICAL );
......
/***************************************************************************** /*****************************************************************************
* wxwindows.cpp : wxWindows plugin for vlc * wxwindows.cpp : wxWindows plugin for vlc
***************************************************************************** *****************************************************************************
* Copyright (C) 2000-2001 VideoLAN * Copyright (C) 2000-2004 VideoLAN
* $Id: wxwindows.cpp,v 1.37 2004/01/15 00:05:04 gbazin Exp $ * $Id: wxwindows.cpp,v 1.38 2004/01/25 03:29:02 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL, extern int wxEntry( HINSTANCE hInstance, HINSTANCE hPrevInstance = NULL,
char *pCmdLine = NULL, int nCmdShow = SW_NORMAL ); char *pCmdLine = NULL, int nCmdShow = SW_NORMAL );
#endif #endif
#ifdef __DARWIN__ #ifdef SYS_DARWIN
int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE ); int wxEntry( int argc, char *argv[] , bool enterLoop = TRUE );
#endif #endif
......
/***************************************************************************** /*****************************************************************************
* wxwindows.h: private wxWindows interface description * wxwindows.h: private wxWindows interface description
***************************************************************************** *****************************************************************************
* Copyright (C) 1999, 2000 VideoLAN * Copyright (C) 1999-2004 VideoLAN
* $Id: wxwindows.h,v 1.86 2004/01/22 15:00:10 sigmunau Exp $ * $Id: wxwindows.h,v 1.87 2004/01/25 03:29:02 hartman Exp $
* *
* Authors: Gildas Bazin <gbazin@netcourrier.com> * Authors: Gildas Bazin <gbazin@netcourrier.com>
* *
......
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