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

use the image file's basename as layer name if we import only one layer or 

2006-12-11  Michael Natterer  <mitch@gimp.org>

	* app/file/file-open.c (file_open_layers): use the image file's
	basename as layer name if we import only one layer or if
	merge_visible was requested. Use "basename - layer name"
	otherwise. Fixes bug #384472.
This commit is contained in:
Michael Natterer 2006-12-11 18:39:12 +00:00 committed by Michael Natterer
parent 4fb72eb8cf
commit f9e884b3d4
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-12-11 Michael Natterer <mitch@gimp.org>
* app/file/file-open.c (file_open_layers): use the image file's
basename as layer name if we import only one layer or if
merge_visible was requested. Use "basename - layer name"
otherwise. Fixes bug #384472.
2006-12-11 Sven Neumann <sven@gimp.org>
* app/core/gimptooloptions.[ch]: added API to delete saved

18
app/file/file-open.c
View File

@ -409,6 +409,8 @@ file_open_layers (Gimp *gimp,
if (layers)
{
gchar *basename = file_utils_uri_display_basename (uri);
for (list = layers; list; list = g_list_next (list))
{
GimpLayer *layer = list->data;
@ -418,13 +420,23 @@ file_open_layers (Gimp *gimp,
G_TYPE_FROM_INSTANCE (layer),
TRUE);
if (merge_visible)
gimp_object_take_name (GIMP_OBJECT (item),
file_utils_uri_display_basename (uri));
if (layers->next == NULL)
{
gimp_object_set_name (GIMP_OBJECT (item), basename);
}
else
{
gchar *name = g_strdup_printf ("%s - %s", basename,
gimp_object_get_name (GIMP_OBJECT (layer)));
gimp_object_take_name (GIMP_OBJECT (item), name);
}
list->data = item;
}
g_free (basename);
gimp_document_list_add_uri (GIMP_DOCUMENT_LIST (gimp->documents),
uri, mime_type);