diff options
Diffstat (limited to 'Gui/mplayer')
-rw-r--r-- | Gui/mplayer/gtk/about.h | 2 | ||||
-rw-r--r-- | Gui/mplayer/gtk/fs.h | 16 | ||||
-rw-r--r-- | Gui/mplayer/gtk/mb.h | 16 | ||||
-rw-r--r-- | Gui/mplayer/gtk/pl.h | 22 | ||||
-rw-r--r-- | Gui/mplayer/gtk/sb.h | 19 | ||||
-rw-r--r-- | Gui/mplayer/menu.h | 4 | ||||
-rw-r--r-- | Gui/mplayer/mplayer.c | 4 | ||||
-rw-r--r-- | Gui/mplayer/play.c | 6 | ||||
-rw-r--r-- | Gui/mplayer/psignal.c | 1 | ||||
-rw-r--r-- | Gui/mplayer/widgets.c | 1 |
10 files changed, 41 insertions, 50 deletions
diff --git a/Gui/mplayer/gtk/about.h b/Gui/mplayer/gtk/about.h index be3955f95c..1deeb6d2f4 100644 --- a/Gui/mplayer/gtk/about.h +++ b/Gui/mplayer/gtk/about.h @@ -2,8 +2,6 @@ #ifndef __WIDGET_ABOUT #define __WIDGET_ABOUT -#include "../../language.h" - void ab_Ok_released( GtkButton * button,gpointer user_data ) { gtk_widget_hide( AboutBox ); diff --git a/Gui/mplayer/gtk/fs.h b/Gui/mplayer/gtk/fs.h index d03a48eaf7..26443c8a8f 100644 --- a/Gui/mplayer/gtk/fs.h +++ b/Gui/mplayer/gtk/fs.h @@ -9,8 +9,6 @@ #include <glob.h> #include <unistd.h> -#include "../../language.h" - #ifdef __SVR4 #define get_current_dir_name() getcwd(NULL, PATH_MAX) #endif @@ -380,7 +378,7 @@ GtkWidget * create_FileSelect( void ) GTK_WIDGET_SET_FLAGS( fsFileSelect,GTK_CAN_FOCUS ); GTK_WIDGET_SET_FLAGS( fsFileSelect,GTK_CAN_DEFAULT ); gtk_widget_set_events( fsFileSelect,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK ); - gtk_window_set_title( GTK_WINDOW( fsFileSelect ),langFileSelect ); + gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_FileSelect ); gtk_window_set_position( GTK_WINDOW( fsFileSelect ),GTK_WIN_POS_CENTER ); gtk_window_set_policy( GTK_WINDOW( fsFileSelect ),FALSE,FALSE,TRUE ); fsColorMap=gdk_colormap_get_system(); @@ -590,10 +588,10 @@ GtkWidget * create_FileSelect( void ) // gtk_container_add( GTK_CONTAINER( hbuttonbox3 ),fsOk ); // gtk_widget_show( fsOk ); - fsOk=gtk_button_new_with_label( langOk ); - gtk_widget_set_name( fsOk,langOk ); + fsOk=gtk_button_new_with_label( MSGTR_Ok ); + gtk_widget_set_name( fsOk,MSGTR_Ok ); gtk_widget_ref( fsOk ); - gtk_object_set_data_full( GTK_OBJECT( fsFileSelect ),langOk,fsOk,( GtkDestroyNotify )gtk_widget_unref ); + gtk_object_set_data_full( GTK_OBJECT( fsFileSelect ),MSGTR_Ok,fsOk,( GtkDestroyNotify )gtk_widget_unref ); gtk_container_add( GTK_CONTAINER( hbuttonbox3 ),fsOk ); gtk_widget_show( fsOk ); @@ -607,10 +605,10 @@ GtkWidget * create_FileSelect( void ) // gtk_container_add( GTK_CONTAINER( hbuttonbox3 ),fsCancel ); // gtk_widget_show( fsCancel ); - fsCancel=gtk_button_new_with_label( langCancel ); - gtk_widget_set_name( fsCancel,langCancel ); + fsCancel=gtk_button_new_with_label( MSGTR_Cancel ); + gtk_widget_set_name( fsCancel,MSGTR_Cancel ); gtk_widget_ref( fsCancel ); - gtk_object_set_data_full( GTK_OBJECT( fsFileSelect ),langCancel,fsCancel,( GtkDestroyNotify )gtk_widget_unref ); + gtk_object_set_data_full( GTK_OBJECT( fsFileSelect ),MSGTR_Cancel,fsCancel,( GtkDestroyNotify )gtk_widget_unref ); gtk_container_add( GTK_CONTAINER( hbuttonbox3 ),fsCancel ); gtk_widget_show( fsCancel ); diff --git a/Gui/mplayer/gtk/mb.h b/Gui/mplayer/gtk/mb.h index baebdf2ed7..a92ba6f583 100644 --- a/Gui/mplayer/gtk/mb.h +++ b/Gui/mplayer/gtk/mb.h @@ -2,8 +2,6 @@ #ifndef __MY_MESSAGEBOX #define __MY_MESSAGEBOX -#include "../../language.h" - GtkWidget * gtkMessageBoxText; void on_MessageBox_destroy( GtkObject * object,gpointer user_data ) @@ -36,17 +34,17 @@ GtkWidget * create_MessageBox( void ) accel_group=gtk_accel_group_new(); MessageBox=gtk_window_new( GTK_WINDOW_DIALOG ); - gtk_widget_set_name( MessageBox,langMessageBox ); - gtk_object_set_data( GTK_OBJECT( MessageBox ),langMessageBox,MessageBox ); + gtk_widget_set_name( MessageBox,MSGTR_MessageBox ); + gtk_object_set_data( GTK_OBJECT( MessageBox ),MSGTR_MessageBox,MessageBox ); gtk_widget_set_usize( MessageBox,420,128 ); GTK_WIDGET_SET_FLAGS( MessageBox,GTK_CAN_FOCUS ); GTK_WIDGET_SET_FLAGS( MessageBox,GTK_CAN_DEFAULT ); gtk_widget_set_events( MessageBox,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK ); - gtk_window_set_title( GTK_WINDOW( MessageBox ),langMessageBox ); + gtk_window_set_title( GTK_WINDOW( MessageBox ),MSGTR_MessageBox ); gtk_window_set_position( GTK_WINDOW( MessageBox ),GTK_WIN_POS_CENTER ); gtk_window_set_modal( GTK_WINDOW( MessageBox ),TRUE ); gtk_window_set_policy( GTK_WINDOW( MessageBox ),FALSE,FALSE,FALSE ); - gtk_window_set_wmclass( GTK_WINDOW( MessageBox ),langMessageBox,langMessageBox ); + gtk_window_set_wmclass( GTK_WINDOW( MessageBox ),MSGTR_MessageBox,MSGTR_MessageBox ); frame1=gtk_frame_new( NULL ); gtk_widget_set_name( frame1,"frame1" ); @@ -132,10 +130,10 @@ GtkWidget * create_MessageBox( void ) gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox1 ),60,0 ); gtk_button_box_set_child_ipadding( GTK_BUTTON_BOX( hbuttonbox1 ),10,0 ); - Ok=gtk_button_new_with_label( langOk ); - gtk_widget_set_name( Ok,langOk ); + Ok=gtk_button_new_with_label( MSGTR_Ok ); + gtk_widget_set_name( Ok,MSGTR_Ok ); gtk_widget_ref( Ok ); - gtk_object_set_data_full( GTK_OBJECT( MessageBox ),langOk,Ok, + gtk_object_set_data_full( GTK_OBJECT( MessageBox ),MSGTR_Ok,Ok, ( GtkDestroyNotify ) gtk_widget_unref ); gtk_widget_show( Ok ); gtk_container_add( GTK_CONTAINER( hbuttonbox1 ),Ok ); diff --git a/Gui/mplayer/gtk/pl.h b/Gui/mplayer/gtk/pl.h index 1b509fe693..6d8372d1f0 100644 --- a/Gui/mplayer/gtk/pl.h +++ b/Gui/mplayer/gtk/pl.h @@ -4,8 +4,6 @@ #ifndef __MY_PLAYLIST #define __MY_PLAYLIST -#include "../../language.h" - void HidePlayList( void ) { gtk_widget_hide( PlayList ); @@ -91,12 +89,12 @@ GtkWidget* create_PlayList( void ) GtkWidget *Cancel; PlayList = gtk_window_new( GTK_WINDOW_DIALOG ); - gtk_object_set_data( GTK_OBJECT( PlayList ),langPlayList,PlayList ); + gtk_object_set_data( GTK_OBJECT( PlayList ),MSGTR_PlayList,PlayList ); gtk_widget_set_usize( PlayList,512,256 ); GTK_WIDGET_SET_FLAGS( PlayList,GTK_CAN_FOCUS ); GTK_WIDGET_SET_FLAGS( PlayList,GTK_CAN_DEFAULT ); gtk_widget_set_events( PlayList,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK ); - gtk_window_set_title( GTK_WINDOW( PlayList ),langPlayList ); + gtk_window_set_title( GTK_WINDOW( PlayList ),MSGTR_PlayList ); gtk_window_set_position( GTK_WINDOW( PlayList ),GTK_WIN_POS_CENTER ); gtk_window_set_policy( GTK_WINDOW( PlayList ),FALSE,FALSE,TRUE ); @@ -220,36 +218,36 @@ GtkWidget* create_PlayList( void ) gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox5 ),65,27 ); gtk_button_box_set_child_ipadding( GTK_BUTTON_BOX( hbuttonbox5 ),2,0 ); - Add = gtk_button_new_with_label( langAdd ); + Add = gtk_button_new_with_label( MSGTR_Add ); gtk_widget_ref( Add ); - gtk_object_set_data_full( GTK_OBJECT( PlayList ),langAdd,Add, + gtk_object_set_data_full( GTK_OBJECT( PlayList ),MSGTR_Add,Add, ( GtkDestroyNotify ) gtk_widget_unref ); gtk_widget_show( Add ); gtk_container_add( GTK_CONTAINER( hbuttonbox5 ),Add ); gtk_widget_set_usize( Add,45,-2 ); GTK_WIDGET_SET_FLAGS( Add,GTK_CAN_DEFAULT ); - Remove = gtk_button_new_with_label( langRemove ); + Remove = gtk_button_new_with_label( MSGTR_Remove ); gtk_widget_ref( Remove ); - gtk_object_set_data_full( GTK_OBJECT( PlayList ),langRemove,Remove, + gtk_object_set_data_full( GTK_OBJECT( PlayList ),MSGTR_Remove,Remove, ( GtkDestroyNotify ) gtk_widget_unref ); gtk_widget_show( Remove ); gtk_container_add( GTK_CONTAINER( hbuttonbox5 ),Remove ); gtk_widget_set_usize( Remove,45,-2 ); GTK_WIDGET_SET_FLAGS( Remove,GTK_CAN_DEFAULT ); - Ok = gtk_button_new_with_label( langOk ); + Ok = gtk_button_new_with_label( MSGTR_Ok ); gtk_widget_ref( Ok ); - gtk_object_set_data_full( GTK_OBJECT( PlayList ),langOk,Ok, + gtk_object_set_data_full( GTK_OBJECT( PlayList ),MSGTR_Ok,Ok, ( GtkDestroyNotify ) gtk_widget_unref ); gtk_widget_show( Ok ); gtk_container_add( GTK_CONTAINER( hbuttonbox5 ),Ok ); gtk_widget_set_usize( Ok,45,-2 ); GTK_WIDGET_SET_FLAGS( Ok,GTK_CAN_DEFAULT ); - Cancel = gtk_button_new_with_label( langCancel ); + Cancel = gtk_button_new_with_label( MSGTR_Cancel ); gtk_widget_ref( Cancel ); - gtk_object_set_data_full( GTK_OBJECT( PlayList ),langCancel,Cancel, + gtk_object_set_data_full( GTK_OBJECT( PlayList ),MSGTR_Cancel,Cancel, ( GtkDestroyNotify ) gtk_widget_unref ); gtk_widget_show( Cancel ); gtk_container_add( GTK_CONTAINER( hbuttonbox5 ),Cancel ); diff --git a/Gui/mplayer/gtk/sb.h b/Gui/mplayer/gtk/sb.h index f1ea25ad9d..32321eea3d 100644 --- a/Gui/mplayer/gtk/sb.h +++ b/Gui/mplayer/gtk/sb.h @@ -9,7 +9,6 @@ #include <unistd.h> #include "../app.h" -#include "../../language.h" GtkWidget * SkinList; GtkWidget * sbOk; @@ -145,14 +144,14 @@ GtkWidget * create_SkinBrowser( void ) GtkWidget * Cancel; SkinBrowser=gtk_window_new( GTK_WINDOW_DIALOG ); - gtk_widget_set_name( SkinBrowser,langSkinBrowser ); - gtk_object_set_data( GTK_OBJECT( SkinBrowser ),langSkinBrowser,SkinBrowser ); + gtk_widget_set_name( SkinBrowser,MSGTR_SkinBrowser ); + gtk_object_set_data( GTK_OBJECT( SkinBrowser ),MSGTR_SkinBrowser,SkinBrowser ); gtk_widget_set_usize( SkinBrowser,256,320 ); gtk_container_set_border_width( GTK_CONTAINER( SkinBrowser ),1 ); GTK_WIDGET_SET_FLAGS( SkinBrowser,GTK_CAN_FOCUS ); GTK_WIDGET_SET_FLAGS( SkinBrowser,GTK_CAN_DEFAULT ); gtk_widget_set_events( SkinBrowser,GDK_EXPOSURE_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_KEY_PRESS_MASK | GDK_KEY_RELEASE_MASK | GDK_FOCUS_CHANGE_MASK | GDK_STRUCTURE_MASK | GDK_PROPERTY_CHANGE_MASK | GDK_VISIBILITY_NOTIFY_MASK ); - gtk_window_set_title( GTK_WINDOW( SkinBrowser ),langSkinBrowser ); + gtk_window_set_title( GTK_WINDOW( SkinBrowser ),MSGTR_SkinBrowser ); gtk_window_set_position( GTK_WINDOW( SkinBrowser ),GTK_WIN_POS_CENTER ); gtk_window_set_policy( GTK_WINDOW( SkinBrowser ),FALSE,FALSE,TRUE ); @@ -269,20 +268,20 @@ GtkWidget * create_SkinBrowser( void ) gtk_button_box_set_spacing( GTK_BUTTON_BOX( hbuttonbox4 ),0 ); gtk_button_box_set_child_size( GTK_BUTTON_BOX( hbuttonbox4 ),80,0 ); - sbOk=gtk_button_new_with_label( langOk ); - gtk_widget_set_name( sbOk,langOk ); + sbOk=gtk_button_new_with_label( MSGTR_Ok ); + gtk_widget_set_name( sbOk,MSGTR_Ok ); gtk_widget_ref( sbOk ); - gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),langOk,sbOk, + gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),MSGTR_Ok,sbOk, ( GtkDestroyNotify ) gtk_widget_unref ); gtk_widget_show( sbOk ); gtk_container_add( GTK_CONTAINER( hbuttonbox4 ),sbOk ); gtk_widget_set_usize( sbOk,-2,33 ); GTK_WIDGET_SET_FLAGS( sbOk,GTK_CAN_DEFAULT ); - Cancel=gtk_button_new_with_label( langCancel ); - gtk_widget_set_name( Cancel,langCancel ); + Cancel=gtk_button_new_with_label( MSGTR_Cancel ); + gtk_widget_set_name( Cancel,MSGTR_Cancel ); gtk_widget_ref( Cancel ); - gtk_object_set_data_full( GTK_OBJECT( SkinBrowser ),langCancel,Cancel, + 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 ); diff --git a/Gui/mplayer/menu.h b/Gui/mplayer/menu.h index 78e21acddf..4d4d1238a8 100644 --- a/Gui/mplayer/menu.h +++ b/Gui/mplayer/menu.h @@ -121,9 +121,9 @@ void mplMenuInit( void ) if ( ( mplMenuDrawBuffer = calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL ) { #ifdef DEBUG - dbprintf( 1,langNEMFMR ); + dbprintf( 1,MSGTR_NEMFMR ); #endif - gtkMessageBox( langNEMFMR ); + gtkMessageBox( MSGTR_NEMFMR ); return; } diff --git a/Gui/mplayer/mplayer.c b/Gui/mplayer/mplayer.c index 751f3d315a..4c90b8ff53 100644 --- a/Gui/mplayer/mplayer.c +++ b/Gui/mplayer/mplayer.c @@ -13,10 +13,10 @@ #include "../wm/widget.h" #include "../bitmap/bitmap.h" #include "../timer.h" -#include "../language.h" #include "../error.h" #include "../../config.h" +#include "../../help_mp.h" #include "../../libvo/x11_common.h" #define mplMouseTimerConst 10 @@ -68,7 +68,7 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp ) if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) { - fprintf( stderr,langNEMDB ); + fprintf( stderr,MSGTR_NEMDB ); exit( 0 ); } diff --git a/Gui/mplayer/play.c b/Gui/mplayer/play.c index eb4629a4f4..1500ba90aa 100644 --- a/Gui/mplayer/play.c +++ b/Gui/mplayer/play.c @@ -16,6 +16,7 @@ int moviex,moviey,moviewidth,movieheight; #include "../wm/widget.h" #include "../../config.h" +#include "../../help_mp.h" #include "../../libvo/x11_common.h" #include "widgets.h" @@ -25,7 +26,6 @@ int moviex,moviey,moviewidth,movieheight; #include "../skin/skin.h" #include "../error.h" -#include "../language.h" mplCommStruct * mplShMem; char * Filename = NULL; @@ -157,7 +157,7 @@ void ChangeSkin( void ) { if ( mplMenuDrawBuffer ) free( mplMenuDrawBuffer ); if ( ( mplMenuDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.menuBase.Bitmap.ImageSize ) ) == NULL ) - { message( False,langNEMDB ); return; } + { message( False,MSGTR_NEMDB ); return; } wsResizeWindow( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height ); wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height ); } @@ -179,7 +179,7 @@ void ChangeSkin( void ) if ( mplDrawBuffer ) free( mplDrawBuffer ); if ( ( mplDrawBuffer = (unsigned char *)calloc( 1,appMPlayer.main.Bitmap.ImageSize ) ) == NULL ) - { message( False,langNEMDB ); return; } + { message( False,MSGTR_NEMDB ); return; } wsVisibleWindow( &appMPlayer.mainWindow,wsHideWindow ); wsResizeWindow( &appMPlayer.mainWindow,appMPlayer.main.width,appMPlayer.main.height ); wsMoveWindow( &appMPlayer.mainWindow,appMPlayer.main.x,appMPlayer.main.y ); diff --git a/Gui/mplayer/psignal.c b/Gui/mplayer/psignal.c index 7a810dffdb..550de227a9 100644 --- a/Gui/mplayer/psignal.c +++ b/Gui/mplayer/psignal.c @@ -13,7 +13,6 @@ #include "../skin/skin.h" #include "../wm/ws.h" #include "../error.h" -#include "../language.h" #include "../../config.h" #include "../../libvo/x11_common.h" diff --git a/Gui/mplayer/widgets.c b/Gui/mplayer/widgets.c index a99dfd0152..30ed8a31b9 100644 --- a/Gui/mplayer/widgets.c +++ b/Gui/mplayer/widgets.c @@ -19,6 +19,7 @@ #include "../events.h" #include "../../config.h" +#include "../../help_mp.h" #include "../error.h" #include "pixmaps/up.xpm" |