* modules/gui/wxwindows/*: replaced the Advanced button with a checkbox. Small strings changes.

This commit is contained in:
Gildas Bazin 2003-05-26 16:06:13 +00:00
parent e230f12227
commit 0188c0993b
2 changed files with 14 additions and 12 deletions

View File

@ -2,7 +2,7 @@
* interface.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: interface.cpp,v 1.33 2003/05/24 17:52:49 gbazin Exp $
* $Id: interface.cpp,v 1.34 2003/05/26 16:06:13 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
@ -164,7 +164,7 @@ END_EVENT_TABLE()
* Constructor.
*****************************************************************************/
Interface::Interface( intf_thread_t *_p_intf ):
wxFrame( NULL, -1, wxT(VOUT_TITLE),
wxFrame( NULL, -1, wxT("VLC media player"),
wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_STYLE )
{
/* Initializations */
@ -266,7 +266,7 @@ void Interface::CreateOurMenuBar()
wxMenu *view_menu = new wxMenu;
view_menu->Append( Playlist_Event, wxU(_("&Playlist...")),
wxU(_(HELP_PLAYLIST)) );
view_menu->Append( Logs_Event, wxU(_("&Logs...")), wxU(_(HELP_LOGS)) );
view_menu->Append( Logs_Event, wxU(_("&Messages...")), wxU(_(HELP_LOGS)) );
view_menu->Append( FileInfo_Event, wxU(_("&File info...")),
wxU(_(HELP_FILEINFO)) );
@ -557,7 +557,7 @@ void Interface::OnExit( wxCommandEvent& WXUNUSED(event) )
void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
{
wxString msg;
msg.Printf( wxString(wxT(VOUT_TITLE)) +
msg.Printf( wxString(wxT("VLC media player")) +
wxU(_(" (wxWindows interface)\n\n")) +
wxU(_("(C) 1996-2003 - the VideoLAN Team\n\n")) +
wxU(_("The VideoLAN team <videolan@videolan.org>\n"
@ -566,8 +566,8 @@ void Interface::OnAbout( wxCommandEvent& WXUNUSED(event) )
"\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 );
wxMessageBox( msg, wxString::Format(wxU(_("About %s")),
wxT("VLC media player")), wxOK | wxICON_INFORMATION, this );
}
void Interface::OnPlaylist( wxCommandEvent& WXUNUSED(event) )

View File

@ -2,7 +2,7 @@
* preferences.cpp : wxWindows plugin for vlc
*****************************************************************************
* Copyright (C) 2000-2001 VideoLAN
* $Id: preferences.cpp,v 1.16 2003/05/22 21:42:43 gbazin Exp $
* $Id: preferences.cpp,v 1.17 2003/05/26 16:06:13 gbazin Exp $
*
* Authors: Gildas Bazin <gbazin@netcourrier.com>
*
@ -211,7 +211,7 @@ END_EVENT_TABLE()
BEGIN_EVENT_TABLE(PrefsPanel, wxPanel)
/* Button events */
EVT_BUTTON(Advanced_Event, PrefsPanel::OnAdvanced)
EVT_CHECKBOX(Advanced_Event, PrefsPanel::OnAdvanced)
END_EVENT_TABLE()
@ -858,12 +858,14 @@ PrefsPanel::PrefsPanel( wxWindow* parent, intf_thread_t *_p_intf,
b_advanced = !config_GetInt( p_intf, "advanced" );
OnAdvanced( dummy_event );
/* Create advanced button */
/* Create advanced checkbox */
if( config_array.GetCount() )
{
wxButton *advanced_button = new wxButton( this, Advanced_Event,
wxU(_("Advanced...")) );
sizer->Add( advanced_button, 0, wxALL, 5 );
wxCheckBox *advanced_checkbox =
new wxCheckBox( this, Advanced_Event, wxU(_("Advanced options")) );
if( b_advanced ) advanced_checkbox->SetValue(TRUE);
sizer->Add( advanced_checkbox, 0, wxALL|wxALIGN_RIGHT, 0 );
}
sizer->Layout();