Skip to content

GitLab

Commit 0bb214dc authored by gbazin's avatar gbazin
Browse files
Options 

* modules/gui/wxwindows/*: the wxWindows plugin is now UNICODE happy.
parent 9d32c978
Hide whitespace changes
Inline Side-by-side
Showing with 321 additions and 299 deletions
modules/gui/wxwindows/fileinfo.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* fileinfo.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: fileinfo.cpp,v 1.11 2003/04/22 18:21:15 ipkiss Exp $
* $Id: fileinfo.cpp,v 1.12 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Sigmund Augdal <sigmunau@idi.ntnu.no>
*
......@@ -76,7 +76,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxFrame( _p_main_interface, -1, "FileInfo", wxDefaultPosition,
wxFrame( _p_main_interface, -1, wxU(_("FileInfo")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -92,10 +92,10 @@ FileInfo::FileInfo( intf_thread_t *_p_intf, Interface *_p_main_interface ):
new wxTreeCtrl( panel, -1, wxDefaultPosition, wxSize( 350, 350 ),
wxTR_HAS_BUTTONS | wxTR_HIDE_ROOT | wxSUNKEN_BORDER );
fileinfo_root_label = "";
fileinfo_root_label = wxT("");
/* Create the OK button */
wxButton *ok_button = new wxButton( panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( panel, wxID_OK, wxU(_("OK")) );
ok_button->SetDefault();
/* Place everything in sizers */
......@@ -123,7 +123,7 @@ void FileInfo::UpdateFileInfo()
{
if( fileinfo_root )
{
fileinfo_root_label = "";
fileinfo_root_label = wxT("");
fileinfo_tree->DeleteChildren( fileinfo_root );
}
return;
......@@ -135,17 +135,17 @@ void FileInfo::UpdateFileInfo()
* retrieved with the GetItemText() method, but it doesn't work on
* Windows when the wxTR_HIDE_ROOT style is set. That's why we need to
* use the fileinfo_root_label variable... */
fileinfo_root = fileinfo_tree->AddRoot( p_input->psz_name );
fileinfo_root_label = p_input->psz_name;
fileinfo_root = fileinfo_tree->AddRoot( wxU(p_input->psz_name) );
fileinfo_root_label = wxU(p_input->psz_name);
}
else if( fileinfo_root_label == (wxString)p_input->psz_name )
else if( fileinfo_root_label == wxU(p_input->psz_name) )
{
return;
}
/* We rebuild the tree from scratch */
fileinfo_tree->DeleteChildren( fileinfo_root );
fileinfo_root_label = p_input->psz_name;
fileinfo_root_label = wxU(p_input->psz_name);
vlc_mutex_lock( &p_input->stream.stream_lock );
......@@ -154,12 +154,12 @@ void FileInfo::UpdateFileInfo()
while( p_cat )
{
wxTreeItemId cat = fileinfo_tree->AppendItem( fileinfo_root,
p_cat->psz_name );
wxU(p_cat->psz_name) );
input_info_t *p_info = p_cat->p_info;
while( p_info )
{
fileinfo_tree->AppendItem( cat, wxString(p_info->psz_name) + ": "
+ p_info->psz_value );
fileinfo_tree->AppendItem( cat, wxU(p_info->psz_name) +
wxT(": ") + wxU(p_info->psz_value) );
p_info = p_info->p_next;
}
p_cat = p_cat->p_next;
......
modules/gui/wxwindows/interface.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: interface.cpp,v 1.23 2003/05/07 12:23:06 gbazin Exp $
* $Id: interface.cpp,v 1.24 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -108,8 +108,6 @@ enum
Logs_Event,
FileInfo_Event,
Audio_Event,
Subtitles_Event,
Prefs_Event,
SliderScroll_Event,
......@@ -159,7 +157,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
Interface::Interface( intf_thread_t *_p_intf ):
wxFrame( NULL, -1, VOUT_TITLE,
wxFrame( NULL, -1, wxT(VOUT_TITLE),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -228,36 +226,42 @@ void Interface::CreateOurMenuBar()
#define HELP_LOGS N_("Show the program logs")
#define HELP_FILEINFO N_("Show information about the file being played")
#define HELP_AUDIO N_("Change the current audio track")
#define HELP_SUBS N_("Change the current subtitles stream")
#define HELP_PREFS N_("Go to the preferences menu")
#define HELP_ABOUT N_("About this program")
/* Create the "File" menu */
wxMenu *file_menu = new wxMenu;
file_menu->Append( OpenFile_Event, _("&Open File..."), HELP_FILE );
file_menu->Append( OpenDisc_Event, _("Open &Disc..."), HELP_DISC );
file_menu->Append( OpenNet_Event, _("&Network Stream..."), HELP_NET );
file_menu->Append( OpenFile_Event, wxU(_("&Open File...")),
wxU(_(HELP_FILE)) );
file_menu->Append( OpenDisc_Event, wxU(_("Open &Disc...")),
wxU(_(HELP_DISC)) );
file_menu->Append( OpenNet_Event, wxU(_("&Network Stream...")),
wxU(_(HELP_NET)) );
#if 0
file_menu->Append( OpenSat_Event, _("&Satellite Stream..."), HELP_NET );
file_menu->Append( OpenSat_Event, wxU(_("&Satellite Stream...")),
wxU(_(HELP_NET)) );
#endif
#if 0
file_menu->AppendSeparator();
file_menu->Append( EjectDisc_Event, _("&Eject Disc"), HELP_EJECT );
file_menu->Append( EjectDisc_Event, wxU(_("&Eject Disc")),
wxU(_(HELP_EJECT)) );
#endif
file_menu->AppendSeparator();
file_menu->Append( Exit_Event, _("E&xit"), HELP_EXIT );
file_menu->Append( Exit_Event, wxU(_("E&xit")), wxU(_(HELP_EXIT)) );
/* Create the "View" menu */
wxMenu *view_menu = new wxMenu;
view_menu->Append( Playlist_Event, _("&Playlist..."), HELP_PLAYLIST );
view_menu->Append( Logs_Event, _("&Logs..."), HELP_LOGS );
view_menu->Append( FileInfo_Event, _("&File info..."), HELP_FILEINFO );
view_menu->Append( Playlist_Event, wxU(_("&Playlist...")),
wxU(_(HELP_PLAYLIST)) );
view_menu->Append( Logs_Event, wxU(_("&Logs...")), wxU(_(HELP_LOGS)) );
view_menu->Append( FileInfo_Event, wxU(_("&File info...")),
wxU(_(HELP_FILEINFO)) );
/* Create the "Settings" menu */
wxMenu *settings_menu = new wxMenu;
settings_menu->Append( Subtitles_Event, _("&Subtitles"), HELP_SUBS );
settings_menu->AppendSeparator();
settings_menu->Append( Prefs_Event, _("&Preferences..."), HELP_PREFS );
settings_menu->Append( Prefs_Event, wxU(_("&Preferences...")),
wxU(_(HELP_PREFS)) );
/* Create the "Audio" menu */
p_audio_menu = new wxMenu;
......@@ -269,16 +273,16 @@ void Interface::CreateOurMenuBar()
/* Create the "Help" menu */
wxMenu *help_menu = new wxMenu;
help_menu->Append( About_Event, _("&About..."), HELP_ABOUT );
help_menu->Append( About_Event, wxU(_("&About...")), wxU(_(HELP_ABOUT)) );
/* Append the freshly created menus to the menu bar... */
wxMenuBar *menubar = new wxMenuBar( wxMB_DOCKABLE );
menubar->Append( file_menu, _("&File") );
menubar->Append( view_menu, _("&View") );
menubar->Append( settings_menu, _("&Settings") );
menubar->Append( p_audio_menu, _("&Audio") );
menubar->Append( p_video_menu, _("&Video") );
menubar->Append( help_menu, _("&Help") );
menubar->Append( file_menu, wxU(_("&File")) );
menubar->Append( view_menu, wxU(_("&View")) );
menubar->Append( settings_menu, wxU(_("&Settings")) );
menubar->Append( p_audio_menu, wxU(_("&Audio")) );
menubar->Append( p_video_menu, wxU(_("&Video")) );
menubar->Append( help_menu, wxU(_("&Help")) );
/* Attach the menu bar to the frame */
SetMenuBar( menubar );
......@@ -309,28 +313,28 @@ void Interface::CreateOurToolBar()
toolbar->SetToolBitmapSize( wxSize(TOOLBAR_BMP_WIDTH,TOOLBAR_BMP_HEIGHT) );
toolbar->AddTool( OpenFile_Event, _("File"), wxBitmap( file_xpm ),
HELP_FILE );
toolbar->AddTool( OpenDisc_Event, _("Disc"), wxBitmap( disc_xpm ),
HELP_DISC );
toolbar->AddTool( OpenNet_Event, _("Net"), wxBitmap( net_xpm ),
HELP_NET );
toolbar->AddTool( OpenFile_Event, wxU(_("File")), wxBitmap( file_xpm ),
wxU(_(HELP_FILE)) );
toolbar->AddTool( OpenDisc_Event, wxU(_("Disc")), wxBitmap( disc_xpm ),
wxU(_(HELP_DISC)) );
toolbar->AddTool( OpenNet_Event, wxU(_("Net")), wxBitmap( net_xpm ),
wxU(_(HELP_NET)) );
#if 0
toolbar->AddTool( OpenSat_Event, _("Sat"), wxBitmap( sat_xpm ),
HELP_SAT );
toolbar->AddTool( OpenSat_Event, wxU(_("Sat")), wxBitmap( sat_xpm ),
wxU(_(HELP_SAT)) );
#endif
toolbar->AddSeparator();
toolbar->AddTool( StopStream_Event, _("Stop"), wxBitmap( stop_xpm ),
HELP_STOP );
toolbar->AddTool( PlayStream_Event, _("Play"), wxBitmap( play_xpm ),
HELP_PLAY );
toolbar->AddTool( StopStream_Event, wxU(_("Stop")), wxBitmap( stop_xpm ),
wxU(_(HELP_STOP)) );
toolbar->AddTool( PlayStream_Event, wxU(_("Play")), wxBitmap( play_xpm ),
wxU(_(HELP_PLAY)) );
toolbar->AddSeparator();
toolbar->AddTool( Playlist_Event, _("Playlist"), wxBitmap( playlist_xpm ),
HELP_PLO );
toolbar->AddTool( PrevStream_Event, _("Prev"), wxBitmap( previous_xpm ),
HELP_PLP );
toolbar->AddTool( NextStream_Event, _("Next"), wxBitmap( next_xpm ),
HELP_PLN );
toolbar->AddTool( Playlist_Event, wxU(_("Playlist")),
wxBitmap( playlist_xpm ), wxU(_(HELP_PLO)) );
toolbar->AddTool( PrevStream_Event, wxU(_("Prev")),
wxBitmap( previous_xpm ), wxU(_(HELP_PLP)) );
toolbar->AddTool( NextStream_Event, wxU(_("Next")), wxBitmap( next_xpm ),
wxU(_(HELP_PLN)) );
toolbar->Realize();
......@@ -360,7 +364,7 @@ void Interface::CreateOurSlider()
slider_frame->SetAutoLayout( TRUE );
/* Create static box to surround the slider */
slider_box = new wxStaticBox( slider_frame, -1, "" );
slider_box = new wxStaticBox( slider_frame, -1, wxT("") );
/* Create sizer for slider frame */
wxStaticBoxSizer *slider_sizer =
......@@ -395,7 +399,7 @@ void Interface::Open( int i_access_method )
return;
}
playlist_Add( p_playlist, (char *)dialog.mrl.c_str(),
playlist_Add( p_playlist, (const char *)dialog.mrl.mb_str(),
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
TogglePlayButton( PLAYING_S );
......@@ -419,7 +423,7 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
{
p_audio_menu = AudioMenu( p_intf, this );
wxMenu *menu =
GetMenuBar()->Replace( 3, p_audio_menu, _("&Audio") );
GetMenuBar()->Replace( 3, p_audio_menu, wxU(_("&Audio")) );
if( menu ) delete menu;
b_audio_menu = 0;
......@@ -432,7 +436,7 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
{
p_video_menu = VideoMenu( p_intf, this );
wxMenu *menu =
GetMenuBar()->Replace( 4, p_video_menu, _("&Video") );
GetMenuBar()->Replace( 4, p_video_menu, wxU(_("&Video")) );
if( menu ) delete menu;
b_video_menu = 0;
......@@ -442,11 +446,11 @@ void Interface::OnMenuOpen(wxMenuEvent& event)
#else
p_audio_menu = AudioMenu( p_intf, this );
wxMenu *menu = GetMenuBar()->Replace( 3, p_audio_menu, _("&Audio") );
wxMenu *menu = GetMenuBar()->Replace( 3, p_audio_menu, wxU(_("&Audio")) );
if( menu ) delete menu;
p_video_menu = VideoMenu( p_intf, this );
menu = GetMenuBar()->Replace( 4, p_video_menu, _("&Video") );
menu = GetMenuBar()->Replace( 4, p_video_menu, wxU(_("&Video")) );
if( menu ) delete menu;
#endif
......@@ -473,15 +477,15 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
msg.Printf( VOUT_TITLE + wxString(_(" (wxWindows interface)\n\n")) +
wxString(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
wxString(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) +
wxString(_("This is the VideoLAN Client, a DVD, MPEG and DivX player."
"\nIt can play MPEG and MPEG2 files from a file or from a "
"network source.")) );
wxMessageBox( msg, wxString::Format(_("About %s"), VOUT_TITLE),
msg.Printf( wxT(VOUT_TITLE) + wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
"http://www.videolan.org/\n\n")) +
wxU(_("This is the VideoLAN Client, a DVD, MPEG and DivX player."
"\nIt can play MPEG and MPEG2 files from a file or from a "
"network source.")) );
wxMessageBox( msg, wxString::Format(wxU(_("About %s")), wxT(VOUT_TITLE)),
wxOK | wxICON_INFORMATION, this );
}
......@@ -650,10 +654,10 @@ void Interface::OnSliderUpdate( wxScrollEvent& event )
char psz_time[ OFFSETTOTIME_MAX_SIZE ];
slider_box->SetLabel(
input_OffsetToTime( p_intf->p_sys->p_input,
psz_time,
p_area->i_size * event.GetPosition()
/ SLIDER_MAX_POS ) );
wxU(input_OffsetToTime( p_intf->p_sys->p_input,
psz_time,
p_area->i_size * event.GetPosition()
/ SLIDER_MAX_POS )) );
#undef p_area
}
}
......@@ -699,12 +703,12 @@ void Interface::TogglePlayButton( int i_playing_status )
if( i_playing_status == PLAYING_S )
{
GetToolBar()->InsertTool( 5, PlayStream_Event, _("Pause"),
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Pause")),
wxBitmap( pause_xpm ) );
}
else
{
GetToolBar()->InsertTool( 5, PlayStream_Event, _("Play"),
GetToolBar()->InsertTool( 5, PlayStream_Event, wxU(_("Play")),
wxBitmap( play_xpm ) );
}
......@@ -738,7 +742,7 @@ bool DragAndDrop::OnDropFiles( wxCoord, wxCoord,
}
for( i = 0; i < filenames.GetCount(); i++ )
playlist_Add( p_playlist, (char *)filenames[i].c_str(),
playlist_Add( p_playlist, (const char *)filenames[i].mb_str(),
PLAYLIST_APPEND | PLAYLIST_GO, PLAYLIST_END );
/* Rebuild the playlist */
......
modules/gui/wxwindows/menus.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* menus.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: menus.cpp,v 1.5 2003/05/08 12:09:59 gbazin Exp $
* $Id: menus.cpp,v 1.6 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -266,7 +266,7 @@ Menu::Menu( intf_thread_t *_p_intf, Interface *_p_main_interface,
if( !pi_objects[i] )
{
Append( MenuDummy_Event, ppsz_varnames[i] );
Append( MenuDummy_Event, wxU(ppsz_varnames[i]) );
continue;
}
......@@ -280,7 +280,7 @@ Menu::Menu( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Special case for empty menus */
if( GetMenuItemCount() == 0 )
{
Append( MenuDummy_Event, _("Empty") );
Append( MenuDummy_Event, wxU(_("Empty")) );
Enable( MenuDummy_Event, FALSE );
}
}
......@@ -332,9 +332,9 @@ void Menu::CreateMenuItem( wxMenu *menu, char *psz_var,
if( i_type & VLC_VAR_HASCHOICE )
{
menu->Append( MenuDummy_Event,
text.psz_string ? text.psz_string : psz_var,
wxU(text.psz_string ? text.psz_string : psz_var),
CreateChoicesMenu( psz_var, p_object ),
"" /* Nothing for now (maybe use a GETLONGTEXT) */ );
wxT("")/* Nothing for now (maybe use a GETLONGTEXT) */ );
if( text.psz_string ) free( text.psz_string );
return;
......@@ -345,18 +345,18 @@ void Menu::CreateMenuItem( wxMenu *menu, char *psz_var,
{
case VLC_VAR_VOID:
menuitem = new wxMenuItemExt( menu, ++i_item_id,
text.psz_string ?
text.psz_string : psz_var,
"", wxITEM_NORMAL, strdup(psz_var),
wxU(text.psz_string ?
text.psz_string : psz_var),
wxT(""), wxITEM_NORMAL, strdup(psz_var),
p_object->i_object_id, val, i_type );
menu->Append( menuitem );
break;
case VLC_VAR_BOOL:
menuitem = new wxMenuItemExt( menu, ++i_item_id,
text.psz_string ?
text.psz_string : psz_var,
"", wxITEM_CHECK, strdup(psz_var),
wxU(text.psz_string ?
text.psz_string : psz_var),
wxT(""), wxITEM_CHECK, strdup(psz_var),
p_object->i_object_id, val, i_type );
menu->Append( menuitem );
Check( i_item_id -1, val.b_bool ? FALSE : TRUE );
......@@ -424,12 +424,12 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object )
{
case VLC_VAR_VARIABLE:
menu->Append( MenuDummy_Event,
text_list.p_list->p_values[i].psz_string ?
wxU(text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string :
val_list.p_list->p_values[i].psz_string,
val_list.p_list->p_values[i].psz_string),
CreateChoicesMenu(
val_list.p_list->p_values[i].psz_string,
p_object ), "" );
p_object ), wxT("") );
break;
case VLC_VAR_STRING:
......@@ -437,10 +437,10 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object )
strdup(val_list.p_list->p_values[i].psz_string);
menuitem =
new wxMenuItemExt( menu, ++i_item_id,
text_list.p_list->p_values[i].psz_string ?
wxU(text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string :
another_val.psz_string,
"", wxITEM_RADIO, strdup(psz_var),
another_val.psz_string),
wxT(""), wxITEM_RADIO, strdup(psz_var),
p_object->i_object_id, another_val, i_type );
menu->Append( menuitem );
......@@ -454,10 +454,10 @@ wxMenu *Menu::CreateChoicesMenu( char *psz_var, vlc_object_t *p_object )
menuitem =
new wxMenuItemExt( menu, ++i_item_id,
text_list.p_list->p_values[i].psz_string ?
text_list.p_list->p_values[i].psz_string :
wxString::Format("%d",
wxU(text_list.p_list->p_values[i].psz_string):
wxString::Format(wxT("%d"),
val_list.p_list->p_values[i].i_int),
"", wxITEM_RADIO, strdup(psz_var),
wxT(""), wxITEM_RADIO, strdup(psz_var),
p_object->i_object_id,
val_list.p_list->p_values[i], i_type );
......
modules/gui/wxwindows/messages.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* playlist.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: messages.cpp,v 1.4 2003/04/20 20:28:40 ipkiss Exp $
* $Id: messages.cpp,v 1.5 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Olivier Teulire <ipkiss@via.ecp.fr>
*
......@@ -77,7 +77,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ):
wxFrame( _p_main_interface, -1, "Messages", wxDefaultPosition,
wxFrame( _p_main_interface, -1, wxU(_("Messages")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -91,7 +91,7 @@ Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ):
messages_panel->SetAutoLayout( TRUE );
/* Create the textctrl and some text attributes */
textctrl = new wxTextCtrl( messages_panel, -1, "", wxDefaultPosition,
textctrl = new wxTextCtrl( messages_panel, -1, wxT(""), wxDefaultPosition,
wxSize::wxSize( 400, 500 ), wxTE_MULTILINE | wxTE_READONLY |
wxTE_RICH | wxTE_NOHIDESEL );
info_attr = new wxTextAttr( wxColour::wxColour( 0, 128, 0 ) );
......@@ -100,12 +100,12 @@ Messages::Messages( intf_thread_t *_p_intf, Interface *_p_main_interface ):
dbg_attr = new wxTextAttr( *wxBLACK );
/* Create the OK button */
wxButton *ok_button = new wxButton( messages_panel, wxID_OK, _("OK") );
wxButton *ok_button = new wxButton( messages_panel, wxID_OK, wxU(_("OK")));
ok_button->SetDefault();
/* Create the Verbose checkbox */
wxCheckBox *verbose_checkbox =
new wxCheckBox( messages_panel, Verbose_Event, _("Verbose") );
new wxCheckBox( messages_panel, Verbose_Event, wxU(_("Verbose")) );
/* Place everything in sizers */
wxBoxSizer *buttons_sizer = new wxBoxSizer( wxHORIZONTAL );
......@@ -151,30 +151,30 @@ void Messages::UpdateLog()
/* Append all messages to log window */
textctrl->SetDefaultStyle( *dbg_attr );
(*textctrl) << p_sub->p_msg[i_start].psz_module;
(*textctrl) << wxU(p_sub->p_msg[i_start].psz_module);
switch( p_sub->p_msg[i_start].i_type )
{
case VLC_MSG_INFO:
(*textctrl) << ": ";
(*textctrl) << wxT(": ");
textctrl->SetDefaultStyle( *info_attr );
break;
case VLC_MSG_ERR:
(*textctrl) << " error: ";
(*textctrl) << wxT(" error: ");
textctrl->SetDefaultStyle( *err_attr );
break;
case VLC_MSG_WARN:
(*textctrl) << " warning: ";
(*textctrl) << wxT(" warning: ");
textctrl->SetDefaultStyle( *warn_attr );
break;
case VLC_MSG_DBG:
default:
(*textctrl) << " debug: ";
(*textctrl) << wxT(" debug: ");
break;
}
/* Add message */
(*textctrl) << p_sub->p_msg[i_start].psz_msg << "\n";
(*textctrl) << wxU(p_sub->p_msg[i_start].psz_msg) << wxT("\n");
}
vlc_mutex_lock( p_sub->p_lock );
......
modules/gui/wxwindows/open.cpp
View file @ 0bb214dc
......@@ -2,7 +2,7 @@
* open.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: open.cpp,v 1.17 2003/05/07 12:23:06 gbazin Exp $
* $Id: open.cpp,v 1.18 2003/05/11 13:22:23 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
......@@ -141,7 +141,7 @@ END_EVENT_TABLE()
*****************************************************************************/
OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
int i_access_method ):
wxDialog( _p_main_interface, -1, _("Open Target"), wxDefaultPosition,
wxDialog( _p_main_interface, -1, wxU(_("Open Target")), wxDefaultPosition,
wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
......@@ -156,17 +156,17 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Create MRL combobox */
wxBoxSizer *mrl_sizer_sizer = new wxBoxSizer( wxHORIZONTAL );
wxStaticBox *mrl_box = new wxStaticBox( panel, -1,
_("Media Resource Locator (MRL)") );
wxU(_("Media Resource Locator (MRL)")) );
wxStaticBoxSizer *mrl_sizer = new wxStaticBoxSizer( mrl_box,
wxHORIZONTAL );
wxStaticText *mrl_label = new wxStaticText( panel, -1,
_("Open Target:") );
wxU(_("Open Target:")) );
mrl_combo = new wxComboBox( panel, MRL_Event, mrl,
wxPoint(20,25), wxSize(120, -1),
0, NULL );
mrl_combo->SetToolTip( _("You can use this field directly by typing the "
"full MRL you want to open.\n""Alternatively, the field will be "
"filled automatically when you use the controls below") );
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 "
"filled automatically when you use the controls below")) );
mrl_sizer->Add( mrl_label, 0, wxALL | wxALIGN_CENTER, 5 );
mrl_sizer->Add( mrl_combo, 1, wxALL | wxALIGN_CENTER, 5 );
......@@ -175,17 +175,18 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Create Static Text */
wxStaticText *label = new wxStaticText( panel, -1,
_("Alternatively, you can build an MRL using one of the "
"following predefined targets:") );
wxU(_("Alternatively, you can build an MRL using one of the "
"following predefined targets:")) );
/* Create Stream Output checkox */
wxFlexGridSizer *sout_sizer = new wxFlexGridSizer( 2, 1, 20 );
sout_checkbox = new wxCheckBox( panel, SoutEnable_Event,
_("Stream output") );
sout_checkbox->SetToolTip( _("Use VLC as a stream server") );
wxU(_("Stream output")) );
sout_checkbox->SetToolTip( wxU(_("Use VLC as a stream server")) );
sout_sizer->Add( sout_checkbox, 0,
wxALIGN_RIGHT | wxALIGN_CENTER_VERTICAL );
sout_button = new wxButton( panel, SoutSettings_Event, _("Settings...") );
sout_button = new wxButton( panel, SoutSettings_Event,
wxU(_("Settings...")) );
sout_button->Disable();
char *psz_sout = config_GetPsz( p_intf, "sout" );
......@@ -201,19 +202,19 @@ OpenDialog::OpenDialog( intf_thread_t *_p_intf, Interface *_p_main_interface,
/* Create Demux Dump checkox */
wxBoxSizer *demuxdump_sizer = new wxBoxSizer( wxHORIZONTAL );
demuxdump_checkbox = new wxCheckBox( panel, DemuxDumpEnable_Event,
_("Capture input stream") );
wxU(_("Capture input stream")) );
demuxdump_checkbox->SetToolTip(
_("Capture the stream you are playing to a file") );
demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event,
"", wxDefaultPosition, wxDefaultSize,
wxU(_("Capture the stream you are playing to a file")) );
demuxdump_textctrl = new wxTextCtrl( panel, DemuxDump_Event, wxT(""),
wxDefaultPosition, wxDefaultSize,
wxTE_PROCESS_ENTER);
demuxdump_button = new wxButton( panel, DemuxDumpBrowse_Event,