[Mplayer-cvslog] CVS: main/Gui/mplayer/gtk about.h,1.2,1.3 fs.h,1.3,1.4 mb.h,1.1,1.2 pl.h,1.1,1.2 sb.h,1.3,1.4

Wed Sep 12 17:08:55 CEST 2001

Update of /cvsroot/mplayer/main/Gui/mplayer/gtk
In directory mplayer:/var/tmp.root/cvs-serv19523/Gui/mplayer/gtk

Modified Files:
	about.h fs.h mb.h pl.h sb.h 
Log Message:
add to multi lang support

Index: about.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/about.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3

--- about.h	12 Sep 2001 09:59:17 -0000	1.2
+++ about.h	12 Sep 2001 15:08:53 -0000	1.3
@@ -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 );

Index: fs.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/fs.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- fs.h	3 Sep 2001 16:13:24 -0000	1.3
+++ fs.h	12 Sep 2001 15:08:53 -0000	1.4
@@ -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 @@
  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 @@
 // 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 @@
 // 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 );
 

Index: mb.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/mb.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mb.h	25 Aug 2001 21:04:28 -0000	1.1
+++ mb.h	12 Sep 2001 15:08:53 -0000	1.2
@@ -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 @@
   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 @@
   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 );

Index: pl.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/pl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pl.h	25 Aug 2001 21:04:28 -0000	1.1
+++ pl.h	12 Sep 2001 15:08:53 -0000	1.2
@@ -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 *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 @@
   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 );

Index: sb.h
===================================================================
RCS file: /cvsroot/mplayer/main/Gui/mplayer/gtk/sb.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sb.h	31 Aug 2001 12:58:43 -0000	1.3
+++ sb.h	12 Sep 2001 15:08:53 -0000	1.4
@@ -9,7 +9,6 @@
 #include <unistd.h>
 
 #include "../app.h"
-#include "../../language.h"
 
 GtkWidget * SkinList;
 GtkWidget * sbOk;
@@ -145,14 +144,14 @@
  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 @@
  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 );


