[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk fs.c,1.5,1.6 menu.c,1.4,1.5 sb.c,1.2,1.3
Zoltan Ponekker
pontscho at mplayer.dev.hu
Tue Dec 18 22:33:05 CET 2001
Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mplayer:/var/tmp.root/cvs-serv25618/Gui/mplayer/gtk
Modified Files:
fs.c menu.c sb.c
Log Message:
full language support for gui
Index: fs.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- fs.c 15 Dec 2001 15:36:07 -0000 1.5
+++ fs.c 18 Dec 2001 21:33:02 -0000 1.6
@@ -62,7 +62,7 @@
#define fsNumberOfOtherFilterNames 0
char * fsOtherFilterNames[fsNumberOfOtherFilterNames+1][2] =
- { { "All types", "*" } };
+ { { "All files ( * )", "*" } };
GtkWidget * fsFileNamesList;
GtkWidget * fsFNameList;
Index: menu.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/menu.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- menu.c 21 Nov 2001 17:43:56 -0000 1.4
+++ menu.c 18 Dec 2001 21:33:02 -0000 1.5
@@ -4,6 +4,7 @@
#include <string.h>
#include "../../../config.h"
+#include "../../../help_mp.h"
#include "../../events.h"
@@ -260,59 +261,59 @@
Menu=gtk_menu_new();
- AddMenuItem( Menu,"About MPlayer"" ", evAbout );
+ AddMenuItem( Menu,MSGTR_MENU_AboutMPlayer" ", evAbout );
AddSeparator( Menu );
- SubMenu=AddSubMenu( Menu,"Open ..." );
- AddMenuItem( SubMenu,"Play file ..."" ", evLoadPlay );
- AddMenuItem( SubMenu,"Play VCD ...", evNone );
+ SubMenu=AddSubMenu( Menu,MSGTR_MENU_Open );
+ AddMenuItem( SubMenu,MSGTR_MENU_PlayFile" ", evLoadPlay );
+ AddMenuItem( SubMenu,MSGTR_MENU_PlayVCD, evNone );
#ifdef USE_DVDREAD
- AddMenuItem( SubMenu,"Play DVD ...", evPlayDVD );
+ AddMenuItem( SubMenu,MSGTR_MENU_PlayDVD, evPlayDVD );
#endif
- AddMenuItem( SubMenu,"Play URL ...", evNone );
- AddMenuItem( SubMenu,"Load subtitle ... ", evLoadSubtitle );
- SubMenu=AddSubMenu( Menu,"Playing" );
- AddMenuItem( SubMenu,"Play"" ", evPlay );
- AddMenuItem( SubMenu,"Pause", evPause );
- AddMenuItem( SubMenu,"Stop", evStop );
- AddMenuItem( SubMenu,"Prev stream", evPrev );
- AddMenuItem( SubMenu,"Next stream", evNext );
+ AddMenuItem( SubMenu,MSGTR_MENU_PlayURL, evNone );
+ AddMenuItem( SubMenu,MSGTR_MENU_LoadSubtitle" ", evLoadSubtitle );
+ SubMenu=AddSubMenu( Menu,MSGTR_MENU_Playing );
+ AddMenuItem( SubMenu,MSGTR_MENU_Play" ", evPlay );
+ AddMenuItem( SubMenu,MSGTR_MENU_Pause, evPause );
+ AddMenuItem( SubMenu,MSGTR_MENU_Stop, evStop );
+ AddMenuItem( SubMenu,MSGTR_MENU_NextStream, evPrev );
+ AddMenuItem( SubMenu,MSGTR_MENU_PrevStream, evNext );
// AddSeparator( SubMenu );
// AddMenuItem( SubMenu,"Back 10 sec", evBackward10sec );
// AddMenuItem( SubMenu,"Fwd 10 sec", evForward10sec );
// AddMenuItem( SubMenu,"Back 1 min", evBackward1min );
// AddMenuItem( SubMenu,"Fwd 1 min", evForward1min );
- SubMenu=AddSubMenu( Menu,"Size" );
- AddMenuItem( SubMenu,"Normal size"" ", evNormalSize );
- AddMenuItem( SubMenu,"Double size", evDoubleSize );
- AddMenuItem( SubMenu,"Fullscreen", evFullScreen );
+ SubMenu=AddSubMenu( Menu,MSGTR_MENU_Size );
+ AddMenuItem( SubMenu,MSGTR_MENU_NormalSize" ", evNormalSize );
+ AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize );
+ AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen );
#ifdef USE_DVDREAD
- DVDSubMenu=AddSubMenu( Menu,"DVD" );
- AddMenuItem( DVDSubMenu,"Play disc ..."" ", evPlayDVD );
- AddMenuItem( DVDSubMenu,"Show DVD Menu", evNone );
+ DVDSubMenu=AddSubMenu( Menu,MSGTR_MENU_DVD );
+ AddMenuItem( DVDSubMenu,MSGTR_MENU_PlayDisc" ", evPlayDVD );
+ AddMenuItem( DVDSubMenu,MSGTR_MENU_ShowDVDMenu, evNone );
AddSeparator( DVDSubMenu );
- DVDTitleMenu=AddSubMenu( DVDSubMenu,"Titles" );
+ DVDTitleMenu=AddSubMenu( DVDSubMenu,MSGTR_MENU_Titles );
if ( gtkShMem->DVD.titles )
{
char tmp[32]; int i;
for ( i=0;i<gtkShMem->DVD.titles;i++ )
{
- sprintf( tmp,"Title %2d",i+1 );
+ sprintf( tmp,MSGTR_MENU_Title,i+1 );
AddMenuItem( DVDTitleMenu,tmp,( (i+1) << 16 ) + evSetDVDTitle );
}
}
- else AddMenuItem( DVDTitleMenu,"(none)",evNone );
- DVDChapterMenu=AddSubMenu( DVDSubMenu,"Chapter" );
+ else AddMenuItem( DVDTitleMenu,MSGTR_MENU_None,evNone );
+ DVDChapterMenu=AddSubMenu( DVDSubMenu,MSGTR_MENU_Chapters );
if ( gtkShMem->DVD.chapters )
{
char tmp[32]; int i;
for ( i=0;i<gtkShMem->DVD.chapters;i++ )
{
- sprintf( tmp,"Chapter %2d",i+1 );
+ sprintf( tmp,MSGTR_MENU_Chapter,i+1 );
AddMenuItem( DVDChapterMenu,tmp,( (i+1) << 16 ) + evSetDVDChapter );
}
}
- else DVDChapterMenu=AddMenuItem( DVDChapterMenu,"(none)",evNone );
- DVDAudioLanguageMenu=AddSubMenu( DVDSubMenu,"Audio language" );
+ else DVDChapterMenu=AddMenuItem( DVDChapterMenu,MSGTR_MENU_None,evNone );
+ DVDAudioLanguageMenu=AddSubMenu( DVDSubMenu,MSGTR_MENU_AudioLanguages );
if ( gtkShMem->DVD.nr_of_audio_channels )
{
char tmp[64]; int i;
@@ -322,8 +323,8 @@
AddMenuItem( DVDAudioLanguageMenu,tmp,( gtkShMem->DVD.audio_streams[i].id << 16 ) + evSetDVDAudio );
}
}
- else DVDChapterMenu=AddMenuItem( DVDAudioLanguageMenu,"(none)",evNone );
- DVDSubtitleLanguageMenu=AddSubMenu( DVDSubMenu,"Subtitle language" );
+ else DVDChapterMenu=AddMenuItem( DVDAudioLanguageMenu,MSGTR_MENU_None,evNone );
+ DVDSubtitleLanguageMenu=AddSubMenu( DVDSubMenu,MSGTR_MENU_SubtitleLanguages );
if ( gtkShMem->DVD.nr_of_subtitles )
{
char tmp[64]; int i;
@@ -333,14 +334,14 @@
AddMenuItem( DVDSubtitleLanguageMenu,tmp,( gtkShMem->DVD.subtitles[i].id << 16 ) + evSetDVDSubtitle );
}
}
- else DVDChapterMenu=AddMenuItem( DVDSubtitleLanguageMenu,"(none)",evNone );
+ else DVDChapterMenu=AddMenuItem( DVDSubtitleLanguageMenu,MSGTR_MENU_None,evNone );
#endif
AddSeparator( Menu );
- AddMenuItem( Menu,"Playlist", evPlayList );
- AddMenuItem( Menu,"Skin browser", evSkinBrowser );
- AddMenuItem( Menu,"Preferences", evPreferences );
+ AddMenuItem( Menu,MSGTR_MENU_PlayList, evPlayList );
+ AddMenuItem( Menu,MSGTR_MENU_SkinBrowser, evSkinBrowser );
+ AddMenuItem( Menu,MSGTR_MENU_Preferences, evPreferences );
AddSeparator( Menu );
- AddMenuItem( Menu,"Exit ...", evExit );
+ AddMenuItem( Menu,MSGTR_MENU_Exit, evExit );
return Menu;
}
Index: sb.c
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sb.c 18 Nov 2001 21:59:20 -0000 1.2
+++ sb.c 18 Dec 2001 21:33:02 -0000 1.3
@@ -161,7 +161,7 @@
gtk_widget_show( vbox5 );
gtk_container_add( GTK_CONTAINER( frame8 ),vbox5 );
- label=gtk_label_new( "Skins:" );
+ label=gtk_label_new( MSGTR_SKIN_LABEL );
gtk_widget_set_name( label,"label" );
gtk_widget_ref( label );
gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),"label",label,
@@ -221,11 +221,12 @@
gtk_widget_set_name( hbuttonbox4,"hbuttonbox4" );
gtk_widget_ref( hbuttonbox4 );
gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),"hbuttonbox4",hbuttonbox4,(GtkDestroyNotify)gtk_widget_unref );
+ gtk_widget_set_usize( hbuttonbox4,-2,25 );
gtk_widget_show( hbuttonbox4 );
gtk_box_pack_start( GTK_BOX( vbox5 ),hbuttonbox4,FALSE,TRUE,0 );
gtk_button_box_set_layout( GTK_BUTTON_BOX( hbuttonbox4 ),GTK_BUTTONBOX_END );
- gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox4 ),0 );
- gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox4 ),80,0 );
+ gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox4 ),5 );
+ gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox4 ),75,0 );
Ok=gtk_button_new_with_label( MSGTR_Ok );
gtk_widget_set_name( Ok,MSGTR_Ok );
@@ -233,8 +234,7 @@
gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),MSGTR_Ok,Ok,(GtkDestroyNotify)gtk_widget_unref );
gtk_widget_show( Ok );
gtk_container_add( GTK_CONTAINER( hbuttonbox4 ),Ok );
- gtk_widget_set_usize( Ok,-2,33 );
- GTK_WIDGET_SET_FLAGS( Ok,GTK_CAN_DEFAULT );
+ gtk_widget_set_usize( Ok,-2,22 );
gtk_widget_add_accelerator( Ok,"released",accel_group,GDK_Return,0,GTK_ACCEL_VISIBLE );
Cancel=gtk_button_new_with_label( MSGTR_Cancel );
@@ -243,8 +243,7 @@
gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),MSGTR_Cancel,Cancel,(GtkDestroyNotify)gtk_widget_unref );
gtk_widget_show( Cancel );
gtk_container_add( GTK_CONTAINER( hbuttonbox4 ),Cancel );
- gtk_widget_set_usize( Cancel,-2,33 );
- GTK_WIDGET_SET_FLAGS( Cancel,GTK_CAN_DEFAULT );
+ gtk_widget_set_usize( Cancel,-2,22 );
gtk_widget_add_accelerator( Cancel,"released",accel_group,GDK_Escape,0,GTK_ACCEL_VISIBLE );
gtk_signal_connect( GTK_OBJECT( SkinBrowser ),"destroy",GTK_SIGNAL_FUNC( on_SkinBrowser_destroy ),NULL );
More information about the MPlayer-cvslog
mailing list