From 1eeed5aca4a949809b0328142f87d98a6909cc19 Mon Sep 17 00:00:00 2001 From: Yves Rizoud Date: Tue, 21 Apr 2009 17:48:26 +0000 Subject: [PATCH] Added some missed translations in source code. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@755 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- buttons.c | 46 ++++++++++---------- buttons.h | 4 +- const.h | 2 +- engine.c | 20 ++++----- global.h | 20 ++++----- help.c | 6 +-- hotkeys.h | 16 +++---- init.c | 23 +++++----- io.c | 14 +++--- loadsave.c | 124 ++++++++++++++++++++++++++--------------------------- loadsave.h | 2 +- main.c | 6 +-- misc.c | 12 +++--- readini.c | 4 +- saveini.c | 4 +- struct.h | 2 +- text.c | 2 +- windows.c | 10 ++--- 18 files changed, 159 insertions(+), 158 deletions(-) diff --git a/buttons.c b/buttons.c index f6bc1201..5a3b40b7 100644 --- a/buttons.c +++ b/buttons.c @@ -443,7 +443,7 @@ byte Button_Quit_local_function(void) { case 1 : return 0; // Rester case 2 : // Sauver et enregistrer - filename_complet(filename,0); + Get_full_filename(filename,0); if ( (!File_exists(filename)) || Confirmation_box("Erase old file ?") ) { Hide_cursor(); @@ -709,7 +709,7 @@ void Settings_display_config(T_Config * conf) Print_in_window(223, 84,(conf->Safety_colors)?YES:NO,MC_Black,MC_Light); Print_in_window(223, 99,(conf->Adjust_brush_pick)?YES:NO,MC_Black,MC_Light); - Print_in_window(223,114,(conf->Couleurs_separees)?YES:NO,MC_Black,MC_Light); + Print_in_window(223,114,(conf->Separate_colors)?YES:NO,MC_Black,MC_Light); Print_in_window(223,129,(conf->Auto_set_res)?YES:NO,MC_Black,MC_Light); Print_in_window(183,144,(conf->Coords_rel)?"Relative":"Absolute",MC_Black,MC_Light); @@ -900,7 +900,7 @@ void Button_Settings(void) Config_choisie.Adjust_brush_pick=!Config_choisie.Adjust_brush_pick; break; case 12 : // Separate colors - Config_choisie.Couleurs_separees=!Config_choisie.Couleurs_separees; + Config_choisie.Separate_colors=!Config_choisie.Separate_colors; break; case 13 : // Auto-set resolution Config_choisie.Auto_set_res=!Config_choisie.Auto_set_res; @@ -1689,7 +1689,7 @@ void Button_Safety_resolution(void) void Button_Draw(void) { Hide_cursor(); - Start_operation_stack(Selected_operation); + Start_operation_stack(Selected_freehand_mode); Display_cursor(); } @@ -1697,13 +1697,13 @@ void Button_Draw(void) void Button_Draw_switch_mode(void) { /* ANCIEN CODE SANS POPUPS */ - Selected_operation++; - if (Selected_operation>OPERATION_FILLED_CONTOUR) - Selected_operation=OPERATION_CONTINUOUS_DRAW; + Selected_freehand_mode++; + if (Selected_freehand_mode>OPERATION_FILLED_CONTOUR) + Selected_freehand_mode=OPERATION_CONTINUOUS_DRAW; Hide_cursor(); - Display_sprite_in_menu(BUTTON_DRAW,Selected_operation); - Start_operation_stack(Selected_operation); + Display_sprite_in_menu(BUTTON_DRAW,Selected_freehand_mode); + Start_operation_stack(Selected_freehand_mode); Display_cursor(); /* NOUVEAU CODE AVEC POPUP (EN COURS DE TEST) *** short clicked_button; @@ -1721,17 +1721,17 @@ void Button_Draw_switch_mode(void) switch(clicked_button) { case 1: - Selected_operation++; - if (Selected_operation>OPERATION_FILLED_CONTOUR) - Selected_operation=OPERATION_CONTINUOUS_DRAW; + Selected_freehand_mode++; + if (Selected_freehand_mode>OPERATION_FILLED_CONTOUR) + Selected_freehand_mode=OPERATION_CONTINUOUS_DRAW; break; } } while (Mouse_K); Close_popup(); - Display_sprite_in_menu(BUTTON_DRAW,Selected_operation); - Start_operation_stack(Selected_operation); + Display_sprite_in_menu(BUTTON_DRAW,Selected_freehand_mode); + Start_operation_stack(Selected_freehand_mode); Display_cursor(); */ } @@ -2646,7 +2646,7 @@ void Backup_existing_file(void) char filename[MAX_PATH_CHARACTERS]; // Nom complet du fichier char new_filename[MAX_PATH_CHARACTERS]; // Nom complet du fichier backup - filename_complet(filename,0); + Get_full_filename(filename,0); // Calcul du nom complet du fichier backup Backup_filename(filename,new_filename); @@ -2761,7 +2761,7 @@ void Button_Autosave(void) byte file_already_exists; - filename_complet(filename,0); + Get_full_filename(filename,0); file_already_exists=File_exists(filename); if ( (!file_already_exists) || Confirmation_box("Erase old file ?") ) @@ -3583,8 +3583,8 @@ void Compute_colorize_table(void) for (index=0;index<256;index++) { - Facteur_A_table[index]=index*factor_a; - Facteur_B_table[index]=index*factor_b; + Factors_table[index]=index*factor_a; + Factors_inv_table[index]=index*factor_b; } } @@ -4206,7 +4206,7 @@ void Button_Airbrush_menu(void) // -- Mode Sieve (Sieve) ---------------------------------------------------- -void Button_Trame_mode(void) +void Button_Sieve_mode(void) { Sieve_mode=!Sieve_mode; } @@ -4306,7 +4306,7 @@ void Update_sieve_area(short x, short y) } -void Button_Trame_menu(void) +void Button_Sieve_menu(void) { short clicked_button; short index; @@ -4653,7 +4653,7 @@ void Button_Trame_menu(void) } if ( (clicked_button==3) && (!Sieve_mode) ) // OK - Button_Trame_mode(); + Button_Sieve_mode(); Display_cursor(); } @@ -4947,7 +4947,7 @@ void Button_Effects(void) case 8 : // Sieve if (Window_attribute1==LEFT_SIDE) { - Button_Trame_mode(); + Button_Sieve_mode(); Hide_cursor(); Display_effect_state(176,62,"Sieve",Sieve_mode); Display_cursor(); @@ -4956,7 +4956,7 @@ void Button_Effects(void) { Close_window(); Display_cursor(); - Button_Trame_menu(); + Button_Sieve_menu(); clicked_button=11; } break; diff --git a/buttons.h b/buttons.h index 816957ee..161245e6 100644 --- a/buttons.h +++ b/buttons.h @@ -378,13 +378,13 @@ void Invert_trame(void); Callback for the Sieve button (in the FX window) left click. Toogle sieve mode. */ -void Button_Trame_mode(void); +void Button_Sieve_mode(void); /*! Callback for the Sieve button (in the FX window) right click. Displays the sieve setup menu. */ -void Button_Trame_menu(void); +void Button_Sieve_menu(void); // Mode Smooth diff --git a/const.h b/const.h index 9e085838..80af6583 100644 --- a/const.h +++ b/const.h @@ -182,7 +182,7 @@ enum CURSOR_SHAPES CURSOR_SHAPE_TARGET, ///< This one uses the paintbrush CURSOR_SHAPE_COLORPICKER, ///< This one uses the paintbrush CURSOR_SHAPE_HOURGLASS, - CURSOR_SHAPE_MULTIDIRECTIONNAL, + CURSOR_SHAPE_MULTIDIRECTIONAL, CURSOR_SHAPE_HORIZONTAL, CURSOR_SHAPE_THIN_TARGET, ///< This one uses the paintbrush CURSOR_SHAPE_THIN_COLORPICKER, ///< This one uses the paintbrush diff --git a/engine.c b/engine.c index 8438cc4a..b7c82950 100644 --- a/engine.c +++ b/engine.c @@ -341,7 +341,7 @@ void Unselect_bouton(int btn_number) // On considère que le bouton est relâché Buttons_Pool[btn_number].Pressed=BUTTON_RELEASED; // On appelle le désenclenchement particulier au bouton: - Buttons_Pool[btn_number].Desenclencher(); + Buttons_Pool[btn_number].Unselect_action(); } } @@ -374,7 +374,7 @@ void Unselect_button(int btn_number,byte click) Display_sprite_in_menu(btn_number,icon+(click==RIGHT_SIDE)); // On note déjà la famille du bouton (La "Famiglia" c'est sacré) - family=Buttons_Pool[btn_number].Famille; + family=Buttons_Pool[btn_number].Family; switch (family) { @@ -388,7 +388,7 @@ void Unselect_button(int btn_number,byte click) // S'il est de la même famille if ( (b!=btn_number) && - (Buttons_Pool[b].Famille==FAMILY_INTERRUPTION) && + (Buttons_Pool[b].Family==FAMILY_INTERRUPTION) && ( (b!=BUTTON_MAGNIFIER) || ((b==BUTTON_MAGNIFIER) && (!Main_magnifier_mode)) ) ) @@ -402,7 +402,7 @@ void Unselect_button(int btn_number,byte click) for (b=0; bd_name); - stat(filename_complet,&Infos_enreg); + strcpy(&full_filename[filename_position], entry->d_name); + stat(full_filename,&Infos_enreg); if (S_ISREG(Infos_enreg.st_mode)) { - Callback(filename_complet); + Callback(full_filename); } } closedir(Repertoire_Courant); diff --git a/loadsave.c b/loadsave.c index c20420db..58064739 100644 --- a/loadsave.c +++ b/loadsave.c @@ -466,7 +466,7 @@ void Draw_palette_preview(void) // Calcul du nom complet du fichier -void filename_complet(char * filename, byte is_colorix_format) +void Get_full_filename(char * filename, byte is_colorix_format) { byte last_char; @@ -699,7 +699,7 @@ void Save_image(byte image) // sauver le format du fichier: (Est-ce vraiment utile??? Je ne crois pas!) File_error=1; - Read_pixel_old=(image)?Read_pixel_from_current_screen:Read_pixel_from_brush; + Read_pixel_function=(image)?Read_pixel_from_current_screen:Read_pixel_from_brush; File_formats[Main_fileformat-1].Save(); @@ -726,7 +726,7 @@ void Test_PAL(void) char filename[MAX_PATH_CHARACTERS]; // Nom complet du fichier long file_size; // Taille du fichier - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=1; @@ -751,7 +751,7 @@ void Load_PAL(void) //long file_size; // Taille du fichier - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; // Ouverture du fichier @@ -790,7 +790,7 @@ void Save_PAL(void) char filename[MAX_PATH_CHARACTERS]; // Nom complet du fichier //long file_size; // Taille du fichier - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; @@ -846,7 +846,7 @@ void Test_IMG(void) byte signature[6]={0x01,0x00,0x47,0x12,0x6D,0xB0}; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=1; @@ -877,7 +877,7 @@ void Load_IMG(void) long file_size; T_IMG_Header IMG_header; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; if ((file=fopen(filename, "rb"))) @@ -937,7 +937,7 @@ void Save_IMG(void) T_IMG_Header IMG_header; byte signature[6]={0x01,0x00,0x47,0x12,0x6D,0xB0}; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; @@ -968,7 +968,7 @@ void Save_IMG(void) for (y_pos=0; ((y_pos=image_size) break; - pixel_value=Read_pixel_old(Compteur_de_pixels % Main_image_width,Compteur_de_pixels / Main_image_width); + pixel_value=Read_pixel_function(Compteur_de_pixels % Main_image_width,Compteur_de_pixels / Main_image_width); } if ( (last_color!=header.recog1) && (last_color!=header.recog2) ) @@ -1468,7 +1468,7 @@ void Test_LBM(void) char section[4]; dword dummy; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; @@ -1750,7 +1750,7 @@ void Load_LBM(void) long file_size; dword dummy; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; @@ -2087,7 +2087,7 @@ void Save_LBM(void) int file_size; File_error=0; - filename_complet(filename,0); + Get_full_filename(filename,0); // Ouverture du fichier if ((LBM_file=fopen(filename,"wb"))) @@ -2145,7 +2145,7 @@ void Save_LBM(void) for (y_pos=0; ((y_pos=0) && (!File_error)); y_pos--) for (x_pos=0; x_pos=Main_image_width) { @@ -3335,7 +3335,7 @@ void Save_GIF(void) GIF_remainder_bits=0; GIF_remainder_byte=0; - filename_complet(filename,0); + Get_full_filename(filename,0); if ((GIF_file=fopen(filename,"wb"))) { @@ -3638,7 +3638,7 @@ void Test_PCX(void) FILE *file; File_error=0; - filename_complet(filename,0); + Get_full_filename(filename,0); if ((file=fopen(filename, "rb"))) { @@ -3721,7 +3721,7 @@ void Load_PCX(void) long image_size; byte * buffer; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; @@ -4039,7 +4039,7 @@ void Save_PCX(void) - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; @@ -4090,20 +4090,20 @@ void Save_PCX(void) for (y_pos=0; ((y_pos1) || (last_pixel>=0xC0) ) @@ -4176,7 +4176,7 @@ void Test_CEL(void) int file_size; File_error=0; - filename_complet(filename,0); + Get_full_filename(filename,0); file_size=File_length(filename); if (file_size==0) { @@ -4243,7 +4243,7 @@ void Load_CEL(void) long file_size; File_error=0; - filename_complet(filename,0); + Get_full_filename(filename,0); if ((file=fopen(filename, "rb"))) { if (Read_bytes(file,&header1,sizeof(T_CEL_Header1))) @@ -4365,7 +4365,7 @@ void Save_CEL(void) Count_used_colors(Utilisation); File_error=0; - filename_complet(filename,0); + Get_full_filename(filename,0); if ((file=fopen(filename,"wb"))) { // On regarde si des couleurs >16 sont utilisées dans l'image @@ -4386,10 +4386,10 @@ void Save_CEL(void) { for (x_pos=0;((x_pos>4);x_pos++) @@ -5361,7 +5361,7 @@ void Test_PC1(void) word resolution; // Résolution de l'image - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=1; @@ -5397,7 +5397,7 @@ void Load_PC1(void) byte * ptr; byte pixels[320]; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; if ((file=fopen(filename, "rb"))) @@ -5471,7 +5471,7 @@ void Save_PC1(void) byte * ptr; byte pixels[320]; - filename_complet(filename,0); + Get_full_filename(filename,0); File_error=0; // Ouverture du fichier @@ -5494,7 +5494,7 @@ void Save_PC1(void) if (y_pos1)) goto Erreur_ERREUR_INI_CORROMPU; - conf->Couleurs_separees=values[0]; + conf->Separate_colors=values[0]; if ((return_code=Load_INI_get_values (file,buffer,"FX_feedback",1,values))) goto Erreur_Retour; diff --git a/saveini.c b/saveini.c index eaca33a1..453bd9bc 100644 --- a/saveini.c +++ b/saveini.c @@ -421,7 +421,7 @@ int Save_INI(T_Config * conf) } } // On récupère un fichier INI "propre" à partir de gfx2def.ini - strcpy(ref_ini_file,Repertoire_des_donnees); + strcpy(ref_ini_file,Data_directory); strcat(ref_ini_file,"gfx2def.ini"); Ancien_fichier=fopen(ref_ini_file,"rb"); if (Ancien_fichier==0) @@ -569,7 +569,7 @@ int Save_INI(T_Config * conf) if ((return_code=Save_INI_set_values (Ancien_fichier,Nouveau_fichier,buffer,"Fast_zoom",1,values,1))) goto Erreur_Retour; - values[0]=conf->Couleurs_separees; + values[0]=conf->Separate_colors; if ((return_code=Save_INI_set_values (Ancien_fichier,Nouveau_fichier,buffer,"Separate_colors",1,values,1))) goto Erreur_Retour; diff --git a/struct.h b/struct.h index 03f5add0..ef4dd931 100644 --- a/struct.h +++ b/struct.h @@ -255,7 +255,7 @@ typedef struct byte Ratio; ///< Determines the scaling of menu and windows: 0 no scaling, 1 scaling, 2 slight scaling. byte Fast_zoom; ///< Boolean, true if the magnifier shortcut should automatically view the mouse area. byte Find_file_fast; ///< In fileselectors, this determines which entries should be sought when typing letters: 0 all, 1 files only, 2 directories only. - byte Couleurs_separees; ///< Boolean, true if the menu palette should separate color cells with a black outline. + byte Separate_colors; ///< Boolean, true if the menu palette should separate color cells with a black outline. word Palette_cells_X; ///< Number of colors to show in a row of the menu palette. word Palette_cells_Y; ///< Number of colors to show in a column of the menu palette. byte Palette_vertical; ///< Boolean, true if the menu palette should go top to bottom instead of left to right diff --git a/text.c b/text.c index 500d5f66..8a750b72 100644 --- a/text.c +++ b/text.c @@ -281,7 +281,7 @@ void Init_text(void) font_list_start = NULL; Nb_fonts=0; // Parcours du répertoire "fonts" - strcpy(directory_name, Repertoire_des_donnees); + strcpy(directory_name, Data_directory); strcat(directory_name, "fonts"); For_each_file(directory_name, Add_font); diff --git a/windows.c b/windows.c index 72237375..f865223f 100644 --- a/windows.c +++ b/windows.c @@ -199,7 +199,7 @@ void Frame_menu_color(byte color) if ((Fore_color>=First_color_in_palette) && (Fore_color