From 9f7a9c9a35914f14a79113ae1299bc08994a984d Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Fri, 4 Feb 2000 04:31:18 +0000 Subject: [PATCH] user_install creates the gflare directory as "gflares" (not "gflare"), so 2000-02-05 Tor Lillqvist * gimprc.in: user_install creates the gflare directory as "gflares" (not "gflare"), so use that form here, too. * gimprc.win32: Update to match the Unix version. * app/ops_buttons.c: Include gimpintl.h. * app/preferences_dialog.c (file_pref_cmd_callback): I18n for the Pixels/%s string. It used to come out as "Pixels/tuuma" in Finnish, for instance. * plug-ins/gflare/gflare.c: Portability. * libgimp/gimpui.def: * plug-ins/makefile.{cygwin,msc} * modules/makefile.{cygwin,msc}: Updates. --- ChangeLog | 19 ++++++++++++++ app/dialogs/preferences-dialog.c | 10 ++++++-- app/gui/preferences-dialog.c | 10 ++++++-- app/ops_buttons.c | 2 ++ app/preferences_dialog.c | 10 ++++++-- etc/gimprc.in | 2 +- etc/gimprc.win32 | 43 +++++++++++++++++++++++++++++-- gimprc.in | 2 +- gimprc.win32 | 43 +++++++++++++++++++++++++++++-- libgimp/gimpui.def | 5 ++++ modules/makefile.cygwin | 7 ++--- modules/makefile.msc | 9 ++++--- plug-ins/gflare/gflare.c | 44 +++++++++++++++----------------- plug-ins/makefile.cygwin | 16 +++++++++--- plug-ins/makefile.msc | 14 ++++++++-- po-libgimp/ChangeLog | 4 +++ po-libgimp/fi.po | 38 ++++++++------------------- 17 files changed, 203 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 383d309cfb..25dd5cf324 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2000-02-05 Tor Lillqvist + + * gimprc.in: user_install creates the gflare directory as + "gflares" (not "gflare"), so use that form here, too. + + * gimprc.win32: Update to match the Unix version. + + * app/ops_buttons.c: Include gimpintl.h. + + * app/preferences_dialog.c (file_pref_cmd_callback): I18n for the + Pixels/%s string. It used to come out as "Pixels/tuuma" in + Finnish, for instance. + + * plug-ins/gflare/gflare.c: Portability. + + * libgimp/gimpui.def: + * plug-ins/makefile.{cygwin,msc} + * modules/makefile.{cygwin,msc}: Updates. + 2000-02-05 Jay Cox * app/paths_cmds.c, tools/pdbgen/pdb/paths.pdb: diff --git a/app/dialogs/preferences-dialog.c b/app/dialogs/preferences-dialog.c index dd84b7e11b..086aeabc1a 100644 --- a/app/dialogs/preferences-dialog.c +++ b/app/dialogs/preferences-dialog.c @@ -1354,6 +1354,7 @@ file_pref_cmd_callback (GtkWidget *widget, gint i; gint divided_mem_size; gint mem_size_unit; + gchar *pixels_per_unit; if (prefs_dlg) { @@ -1573,8 +1574,10 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_widget_show (hbox); + pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL); + sizeentry2 = - gimp_size_entry_new (2, default_resolution_units, "Pixels/%s", + gimp_size_entry_new (2, default_resolution_units, pixels_per_unit, FALSE, FALSE, TRUE, 75, GIMP_SIZE_ENTRY_UPDATE_RESOLUTION); @@ -2334,8 +2337,11 @@ file_pref_cmd_callback (GtkWidget *widget, abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); sizeentry = - gimp_size_entry_new (2, UNIT_INCH, "Pixels/%s", FALSE, FALSE, TRUE, 75, + gimp_size_entry_new (2, UNIT_INCH, pixels_per_unit, FALSE, FALSE, TRUE, 75, GIMP_SIZE_ENTRY_UPDATE_RESOLUTION); + + g_free (pixels_per_unit); + pixels_per_unit = NULL; button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM); if (ABS (monitor_xres - monitor_yres) < GIMP_MIN_RESOLUTION) diff --git a/app/gui/preferences-dialog.c b/app/gui/preferences-dialog.c index dd84b7e11b..086aeabc1a 100644 --- a/app/gui/preferences-dialog.c +++ b/app/gui/preferences-dialog.c @@ -1354,6 +1354,7 @@ file_pref_cmd_callback (GtkWidget *widget, gint i; gint divided_mem_size; gint mem_size_unit; + gchar *pixels_per_unit; if (prefs_dlg) { @@ -1573,8 +1574,10 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_widget_show (hbox); + pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL); + sizeentry2 = - gimp_size_entry_new (2, default_resolution_units, "Pixels/%s", + gimp_size_entry_new (2, default_resolution_units, pixels_per_unit, FALSE, FALSE, TRUE, 75, GIMP_SIZE_ENTRY_UPDATE_RESOLUTION); @@ -2334,8 +2337,11 @@ file_pref_cmd_callback (GtkWidget *widget, abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); sizeentry = - gimp_size_entry_new (2, UNIT_INCH, "Pixels/%s", FALSE, FALSE, TRUE, 75, + gimp_size_entry_new (2, UNIT_INCH, pixels_per_unit, FALSE, FALSE, TRUE, 75, GIMP_SIZE_ENTRY_UPDATE_RESOLUTION); + + g_free (pixels_per_unit); + pixels_per_unit = NULL; button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM); if (ABS (monitor_xres - monitor_yres) < GIMP_MIN_RESOLUTION) diff --git a/app/ops_buttons.c b/app/ops_buttons.c index 1e98f0b858..7acd1cb847 100644 --- a/app/ops_buttons.c +++ b/app/ops_buttons.c @@ -22,6 +22,8 @@ #include "gimphelp.h" #include "ops_buttons.h" +#include "libgimp/gimpintl.h" + static void ops_button_pressed_callback (GtkWidget*, GdkEventButton*, gpointer); static void ops_button_extended_callback (GtkWidget*, gpointer); diff --git a/app/preferences_dialog.c b/app/preferences_dialog.c index dd84b7e11b..086aeabc1a 100644 --- a/app/preferences_dialog.c +++ b/app/preferences_dialog.c @@ -1354,6 +1354,7 @@ file_pref_cmd_callback (GtkWidget *widget, gint i; gint divided_mem_size; gint mem_size_unit; + gchar *pixels_per_unit; if (prefs_dlg) { @@ -1573,8 +1574,10 @@ file_pref_cmd_callback (GtkWidget *widget, gtk_container_add (GTK_CONTAINER (frame), hbox); gtk_widget_show (hbox); + pixels_per_unit = g_strconcat (_("Pixels"), "/%s", NULL); + sizeentry2 = - gimp_size_entry_new (2, default_resolution_units, "Pixels/%s", + gimp_size_entry_new (2, default_resolution_units, pixels_per_unit, FALSE, FALSE, TRUE, 75, GIMP_SIZE_ENTRY_UPDATE_RESOLUTION); @@ -2334,8 +2337,11 @@ file_pref_cmd_callback (GtkWidget *widget, abox = gtk_alignment_new (0.5, 0.5, 0.0, 0.0); sizeentry = - gimp_size_entry_new (2, UNIT_INCH, "Pixels/%s", FALSE, FALSE, TRUE, 75, + gimp_size_entry_new (2, UNIT_INCH, pixels_per_unit, FALSE, FALSE, TRUE, 75, GIMP_SIZE_ENTRY_UPDATE_RESOLUTION); + + g_free (pixels_per_unit); + pixels_per_unit = NULL; button = gimp_chain_button_new (GIMP_CHAIN_BOTTOM); if (ABS (monitor_xres - monitor_yres) < GIMP_MIN_RESOLUTION) diff --git a/etc/gimprc.in b/etc/gimprc.in index 9e143cc362..e2e02b763e 100644 --- a/etc/gimprc.in +++ b/etc/gimprc.in @@ -310,6 +310,6 @@ # GFlare path # This path will be searched for gflares when you use the GFlare plug-in. -(gflare-path "${gimp_dir}/gflare:${gimp_data_dir}/gflare") +(gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares") # [end of file] diff --git a/etc/gimprc.win32 b/etc/gimprc.win32 index b3a4e60742..f594ac72a3 100644 --- a/etc/gimprc.win32 +++ b/etc/gimprc.win32 @@ -43,7 +43,7 @@ # Specify a default brush. If none is specified it defaults to the # "1circle.gbr" brush which is just a single pixel sized brush. # The brush is searched for in the brush path. -(default-brush "19fcircle.gbr") +(default-brush "Circle (19)") # Set the pattern search path...this path will be searched for valid # patterns at startup. @@ -51,7 +51,7 @@ # Specify a default pattern. # The pattern is searched for in the specified pattern paths. -(default-pattern "wood2.pat") +(default-pattern "Pine?") # Set the palette search path...this path will be searched for valid # palettes at startup. @@ -258,4 +258,43 @@ # %d destination scale factor (image-title-format "%f-%p.%i (%t) %z%%") +# Global paint options +# By default options for the paint tools are global, e.g. all paint tools +# use the options you specify in the brushes dialog. You can change this +# so each tool has its own settings by uncommenting the next line. +# (no-global-paint-options) + +# Maximal new image size +# To prevent mistakes Gimp will warn you if you try to create a very large +# image. The default maximum memory consumption of the new image that +# triggers the warning is 32MB. +(max-new-image-size 32M) + +# Trust dirty flag +# Gimp tries to keep track of changes to an image. If you trust this +# behaviour, nothing will happen if you save an unchanged image. By default +# this is turned off. +# Just uncomment the following line if you trust the dirty flag. +# (trust-dirty-flag) + +# Help browser +# Determines which program to use as browser for the GIMP help pages. +# Possible values are "gimp" which means the built-in help browser +# which comes with GIMP as a plug-in and "netscape" which will show +# the help pages using the "netscape-remote" command. +(help-browser gimp) + +# Gfig search path +# This path will be searched for Gfig figures when you use the Gfig plug-in. +(gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig") + +# Fractalexplorer path +# This path will be searched for fractals when you use the Fractalexplorer +# plug-in. +(fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer") + +# GFlare path +# This path will be searched for gflares when you use the GFlare plug-in. +(gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares") + # [end of file] diff --git a/gimprc.in b/gimprc.in index 9e143cc362..e2e02b763e 100644 --- a/gimprc.in +++ b/gimprc.in @@ -310,6 +310,6 @@ # GFlare path # This path will be searched for gflares when you use the GFlare plug-in. -(gflare-path "${gimp_dir}/gflare:${gimp_data_dir}/gflare") +(gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares") # [end of file] diff --git a/gimprc.win32 b/gimprc.win32 index b3a4e60742..f594ac72a3 100644 --- a/gimprc.win32 +++ b/gimprc.win32 @@ -43,7 +43,7 @@ # Specify a default brush. If none is specified it defaults to the # "1circle.gbr" brush which is just a single pixel sized brush. # The brush is searched for in the brush path. -(default-brush "19fcircle.gbr") +(default-brush "Circle (19)") # Set the pattern search path...this path will be searched for valid # patterns at startup. @@ -51,7 +51,7 @@ # Specify a default pattern. # The pattern is searched for in the specified pattern paths. -(default-pattern "wood2.pat") +(default-pattern "Pine?") # Set the palette search path...this path will be searched for valid # palettes at startup. @@ -258,4 +258,43 @@ # %d destination scale factor (image-title-format "%f-%p.%i (%t) %z%%") +# Global paint options +# By default options for the paint tools are global, e.g. all paint tools +# use the options you specify in the brushes dialog. You can change this +# so each tool has its own settings by uncommenting the next line. +# (no-global-paint-options) + +# Maximal new image size +# To prevent mistakes Gimp will warn you if you try to create a very large +# image. The default maximum memory consumption of the new image that +# triggers the warning is 32MB. +(max-new-image-size 32M) + +# Trust dirty flag +# Gimp tries to keep track of changes to an image. If you trust this +# behaviour, nothing will happen if you save an unchanged image. By default +# this is turned off. +# Just uncomment the following line if you trust the dirty flag. +# (trust-dirty-flag) + +# Help browser +# Determines which program to use as browser for the GIMP help pages. +# Possible values are "gimp" which means the built-in help browser +# which comes with GIMP as a plug-in and "netscape" which will show +# the help pages using the "netscape-remote" command. +(help-browser gimp) + +# Gfig search path +# This path will be searched for Gfig figures when you use the Gfig plug-in. +(gfig-path "${gimp_dir}/gfig:${gimp_data_dir}/gfig") + +# Fractalexplorer path +# This path will be searched for fractals when you use the Fractalexplorer +# plug-in. +(fractalexplorer-path "${gimp_dir}/fractalexplorer:${gimp_data_dir}/fractalexplorer") + +# GFlare path +# This path will be searched for gflares when you use the GFlare plug-in. +(gflare-path "${gimp_dir}/gflares:${gimp_data_dir}/gflares") + # [end of file] diff --git a/libgimp/gimpui.def b/libgimp/gimpui.def index c91dcd231a..fb84f50a74 100644 --- a/libgimp/gimpui.def +++ b/libgimp/gimpui.def @@ -11,6 +11,7 @@ EXPORTS gimp_color_button_new gimp_color_button_update gimp_context_help + gimp_coordinates_new gimp_dialog_create_action_area gimp_dialog_create_action_areav gimp_dialog_new @@ -24,9 +25,12 @@ EXPORTS gimp_file_selection_new gimp_file_selection_set_filename gimp_float_adjustment_update + gimp_gradient_close_popup + gimp_gradient_get_gradient_data gimp_gradient_select_widget gimp_gradient_select_widget_close_popup gimp_gradient_select_widget_set_popup + gimp_gradient_set_popup gimp_help_connect_help_accel gimp_help_disable_tooltips gimp_help_enable_tooltips @@ -40,6 +44,7 @@ EXPORTS gimp_layer_menu_new gimp_menu_item_update gimp_option_menu_new + gimp_option_menu_new2 gimp_pattern_close_popup gimp_pattern_get_pattern_data gimp_pattern_select_widget diff --git a/modules/makefile.cygwin b/modules/makefile.cygwin index ea9a0e5350..71f301501d 100644 --- a/modules/makefile.cygwin +++ b/modules/makefile.cygwin @@ -22,8 +22,9 @@ GLIB_VER = 1.3 GLIB = ../../glib GMODULE = $(GLIB)/gmodule GTK = ../../gtk+ +INTL = ../../intl -CFLAGS = $(OPTIMIZE) -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk/win32 -I$(GTK)/gdk -I$(GTK) +CFLAGS = $(OPTIMIZE) -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)/gdk -I$(GTK) -I$(INTL) LDFLAGS = -s MODULES = \ @@ -44,10 +45,10 @@ colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.o module.def $(GLIB)/build-dll colorsel_gtk $(GIMP_VER) module.def colorsel_gtk.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.o module.def - $(GLIB)/build-dll colorsel_triangle $(GIMP_VER) module.def colorsel_triangle.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) + $(GLIB)/build-dll colorsel_triangle $(GIMP_VER) module.def colorsel_triangle.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) colorsel_water-$(GIMP_VER).dll : colorsel_water.o module.def - $(GLIB)/build-dll colorsel_water $(GIMP_VER) module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk/win32 -lgdk-$(GTK_VER) -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) + $(GLIB)/build-dll colorsel_water $(GIMP_VER) module.def colorsel_water.o $(LDFLAGS) -L ../app -lgimp -L $(GTK)/gtk -lgtk-$(GTK_VER) -L $(GTK)/gdk -lgdk-$(GTK_VER) -L $(INTL) -lgnu-intl -L $(GLIB) -lgmodule-$(GLIB_VER) -lglib-$(GLIB_VER) clean: -rm *.dll *.a *.o *.exp *.base diff --git a/modules/makefile.msc b/modules/makefile.msc index a3b9bb74cd..6b961ddcd3 100644 --- a/modules/makefile.msc +++ b/modules/makefile.msc @@ -2,7 +2,7 @@ ## Use: nmake -f makefile.msc # Change this to wherever you install the gimp. -GIMP = D:\gimp +GIMP = C:\gimp BIN = $(GIMP)\modules ################################################################ @@ -32,8 +32,9 @@ GLIB_VER = 1.3 GLIB = ..\..\glib GMODULE = $(GLIB)\gmodule GTK = ..\..\gtk+ +INTL = ..\..\intl -CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk\win32 -I$(GTK) +CFLAGS = -DHAVE_CONFIG_H -DMODULE_COMPILATION -I. -I.. -I$(GLIB) -I$(GMODULE) -I$(GTK)\gdk -I$(GTK) -I$(INTL) MODULES = \ colorsel_gtk-$(GIMP_VER).dll \ @@ -54,10 +55,10 @@ colorsel_gtk-$(GIMP_VER).dll : colorsel_gtk.obj module.def $(CC) $(CFLAGS) -LD -Fe$@ colorsel_gtk.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def colorsel_triangle-$(GIMP_VER).dll : colorsel_triangle.obj module.def - $(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def + $(CC) $(CFLAGS) -LD -Fe$@ colorsel_triangle.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def colorsel_water-$(GIMP_VER).dll : colorsel_water.obj module.def - $(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\win32\gdk-$(GTK_VER).lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def + $(CC) $(CFLAGS) -LD -Fe$@ colorsel_water.obj $(LDFLAGS) ..\app\gimp.lib $(GTK)\gtk\gtk-$(GTK_VER).lib $(GTK)\gdk\gdk-$(GTK_VER).lib $(INTL)\gnu-intl.lib $(GLIB)\gmodule-$(GLIB_VER).lib $(GLIB)\glib-$(GLIB_VER).lib /def:module.def # General rule for building .c.obj: diff --git a/plug-ins/gflare/gflare.c b/plug-ins/gflare/gflare.c index 9b13b5c958..97b053319d 100644 --- a/plug-ins/gflare/gflare.c +++ b/plug-ins/gflare/gflare.c @@ -53,8 +53,12 @@ static char rcsid[] = "$Id$"; #include #include #include +#ifdef HAVE_UNISTD_H #include +#endif +#ifdef HAVE_DIRENT_H #include +#endif #include @@ -69,7 +73,7 @@ static char rcsid[] = "$Id$"; /* #define DEBUG */ #ifdef DEBUG -#define DEBUG_PRINT(X) printf X +#define DEBUG_PRINT(X) g_print X #else #define DEBUG_PRINT(X) #endif @@ -279,7 +283,7 @@ typedef struct /* * What's the difference between (structure) CalcParams and GFlare ? * well, radius and lengths are actual length for CalcParams where - * they are typically 0 to 100 for GFlares, and angles are M_PI based + * they are typically 0 to 100 for GFlares, and angles are G_PI based * (radian) for CalcParams where they are degree for GFlares. et cetra. * This is because convienience for dialog processing and for calculating. * these conversion is taken place in calc init routines. see below. @@ -909,15 +913,12 @@ plug_in_parse_gflare_path () path_string = g_strdup (return_vals[1].data.d_string); gimp_destroy_params (return_vals, nreturn_vals); - /* Set local path to contain temp_path, where (supposedly) - * there may be working files. - */ - home = getenv ("HOME"); + home = g_get_home_dir (); /* Search through all directories in the path */ next_token = path_string; - token = strtok (next_token, G_SEARCHPATH_SEPARATOR_S ); + token = strtok (next_token, G_SEARCHPATH_SEPARATOR_S); while (token) { @@ -943,8 +944,8 @@ plug_in_parse_gflare_path () if (!err && S_ISDIR (filestat.st_mode)) { - if (path[strlen (path) - 1] != '/') - strcat (path, "/"); + if (path[strlen (path) - 1] != G_DIR_SEPARATOR) + strcat (path, G_DIR_SEPARATOR_S); DEBUG_PRINT(("Added `%s' to gflare_path_list\n", path)); gflare_path_list = g_list_append (gflare_path_list, path); @@ -1467,8 +1468,7 @@ gflare_save (GFlare *gflare) /* get first entry of path */ path = gflare_path_list->data; - gflare->filename = g_malloc (strlen (path) + strlen (gflare->name) + 2); - sprintf (gflare->filename, "%s%s", path, gflare->name); + gflare->filename = g_strdup_printf ("%s%s", path, gflare->name); } fp = fopen (gflare->filename, "w"); @@ -1668,9 +1668,7 @@ gflares_list_load_all () { while ((dir_ent = readdir (dir))) { - filename = g_malloc (strlen(path) + strlen (dir_ent->d_name) + 1); - - sprintf (filename, "%s%s", path, dir_ent->d_name); + filename = g_strdup_printf ("%s%s", path, dir_ent->d_name); /* Check the file and see that it is not a sub-directory */ err = stat (filename, &filestat); @@ -1737,16 +1735,16 @@ calc_init_params (GFlare *gflare, gint calc_type, calc.xcenter = xcenter; calc.ycenter = ycenter; calc.radius = radius; - calc.rotation = rotation * M_PI / 180.0; + calc.rotation = rotation * G_PI / 180.0; calc.hue = hue; - calc.vangle = vangle * M_PI / 180.0; + calc.vangle = vangle * G_PI / 180.0; calc.vlength = radius * vlength / 100.0; calc.glow_radius = radius * gflare->glow_size / 100.0; calc.rays_radius = radius * gflare->rays_size / 100.0; calc.sflare_radius = radius * gflare->sflare_size / 100.0; - calc.glow_rotation = (rotation + gflare->glow_rotation) * M_PI / 180.0; - calc.rays_rotation = (rotation + gflare->rays_rotation) * M_PI / 180.0; - calc.sflare_rotation = (rotation + gflare->sflare_rotation) * M_PI / 180.0; + calc.glow_rotation = (rotation + gflare->glow_rotation) * G_PI / 180.0; + calc.rays_rotation = (rotation + gflare->rays_rotation) * G_PI / 180.0; + calc.sflare_rotation = (rotation + gflare->sflare_rotation) * G_PI / 180.0; calc.glow_opacity = gflare->glow_opacity * 255 / 100.0; calc.rays_opacity = gflare->rays_opacity * 255 / 100.0; calc.sflare_opacity = gflare->sflare_opacity * 255 / 100.0; @@ -1773,7 +1771,7 @@ calc_init_params (GFlare *gflare, gint calc_type, calc.sflare_shape = gflare->sflare_shape; if (calc.sflare_shape == GF_POLYGON) { - calc.sflare_angle = 2 * M_PI / (2 * gflare->sflare_nverts); + calc.sflare_angle = 2 * G_PI / (2 * gflare->sflare_nverts); calc.sflare_factor = 1.0 / cos (calc.sflare_angle); } @@ -2063,7 +2061,7 @@ calc_glow_pix (guchar *dest_pix, gdouble x, gdouble y) x -= calc.xcenter; y -= calc.ycenter; radius = sqrt (x*x + y*y) / calc.glow_radius; - angle = (atan2 (-y, x) + calc.glow_rotation ) / (2*M_PI); + angle = (atan2 (-y, x) + calc.glow_rotation ) / (2*G_PI); angle = fmod_positive (angle, 1.0); calc_get_gradient (size_pix, calc.glow_angular_size, angle); @@ -2107,7 +2105,7 @@ calc_rays_pix (guchar *dest_pix, gdouble x, gdouble y) x -= calc.xcenter; y -= calc.ycenter; radius = sqrt (x*x + y*y) / calc.rays_radius; - angle = (atan2 (-y, x) + calc.rays_rotation ) / (2*M_PI); + angle = (atan2 (-y, x) + calc.rays_rotation ) / (2*G_PI); angle = fmod_positive (angle, 1.0); /* make sure 0 <= angle < 1.0 */ spike_frac = fmod (angle, calc.rays_spike_mod * 2); spike_angle = angle - spike_frac + calc.rays_spike_mod; @@ -5446,7 +5444,7 @@ query_string_box (char *title, GtkWidget *entry; GtkWidget *button; - query_box = (QueryBox *) g_malloc (sizeof (QueryBox)); + query_box = g_new (QueryBox, 1); qbox = gtk_dialog_new (); gtk_window_set_title (GTK_WINDOW (qbox), title); diff --git a/plug-ins/makefile.cygwin b/plug-ins/makefile.cygwin index 1c5c8fa8ed..52ca60e5fa 100644 --- a/plug-ins/makefile.cygwin +++ b/plug-ins/makefile.cygwin @@ -30,7 +30,7 @@ COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop # These have own subdirectories each -SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gdyntext gfig gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap +SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap # These are unofficial, ie not in the CVS. To build these, you should # get tml's source snapshot and copy this makefile to the @@ -112,7 +112,7 @@ sub-one-separate : cd $(DIR); $(MAKE) -f ../makefile.cygwin TOP=../.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) -data-install : gimpressionist-data-install script-fu-data-install gap-data-install +data-install : gimpressionist-data-install script-fu-data-install gap-data-install guash-data-install gimpressionist-data-install : -mkdir $(GIMP)/gimpressionist $(GIMP)/gimpressionist/Brushes $(GIMP)/gimpressionist/Paper $(GIMP)/gimpressionist/Presets @@ -132,6 +132,8 @@ gap-data-install: -mkdir $(GIMP)/scripts $(INSTALL) gap/*.scm $(GIMP)/scripts +guash-data-install: + endif # ifndef MODULE endif # ifndef PLUGIN endif # ifndef LIBRARY @@ -143,7 +145,6 @@ ifndef FROMPLUGINSDIR ifdef EXTRA_FractalExplorer OBJECTS = \ - Callbacks.o \ Dialogs.o \ Events.o \ FractalExplorer.o \ @@ -260,9 +261,16 @@ OBJECTS = \ message_window.o endif +ifdef EXTRA_gflare +OBJECTS = \ + asupsample.o \ + gflare.o \ + gtkmultioptionmenu.o +endif + ifdef EXTRA_gfli OBJECTS = \ - fli.o \ + fli.o \ gfli.o endif diff --git a/plug-ins/makefile.msc b/plug-ins/makefile.msc index 32bdbb936a..637b53ed89 100644 --- a/plug-ins/makefile.msc +++ b/plug-ins/makefile.msc @@ -29,7 +29,7 @@ COMMON4 = mapcolor max_rgb mblur newsprint nlfilt noisify normalize nova oilify COMMON5 = sample_colorize scatter_hsv semiflatten sharpen shift smooth_palette snoise sobel sparkle spheredesigner spread sunras tga threshold_alpha tiff tile tileit tiler video vinvert vpropagate waves whirlpinch winclipboard wind winprint wmf xbm xwd zealouscrop # These have own subdirectories each -SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gdyntext gfig gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap +SEPARATE = AlienMap AlienMap2 FractalExplorer Lighting MapObject bmp borderaverage dbbrowser faxg3 fits flame fp gdyntext gfig gflare gfli gimpressionist ifscompose imagemap maze mosaic pagecurl rcm sel2path sgi sinus struc twain unsharp winsnap # These are unofficial, ie not in the CVS. To build these, you should # get tml's source snapshot and copy this makefile to the @@ -123,7 +123,7 @@ sub-one-separate : nmake -nologo -f ..\makefile.msc TOP=..\.. PLUGIN=$(DIR) EXTRA_$(DIR)=1 $(TARGET) -data-install : gimpressionist-data-install +data-install : gimpressionist-data-install guash-data-install -md $(GIMP)\scripts $(INSTALL) script-fu\scripts\*.scm $(GIMP)\scripts $(INSTALL) script-fu\scripts\*.jpg $(GIMP)\scripts @@ -141,6 +141,9 @@ gimpressionist-data-install : $(INSTALL) gimpressionist\Presets\* $(GIMP)\gimpressionist\Presets del $(GIMP)\gimpressionist\Presets\Makefile.am +guash-data-install : + + !ENDIF !ENDIF !ENDIF @@ -273,6 +276,13 @@ OBJECTS = \ message_window.obj !ENDIF +ifdef EXTRA_gflare +OBJECTS = \ + asupsample.obj \ + gflare.obj \ + gtkmultioptionmenu.obj +endif + !IFDEF EXTRA_gfli OBJECTS = \ fli.obj \ diff --git a/po-libgimp/ChangeLog b/po-libgimp/ChangeLog index 2ebabddc07..dee3612ccf 100644 --- a/po-libgimp/ChangeLog +++ b/po-libgimp/ChangeLog @@ -1,3 +1,7 @@ +2000-02-05 Tor Lillqvist + + * fi.po: Updated translation. + Fri Feb 4 20:41:56 CET 2000 Stanislav Brabec * cs.po: Updated translation. diff --git a/po-libgimp/fi.po b/po-libgimp/fi.po index c47c89920b..2a91f5cab7 100644 --- a/po-libgimp/fi.po +++ b/po-libgimp/fi.po @@ -15,34 +15,29 @@ msgstr "" #: libgimp/gimpcolorbutton.c:105 msgid "/Use Foreground Color" -msgstr "" +msgstr "/Käytä edustaväriä" #: libgimp/gimpcolorbutton.c:106 msgid "/Use Background Color" -msgstr "" +msgstr "/Käytä taustaväriä" #: libgimp/gimpexport.c:124 -#, fuzzy msgid "can't Handle Layers" msgstr "ei pysty käsittelemään tasoja" #: libgimp/gimpexport.c:125 libgimp/gimpexport.c:134 -#, fuzzy msgid "Merge Visible Layers" msgstr "Yhdistä näkyvät tasot" #: libgimp/gimpexport.c:133 -#, fuzzy msgid "can only Handle Layers as Animation Frames" msgstr "voi käyttää tasoja ainoastaan animaation ruutuina" #: libgimp/gimpexport.c:134 -#, fuzzy msgid "Save as Animation" msgstr "Tallenna animaationa" #: libgimp/gimpexport.c:142 -#, fuzzy msgid "can't Handle Transparency" msgstr "ei pysty käsittelemään läpinäkyvyyttä" @@ -51,7 +46,6 @@ msgid "Flatten Image" msgstr "Yhdistä kuva" #: libgimp/gimpexport.c:151 -#, fuzzy msgid "can only Handle RGB Images" msgstr "käsittelee ainoastaan täysvärikuvia" @@ -60,17 +54,14 @@ msgid "Convert to RGB" msgstr "Muunna täysvärikuvaksi" #: libgimp/gimpexport.c:160 -#, fuzzy msgid "can only Handle Grayscale Images" msgstr "käsittelee ainoastaan harmaasävykuvia" #: libgimp/gimpexport.c:161 libgimp/gimpexport.c:180 libgimp/gimpexport.c:201 -#, fuzzy msgid "Convert to Grayscale" msgstr "Muunna harmaasävyksi" #: libgimp/gimpexport.c:169 -#, fuzzy msgid "can only Handle Indexed Images" msgstr "käsittelee ainoastaan indeksoituja kuvia" @@ -83,27 +74,22 @@ msgstr "" "(Tee se käsin jos haluat käyttää muita kuin oletuksia)" #: libgimp/gimpexport.c:179 -#, fuzzy msgid "can only Handle RGB or Grayscale Images" msgstr "käsittelee ainoastaan täysväri- tai harmaasävykuvia" #: libgimp/gimpexport.c:188 -#, fuzzy msgid "can only Handle RGB or Indexed Images" msgstr "käsittelee ainoastaan täysväri- tai indeksoituja kuvia" #: libgimp/gimpexport.c:198 -#, fuzzy msgid "can only Handle Grayscale or Indexed Images" msgstr "käsittelee ainoastaan harmaasävy- tai indeksoituja kuvia" #: libgimp/gimpexport.c:209 -#, fuzzy msgid "needs an Alpha Channel" msgstr "vaatii että kuvassa on alfakanava" #: libgimp/gimpexport.c:210 -#, fuzzy msgid "Add Alpha Channel" msgstr "Lisää alfakanava" @@ -140,9 +126,8 @@ msgid "The export conversion won't modify your original image." msgstr "Muokkaus ulosvientiä varten ei vaikuta alkuperäiseen kuvaan." #: libgimp/gimpfileselection.c:352 -#, fuzzy msgid "Select File" -msgstr "Valitse" +msgstr "Valitse tiedosto" #: libgimp/gimpfileselection.c:362 libgimp/gimpunitmenu.c:462 msgid "Select" @@ -155,11 +140,11 @@ msgstr "Sulje" #. pseudo unit #: libgimp/gimpunit.c:46 msgid "pixel" -msgstr "" +msgstr "pikseli" #: libgimp/gimpunit.c:46 msgid "pixels" -msgstr "" +msgstr "pikseliä" #. standard units #: libgimp/gimpunit.c:49 @@ -189,7 +174,7 @@ msgstr "pistett #: libgimp/gimpunit.c:54 msgid "pica" -msgstr "" +msgstr "pica" #: libgimp/gimpunit.c:54 msgid "picas" @@ -197,21 +182,20 @@ msgstr "picaa" #: libgimp/gimpunit.c:61 msgid "percent" -msgstr "%" +msgstr "prosenttia" #: libgimp/gimpunitmenu.c:215 msgid "More..." -msgstr "" +msgstr "Lisää..." #: libgimp/gimpunitmenu.c:457 -#, fuzzy msgid "Unit Selection" -msgstr "Valitse" +msgstr "Valitse mittayksikkö" #: libgimp/gimpunitmenu.c:493 msgid "Unit" -msgstr "" +msgstr "Mittayksikkö" #: libgimp/gimpunitmenu.c:494 msgid "Factor" -msgstr "" +msgstr "Kerroin"