dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

added "const gchar *undo_desc" to gimp_image_merge_layers() so the undo 

2003-02-17  Michael Natterer  <mitch@gimp.org>

	* app/core/gimpimage-merge.[ch]: added "const gchar *undo_desc" to
	gimp_image_merge_layers() so the undo steps say "Merge Down",
	"Flatten Image" etc. instead of always "Merge Layers".
This commit is contained in:
Michael Natterer 2003-02-17 11:21:35 +00:00 committed by Michael Natterer
parent f23d961468
commit 858398d630
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-02-17 Michael Natterer <mitch@gimp.org>
* app/core/gimpimage-merge.[ch]: added "const gchar *undo_desc" to
gimp_image_merge_layers() so the undo steps say "Merge Down",
"Flatten Image" etc. instead of always "Merge Layers".
2003-02-15 Larry Ewing <lewing@ximian.com>
* app/tools/gimpinkoptions.c (gimp_ink_options_gui): add a new

14
app/core/gimpimage-merge.c
View File

@ -85,7 +85,8 @@ gimp_image_merge_visible_layers (GimpImage *gimage,
{
gimp_set_busy (gimage->gimp);
layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
layer = gimp_image_merge_layers (gimage, merge_list, merge_type,
_("Merge Visible Layers"));
g_slist_free (merge_list);
gimp_unset_busy (gimage->gimp);
@ -133,7 +134,8 @@ gimp_image_flatten (GimpImage *gimage)
merge_list = g_slist_append (merge_list, layer);
}
layer = gimp_image_merge_layers (gimage, merge_list, GIMP_FLATTEN_IMAGE);
layer = gimp_image_merge_layers (gimage, merge_list, GIMP_FLATTEN_IMAGE,
_("Flatten Image"));
g_slist_free (merge_list);
gimp_image_alpha_changed (gimage);
@ -181,7 +183,8 @@ gimp_image_merge_down (GimpImage *gimage,
gimp_set_busy (gimage->gimp);
layer = gimp_image_merge_layers (gimage, merge_list, merge_type);
layer = gimp_image_merge_layers (gimage, merge_list, merge_type,
_("Merge Down"));
g_slist_free (merge_list);
gimp_unset_busy (gimage->gimp);
@ -198,7 +201,8 @@ gimp_image_merge_down (GimpImage *gimage,
GimpLayer *
gimp_image_merge_layers (GimpImage *gimage,
GSList *merge_list,
GimpMergeType merge_type)
GimpMergeType merge_type,
const gchar *undo_desc)
{
GList *list;
GSList *reverse_list = NULL;
@ -296,7 +300,7 @@ gimp_image_merge_layers (GimpImage *gimage,
/* Start a merge undo group. */
gimp_image_undo_group_start (gimage, GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE,
_("Merge Layers"));
undo_desc);
name = g_strdup (gimp_object_get_name (GIMP_OBJECT (layer)));

5
app/core/gimpimage-merge.h
View File

@ -1,5 +1,5 @@
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattisbvf
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@ -28,7 +28,8 @@ GimpLayer * gimp_image_merge_down (GimpImage *gimage,
GimpLayer * gimp_image_flatten (GimpImage *gimage);
GimpLayer * gimp_image_merge_layers (GimpImage *gimage,
GSList *merge_list,
GimpMergeType merge_type);
GimpMergeType merge_type,
const gchar *undo_desc);
#endif /* __GIMP_IMAGE_MERGE_H__ */