diff --git a/ChangeLog b/ChangeLog index 5d2e396072..2441f2aba5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +Fri Sep 3 17:33:37 PDT 1999 Manish Singh + + * configure.in: add plug-ins/AlienMap2/Makefile to AC_OUTPUT + + * libgimp/gimp.c: setlocale (LC_NUMERIC, "C") in gimp_main + so floats are sane over the wire + + * libgimp/stdplugins-intl.h: same for INIT_I18N_UI() + + * plug-ins/common/color_enhance.c: no literal newlines in string for + portability + + * plug-ins/sel2path/sel2path.c: i18n patch from SHIRASAKI Yasuhiro + Sat Sep 4 01:04:00 CEST 1999 Marc Lehmann * plug-ins/Makefile.am, plug-ins/AlienMap2: new plug-in. diff --git a/configure.in b/configure.in index 46936dc0b6..53935e8cf4 100644 --- a/configure.in +++ b/configure.in @@ -654,6 +654,7 @@ plug-ins/script-fu/scripts/Makefile plug-ins/webbrowser/Makefile plug-ins/xjt/Makefile plug-ins/AlienMap/Makefile +plug-ins/AlienMap2/Makefile plug-ins/FractalExplorer/Makefile plug-ins/FractalExplorer/fractalexplorer-examples/Makefile plug-ins/Lighting/Makefile diff --git a/libgimp/gimp.c b/libgimp/gimp.c index e326ebd73d..dc1112dbcb 100644 --- a/libgimp/gimp.c +++ b/libgimp/gimp.c @@ -18,6 +18,7 @@ */ #include "config.h" +#include #include #include #include @@ -141,6 +142,8 @@ gimp_main (int argc, int i, j, k; #endif + setlocale (LC_NUMERIC, "C"); + #ifdef NATIVE_WIN32 /* Check for exe file name with spaces in the path having been split up * by buggy NT C runtime, or something. I don't know why this happens diff --git a/libgimp/stdplugins-intl.h b/libgimp/stdplugins-intl.h index 4c2e22046f..8513ec055e 100644 --- a/libgimp/stdplugins-intl.h +++ b/libgimp/stdplugins-intl.h @@ -15,6 +15,7 @@ textdomain("gimp-std-plugins") #define INIT_I18N_UI() \ gtk_set_locale(); \ + setlocale (LC_NUMERIC, "C"); \ INIT_I18N(); #else #define INIT_I18N() \ @@ -22,5 +23,6 @@ textdomain("gimp-std-plugins") #define INIT_I18N_UI() \ gtk_set_locale(); \ + setlocale (LC_NUMERIC, "C"); \ INIT_I18N(); #endif diff --git a/plug-ins/common/color_enhance.c b/plug-ins/common/color_enhance.c index 81303d7c2b..4fb82d1c3b 100644 --- a/plug-ins/common/color_enhance.c +++ b/plug-ins/common/color_enhance.c @@ -63,7 +63,7 @@ GPlugInInfo PLUG_IN_INFO = MAIN () static void -query () +query (void) { static GParamDef args[] = { @@ -76,14 +76,8 @@ query () static int nreturn_vals = 0; gimp_install_procedure ("plug_in_Color_Enhance", - "Automatically stretch the saturation of the -specified drawable to cover all possible ranges.", - "This simple plug-in does an automatic -saturation stretch. For each channel in the image, it finds the -minimum and maximum values... it uses those values to stretch the individual -histograms to the full range. For some images it may do just what -you want; for others it may be total crap :). This version differs from -Contrast Autostretch in that it works in HSV space, and preserves hue.", + "Automatically stretch the saturation of the specified drawable to cover all possible ranges.", + "This simple plug-in does an automatic saturation stretch. For each channel in the image, it finds the minimum and maximum values... it uses those values to stretch the individual histograms to the full range. For some images it may do just what you want; for others it may be total crap :). This version differs from Contrast Autostretch in that it works in HSV space, and preserves hue.", "Martin Weber", "Martin Weber", "1997", diff --git a/plug-ins/sel2path/sel2path.c b/plug-ins/sel2path/sel2path.c index 7bf802580f..7f8695746f 100644 --- a/plug-ins/sel2path/sel2path.c +++ b/plug-ins/sel2path/sel2path.c @@ -122,8 +122,8 @@ query_2() static int nreturn_vals = 0; gimp_install_procedure ("plug_in_sel2path_advanced", - "Converts a selection to a path (with advanced user menu)", - "Converts a selection to a path (with advanced user menu)", + _("Converts a selection to a path (with advanced user menu)"), + _("Converts a selection to a path (with advanced user menu)"), "Andy Thomas", "Andy Thomas", "1999", @@ -147,13 +147,15 @@ query () static int nargs = sizeof (args) / sizeof (args[0]); static int nreturn_vals = 0; + INIT_I18N(); + gimp_install_procedure ("plug_in_sel2path", - "Converts a selection to a path", - "Converts a selection to a path", + _("Converts a selection to a path"), + _("Converts a selection to a path"), "Andy Thomas", "Andy Thomas", "1999", - "/Select/To Path", + N_("/Select/To Path"), "RGB*, INDEXED*, GRAY*", PROC_PLUG_IN, nargs, nreturn_vals, @@ -179,8 +181,11 @@ run (gchar *name, run_mode = param[0].data.d_int32; - if(!strcmp(name,"plug_in_sel2path")) + if(!strcmp(name,"plug_in_sel2path")) { no_dialog = TRUE; + INIT_I18N(); + } else + INIT_I18N_UI(); *nreturn_vals = 1; *return_vals = values; @@ -195,7 +200,7 @@ run (gchar *name, if(gimp_selection_is_empty(image_ID)) { - g_message("No selection to convert"); + g_message(_("No selection to convert")); gimp_drawable_detach (drawable); return; } @@ -342,7 +347,7 @@ sel2path_dialog (SELVALS *sels) gtk_container_add (GTK_CONTAINER (vbox), table); /* Action area */ - button = gtk_button_new_with_label ("OK"); + button = gtk_button_new_with_label ( _("OK")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect (GTK_OBJECT (button), "clicked", (GtkSignalFunc) sel2path_ok_callback, @@ -351,7 +356,7 @@ sel2path_dialog (SELVALS *sels) gtk_widget_grab_default (button); gtk_widget_show (button); - button = gtk_button_new_with_label ("Cancel"); + button = gtk_button_new_with_label ( _("Cancel")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", (GtkSignalFunc) gtk_widget_destroy, @@ -359,7 +364,7 @@ sel2path_dialog (SELVALS *sels) gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->action_area), button, TRUE, TRUE, 0); gtk_widget_show (button); - button = gtk_button_new_with_label ("Default Values"); + button = gtk_button_new_with_label ( ("Default Values")); GTK_WIDGET_SET_FLAGS (button, GTK_CAN_DEFAULT); gtk_signal_connect_object (GTK_OBJECT (button), "clicked", (GtkSignalFunc) sel2path_reset_callback, @@ -407,7 +412,7 @@ sel_pixel_value(gint row, gint col) if(col > sel_width || row > sel_height) { - g_warning("sel_pixel_value [%d,%d] out of bounds",col,row); + g_warning ("sel_pixel_value [%d,%d] out of bounds", col, row); return 0; } @@ -548,7 +553,7 @@ do_points(spline_list_array_type in_splines,gint32 image_ID) last_y = END_POINT (s).y; } else - g_message ("print_spline: strange degree (%d)", SPLINE_DEGREE (s)); + g_message ( _("print_spline: strange degree (%d)"), SPLINE_DEGREE (s)); point_count++; } @@ -582,7 +587,7 @@ do_sel2path(gint32 drawable_ID,gint32 image_ID ) if(selection_ID < 0) { - g_message("gimp_image_get_selection failed"); + g_message( _("gimp_image_get_selection failed")); return FALSE; } @@ -590,7 +595,7 @@ do_sel2path(gint32 drawable_ID,gint32 image_ID ) if(gimp_drawable_bpp(selection_ID) != 1) { - g_message("Internal error. Selection bpp > 1"); + g_message( _("Internal error. Selection bpp > 1")); return FALSE; } @@ -735,7 +740,7 @@ safe_free (address *item) { if (item == NULL || *item == NULL) { - fprintf (stderr, "safe_free: Attempt to free a null item.\n"); + g_warning ("safe_free: Attempt to free a null item."); abort (); }