diff --git a/ChangeLog b/ChangeLog index ab50e4d1cb..e56602b5a9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2005-09-30 Michael Natterer + + * plug-ins/*/*.c: removed '...' from progress messages. They are + redundant because we are already in a progress. Ported some more + g_strdup_printf()/gimp_progress_init() to + gimp_progress_init_printf(). Core will follow... + 2005-09-29 Manish Singh * plug-ins/uri/uri-backend-wget.c: Finish porting to new progress diff --git a/plug-ins/FractalExplorer/FractalExplorer.c b/plug-ins/FractalExplorer/FractalExplorer.c index a98537a3c5..3b8e2de5d1 100644 --- a/plug-ins/FractalExplorer/FractalExplorer.c +++ b/plug-ins/FractalExplorer/FractalExplorer.c @@ -377,7 +377,7 @@ run (const gchar *name, /* Make sure that the drawable is indexed or RGB color */ if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Rendering Fractal...")); + gimp_progress_init (_("Rendering fractal")); /* Set the tile cache size */ gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width() + 1)); diff --git a/plug-ins/Lighting/lighting_apply.c b/plug-ins/Lighting/lighting_apply.c index 4099c3702d..0dac4e91a7 100644 --- a/plug-ins/Lighting/lighting_apply.c +++ b/plug-ins/Lighting/lighting_apply.c @@ -100,7 +100,7 @@ compute_image (void) row = g_new (guchar, obpp * width); - gimp_progress_init (_("Lighting Effects...")); + gimp_progress_init (_("Lighting Effects")); /* if (mapvals.antialiasing==FALSE) { */ diff --git a/plug-ins/MapObject/mapobject_apply.c b/plug-ins/MapObject/mapobject_apply.c index f04d81f558..57490ec2f9 100644 --- a/plug-ins/MapObject/mapobject_apply.c +++ b/plug-ins/MapObject/mapobject_apply.c @@ -271,16 +271,16 @@ compute_image (void) switch (mapvals.maptype) { case MAP_PLANE: - gimp_progress_init (_("Map to Plane...")); + gimp_progress_init (_("Map to plane")); break; case MAP_SPHERE: - gimp_progress_init (_("Map to Sphere...")); + gimp_progress_init (_("Map to sphere")); break; case MAP_BOX: - gimp_progress_init (_("Map to Box...")); + gimp_progress_init (_("Map to box")); break; case MAP_CYLINDER: - gimp_progress_init (_("Map to Cylinder...")); + gimp_progress_init (_("Map to cylinder")); break; } diff --git a/plug-ins/bmp/bmpread.c b/plug-ins/bmp/bmpread.c index 0811f7a63c..5bd5782d08 100644 --- a/plug-ins/bmp/bmpread.c +++ b/plug-ins/bmp/bmpread.c @@ -154,7 +154,7 @@ ReadBMP (const gchar *name) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (name)); /* It is a File. Now is it a Bitmap? Read the shortest possible header */ @@ -613,7 +613,7 @@ ReadImage (FILE *fd, /* compressed image (either RLE8 or RLE4) */ while (ypos >= 0 && xpos <= width) { - if (!ReadOK (fd, buffer, 2)) + if (!ReadOK (fd, buffer, 2)) { g_message (_("The bitmap ends unexpectedly.")); break; diff --git a/plug-ins/bmp/bmpwrite.c b/plug-ins/bmp/bmpwrite.c index 395e7344ea..f253163957 100644 --- a/plug-ins/bmp/bmpwrite.c +++ b/plug-ins/bmp/bmpwrite.c @@ -208,7 +208,7 @@ WriteBMP (const gchar *filename, 0, 0, drawable->width, drawable->height); /* And let's begin the progress */ - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); cur_progress = 0; diff --git a/plug-ins/common/AlienMap2.c b/plug-ins/common/AlienMap2.c index 54f1cdce63..ac59c92bca 100644 --- a/plug-ins/common/AlienMap2.c +++ b/plug-ins/common/AlienMap2.c @@ -317,7 +317,7 @@ run (const gchar *name, /* Make sure that the drawable is RGB or RGBA */ if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("AlienMap2: Transforming...")); + gimp_progress_init (_("AlienMap2: Transforming")); /* Set the tile cache size */ gimp_tile_cache_ntiles (2 * (drawable->width / diff --git a/plug-ins/common/CEL.c b/plug-ins/common/CEL.c index f5c50372b3..3d3fd3c1d8 100644 --- a/plug-ins/common/CEL.c +++ b/plug-ins/common/CEL.c @@ -274,7 +274,6 @@ load_image (const gchar *file, const gchar *brief) { FILE *fp; /* Read file pointer */ - gchar *progress; /* Title for progress display */ guchar header[32]; /* File header */ gint height, width, /* Dimensions of image */ offx, offy, /* Layer offets */ @@ -302,10 +301,8 @@ load_image (const gchar *file, return -1; } - progress = g_strdup_printf (_("Opening '%s'..."), - gimp_filename_to_utf8 (brief)); - gimp_progress_init (progress); - g_free (progress); + gimp_progress_init_printf (_("Opening '%s'"), + gimp_filename_to_utf8 (brief)); /* Get the image dimensions and create the image... */ @@ -539,7 +536,6 @@ save_image (const gchar *file, gint32 layer) { FILE *fp; /* Write file pointer */ - char *progress; /* Title for progress display */ guchar header[32]; /* File header */ gint bpp; /* Bit per pixel */ gint colours, type; /* Number of colours, type of layer */ @@ -574,10 +570,8 @@ save_image (const gchar *file, return FALSE; } - progress = g_strdup_printf (_("Saving '%s'..."), - gimp_filename_to_utf8 (brief)); - gimp_progress_init (progress); - g_free (progress); + gimp_progress_init_printf (_("Saving '%s'"), + gimp_filename_to_utf8 (brief)); /* Headers */ memset (header, 0, 32); diff --git a/plug-ins/common/CML_explorer.c b/plug-ins/common/CML_explorer.c index d019270e6d..f6b9035703 100644 --- a/plug-ins/common/CML_explorer.c +++ b/plug-ins/common/CML_explorer.c @@ -755,7 +755,7 @@ CML_main_function (gboolean preview_p) } if (! preview_p) - gimp_progress_init (_("CML_explorer: evoluting...")); + gimp_progress_init (_("CML Explorer: evoluting")); /* rolling start */ for (index = 0; index < VALS.start_offset; index++) diff --git a/plug-ins/common/animoptimize.c b/plug-ins/common/animoptimize.c index 18fc08fb76..671147758c 100644 --- a/plug-ins/common/animoptimize.c +++ b/plug-ins/common/animoptimize.c @@ -426,17 +426,17 @@ do_optimizations (GimpRunMode run_mode, switch (opmode) { case OPUNOPTIMIZE: - gimp_progress_init (_("UnOptimizing Animation...")); + gimp_progress_init (_("Unoptimizing animation")); break; case OPFOREGROUND: - gimp_progress_init (_("Removing Animation Background...")); + gimp_progress_init (_("Removing animation background")); break; case OPBACKGROUND: - gimp_progress_init (_("Finding Animation Background...")); + gimp_progress_init (_("Finding animation background")); break; case OPOPTIMIZE: default: - gimp_progress_init (_("Optimizing Animation...")); + gimp_progress_init (_("Optimizing animation")); break; } diff --git a/plug-ins/common/apply_lens.c b/plug-ins/common/apply_lens.c index 22f753cc54..362f48d136 100644 --- a/plug-ins/common/apply_lens.c +++ b/plug-ins/common/apply_lens.c @@ -179,7 +179,7 @@ run (const gchar *name, } gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); - gimp_progress_init (_("Applying lens...")); + gimp_progress_init (_("Applying lens")); drawlens (drawable, NULL); if (run_mode != GIMP_RUN_NONINTERACTIVE) diff --git a/plug-ins/common/autocrop.c b/plug-ins/common/autocrop.c index 1a5c03d843..7b75f7d433 100644 --- a/plug-ins/common/autocrop.c +++ b/plug-ins/common/autocrop.c @@ -147,7 +147,7 @@ run (const gchar *name, gimp_drawable_is_indexed (drawable->drawable_id)) { if (interactive) - gimp_progress_init (_("Cropping...")); + gimp_progress_init (_("Cropping")); gimp_tile_cache_ntiles (MAX (drawable->width / gimp_tile_width (), drawable->height / gimp_tile_height ()) + 1); diff --git a/plug-ins/common/autostretch_hsv.c b/plug-ins/common/autostretch_hsv.c index e914b44792..1451478342 100644 --- a/plug-ins/common/autostretch_hsv.c +++ b/plug-ins/common/autostretch_hsv.c @@ -115,7 +115,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Auto-Stretching HSV...")); + gimp_progress_init (_("Auto-Stretching HSV")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); autostretch_hsv (drawable); diff --git a/plug-ins/common/blinds.c b/plug-ins/common/blinds.c index c12a347deb..8118505193 100644 --- a/plug-ins/common/blinds.c +++ b/plug-ins/common/blinds.c @@ -187,7 +187,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init ( _("Adding Blinds...")); + gimp_progress_init ( _("Adding blinds")); apply_blinds (drawable); diff --git a/plug-ins/common/blur.c b/plug-ins/common/blur.c index 742530bedc..453b42f21f 100644 --- a/plug-ins/common/blur.c +++ b/plug-ins/common/blur.c @@ -187,7 +187,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Blurring...")); + gimp_progress_init (_("Blurring")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); blur (drawable); diff --git a/plug-ins/common/borderaverage.c b/plug-ins/common/borderaverage.c index 22f3aa00fb..3bdd8ae1a7 100644 --- a/plug-ins/common/borderaverage.c +++ b/plug-ins/common/borderaverage.c @@ -168,7 +168,7 @@ run (const gchar *name, /* Make sure that the drawable is RGB color */ if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init ( _("Border Average...")); + gimp_progress_init ( _("Border Average")); borderaverage (drawable, &result_color); if (run_mode != GIMP_RUN_NONINTERACTIVE) diff --git a/plug-ins/common/bumpmap.c b/plug-ins/common/bumpmap.c index 7af28d2a93..7f5c90cc24 100644 --- a/plug-ins/common/bumpmap.c +++ b/plug-ins/common/bumpmap.c @@ -487,7 +487,7 @@ bumpmap (void) gint progress; gint drawable_tiles_per_row, bm_tiles_per_row; - gimp_progress_init (_("Bump-mapping...")); + gimp_progress_init (_("Bump-mapping")); /* Get the bumpmap drawable */ if (bmvals.bumpmap_id != -1) diff --git a/plug-ins/common/c_astretch.c b/plug-ins/common/c_astretch.c index 675561e837..405702aaf0 100644 --- a/plug-ins/common/c_astretch.c +++ b/plug-ins/common/c_astretch.c @@ -112,7 +112,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Auto-Stretching Contrast...")); + gimp_progress_init (_("Auto-stretching contrast")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); c_astretch (drawable); diff --git a/plug-ins/common/cartoon.c b/plug-ins/common/cartoon.c index 707a84fd11..762da8c01f 100644 --- a/plug-ins/common/cartoon.c +++ b/plug-ins/common/cartoon.c @@ -214,7 +214,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init ("Cartoon..."); + gimp_progress_init ("Cartoon"); cartoon (drawable, NULL); diff --git a/plug-ins/common/ccanalyze.c b/plug-ins/common/ccanalyze.c index 344bbeb756..01415f5fe2 100644 --- a/plug-ins/common/ccanalyze.c +++ b/plug-ins/common/ccanalyze.c @@ -199,7 +199,7 @@ analyze (GimpDrawable *drawable) gint ofsx, ofsy; GimpDrawable *selDrawable; - gimp_progress_init (_("Colorcube Analysis...")); + gimp_progress_init (_("Colorcube Analysis")); gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); diff --git a/plug-ins/common/channel_mixer.c b/plug-ins/common/channel_mixer.c index 43ee6c5817..734747ad8a 100644 --- a/plug-ins/common/channel_mixer.c +++ b/plug-ins/common/channel_mixer.c @@ -39,7 +39,6 @@ #define PLUG_IN_PROC "plug-in-colors-channel-mixer" #define PLUG_IN_BINARY "channel_mixer" -#define PLUG_IN_VERSION "Channel Mixer 0.8" #define PROGRESS_UPDATE_NUM 20 #define CM_LINE_SIZE 1024 @@ -275,7 +274,7 @@ run (const gchar *name, param[3].data.d_int32, mix.black.red_gain, mix.black.green_gain, mix.black.blue_gain); */ - gimp_progress_init (_(PLUG_IN_VERSION)); + gimp_progress_init (_("Channel Mixer")); channel_mixer (drawable); diff --git a/plug-ins/common/checkerboard.c b/plug-ins/common/checkerboard.c index 8201e3d5c1..3d8c4076f2 100644 --- a/plug-ins/common/checkerboard.c +++ b/plug-ins/common/checkerboard.c @@ -158,7 +158,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Adding Checkerboard...")); + gimp_progress_init (_("Adding checkerboard")); do_checkerboard_pattern (drawable, NULL); diff --git a/plug-ins/common/color_enhance.c b/plug-ins/common/color_enhance.c index a7f794adaf..c41823b310 100644 --- a/plug-ins/common/color_enhance.c +++ b/plug-ins/common/color_enhance.c @@ -114,7 +114,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Color Enhance...")); + gimp_progress_init (_("Color Enhance")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); Color_Enhance (drawable); diff --git a/plug-ins/common/colorify.c b/plug-ins/common/colorify.c index 3388ce078b..017cf43dfd 100644 --- a/plug-ins/common/colorify.c +++ b/plug-ins/common/colorify.c @@ -166,7 +166,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Colorifying...")); + gimp_progress_init (_("Colorifying")); colorify (drawable, NULL); diff --git a/plug-ins/common/colortoalpha.c b/plug-ins/common/colortoalpha.c index 10310ebfd4..b015a8aad1 100644 --- a/plug-ins/common/colortoalpha.c +++ b/plug-ins/common/colortoalpha.c @@ -183,7 +183,7 @@ run (const gchar *name, lock_alpha = gimp_layer_get_lock_alpha (drawable->drawable_id); gimp_layer_set_lock_alpha (drawable->drawable_id, FALSE); - gimp_progress_init (_("Removing color...")); + gimp_progress_init (_("Removing color")); gimp_rgn_iterate2 (drawable, 0 /* unused */, to_alpha_func, NULL); gimp_layer_set_lock_alpha (drawable->drawable_id, lock_alpha); diff --git a/plug-ins/common/compose.c b/plug-ins/common/compose.c index ad99f576ed..067c6d7d7c 100644 --- a/plug-ins/common/compose.c +++ b/plug-ins/common/compose.c @@ -585,7 +585,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Composing...")); + gimp_progress_init (_("Composing")); image_ID = compose (composevals.compose_type, composevals.inputs, diff --git a/plug-ins/common/cubism.c b/plug-ins/common/cubism.c index c2abadaea2..0a77d55711 100644 --- a/plug-ins/common/cubism.c +++ b/plug-ins/common/cubism.c @@ -416,7 +416,7 @@ cubism (GimpDrawable *drawable, } else { - gimp_progress_init (_("Cubistic Transformation...")); + gimp_progress_init (_("Cubistic transformation")); gimp_pixel_rgn_init (&src_rgn, drawable, x1, y1, (x2 - x1), (y2 - y1), TRUE, TRUE); diff --git a/plug-ins/common/curve_bend.c b/plug-ins/common/curve_bend.c index 6f5619c07e..03c0f6ce93 100644 --- a/plug-ins/common/curve_bend.c +++ b/plug-ins/common/curve_bend.c @@ -761,7 +761,7 @@ run (const gchar *name, { cd = g_new (BenderDialog, 1); cd->run = TRUE; - cd->show_progress = FALSE; + cd->show_progress = TRUE; cd->drawable = l_active_drawable; cd->rotation = (gdouble) param[3].data.d_float; @@ -2952,7 +2952,7 @@ p_vertical_bend (BenderDialog *cd, l_progress_step = 1.0 / l_progress_max; l_progress = 0.0; if (cd->show_progress) - gimp_progress_init ( _("Curve Bend...")); + gimp_progress_init ( _("Curve Bend")); for (l_row = l_first_row; l_row <= l_last_row; l_row++) { diff --git a/plug-ins/common/decompose.c b/plug-ins/common/decompose.c index d467494b7f..885a8545f6 100644 --- a/plug-ins/common/decompose.c +++ b/plug-ins/common/decompose.c @@ -339,7 +339,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Decomposing...")); + gimp_progress_init (_("Decomposing")); num_images = decompose (image_ID, layer, decovals.extract_type, diff --git a/plug-ins/common/deinterlace.c b/plug-ins/common/deinterlace.c index 71bb0a27e2..2b98a01ad8 100644 --- a/plug-ins/common/deinterlace.c +++ b/plug-ins/common/deinterlace.c @@ -156,7 +156,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Deinterlace...")); + gimp_progress_init (_("Deinterlace")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); deinterlace (drawable, NULL); diff --git a/plug-ins/common/depthmerge.c b/plug-ins/common/depthmerge.c index 51dfd7345a..c02e2f4b2a 100644 --- a/plug-ins/common/depthmerge.c +++ b/plug-ins/common/depthmerge.c @@ -374,22 +374,22 @@ DepthMerge_execute (DepthMerge *dm) depthMap1HasAlpha = 0; depthMap2HasAlpha = 0; - gimp_progress_init(_("Depth-merging...")); + gimp_progress_init (_("Depth-merging")); - resultRow = g_new(guchar, dm->selectionWidth * 4); - source1Row = g_new(guchar, dm->selectionWidth * 4); - source2Row = g_new(guchar, dm->selectionWidth * 4); - depthMap1Row = g_new(guchar, dm->selectionWidth ); - depthMap2Row = g_new(guchar, dm->selectionWidth ); - tempRow = g_new(guchar, dm->selectionWidth * 4); + resultRow = g_new (guchar, dm->selectionWidth * 4); + source1Row = g_new (guchar, dm->selectionWidth * 4); + source2Row = g_new (guchar, dm->selectionWidth * 4); + depthMap1Row = g_new (guchar, dm->selectionWidth ); + depthMap2Row = g_new (guchar, dm->selectionWidth ); + tempRow = g_new (guchar, dm->selectionWidth * 4); if (dm->source1Drawable != NULL) { - source1HasAlpha = gimp_drawable_has_alpha(dm->source1Drawable->drawable_id); - gimp_pixel_rgn_init(&source1Rgn, dm->source1Drawable, - dm->selectionX0, dm->selectionY0, - dm->selectionWidth, dm->selectionHeight, - FALSE, FALSE); + source1HasAlpha = gimp_drawable_has_alpha (dm->source1Drawable->drawable_id); + gimp_pixel_rgn_init (&source1Rgn, dm->source1Drawable, + dm->selectionX0, dm->selectionY0, + dm->selectionWidth, dm->selectionHeight, + FALSE, FALSE); } else for (x = 0; x < dm->selectionWidth; x++) @@ -401,11 +401,11 @@ DepthMerge_execute (DepthMerge *dm) } if (dm->source2Drawable != NULL) { - source2HasAlpha = gimp_drawable_has_alpha(dm->source2Drawable->drawable_id); - gimp_pixel_rgn_init(&source2Rgn, dm->source2Drawable, - dm->selectionX0, dm->selectionY0, - dm->selectionWidth, dm->selectionHeight, - FALSE, FALSE); + source2HasAlpha = gimp_drawable_has_alpha (dm->source2Drawable->drawable_id); + gimp_pixel_rgn_init (&source2Rgn, dm->source2Drawable, + dm->selectionX0, dm->selectionY0, + dm->selectionWidth, dm->selectionHeight, + FALSE, FALSE); } else for (x = 0; x < dm->selectionWidth; x++) @@ -501,7 +501,8 @@ DepthMerge_execute (DepthMerge *dm) dm->selectionX0, y, dm->selectionWidth); - gimp_progress_update((double)(y-dm->selectionY0) / (double)(dm->selectionHeight-1)); + gimp_progress_update ((double)(y-dm->selectionY0) / + (double)(dm->selectionHeight-1)); } g_free (resultRow); diff --git a/plug-ins/common/destripe.c b/plug-ins/common/destripe.c index 7bf22f9ffe..a94399a3dd 100644 --- a/plug-ins/common/destripe.c +++ b/plug-ins/common/destripe.c @@ -269,7 +269,7 @@ destripe (GimpDrawable *drawable, } else { - gimp_progress_init (_("Destriping...")); + gimp_progress_init (_("Destriping")); gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); width = x2 - x1; diff --git a/plug-ins/common/dicom.c b/plug-ins/common/dicom.c index 1d821437c7..faafc6ac65 100644 --- a/plug-ins/common/dicom.c +++ b/plug-ins/common/dicom.c @@ -278,7 +278,6 @@ load_image (const gchar *filename) gint32 layer_ID; GimpDrawable *drawable; FILE *DICOM; - gchar *temp; gchar buf[500]; /* buffer for random things like scanning */ DicomInfo *dicominfo; gint width = 0; @@ -298,10 +297,8 @@ load_image (const gchar *filename) return -1; } - temp = g_strdup_printf (_("Opening '%s'..."), - gimp_filename_to_utf8 (filename)); - gimp_progress_init (temp); - g_free (temp); + gimp_progress_init_printf (_("Opening '%s'"), + gimp_filename_to_utf8 (filename)); /* allocate the necessary structures */ dicominfo = g_new0 (DicomInfo, 1); diff --git a/plug-ins/common/diffraction.c b/plug-ins/common/diffraction.c index bc9cc6864f..1c64c4613c 100644 --- a/plug-ins/common/diffraction.c +++ b/plug-ins/common/diffraction.c @@ -305,11 +305,11 @@ diffraction_func (gint x, py = 5.0 + param->dvert * (y - param->y1); diff_diffract (px, py, &rgb); - + dest[0] = 255.0 * rgb.r; dest[1] = 255.0 * rgb.g; dest[2] = 255.0 * rgb.b; - + if (bpp == 4) dest[3] = 255; } @@ -327,7 +327,7 @@ diffraction (GimpDrawable *drawable) param.dhoriz = 10.0 / (x2 - x1 - 1); param.dvert = -10.0 / (y2 - y1 - 1); - gimp_progress_init (_("Creating diffraction pattern...")); + gimp_progress_init (_("Creating diffraction pattern")); iter = gimp_rgn_iterator_new (drawable, 0); gimp_rgn_iterator_dest (iter, diffraction_func, ¶m); gimp_rgn_iterator_free (iter); diff --git a/plug-ins/common/displace.c b/plug-ins/common/displace.c index 89cd5055aa..9d3cbfcf5a 100644 --- a/plug-ins/common/displace.c +++ b/plug-ins/common/displace.c @@ -274,7 +274,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS && (dvals.do_x || dvals.do_y)) { - gimp_progress_init (_("Displacing...")); + gimp_progress_init (_("Displacing")); /* run the displace effect */ displace (drawable, NULL); diff --git a/plug-ins/common/edge.c b/plug-ins/common/edge.c index 2f83920946..724ba7a737 100644 --- a/plug-ins/common/edge.c +++ b/plug-ins/common/edge.c @@ -227,7 +227,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Edge Detection...")); + gimp_progress_init (_("Edge detection")); /* set the tile cache size */ gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/emboss.c b/plug-ins/common/emboss.c index 58766de233..5e60b21b22 100644 --- a/plug-ins/common/emboss.c +++ b/plug-ins/common/emboss.c @@ -404,7 +404,7 @@ emboss (GimpDrawable *drawable, for (y = 0; y < height - 2; y++) { if (! preview && (y % p_update == 0)) - gimp_progress_update ((gdouble) y / (gdouble) height); + gimp_progress_update ((gdouble) y / (gdouble) height); gimp_pixel_rgn_get_rect (&src, srcbuf, x1, y1+y, width, 3); EmbossRow (srcbuf, evals.embossp ? (guchar *) 0 : srcbuf, diff --git a/plug-ins/common/engrave.c b/plug-ins/common/engrave.c index 45ab594786..bc60783737 100644 --- a/plug-ins/common/engrave.c +++ b/plug-ins/common/engrave.c @@ -179,7 +179,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Engraving...")); + gimp_progress_init (_("Engraving")); engrave (drawable, NULL); diff --git a/plug-ins/common/exchange.c b/plug-ins/common/exchange.c index 7d96582d6e..f76cc8562e 100644 --- a/plug-ins/common/exchange.c +++ b/plug-ins/common/exchange.c @@ -211,7 +211,7 @@ run (const gchar *name, { if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Color Exchange...")); + gimp_progress_init (_("Color Exchange")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); exchange (drawable, NULL); diff --git a/plug-ins/common/film.c b/plug-ins/common/film.c index e88daf2e82..bf149a1c23 100644 --- a/plug-ins/common/film.c +++ b/plug-ins/common/film.c @@ -320,7 +320,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Composing Images...")); + gimp_progress_init (_("Composing images")); image_ID = film (); diff --git a/plug-ins/common/flarefx.c b/plug-ins/common/flarefx.c index 6dbd8d49bb..3fa5d107cb 100644 --- a/plug-ins/common/flarefx.c +++ b/plug-ins/common/flarefx.c @@ -267,7 +267,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Render Flare...")); + gimp_progress_init (_("Render flare")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/fp.c b/plug-ins/common/fp.c index 9b22c0b0fd..7c0f99ad3c 100644 --- a/plug-ins/common/fp.c +++ b/plug-ins/common/fp.c @@ -400,7 +400,7 @@ run (const gchar *name, /* Make sure that the drawable is gray or RGB color */ if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Applying Filter Pack...")); + gimp_progress_init (_("Applying filter pack")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); fp (drawable); diff --git a/plug-ins/common/gauss.c b/plug-ins/common/gauss.c index b034065694..98b052bb86 100644 --- a/plug-ins/common/gauss.c +++ b/plug-ins/common/gauss.c @@ -415,7 +415,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Gaussian Blur...")); + gimp_progress_init (_("Gaussian Blur")); /* run the gaussian blur */ gauss (drawable, diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index 53309a334d..d4f0a9d218 100644 --- a/plug-ins/common/gbr.c +++ b/plug-ins/common/gbr.c @@ -350,7 +350,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); if (read (fd, &bh, sizeof (BrushHeader)) != sizeof (BrushHeader)) @@ -606,7 +606,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); drawable = gimp_drawable_get (drawable_ID); diff --git a/plug-ins/common/gif.c b/plug-ins/common/gif.c index 9ba7946e70..c21f6a364a 100644 --- a/plug-ins/common/gif.c +++ b/plug-ins/common/gif.c @@ -1004,7 +1004,7 @@ save_image (const gchar *filename, /* init the progress meter */ - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); diff --git a/plug-ins/common/gifload.c b/plug-ins/common/gifload.c index 675f51071c..f8643d7b69 100644 --- a/plug-ins/common/gifload.c +++ b/plug-ins/common/gifload.c @@ -299,7 +299,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); if (!ReadOK (fd, buf, 6)) diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index adb945e194..c673225da6 100644 --- a/plug-ins/common/gih.c +++ b/plug-ins/common/gih.c @@ -651,7 +651,7 @@ gih_load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* The file format starts with a painfully simple text header */ @@ -1260,7 +1260,7 @@ gih_save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); parstring = gimp_pixpipe_params_build (&gihparams); diff --git a/plug-ins/common/glasstile.c b/plug-ins/common/glasstile.c index a8bdb5706f..0751121037 100644 --- a/plug-ins/common/glasstile.c +++ b/plug-ins/common/glasstile.c @@ -209,7 +209,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Glass Tile...")); + gimp_progress_init (_("Glass Tile")); glasstile (drawable, NULL); diff --git a/plug-ins/common/gqbist.c b/plug-ins/common/gqbist.c index 97b5580d71..450f83556c 100644 --- a/plug-ins/common/gqbist.c +++ b/plug-ins/common/gqbist.c @@ -505,7 +505,7 @@ run (const gchar *name, optimize (&qbist_info.info); - gimp_progress_init (_("Qbist ...")); + gimp_progress_init (_("Qbist")); for (pr = gimp_pixel_rgns_register (1, &imagePR); pr != NULL; diff --git a/plug-ins/common/gradmap.c b/plug-ins/common/gradmap.c index 3ec65789e5..c417871855 100644 --- a/plug-ins/common/gradmap.c +++ b/plug-ins/common/gradmap.c @@ -161,12 +161,12 @@ run (const gchar *name, if ( !strcmp (name, GRADMAP_PROC)) { mode = GRADIENT_MODE; - gimp_progress_init (_("Gradient Map...")); + gimp_progress_init (_("Gradient Map")); } else if ( !strcmp (name, PALETTEMAP_PROC)) { mode = PALETTE_MODE; - gimp_progress_init (_("Palette Map...")); + gimp_progress_init (_("Palette Map")); } else { diff --git a/plug-ins/common/grid.c b/plug-ins/common/grid.c index ece3a91ca6..a74ac4f3c5 100644 --- a/plug-ins/common/grid.c +++ b/plug-ins/common/grid.c @@ -238,7 +238,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Drawing Grid...")); + gimp_progress_init (_("Drawing grid")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); grid (image_ID, drawable, NULL); diff --git a/plug-ins/common/gtm.c b/plug-ins/common/gtm.c index 4ebab42cd0..3e1f46640b 100644 --- a/plug-ins/common/gtm.c +++ b/plug-ins/common/gtm.c @@ -242,7 +242,7 @@ save_image (const gchar *filename, fprintf (fp, "%s\n", gtmvals.captiontxt); - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); gimp_pixel_rgn_init (&pixel_rgn, drawable, diff --git a/plug-ins/common/guillotine.c b/plug-ins/common/guillotine.c index 066d72ceef..a2b74dd3ff 100644 --- a/plug-ins/common/guillotine.c +++ b/plug-ins/common/guillotine.c @@ -105,7 +105,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Guillotine...")); + gimp_progress_init (_("Guillotine")); guillotine (image_ID); gimp_displays_flush (); } diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index 1244f4a27a..17498efc15 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -376,7 +376,7 @@ pluginCore (piArgs *argp) build_tab (argp->mode); - gimp_progress_init (_("Hot...")); + gimp_progress_init (_("Hot")); prog_interval = height / 10; for (y = sel_y1; y < sel_y2; y++) diff --git a/plug-ins/common/illusion.c b/plug-ins/common/illusion.c index f1acd3a1c0..819a04fa66 100644 --- a/plug-ins/common/illusion.c +++ b/plug-ins/common/illusion.c @@ -165,7 +165,7 @@ run (const gchar *name, gimp_drawable_is_gray (drawable->drawable_id)) { gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width() + 1)); - gimp_progress_init (_("Illusion...")); + gimp_progress_init (_("Illusion")); illusion (drawable); if (run_mode != GIMP_RUN_NONINTERACTIVE) gimp_displays_flush (); diff --git a/plug-ins/common/iwarp.c b/plug-ins/common/iwarp.c index 8d00fc1fce..bcec30ad3c 100644 --- a/plug-ins/common/iwarp.c +++ b/plug-ins/common/iwarp.c @@ -683,7 +683,7 @@ iwarp_frame (void) gimp_drawable_has_alpha (destdrawable->drawable_id)); if (!do_animate) - gimp_progress_init (_("Warping...")); + gimp_progress_init (_("Warping")); for (pr = gimp_pixel_rgns_register (1, &dest_rgn); pr != NULL; @@ -788,7 +788,7 @@ iwarp (void) destdrawable = gimp_drawable_get (animlayers[i]); - gimp_progress_init_printf (_("Warping Frame No. %d..."), + gimp_progress_init_printf (_("Warping Frame %d"), frame_number); if (animate_deform_value > 0.0) diff --git a/plug-ins/common/jigsaw.c b/plug-ins/common/jigsaw.c index fef7b20cf2..adab595538 100644 --- a/plug-ins/common/jigsaw.c +++ b/plug-ins/common/jigsaw.c @@ -411,7 +411,7 @@ run (const gchar *name, status = GIMP_PDB_CANCEL; break; } - gimp_progress_init (_("Assembling Jigsaw...")); + gimp_progress_init (_("Assembling jigsaw")); jigsaw (drawable, NULL); gimp_set_data (PLUG_IN_PROC, &config, sizeof(config_t)); @@ -2566,4 +2566,3 @@ jigsaw_dialog (GimpDrawable *drawable) return run; } - diff --git a/plug-ins/common/laplace.c b/plug-ins/common/laplace.c index 51d749e19a..6cc5e20b52 100644 --- a/plug-ins/common/laplace.c +++ b/plug-ins/common/laplace.c @@ -242,7 +242,7 @@ laplace (GimpDrawable *drawable) */ gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - gimp_progress_init (_("Laplace...")); + gimp_progress_init (_("Laplace")); /* Get the size of the input image. (This will/must be the same * as the size of the output image. @@ -320,7 +320,7 @@ laplace (GimpDrawable *drawable) laplace_prepare_row (&srcPR, pr, x1, y1 - 1, (x2 - x1)); laplace_prepare_row (&srcPR, cr, x1, y1, (x2 - x1)); - gimp_progress_init (_("Cleanup...")); + gimp_progress_init (_("Cleanup")); counter =0; /* loop through the rows, applying the laplace convolution */ diff --git a/plug-ins/common/lic.c b/plug-ins/common/lic.c index 8703b1bdbf..c49c73fba5 100644 --- a/plug-ins/common/lic.c +++ b/plug-ins/common/lic.c @@ -564,7 +564,7 @@ compute_image (GimpDrawable *drawable) gimp_drawable_mask_bounds (drawable->drawable_id, &border_x1, &border_y1, &border_x2, &border_y2); - gimp_progress_init (_("Van Gogh (LIC)...")); + gimp_progress_init (_("Van Gogh (LIC)")); if (licvals.effect_convolve == 0) generatevectors (); diff --git a/plug-ins/common/mapcolor.c b/plug-ins/common/mapcolor.c index d82cd38d38..b82d05a2ee 100644 --- a/plug-ins/common/mapcolor.c +++ b/plug-ins/common/mapcolor.c @@ -233,7 +233,7 @@ run (const gchar *name, plvals.map_mode = 0; - gimp_progress_init (_("Adjusting Foreground/Background...")); + gimp_progress_init (_("Adjusting FG-BG")); color_mapping (drawable); break; @@ -275,7 +275,7 @@ run (const gchar *name, break; } - gimp_progress_init (_("Mapping colors...")); + gimp_progress_init (_("Mapping colors")); color_mapping (drawable); diff --git a/plug-ins/common/max_rgb.c b/plug-ins/common/max_rgb.c index 9266f7e48d..8b13e0ad58 100644 --- a/plug-ins/common/max_rgb.c +++ b/plug-ins/common/max_rgb.c @@ -234,7 +234,7 @@ main_function (GimpDrawable *drawable, } else { - gimp_progress_init ( _("Max RGB...")); + gimp_progress_init (_("Max RGB")); gimp_rgn_iterate2 (drawable, 0 /* unused */, max_rgb_func, ¶m); diff --git a/plug-ins/common/mblur.c b/plug-ins/common/mblur.c index 9cbeaf99e3..a6896d78e2 100644 --- a/plug-ins/common/mblur.c +++ b/plug-ins/common/mblur.c @@ -805,7 +805,7 @@ mblur (GimpDrawable *drawable, return; if (! preview) - gimp_progress_init (_("Motion Blurring...")); + gimp_progress_init (_("Motion blurring")); switch (mbvals.mblur_type) { diff --git a/plug-ins/common/mosaic.c b/plug-ins/common/mosaic.c index 3003f6acc8..a090c2b834 100644 --- a/plug-ins/common/mosaic.c +++ b/plug-ins/common/mosaic.c @@ -494,7 +494,7 @@ mosaic (GimpDrawable *drawable, height = (y2 - y1); /* progress bar for gradient finding */ - gimp_progress_init (_("Finding Edges...")); + gimp_progress_init (_("Finding edges")); } /* Find the gradients */ @@ -545,7 +545,7 @@ mosaic (GimpDrawable *drawable, if (!preview) { /* Progress bar for rendering tiles */ - gimp_progress_init (_("Rendering Tiles...")); + gimp_progress_init (_("Rendering tiles")); } /* Render the tiles */ diff --git a/plug-ins/common/neon.c b/plug-ins/common/neon.c index 63cf1a4913..9f5a401427 100644 --- a/plug-ins/common/neon.c +++ b/plug-ins/common/neon.c @@ -208,7 +208,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Neon...")); + gimp_progress_init (_("Neon")); /* run the neon effect */ neon (drawable, evals.radius, evals.amount, NULL); diff --git a/plug-ins/common/newsprint.c b/plug-ins/common/newsprint.c index e3e6f239c9..a0fdf8639a 100644 --- a/plug-ins/common/newsprint.c +++ b/plug-ins/common/newsprint.c @@ -626,7 +626,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Newsprint...")); + gimp_progress_init (_("Newsprint")); /* set the tile cache size */ gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/nlfilt.c b/plug-ins/common/nlfilt.c index 96f2dc17cb..3b03a93077 100644 --- a/plug-ins/common/nlfilt.c +++ b/plug-ins/common/nlfilt.c @@ -952,7 +952,7 @@ nlfilter (GimpDrawable *drawable, filtno = nlfiltInit (nlfvals.alpha, nlfvals.radius, nlfvals.filter); if (!preview) - gimp_progress_init (_("NL Filter...")); + gimp_progress_init (_("NL Filter")); /* first row */ gimp_pixel_rgn_get_row (&srcPr, thisrow, x1, y1, width); diff --git a/plug-ins/common/noisify.c b/plug-ins/common/noisify.c index f0c444f039..9abbc5bb59 100644 --- a/plug-ins/common/noisify.c +++ b/plug-ins/common/noisify.c @@ -279,7 +279,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Adding Noise...")); + gimp_progress_init (_("Adding noise")); /* compute the luminosity which exceeds the luminosity threshold */ gimp_rgn_iterate2 (drawable, 0 /* unused */, noisify_func, noise_gr); diff --git a/plug-ins/common/normalize.c b/plug-ins/common/normalize.c index 8bb53579e6..e3daebeb70 100644 --- a/plug-ins/common/normalize.c +++ b/plug-ins/common/normalize.c @@ -121,7 +121,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Normalizing...")); + gimp_progress_init (_("Normalizing")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); normalize (drawable); diff --git a/plug-ins/common/nova.c b/plug-ins/common/nova.c index c3c3f9fbb5..62d4809013 100644 --- a/plug-ins/common/nova.c +++ b/plug-ins/common/nova.c @@ -257,7 +257,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Rendering SuperNova...")); + gimp_progress_init (_("Rendering SuperNova")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/common/oilify.c b/plug-ins/common/oilify.c index 7da94f7fbb..36bb70825f 100644 --- a/plug-ins/common/oilify.c +++ b/plug-ins/common/oilify.c @@ -184,7 +184,7 @@ run (const gchar *name, (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id))) { - gimp_progress_init (_("Oil Painting...")); + gimp_progress_init (_("Oil painting")); oilify (drawable, NULL); diff --git a/plug-ins/common/papertile.c b/plug-ins/common/papertile.c index 59b35df2ba..b370e113c5 100644 --- a/plug-ins/common/papertile.c +++ b/plug-ins/common/papertile.c @@ -530,7 +530,7 @@ filter (void) overlap = p.drawable_has_alpha ? overlap_RGBA : overlap_RGB; - gimp_progress_init (_("Paper Tile...")); + gimp_progress_init (_("Paper Tile")); gimp_drawable_mask_bounds (p.drawable->drawable_id, &p.selection.x0, &p.selection.y0, diff --git a/plug-ins/common/pat.c b/plug-ins/common/pat.c index 735930c4da..a933c641bb 100644 --- a/plug-ins/common/pat.c +++ b/plug-ins/common/pat.c @@ -323,7 +323,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); if (read (fd, &ph, sizeof (PatternHeader)) != sizeof (PatternHeader)) @@ -453,7 +453,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); drawable = gimp_drawable_get (drawable_ID); diff --git a/plug-ins/common/pcx.c b/plug-ins/common/pcx.c index e8609abf8f..b19b8e5155 100644 --- a/plug-ins/common/pcx.c +++ b/plug-ins/common/pcx.c @@ -311,7 +311,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); if (fread (&pcx_header, 128, 1, fd) == 0) @@ -547,7 +547,7 @@ save_image (const gchar *filename, height = drawable->height; gimp_pixel_rgn_init (&pixel_rgn, drawable, 0, 0, width, height, FALSE, FALSE); - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); pcx_header.manufacturer = 0x0a; diff --git a/plug-ins/common/photocopy.c b/plug-ins/common/photocopy.c index 73290549cb..0c3516dbd7 100644 --- a/plug-ins/common/photocopy.c +++ b/plug-ins/common/photocopy.c @@ -228,7 +228,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init ("Photocopy..."); + gimp_progress_init ("Photocopy"); photocopy (drawable, NULL); diff --git a/plug-ins/common/pix.c b/plug-ins/common/pix.c index 4a0cf2699f..7b4074e74d 100644 --- a/plug-ins/common/pix.c +++ b/plug-ins/common/pix.c @@ -331,7 +331,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* Read header information */ @@ -510,7 +510,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* Write the image header */ diff --git a/plug-ins/common/pixelize.c b/plug-ins/common/pixelize.c index e1cb3b9ca2..45fc2ba23a 100644 --- a/plug-ins/common/pixelize.c +++ b/plug-ins/common/pixelize.c @@ -270,7 +270,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Pixelizing...")); + gimp_progress_init (_("Pixelizing")); /* set the tile cache size */ gimp_tile_cache_ntiles (TILE_CACHE_SIZE); diff --git a/plug-ins/common/plasma.c b/plug-ins/common/plasma.c index 622adf83eb..6470e717e2 100644 --- a/plug-ins/common/plasma.c +++ b/plug-ins/common/plasma.c @@ -263,7 +263,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Plasma...")); + gimp_progress_init (_("Plasma")); gimp_tile_cache_ntiles (TILE_CACHE_SIZE); plasma (drawable, FALSE); diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index aecd11149d..bfae944b98 100644 --- a/plug-ins/common/png.c +++ b/plug-ins/common/png.c @@ -724,7 +724,7 @@ load_image (const gchar *filename, png_init_io (pp, fp); - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* @@ -1225,7 +1225,7 @@ save_image (const gchar *filename, png_init_io (pp, fp); - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* diff --git a/plug-ins/common/pnm.c b/plug-ins/common/pnm.c index 62330ed45f..02a2806a43 100644 --- a/plug-ins/common/pnm.c +++ b/plug-ins/common/pnm.c @@ -444,7 +444,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* allocate the necessary structures */ @@ -819,7 +819,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); xres = drawable->width; diff --git a/plug-ins/common/polar.c b/plug-ins/common/polar.c index ab03a013c8..c490fc0dfe 100644 --- a/plug-ins/common/polar.c +++ b/plug-ins/common/polar.c @@ -346,7 +346,7 @@ polarize (GimpDrawable *drawable) gimp_context_get_background (&background); gimp_pixel_fetcher_set_bg_color (pft, &background); - gimp_progress_init (_("Polarizing...")); + gimp_progress_init (_("Polarizing")); iter = gimp_rgn_iterator_new (drawable, 0); gimp_rgn_iterator_dest (iter, polarize_func, pft); diff --git a/plug-ins/common/poppler.c b/plug-ins/common/poppler.c index a6abe75cae..539fccd4eb 100644 --- a/plug-ins/common/poppler.c +++ b/plug-ins/common/poppler.c @@ -460,7 +460,7 @@ load_image (PopplerDocument *doc, if (target == GIMP_PAGE_SELECTOR_TARGET_IMAGES) images = g_new0 (gint32, pages->n_pages); - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); scale = resolution / gimp_unit_get_factor (GIMP_UNIT_POINT); diff --git a/plug-ins/common/postscript.c b/plug-ins/common/postscript.c index 397725cbd1..99257bf8c8 100644 --- a/plug-ins/common/postscript.c +++ b/plug-ins/common/postscript.c @@ -1014,7 +1014,7 @@ load_image (const gchar *filename) } fclose (ifp); - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); ifp = ps_open (filename, &plvals, &llx, &lly, &urx, &ury, &is_epsf, @@ -1186,7 +1186,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); save_ps_header (ofp, filename); diff --git a/plug-ins/common/psd.c b/plug-ins/common/psd.c index 897b9cd0a3..c9dcc235aa 100644 --- a/plug-ins/common/psd.c +++ b/plug-ins/common/psd.c @@ -1882,7 +1882,7 @@ load_image (const gchar *name) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (name)); read_whole_file (fd); diff --git a/plug-ins/common/psd_save.c b/plug-ins/common/psd_save.c index 84f6017ea4..79629dd374 100644 --- a/plug-ins/common/psd_save.c +++ b/plug-ins/common/psd_save.c @@ -1351,7 +1351,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); IFDBG g_print (" File \"%s\" has been opened\n", diff --git a/plug-ins/common/randomize.c b/plug-ins/common/randomize.c index 8ee3c35561..bacdc1417a 100644 --- a/plug-ins/common/randomize.c +++ b/plug-ins/common/randomize.c @@ -386,7 +386,7 @@ run (const gchar *name, case RNDM_SLUR: rndm_type_str = "slur"; break; } - gimp_progress_init_printf ("%s (%s)...", + gimp_progress_init_printf ("%s (%s)", gettext (RNDM_VERSION[rndm_type - 1]), gettext (rndm_type_str)); gimp_tile_cache_ntiles (2 * @@ -658,7 +658,7 @@ randomize (GimpDrawable *drawable, nr = tmp; if (PROG_UPDATE_TIME) - gimp_progress_update((double) row / (double) (y2 - y1)); + gimp_progress_update ((double) row / (double) (y2 - y1)); } /* * if we have more cycles to perform, swap the src and dest Pixel Regions @@ -679,13 +679,13 @@ randomize (GimpDrawable *drawable, } } } - gimp_progress_update((double) 100); + gimp_progress_update ((double) 100); /* * update the randomized region */ - gimp_drawable_flush(drawable); - gimp_drawable_merge_shadow(drawable->drawable_id, TRUE); - gimp_drawable_update(drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1)); + gimp_drawable_flush (drawable); + gimp_drawable_merge_shadow (drawable->drawable_id, TRUE); + gimp_drawable_update (drawable->drawable_id, x1, y1, (x2 - x1), (y2 - y1)); /* * clean up after ourselves. */ diff --git a/plug-ins/common/raw.c b/plug-ins/common/raw.c index aa9c522d9b..6a6a577462 100644 --- a/plug-ins/common/raw.c +++ b/plug-ins/common/raw.c @@ -649,7 +649,7 @@ load_image (gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); size = get_file_info (filename); diff --git a/plug-ins/common/retinex.c b/plug-ins/common/retinex.c index 8a78808485..4ebf940936 100644 --- a/plug-ins/common/retinex.c +++ b/plug-ins/common/retinex.c @@ -247,9 +247,9 @@ run (const gchar *name, if ((status == GIMP_PDB_SUCCESS) && (gimp_drawable_is_rgb (drawable->drawable_id))) { - gimp_progress_init (_("Retinex...")); + gimp_progress_init (_("Retinex")); + retinex (drawable, NULL); - gimp_progress_init (_("Retinex (4/4): updated...")); if (run_mode != GIMP_RUN_NONINTERACTIVE) gimp_displays_flush (); @@ -651,7 +651,7 @@ MSRCR (guchar *src, gint width, gint height, gint bytes, gboolean preview_mode) if (!preview_mode) { - gimp_progress_init (_("Retinex: Filtering...")); + gimp_progress_init (_("Retinex: filtering")); max_preview = 3 * rvals.nscales; } diff --git a/plug-ins/common/ripple.c b/plug-ins/common/ripple.c index 6303b4253e..f58defe292 100644 --- a/plug-ins/common/ripple.c +++ b/plug-ins/common/ripple.c @@ -220,7 +220,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Rippling...")); + gimp_progress_init (_("Rippling")); /* run the ripple effect */ ripple (drawable, NULL); diff --git a/plug-ins/common/rotate.c b/plug-ins/common/rotate.c index ae2da2f99c..9684756d2f 100644 --- a/plug-ins/common/rotate.c +++ b/plug-ins/common/rotate.c @@ -434,7 +434,7 @@ rotate (void) } } - gimp_progress_init (_("Rotating...")); + gimp_progress_init (_("Rotating")); gimp_image_undo_group_start (image_ID); diff --git a/plug-ins/common/sample_colorize.c b/plug-ins/common/sample_colorize.c index 476d587443..4c59b1aa23 100644 --- a/plug-ins/common/sample_colorize.c +++ b/plug-ins/common/sample_colorize.c @@ -2651,7 +2651,7 @@ sample_analyze (t_GDRW *sample_gdrw) progress_step = 1.0 / progress_max; progress = 0.0; if (g_show_progress) - gimp_progress_init (_("Sample Analyze...")); + gimp_progress_init (_("Sample analyze")); prot_fp = NULL; if (g_Sdebug) @@ -3029,7 +3029,7 @@ colorize_drawable (gint32 drawable_id) has_alpha = gimp_drawable_has_alpha (drawable->drawable_id); if (g_show_progress) - gimp_progress_init (_("Remap Colorized...")); + gimp_progress_init (_("Remap colorized")); gimp_rgn_iterate2 (drawable, 0 /* unused */, colorize_func, GINT_TO_POINTER (has_alpha)); diff --git a/plug-ins/common/scatter_hsv.c b/plug-ins/common/scatter_hsv.c index b63ea36c3f..4353d878e1 100644 --- a/plug-ins/common/scatter_hsv.c +++ b/plug-ins/common/scatter_hsv.c @@ -215,7 +215,7 @@ scatter_hsv (GimpDrawable *drawable) { gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); - gimp_progress_init (_("Scattering HSV...")); + gimp_progress_init (_("HSV Noise")); gimp_rgn_iterate2 (drawable, 0 /* unused */, scatter_hsv_func, NULL); diff --git a/plug-ins/common/screenshot.c b/plug-ins/common/screenshot.c index c82f5dc674..330e8bc296 100644 --- a/plug-ins/common/screenshot.c +++ b/plug-ins/common/screenshot.c @@ -599,7 +599,7 @@ create_image (const GdkPixbuf *pixbuf) guchar *pixels; gpointer pr; - status = gimp_progress_init (_("Loading Screenshot...")); + status = gimp_progress_init (_("Importing screenshot")); width = gdk_pixbuf_get_width (pixbuf); height = gdk_pixbuf_get_height (pixbuf); diff --git a/plug-ins/common/sel_gauss.c b/plug-ins/common/sel_gauss.c index 2362aceb8b..15b69af837 100644 --- a/plug-ins/common/sel_gauss.c +++ b/plug-ins/common/sel_gauss.c @@ -186,7 +186,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Selective Gaussian Blur...")); + gimp_progress_init (_("Selective Gaussian Blur")); radius = fabs (bvals.radius) + 1.0; diff --git a/plug-ins/common/semiflatten.c b/plug-ins/common/semiflatten.c index 1c2be04ac5..f5ff64de12 100644 --- a/plug-ins/common/semiflatten.c +++ b/plug-ins/common/semiflatten.c @@ -117,7 +117,7 @@ run (const gchar *name, /* Make sure that the drawable is indexed or RGB color */ if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Semi-Flattening...")); + gimp_progress_init (_("Semi-Flattening")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); semiflatten (drawable); diff --git a/plug-ins/common/sharpen.c b/plug-ins/common/sharpen.c index f8ed4de874..085b71ae6d 100644 --- a/plug-ins/common/sharpen.c +++ b/plug-ins/common/sharpen.c @@ -306,7 +306,7 @@ sharpen (GimpDrawable *drawable) /* * Let the user know what we're doing... */ - gimp_progress_init( _("Sharpening...")); + gimp_progress_init( _("Sharpening")); /* * Setup for filter... diff --git a/plug-ins/common/shift.c b/plug-ins/common/shift.c index 73452f1c6b..244fa34287 100644 --- a/plug-ins/common/shift.c +++ b/plug-ins/common/shift.c @@ -188,7 +188,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Shifting...")); + gimp_progress_init (_("Shifting")); /* run the shift effect */ shift (drawable, NULL); diff --git a/plug-ins/common/sinus.c b/plug-ins/common/sinus.c index c3ef775364..2cf10c09f7 100644 --- a/plug-ins/common/sinus.c +++ b/plug-ins/common/sinus.c @@ -281,7 +281,7 @@ run (const gchar *name, (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id))) { - gimp_progress_init (_("Sinus: rendering...")); + gimp_progress_init (_("Sinus: rendering")); gimp_tile_cache_ntiles (1); sinus (); diff --git a/plug-ins/common/smooth_palette.c b/plug-ins/common/smooth_palette.c index 86c348be2f..3f0e758def 100644 --- a/plug-ins/common/smooth_palette.c +++ b/plug-ins/common/smooth_palette.c @@ -176,7 +176,7 @@ run (const gchar *name, { if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Deriving Smooth Palette...")); + gimp_progress_init (_("Deriving smooth palette")); gimp_tile_cache_ntiles (2 * (drawable->width + 1) / gimp_tile_width ()); diff --git a/plug-ins/common/snoise.c b/plug-ins/common/snoise.c index 8d12109f95..badc98586f 100644 --- a/plug-ins/common/snoise.c +++ b/plug-ins/common/snoise.c @@ -329,7 +329,7 @@ solid_noise (GimpDrawable *drawable, /* Initialization */ solid_noise_init (); if (!preview) - gimp_progress_init (_("Solid Noise...")); + gimp_progress_init (_("Solid Noise")); progress = 0; max_progress = width * height; diff --git a/plug-ins/common/sobel.c b/plug-ins/common/sobel.c index 76b0aba120..3f08f2dd5a 100644 --- a/plug-ins/common/sobel.c +++ b/plug-ins/common/sobel.c @@ -365,7 +365,7 @@ sobel (GimpDrawable *drawable, else { gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - gimp_progress_init (_("Sobel Edge Detecting...")); + gimp_progress_init (_("Sobel edge detecting")); width = x2 - x1; height = y2 - y1; } diff --git a/plug-ins/common/softglow.c b/plug-ins/common/softglow.c index 36dfdd0e06..efb4463f9a 100644 --- a/plug-ins/common/softglow.c +++ b/plug-ins/common/softglow.c @@ -206,7 +206,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init ("Softglow..."); + gimp_progress_init ("Softglow"); softglow (drawable, NULL); diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 6b58a7f355..a240ec1258 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -299,7 +299,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Sparkling...")); + gimp_progress_init (_("Sparkling")); sparkle (drawable, NULL); diff --git a/plug-ins/common/spheredesigner.c b/plug-ins/common/spheredesigner.c index a564ed12e3..2bbef3f12a 100644 --- a/plug-ins/common/spheredesigner.c +++ b/plug-ins/common/spheredesigner.c @@ -2938,7 +2938,7 @@ realrender (GimpDrawable *drawable) tx = x2 - x1; ty = y2 - y1; - gimp_progress_init (_("Rendering Sphere...")); + gimp_progress_init (_("Rendering sphere")); for (y = 0; y < ty; y++) { diff --git a/plug-ins/common/spread.c b/plug-ins/common/spread.c index f9e8bc66d7..7120d5b653 100644 --- a/plug-ins/common/spread.c +++ b/plug-ins/common/spread.c @@ -180,8 +180,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Spreading...")); - + gimp_progress_init (_("Spreading")); /* run the spread effect */ spread (drawable); diff --git a/plug-ins/common/struc.c b/plug-ins/common/struc.c index 8559be7540..1ece32b8b0 100644 --- a/plug-ins/common/struc.c +++ b/plug-ins/common/struc.c @@ -1225,7 +1225,7 @@ run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Applying Canvas...")); + gimp_progress_init (_("Applying canvas")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); strucpi (drawable, NULL); diff --git a/plug-ins/common/sunras.c b/plug-ins/common/sunras.c index 94a5ca9705..0cacecc7bf 100644 --- a/plug-ins/common/sunras.c +++ b/plug-ins/common/sunras.c @@ -430,7 +430,7 @@ load_image (const gchar *filename) *4 + sunhdr.l_ras_maplength, SEEK_SET); } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); switch (sunhdr.l_ras_depth) @@ -509,7 +509,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); if (drawable_type == GIMP_INDEXED_IMAGE) diff --git a/plug-ins/common/svg.c b/plug-ins/common/svg.c index 6b34adfaac..893ea259f3 100644 --- a/plug-ins/common/svg.c +++ b/plug-ins/common/svg.c @@ -316,7 +316,7 @@ load_image (const gchar *filename) gimp_quit (); } - gimp_progress_init (_("Rendering SVG...")); + gimp_progress_init (_("Rendering SVG")); width = gdk_pixbuf_get_width (pixbuf); height = gdk_pixbuf_get_height (pixbuf); diff --git a/plug-ins/common/tga.c b/plug-ins/common/tga.c index d0d20def71..bc3707886a 100644 --- a/plug-ins/common/tga.c +++ b/plug-ins/common/tga.c @@ -416,7 +416,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); if (!fseek (fp, -26L, SEEK_END)) { /* Is file big enough for a footer? */ @@ -1028,7 +1028,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); header[0] = 0; /* No image identifier / description */ diff --git a/plug-ins/common/threshold_alpha.c b/plug-ins/common/threshold_alpha.c index e9f29fc31c..ef120d5589 100644 --- a/plug-ins/common/threshold_alpha.c +++ b/plug-ins/common/threshold_alpha.c @@ -162,7 +162,7 @@ run (const gchar *name, { if (gimp_drawable_has_alpha (drawable->drawable_id)) { - gimp_progress_init (_("Threshold Alpha: Coloring Transparency...")); + gimp_progress_init (_("Coloring transparency")); threshold_alpha (drawable, NULL); diff --git a/plug-ins/common/tiff.c b/plug-ins/common/tiff.c index 3b91dce79a..96495c0095 100644 --- a/plug-ins/common/tiff.c +++ b/plug-ins/common/tiff.c @@ -532,7 +532,7 @@ load_image (const gchar *filename) gimp_quit (); } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* We will loop through the all pages in case of multipage TIFF @@ -1922,7 +1922,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); drawable = gimp_drawable_get (layer); diff --git a/plug-ins/common/tile.c b/plug-ins/common/tile.c index 5ee92c1dfa..f87b4da856 100644 --- a/plug-ins/common/tile.c +++ b/plug-ins/common/tile.c @@ -189,7 +189,7 @@ run (const gchar *name, /* Make sure that the drawable is gray or RGB color */ if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init (_("Tiling...")); + gimp_progress_init (_("Tiling")); gimp_tile_cache_ntiles (2 * (width + 1) / gimp_tile_width ()); values[1].data.d_image = tile (param[1].data.d_image, diff --git a/plug-ins/common/tileit.c b/plug-ins/common/tileit.c index 4a5e25cab7..5427a34758 100644 --- a/plug-ins/common/tileit.c +++ b/plug-ins/common/tileit.c @@ -318,7 +318,7 @@ run (const gchar *name, { /* Set the tile cache size */ - gimp_progress_init (_("Tiling...")); + gimp_progress_init (_("Tiling")); do_tiles (); diff --git a/plug-ins/common/tiler.c b/plug-ins/common/tiler.c index 7cfe990e2a..a9227796d9 100644 --- a/plug-ins/common/tiler.c +++ b/plug-ins/common/tiler.c @@ -335,7 +335,7 @@ tile (GimpDrawable *drawable) gint x1, y1, x2, y2; gimp_drawable_mask_bounds (drawable->drawable_id, &x1, &y1, &x2, &y2); - gimp_progress_init (_("Tiler...")); + gimp_progress_init (_("Tiler")); height = y2 - y1; width = x2 - x1; diff --git a/plug-ins/common/unsharp.c b/plug-ins/common/unsharp.c index 16904606ee..30c29e98f1 100644 --- a/plug-ins/common/unsharp.c +++ b/plug-ins/common/unsharp.c @@ -426,7 +426,7 @@ unsharp_region (GimpPixelRgn *srcPR, gint threshold = unsharp_params.threshold; if (show_progress) - gimp_progress_init (_("Blurring...")); + gimp_progress_init (_("Blurring")); /* generate convolution matrix and make sure it's smaller than each dimension */ @@ -462,7 +462,7 @@ unsharp_region (GimpPixelRgn *srcPR, } if (show_progress) - gimp_progress_init (_("Merging...")); + gimp_progress_init (_("Merging")); /* merge the source and destination (which currently contains the blurred version) images */ diff --git a/plug-ins/common/video.c b/plug-ins/common/video.c index 0ffc4d778a..409e369f40 100644 --- a/plug-ins/common/video.c +++ b/plug-ins/common/video.c @@ -1883,7 +1883,7 @@ run (const gchar *name, /* Make sure that the drawable is gray or RGB color */ if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Video/RGB...")); + gimp_progress_init (_("Video")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); video (drawable); @@ -1986,8 +1986,8 @@ video_render_preview (gboolean raw) } else { - video_func (x, y, - &preview_raw[y * PREVIEW_WIDTH * 3 + x * 3], + video_func (x, y, + &preview_raw[y * PREVIEW_WIDTH * 3 + x * 3], preview_row + (y * PREVIEW_WIDTH + x) * 3, 3, NULL); } diff --git a/plug-ins/common/vinvert.c b/plug-ins/common/vinvert.c index f5a21dee89..82afe8c278 100644 --- a/plug-ins/common/vinvert.c +++ b/plug-ins/common/vinvert.c @@ -123,7 +123,7 @@ run (const gchar *name, if (run_mode != GIMP_RUN_NONINTERACTIVE) { INIT_I18N(); - gimp_progress_init (_("Value Invert...")); + gimp_progress_init (_("Value Invert")); } vinvert (drawable); diff --git a/plug-ins/common/vpropagate.c b/plug-ins/common/vpropagate.c index be74d3cda5..3f304818da 100644 --- a/plug-ins/common/vpropagate.c +++ b/plug-ins/common/vpropagate.c @@ -468,7 +468,7 @@ value_propagate_body (GimpDrawable *drawable, best = g_new (guchar, bytes); if (!preview) - gimp_progress_init (_("Value Propagating...")); + gimp_progress_init (_("Value Propagating")); gimp_context_get_foreground (&foreground); gimp_rgb_get_uchar (&foreground, fore+0, fore+1, fore+2); diff --git a/plug-ins/common/warp.c b/plug-ins/common/warp.c index a75b963b0a..3b9627a2e3 100644 --- a/plug-ins/common/warp.c +++ b/plug-ins/common/warp.c @@ -1176,9 +1176,9 @@ diff (GimpDrawable *drawable, gimp_displays_flush(); /* make sure layer is visible */ - gimp_progress_init (_("Smoothing X gradient...")); + gimp_progress_init (_("Smoothing X gradient")); blur16(draw_xd); - gimp_progress_init (_("Smoothing Y gradient...")); + gimp_progress_init (_("Smoothing Y gradient")); blur16(draw_yd); g_free (prev_row); /* row buffers allocated at top of fn. */ @@ -1233,7 +1233,7 @@ warp (GimpDrawable *orig_draw, /* calculate new X,Y Displacement image maps */ - gimp_progress_init (_("Finding XY gradient...")); + gimp_progress_init (_("Finding XY gradient")); diff (disp_map, &xdlayer, &ydlayer); /* generate x,y differential images (arrays) */ @@ -1258,11 +1258,8 @@ warp (GimpDrawable *orig_draw, for (warp_iter = 0; warp_iter < dvals.iter; warp_iter++) { - string = g_strdup_printf (_("Flow Step %d..."), warp_iter+1); - gimp_progress_init (string); - g_free (string); + gimp_progress_init_printf (_("Flow step %d"), warp_iter+1); progress = 0; - gimp_progress_update (0); warp_one (orig_draw, orig_draw, *map_x, *map_y, mag_draw, first_time, warp_iter); diff --git a/plug-ins/common/waves.c b/plug-ins/common/waves.c index 8e1084f610..f0cb1b535f 100644 --- a/plug-ins/common/waves.c +++ b/plug-ins/common/waves.c @@ -429,7 +429,7 @@ wave (guchar *src, if (verbose) { - gimp_progress_init (_("Waving...")); + gimp_progress_init (_("Waving")); prog_interval=height/10; } diff --git a/plug-ins/common/whirlpinch.c b/plug-ins/common/whirlpinch.c index a975184e9b..8cfefecd4a 100644 --- a/plug-ins/common/whirlpinch.c +++ b/plug-ins/common/whirlpinch.c @@ -338,7 +338,7 @@ whirl_pinch (GimpDrawable *drawable) progress = 0; max_progress = sel_width * sel_height; - gimp_progress_init (_("Whirling and Pinching...")); + gimp_progress_init (_("Whirling and pinching")); whirl = wpvals.whirl * G_PI / 180; radius2 = radius * radius * wpvals.radius; diff --git a/plug-ins/common/wind.c b/plug-ins/common/wind.c index 605ff3cf20..b4a2c9724d 100644 --- a/plug-ins/common/wind.c +++ b/plug-ins/common/wind.c @@ -314,7 +314,7 @@ render_blast (GimpDrawable *drawable, if (gimp_drawable_mask_intersect (drawable->drawable_id, &x1, &y1, &x2, &y2)) { - gimp_progress_init (_("Rendering Blast...")); + gimp_progress_init (_("Rendering blast")); width = x2 - x1; height = y2 - y1; @@ -441,7 +441,7 @@ render_wind (GimpDrawable *drawable, { if (gimp_drawable_mask_intersect (drawable->drawable_id, &x1, &y1, &x2, &y2)) { - gimp_progress_init (_("Rendering Wind...")); + gimp_progress_init (_("Rendering wind")); width = x2 - x1; height = y2 - y1; diff --git a/plug-ins/common/winprint.c b/plug-ins/common/winprint.c index 2ae9a98e4f..31770103df 100644 --- a/plug-ins/common/winprint.c +++ b/plug-ins/common/winprint.c @@ -424,7 +424,7 @@ run (const gchar *name, if (status == GIMP_PDB_SUCCESS) { - gimp_progress_init(_("Printing...")); + gimp_progress_init(_("Printing")); gimp_pixel_rgn_init(&rgn, drawable, 0, 0, width, height, diff --git a/plug-ins/common/wmf.c b/plug-ins/common/wmf.c index 5320b58802..10e5c5aa11 100644 --- a/plug-ins/common/wmf.c +++ b/plug-ins/common/wmf.c @@ -949,7 +949,7 @@ load_image (const gchar *filename) gimp_quit (); } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); image = gimp_image_new (width, height, GIMP_RGB); diff --git a/plug-ins/common/xbm.c b/plug-ins/common/xbm.c index 1e939b6cfe..f58febec9a 100644 --- a/plug-ins/common/xbm.c +++ b/plug-ins/common/xbm.c @@ -722,7 +722,7 @@ load_image (const gchar *filename) return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); comment = fgetcomment (fp); @@ -1004,7 +1004,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* Maybe write the image comment. */ diff --git a/plug-ins/common/xpm.c b/plug-ins/common/xpm.c index 3ecabce60e..bd48e63bf0 100644 --- a/plug-ins/common/xpm.c +++ b/plug-ins/common/xpm.c @@ -340,7 +340,7 @@ load_image (const gchar *filename) guchar *cmap; gint32 image_ID; - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* read the raw file */ @@ -620,7 +620,7 @@ save_image (const gchar *filename, hash = g_hash_table_new ((GHashFunc) rgbhash, (GCompareFunc) compare); - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); ncolors = alpha ? 1 : 0; diff --git a/plug-ins/common/xwd.c b/plug-ins/common/xwd.c index bfa3fed240..5cff65f8f0 100644 --- a/plug-ins/common/xwd.c +++ b/plug-ins/common/xwd.c @@ -470,7 +470,7 @@ load_image (const gchar *filename) } } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); depth = xwdhdr.l_pixmap_depth; @@ -567,7 +567,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); if (drawable_type == GIMP_INDEXED_IMAGE) diff --git a/plug-ins/common/zealouscrop.c b/plug-ins/common/zealouscrop.c index 5b4c388bb4..2019bbb683 100644 --- a/plug-ins/common/zealouscrop.c +++ b/plug-ins/common/zealouscrop.c @@ -136,7 +136,7 @@ run (const gchar *name, gimp_drawable_is_gray (drawable->drawable_id) || gimp_drawable_is_indexed (drawable->drawable_id)) { - gimp_progress_init (_("ZealousCropping(tm)...")); + gimp_progress_init (_("Zealous cropping")); gimp_tile_cache_ntiles (1 + 2 * (drawable->width > drawable->height ? diff --git a/plug-ins/faxg3/faxg3.c b/plug-ins/faxg3/faxg3.c index c50db81f42..66e55ca855 100644 --- a/plug-ins/faxg3/faxg3.c +++ b/plug-ins/faxg3/faxg3.c @@ -201,7 +201,7 @@ load_image (const gchar *filename) gint max_rows; /* max. rows allocated */ gint col, hcol; /* column, highest column ever used */ - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* initialize lookup trees */ diff --git a/plug-ins/fits/fits.c b/plug-ins/fits/fits.c index 99fef6d07f..6397b30cc7 100644 --- a/plug-ins/fits/fits.c +++ b/plug-ins/fits/fits.c @@ -456,7 +456,7 @@ save_image (const gchar *filename, return (FALSE); } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); if ((drawable_type == GIMP_INDEXED_IMAGE) || diff --git a/plug-ins/flame/flame.c b/plug-ins/flame/flame.c index 5b3fa13ffc..677347515d 100644 --- a/plug-ins/flame/flame.c +++ b/plug-ins/flame/flame.c @@ -223,7 +223,7 @@ run (const gchar *name, { if (gimp_drawable_is_rgb (drawable->drawable_id)) { - gimp_progress_init (_("Drawing Flame...")); + gimp_progress_init (_("Drawing flame")); gimp_tile_cache_ntiles (2 * (drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/gflare/gflare.c b/plug-ins/gflare/gflare.c index bf9df6462c..0551525e66 100644 --- a/plug-ins/gflare/gflare.c +++ b/plug-ins/gflare/gflare.c @@ -815,7 +815,7 @@ plugin_query (void) "Eiichi Takamori", "Eiichi Takamori, and a lot of GIMP people", "1997", - N_("_GFlare..."), + N_("_Gradient Flare..."), "RGB*, GRAY*", GIMP_PLUGIN, G_N_ELEMENTS (args), 0, @@ -954,7 +954,7 @@ plugin_run (const gchar *name, if (gimp_drawable_is_rgb (drawable->drawable_id) || gimp_drawable_is_gray (drawable->drawable_id)) { - gimp_progress_init (_("Gradient Flare...")); + gimp_progress_init (_("Gradient Flare")); plugin_do (); if (run_mode != GIMP_RUN_NONINTERACTIVE) @@ -2288,7 +2288,7 @@ dlg_run (void) * Dialog Shell */ - shell = dlg->shell = gimp_dialog_new (_("GFlare"), PLUG_IN_BINARY, + shell = dlg->shell = gimp_dialog_new (_("Gradient Flare"), PLUG_IN_BINARY, NULL, 0, gimp_standard_help_func, PLUG_IN_PROC, @@ -2986,7 +2986,7 @@ dlg_selector_new_callback (GtkWidget *widget, { GtkWidget *query_box; - query_box = gimp_query_string_box (_("New GFlare"), + query_box = gimp_query_string_box (_("New Gradient Flare"), gtk_widget_get_toplevel (widget), gimp_standard_help_func, PLUG_IN_PROC, _("Enter a name for the new GFlare"), @@ -3065,7 +3065,7 @@ dlg_selector_copy_callback (GtkWidget *widget, name = g_strdup_printf ("%s copy", dlg->gflare->name); - query_box = gimp_query_string_box (_("Copy GFlare"), + query_box = gimp_query_string_box (_("Copy Gradient Flare"), gtk_widget_get_toplevel (widget), gimp_standard_help_func, PLUG_IN_PROC, _("Enter a name for the copied GFlare"), @@ -3131,7 +3131,7 @@ dlg_selector_delete_callback (GtkWidget *widget, "\"%s\" from the list and from disk?"), dlg->gflare->name); - dialog = gimp_query_boolean_box (_("Delete GFlare"), + dialog = gimp_query_boolean_box (_("Delete Gradient Flare"), dlg->shell, gimp_standard_help_func, PLUG_IN_PROC, GTK_STOCK_DIALOG_QUESTION, @@ -3244,7 +3244,7 @@ ed_run (GtkWindow *parent, * Dialog Shell */ ed->shell = - shell = gimp_dialog_new (_("GFlare Editor"), PLUG_IN_BINARY, + shell = gimp_dialog_new (_("Gradient Flare Editor"), PLUG_IN_BINARY, GTK_WIDGET (parent), 0, gimp_standard_help_func, PLUG_IN_PROC, diff --git a/plug-ins/gfli/gfli.c b/plug-ins/gfli/gfli.c index 1822c59ee0..dbee6d0740 100644 --- a/plug-ins/gfli/gfli.c +++ b/plug-ins/gfli/gfli.c @@ -465,7 +465,7 @@ load_image (const gchar *filename, return -1; } - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); fli_read_header (file, &fli_header); @@ -680,7 +680,7 @@ save_image (const gchar *filename, return FALSE; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* diff --git a/plug-ins/gimpressionist/gimp.c b/plug-ins/gimpressionist/gimp.c index cf20337937..cdd90bee76 100644 --- a/plug-ins/gimpressionist/gimp.c +++ b/plug-ins/gimpressionist/gimp.c @@ -347,7 +347,7 @@ gimpressionist_main (void) dest_row = g_new (guchar, (x2 - x1) * bpp); - gimp_progress_init (_("Painting...")); + gimp_progress_init (_("Painting")); if (!PPM_IS_INITED (&infile)) { diff --git a/plug-ins/ifscompose/ifscompose.c b/plug-ins/ifscompose/ifscompose.c index b5956c9e0e..8da0b38b0f 100644 --- a/plug-ins/ifscompose/ifscompose.c +++ b/plug-ins/ifscompose/ifscompose.c @@ -1303,7 +1303,7 @@ ifs_compose (GimpDrawable *drawable) gint progress; gint max_progress; - gimp_progress_init_printf (_("Rendering IFS (%d/%d)..."), + gimp_progress_init_printf (_("Rendering IFS (%d/%d)"), band_no + 1, num_bands); /* render the band to a buffer */ @@ -1320,7 +1320,7 @@ ifs_compose (GimpDrawable *drawable) /* transfer the image to the drawable */ - gimp_progress_init_printf (_("Copying IFS to image (%d/%d)..."), + gimp_progress_init_printf (_("Copying IFS to image (%d/%d)"), band_no + 1, num_bands); progress = 0; diff --git a/plug-ins/jpeg/jpeg-load.c b/plug-ins/jpeg/jpeg-load.c index c0789de2e5..989c9e043e 100644 --- a/plug-ins/jpeg/jpeg-load.c +++ b/plug-ins/jpeg/jpeg-load.c @@ -88,7 +88,7 @@ load_image (const gchar *filename, } if (!preview) - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); image_ID = -1; @@ -603,7 +603,7 @@ load_thumbnail_image (const gchar *filename, jerr.pub.emit_message = my_emit_message; jerr.pub.output_message = my_output_message; - gimp_progress_init_printf (_("Opening thumbnail for '%s'..."), + gimp_progress_init_printf (_("Opening thumbnail for '%s'"), gimp_filename_to_utf8 (filename)); /* Establish the setjmp return context for my_error_exit to use. */ diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 684d8de8a2..7bea44bb1a 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -220,7 +220,7 @@ save_image (const gchar *filename, 0, 0, drawable->width, drawable->height, FALSE, FALSE); if (!preview) - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* Step 1: allocate and initialize JPEG compression object */ diff --git a/plug-ins/maze/algorithms.c b/plug-ins/maze/algorithms.c index 39b66287f0..e729e8b512 100644 --- a/plug-ins/maze/algorithms.c +++ b/plug-ins/maze/algorithms.c @@ -1,11 +1,11 @@ /* $Id$ - * Contains routines for generating mazes, somewhat intertwined with + * Contains routines for generating mazes, somewhat intertwined with * Gimp plug-in-maze specific stuff. * * Kevin Turner * http://gimp-plug-ins.sourceforge.net/maze/ */ - + /* mazegen code from rec.games.programmer's maze-faq: * * maz.c - generate a maze * * @@ -16,7 +16,7 @@ * * yell and scream and embarass you in front of your friends... */ -/* I've put a HTMLized version of the FAQ up at +/* I've put a HTMLized version of the FAQ up at * http://www.poboxes.com/kevint/gimp/maze-faq/maze-faq.html */ @@ -61,11 +61,11 @@ void mazegen_tileable(gint pos, gint y, gint rnd); void prim(gint pos, - gchar *maz, - guint x, + gchar *maz, + guint x, guint y); -void prim_tileable(gchar *maz, - guint x, +void prim_tileable(gchar *maz, + guint x, guint y); #define ABSMOD(A,B) ( ((A) < 0) ? (((B) + (A)) % (B)) : ((A) % (B)) ) @@ -97,7 +97,7 @@ void prim_tileable(gchar *maz, #define CELL_UP_TILEABLE(POS) ((POS) < (x*2) ? x*(y-2)+(POS) : (POS) - x - x) #define CELL_DOWN_TILEABLE(POS) ((POS) >= x*(y-2) ? (POS) - x*(y-2) : (POS) + x + x) #define CELL_LEFT_TILEABLE(POS) (((POS) % x) <= 1 ? (POS) + x - 2 : (POS) - 2) -#define CELL_RIGHT_TILEABLE(POS) (((POS) % x) >= (x - 2) ? (POS) + 2 - x : (POS) + 2) +#define CELL_RIGHT_TILEABLE(POS) (((POS) % x) >= (x - 2) ? (POS) + 2 - x : (POS) + 2) /* Up and left need checks, but down and right should never have to wrap on an even sized maze. */ #define WALL_UP_TILEABLE(POS) ((POS) < x ? x*(y-1)+(POS) : (POS) - x) @@ -151,7 +151,7 @@ mazegen(gint pos, gchar *maz, gint x, gint y, gint rnd) switch (i) { /* This is simple enough. */ case 0: /* Go in the direction we just figured . . . */ - j= -x; + j= -x; break; case 1: j = x; @@ -229,7 +229,7 @@ mazegen_tileable(gint pos, gchar *maz, gint x, gint y, gint rnd) break; case 1: maz[WALL_DOWN_TILEABLE(pos)]=IN; - npos = CELL_DOWN_TILEABLE(pos); + npos = CELL_DOWN_TILEABLE(pos); break; case 2: maz[WALL_RIGHT_TILEABLE(pos)]=IN; @@ -284,7 +284,7 @@ prim(gint pos, gchar *maz, guint x, guint y) g_rand_set_seed (gr, rnd); - gimp_progress_init (_("Constructing maze using Prim's Algorithm...")); + gimp_progress_init (_("Constructing maze using Prim's Algorithm")); /* OUT is zero, so we should be already initalized. */ @@ -294,7 +294,7 @@ prim(gint pos, gchar *maz, guint x, guint y) maz[pos]=IN; - /* For now, repeating everything four times seems manageable. But when + /* For now, repeating everything four times seems manageable. But when Gimp is extended to drawings in n-dimensional space instead of 2D, this will require a bit of a re-write. */ /* Add frontier. */ @@ -344,7 +344,7 @@ prim(gint pos, gchar *maz, guint x, guint y) case OUT: maz[up]=FRONTIER; front_cells=g_slist_prepend(front_cells, - GINT_TO_POINTER(up)); + GINT_TO_POINTER(up)); break; case IN: d=1; @@ -358,7 +358,7 @@ prim(gint pos, gchar *maz, guint x, guint y) case OUT: maz[down]=FRONTIER; front_cells=g_slist_prepend(front_cells, - GINT_TO_POINTER(down)); + GINT_TO_POINTER(down)); break; case IN: d=d|2; @@ -372,7 +372,7 @@ prim(gint pos, gchar *maz, guint x, guint y) case OUT: maz[left]=FRONTIER; front_cells=g_slist_prepend(front_cells, - GINT_TO_POINTER(left)); + GINT_TO_POINTER(left)); break; case IN: d=d|4; @@ -386,14 +386,14 @@ prim(gint pos, gchar *maz, guint x, guint y) case OUT: maz[right]=FRONTIER; front_cells=g_slist_prepend(front_cells, - GINT_TO_POINTER(right)); + GINT_TO_POINTER(right)); break; case IN: d=d|8; break; default: ; - } + } } /* The cell is guaranteed to have at least one neighbor in @@ -405,7 +405,7 @@ prim(gint pos, gchar *maz, guint x, guint y) g_warning("maze: prim: Lack of neighbors.\n" "seed: %d, mw: %d, mh: %d, mult: %d, offset: %d\n", mvals.seed, x, y, mvals.multiple, mvals.offset); - break; + break; } c=0; @@ -417,7 +417,7 @@ prim(gint pos, gchar *maz, guint x, guint y) break; /* here forever... */ } } while ( !(d & ( 1 << i) ) ); - + switch (i) { case 0: maz[WALL_UP(pos)]=IN; @@ -460,7 +460,7 @@ prim_tileable(gchar *maz, guint x, guint y) g_rand_set_seed (gr, rnd); - gimp_progress_init (_("Constructing tileable maze using Prim's Algorithm...")); + gimp_progress_init (_("Constructing tileable maze using Prim's Algorithm")); /* OUT is zero, so we should be already initalized. */ @@ -484,7 +484,7 @@ prim_tileable(gchar *maz, guint x, guint y) front_cells=g_slist_append(front_cells,GINT_TO_POINTER(down)); front_cells=g_slist_append(front_cells,GINT_TO_POINTER(left)); front_cells=g_slist_append(front_cells,GINT_TO_POINTER(right)); - + /* While frontier is not empty do the following... */ while(g_slist_length(front_cells) > 0) { @@ -547,7 +547,7 @@ prim_tileable(gchar *maz, guint x, guint y) break; default: ; - } + } /* The cell is guaranteed to have at least one neighbor in IN (otherwise it would not have been in FRONTIER); pick @@ -558,7 +558,7 @@ prim_tileable(gchar *maz, guint x, guint y) g_warning("maze: prim's tileable: Lack of neighbors.\n" "seed: %d, mw: %d, mh: %d, mult: %d, offset: %d\n", mvals.seed, x, y, mvals.multiple, mvals.offset); - break; + break; } c=0; @@ -570,7 +570,7 @@ prim_tileable(gchar *maz, guint x, guint y) break; /* here forever... */ } } while ( !(d & ( 1 << i) ) ); - + switch (i) { case 0: maz[WALL_UP_TILEABLE(pos)]=IN; diff --git a/plug-ins/maze/maze.c b/plug-ins/maze/maze.c index ad216b7329..f2395604c7 100644 --- a/plug-ins/maze/maze.c +++ b/plug-ins/maze/maze.c @@ -444,7 +444,7 @@ maze (GimpDrawable * drawable) /* Get the foreground and background colors */ get_colors (drawable, fg, bg); - gimp_progress_init (_("Drawing Maze...")); + gimp_progress_init (_("Drawing maze")); for (pr = gimp_pixel_rgns_register (1, &dest_rgn); pr != NULL; diff --git a/plug-ins/pagecurl/pagecurl.c b/plug-ins/pagecurl/pagecurl.c index 4a7423f78a..4b5aeb5b21 100644 --- a/plug-ins/pagecurl/pagecurl.c +++ b/plug-ins/pagecurl/pagecurl.c @@ -1019,7 +1019,7 @@ page_curl (gint32 drawable_id) gimp_image_undo_group_start (image_id); - gimp_progress_init (_("Page Curl...")); + gimp_progress_init (_("Page Curl")); init_calculation (drawable_id); diff --git a/plug-ins/print/print-image-gimp.c b/plug-ins/print/print-image-gimp.c index fcd63b7677..a7eb0f7060 100644 --- a/plug-ins/print/print-image-gimp.c +++ b/plug-ins/print/print-image-gimp.c @@ -317,7 +317,7 @@ Image_get_row(stp_image_t *image, unsigned char *data, int row) static void Image_progress_init(stp_image_t *image) { - gimp_progress_init(_("Printing...")); + gimp_progress_init(_("Printing")); } static void diff --git a/plug-ins/rcm/rcm.c b/plug-ins/rcm/rcm.c index cb60fbac5d..f6c669736e 100644 --- a/plug-ins/rcm/rcm.c +++ b/plug-ins/rcm/rcm.c @@ -263,7 +263,7 @@ run (const gchar *name, /* call dialog and rotate the colormap */ if (gimp_drawable_is_rgb (Current.drawable->drawable_id) && rcm_dialog ()) { - gimp_progress_init (_("Rotating the colormap...")); + gimp_progress_init (_("Rotating the colormap")); gimp_tile_cache_ntiles (2 * (Current.drawable->width / gimp_tile_width () + 1)); diff --git a/plug-ins/sel2path/pxl-outline.c b/plug-ins/sel2path/pxl-outline.c index 9a58a3105f..153b1b9500 100644 --- a/plug-ins/sel2path/pxl-outline.c +++ b/plug-ins/sel2path/pxl-outline.c @@ -32,7 +32,7 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ static pixel_outline_type find_one_outline (edge_type, unsigned, unsigned, bitmap_type *); -static void append_pixel_outline (pixel_outline_list_type *, +static void append_pixel_outline (pixel_outline_list_type *, pixel_outline_type); static pixel_outline_type new_pixel_outline (void); static void append_outline_pixel (pixel_outline_type *, coordinate_type); @@ -80,7 +80,7 @@ find_outline_pixels (void) /* printf("width = %d, height = %d\n",BITMAP_WIDTH(marked),BITMAP_HEIGHT(marked)); */ - gimp_progress_init (_("Selection to Path...")); + gimp_progress_init (_("Selection to Path")); O_LIST_LENGTH (outline_list) = 0; outline_list.data = NULL; @@ -103,9 +103,9 @@ find_outline_pixels (void) { pixel_outline_type outline; boolean clockwise = edge == bottom; - + outline = find_one_outline (edge, row, col, &marked); - + /* Outside outlines will start at a top edge, and move counterclockwise, and inside outlines will start at a bottom edge, and move clockwise. This happens because of @@ -120,8 +120,8 @@ find_outline_pixels (void) gimp_progress_update (((gdouble)row) / height); } - local_free_bitmap (&marked); - + local_free_bitmap (&marked); + return outline_list; } @@ -146,7 +146,7 @@ find_one_outline (edge_type original_edge, { /* Put this edge on to the output list, changing to Cartesian, and taking account of the side bearings. */ - append_coordinate (&outline, col, + append_coordinate (&outline, col, sel_get_height() - row, edge); mark_edge (edge, row, col, marked); @@ -190,7 +190,7 @@ free_pixel_outline_list (pixel_outline_list_type *outline_list) /* Return an empty list of pixels. */ - + pixel_outline_type new_pixel_outline (void) @@ -235,22 +235,22 @@ append_coordinate (pixel_outline_type *o, int x, int y, edge_type edge) c.y++; str = "top"; break; - + case right: c.x++; c.y++; str = "right"; break; - + case bottom: c.x++; str = "bottom"; break; - + case left: str = "left"; break; - + default: printf ("append_coordinate: Bad edge (%d)", edge); } diff --git a/plug-ins/sgi/sgi.c b/plug-ins/sgi/sgi.c index 2c08d3844a..83cacb60c3 100644 --- a/plug-ins/sgi/sgi.c +++ b/plug-ins/sgi/sgi.c @@ -315,7 +315,7 @@ load_image (const gchar *filename) /* I - File to load */ return -1; }; - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* @@ -534,7 +534,7 @@ save_image (const gchar *filename, return FALSE; }; - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* diff --git a/plug-ins/twain/twain.c b/plug-ins/twain/twain.c index 61831e37f0..b99a27b60a 100644 --- a/plug-ins/twain/twain.c +++ b/plug-ins/twain/twain.c @@ -489,7 +489,7 @@ void preTransferCallback(void *clientData) { /* Initialize our progress dialog */ - gimp_progress_init(_("Transferring TWAIN data...")); + gimp_progress_init(_("Transferring TWAIN data")); } /* diff --git a/plug-ins/uri/uri-backend-gnomevfs.c b/plug-ins/uri/uri-backend-gnomevfs.c index 7818bf319e..0314af97fe 100644 --- a/plug-ins/uri/uri-backend-gnomevfs.c +++ b/plug-ins/uri/uri-backend-gnomevfs.c @@ -189,7 +189,7 @@ copy_uri (const gchar *src_uri, gchar *memsize; GTimeVal last_time = { 0, 0 }; - gimp_progress_init (_("Connecting to server...")); + gimp_progress_init (_("Connecting to server")); src_info = gnome_vfs_file_info_new (); result = gnome_vfs_get_file_info (src_uri, src_info, 0); diff --git a/plug-ins/uri/uri-backend-wget.c b/plug-ins/uri/uri-backend-wget.c index dc1ce21d5a..46e46a7fa9 100644 --- a/plug-ins/uri/uri-backend-wget.c +++ b/plug-ins/uri/uri-backend-wget.c @@ -167,7 +167,7 @@ uri_backend_load_image (const gchar *uri, timeout_msg = g_strdup_printf (_("(timeout is %s seconds)"), TIMEOUT); gimp_progress_init_printf ("%s %s", - _("Connecting to server..."), timeout_msg); + _("Connecting to server"), timeout_msg); read_connect: if (fgets (buf, sizeof (buf), input) == NULL) @@ -191,7 +191,7 @@ uri_backend_load_image (const gchar *uri, /* The fourth line is either the network request or an error */ - gimp_progress_set_text_printf ("%s %s", _("Opening URI..."), timeout_msg); + gimp_progress_set_text_printf ("%s %s", _("Opening URI"), timeout_msg); if (fgets (buf, sizeof (buf), input) == NULL) { @@ -275,12 +275,12 @@ uri_backend_load_image (const gchar *uri, if (size > 0) { memsize = gimp_memsize_to_string (size); - message = g_strdup_printf (_("Downloading %s of image data..."), + message = g_strdup_printf (_("Downloading %s of image data"), memsize); } else { - message = g_strdup (_("Downloading unknown amount of image data...")); + message = g_strdup (_("Downloading unknown amount of image data")); memsize = NULL; } diff --git a/plug-ins/winicon/icoload.c b/plug-ins/winicon/icoload.c index 0e42087b38..8fe8e435e6 100644 --- a/plug-ins/winicon/icoload.c +++ b/plug-ins/winicon/icoload.c @@ -457,7 +457,7 @@ ico_load_image (const gchar *filename) gint height = 0; gint i; - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); if (! ico_init (filename, &ico)) @@ -521,7 +521,7 @@ ico_load_thumbnail_image (const gchar *filename, gint match = 0; gint i; - gimp_progress_init_printf (_("Opening thumbnail for '%s'..."), + gimp_progress_init_printf (_("Opening thumbnail for '%s'"), gimp_filename_to_utf8 (filename)); if (! ico_init (filename, &ico)) diff --git a/plug-ins/winicon/icosave.c b/plug-ins/winicon/icosave.c index 6ee9f1ba81..43a3c2587f 100644 --- a/plug-ins/winicon/icosave.c +++ b/plug-ins/winicon/icosave.c @@ -974,7 +974,7 @@ SaveICO (const gchar *filename, if ((icon_depths = ico_show_icon_dialog (image, &num_icons)) == NULL) return GIMP_PDB_CANCEL; - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* Okay, let's actually save the thing with the depths the diff --git a/plug-ins/xjt/xjt.c b/plug-ins/xjt/xjt.c index 1fa344fa5a..40e7a1cc14 100644 --- a/plug-ins/xjt/xjt.c +++ b/plug-ins/xjt/xjt.c @@ -1686,7 +1686,7 @@ save_xjt_image (const gchar *filename, break; } - gimp_progress_init_printf (_("Saving '%s'..."), + gimp_progress_init_printf (_("Saving '%s'"), gimp_filename_to_utf8 (filename)); /* create temporary directory */ @@ -3311,7 +3311,7 @@ load_xjt_image (const gchar *filename) l_fsel_attached_to_id = -1; /* -1 assume fsel is not available (and not attached to any drawable) */ l_fsel_id = -1; /* -1 assume there is no floating selection */ - gimp_progress_init_printf (_("Opening '%s'..."), + gimp_progress_init_printf (_("Opening '%s'"), gimp_filename_to_utf8 (filename)); /* create temporary directory */