renamed PDB function gimp_image_active_drawable() to

2003-12-08  Michael Natterer  <mitch@gimp.org>

	* tools/pdbgen/pdb/image.pdb: renamed PDB function
	gimp_image_active_drawable() to gimp_image_get_active_drawable()
	so it's consistent with all other drawable getters.

	* app/pdb/procedural_db.c
	* libgimp/gimpcompat.h: added compat stuff.

	* app/pdb/image_cmds.c
	* libgimp/gimpimage_pdb.[ch]: regenerated.

	* plug-ins/pygimp/pygimp-image.c
	* plug-ins/script-fu/scripts/add-bevel.scm
	* plug-ins/script-fu/scripts/carved-logo.scm
	* plug-ins/script-fu/scripts/chrome-it.scm
	* plug-ins/script-fu/scripts/crystal-logo.scm
	* plug-ins/script-fu/scripts/round-corners.scm
	* plug-ins/script-fu/scripts/slide.scm
	* plug-ins/script-fu/scripts/sota-chrome-logo.scm: changed accordingly.

2003-12-08  Michael Natterer  <mitch@gimp.org>

	* libgimp/libgimp-sections.txt
	* libgimp/tmpl/gimpimage.sgml: updated.
This commit is contained in:
Michael Natterer
2003-12-08 18:30:54 +00:00
committed by Michael Natterer
parent ed6fe48b09
commit a046969687
21 changed files with 375 additions and 342 deletions

View File

@ -1,3 +1,24 @@
2003-12-08 Michael Natterer <mitch@gimp.org>
* tools/pdbgen/pdb/image.pdb: renamed PDB function
gimp_image_active_drawable() to gimp_image_get_active_drawable()
so it's consistent with all other drawable getters.
* app/pdb/procedural_db.c
* libgimp/gimpcompat.h: added compat stuff.
* app/pdb/image_cmds.c
* libgimp/gimpimage_pdb.[ch]: regenerated.
* plug-ins/pygimp/pygimp-image.c
* plug-ins/script-fu/scripts/add-bevel.scm
* plug-ins/script-fu/scripts/carved-logo.scm
* plug-ins/script-fu/scripts/chrome-it.scm
* plug-ins/script-fu/scripts/crystal-logo.scm
* plug-ins/script-fu/scripts/round-corners.scm
* plug-ins/script-fu/scripts/slide.scm
* plug-ins/script-fu/scripts/sota-chrome-logo.scm: changed accordingly.
2003-12-08 Michael Natterer <mitch@gimp.org> 2003-12-08 Michael Natterer <mitch@gimp.org>
Some PDB fixes/cosmetics before doing real changes again: Some PDB fixes/cosmetics before doing real changes again:

View File

@ -118,37 +118,38 @@ procedural_db_init_procs (Gimp *gimp,
} }
compat_procs[] = compat_procs[] =
{ {
{ "gimp_brushes_list", "gimp_brushes_get_list" }, { "gimp_brushes_list", "gimp_brushes_get_list" },
{ "gimp_channel_delete", "gimp_drawable_delete" }, { "gimp_channel_delete", "gimp_drawable_delete" },
{ "gimp_channel_get_name", "gimp_drawable_get_name" }, { "gimp_channel_get_name", "gimp_drawable_get_name" },
{ "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_channel_get_visible", "gimp_drawable_get_visible" }, { "gimp_channel_get_visible", "gimp_drawable_get_visible" },
{ "gimp_channel_set_name", "gimp_drawable_set_name" }, { "gimp_channel_set_name", "gimp_drawable_set_name" },
{ "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_channel_set_visible", "gimp_drawable_set_visible" }, { "gimp_channel_set_visible", "gimp_drawable_set_visible" },
{ "gimp_convert_grayscale", "gimp_image_convert_grayscale" }, { "gimp_convert_grayscale", "gimp_image_convert_grayscale" },
{ "gimp_convert_indexed", "gimp_image_convert_indexed" }, { "gimp_convert_indexed", "gimp_image_convert_indexed" },
{ "gimp_convert_rgb", "gimp_image_convert_rgb" }, { "gimp_convert_rgb", "gimp_image_convert_rgb" },
{ "gimp_crop", "gimp_image_crop" }, { "gimp_crop", "gimp_image_crop" },
{ "gimp_drawable_bytes", "gimp_drawable_bpp" }, { "gimp_drawable_bytes", "gimp_drawable_bpp" },
{ "gimp_drawable_image", "gimp_drawable_get_image" }, { "gimp_drawable_image", "gimp_drawable_get_image" },
{ "gimp_gradients_get_active", "gimp_gradients_get_gradient" }, { "gimp_gradients_get_active", "gimp_gradients_get_gradient" },
{ "gimp_gradients_set_active", "gimp_gradients_set_gradient" }, { "gimp_gradients_set_active", "gimp_gradients_set_gradient" },
{ "gimp_image_floating_selection", "gimp_image_get_floating_sel" }, { "gimp_image_active_drawable", "gimp_image_get_active_drawable" },
{ "gimp_layer_delete", "gimp_drawable_delete" }, { "gimp_image_floating_selection", "gimp_image_get_floating_sel" },
{ "gimp_layer_get_linked", "gimp_drawable_get_linked" }, { "gimp_layer_delete", "gimp_drawable_delete" },
{ "gimp_layer_get_name", "gimp_drawable_get_name" }, { "gimp_layer_get_linked", "gimp_drawable_get_linked" },
{ "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_layer_get_name", "gimp_drawable_get_name" },
{ "gimp_layer_get_visible", "gimp_drawable_get_visible" }, { "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_layer_mask", "gimp_layer_get_mask" }, { "gimp_layer_get_visible", "gimp_drawable_get_visible" },
{ "gimp_layer_set_linked", "gimp_drawable_set_linked" }, { "gimp_layer_mask", "gimp_layer_get_mask" },
{ "gimp_layer_set_name", "gimp_drawable_set_name" }, { "gimp_layer_set_linked", "gimp_drawable_set_linked" },
{ "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_layer_set_name", "gimp_drawable_set_name" },
{ "gimp_layer_set_visible", "gimp_drawable_set_visible" }, { "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_palette_refresh", "gimp_palettes_refresh" }, { "gimp_layer_set_visible", "gimp_drawable_set_visible" },
{ "gimp_patterns_list", "gimp_patterns_get_list" }, { "gimp_palette_refresh", "gimp_palettes_refresh" },
{ "gimp_undo_push_group_start", "gimp_image_undo_group_start" }, { "gimp_patterns_list", "gimp_patterns_get_list" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" } { "gimp_undo_push_group_start", "gimp_image_undo_group_start" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" }
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));

View File

@ -118,37 +118,38 @@ procedural_db_init_procs (Gimp *gimp,
} }
compat_procs[] = compat_procs[] =
{ {
{ "gimp_brushes_list", "gimp_brushes_get_list" }, { "gimp_brushes_list", "gimp_brushes_get_list" },
{ "gimp_channel_delete", "gimp_drawable_delete" }, { "gimp_channel_delete", "gimp_drawable_delete" },
{ "gimp_channel_get_name", "gimp_drawable_get_name" }, { "gimp_channel_get_name", "gimp_drawable_get_name" },
{ "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_channel_get_visible", "gimp_drawable_get_visible" }, { "gimp_channel_get_visible", "gimp_drawable_get_visible" },
{ "gimp_channel_set_name", "gimp_drawable_set_name" }, { "gimp_channel_set_name", "gimp_drawable_set_name" },
{ "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_channel_set_visible", "gimp_drawable_set_visible" }, { "gimp_channel_set_visible", "gimp_drawable_set_visible" },
{ "gimp_convert_grayscale", "gimp_image_convert_grayscale" }, { "gimp_convert_grayscale", "gimp_image_convert_grayscale" },
{ "gimp_convert_indexed", "gimp_image_convert_indexed" }, { "gimp_convert_indexed", "gimp_image_convert_indexed" },
{ "gimp_convert_rgb", "gimp_image_convert_rgb" }, { "gimp_convert_rgb", "gimp_image_convert_rgb" },
{ "gimp_crop", "gimp_image_crop" }, { "gimp_crop", "gimp_image_crop" },
{ "gimp_drawable_bytes", "gimp_drawable_bpp" }, { "gimp_drawable_bytes", "gimp_drawable_bpp" },
{ "gimp_drawable_image", "gimp_drawable_get_image" }, { "gimp_drawable_image", "gimp_drawable_get_image" },
{ "gimp_gradients_get_active", "gimp_gradients_get_gradient" }, { "gimp_gradients_get_active", "gimp_gradients_get_gradient" },
{ "gimp_gradients_set_active", "gimp_gradients_set_gradient" }, { "gimp_gradients_set_active", "gimp_gradients_set_gradient" },
{ "gimp_image_floating_selection", "gimp_image_get_floating_sel" }, { "gimp_image_active_drawable", "gimp_image_get_active_drawable" },
{ "gimp_layer_delete", "gimp_drawable_delete" }, { "gimp_image_floating_selection", "gimp_image_get_floating_sel" },
{ "gimp_layer_get_linked", "gimp_drawable_get_linked" }, { "gimp_layer_delete", "gimp_drawable_delete" },
{ "gimp_layer_get_name", "gimp_drawable_get_name" }, { "gimp_layer_get_linked", "gimp_drawable_get_linked" },
{ "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_layer_get_name", "gimp_drawable_get_name" },
{ "gimp_layer_get_visible", "gimp_drawable_get_visible" }, { "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_layer_mask", "gimp_layer_get_mask" }, { "gimp_layer_get_visible", "gimp_drawable_get_visible" },
{ "gimp_layer_set_linked", "gimp_drawable_set_linked" }, { "gimp_layer_mask", "gimp_layer_get_mask" },
{ "gimp_layer_set_name", "gimp_drawable_set_name" }, { "gimp_layer_set_linked", "gimp_drawable_set_linked" },
{ "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_layer_set_name", "gimp_drawable_set_name" },
{ "gimp_layer_set_visible", "gimp_drawable_set_visible" }, { "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_palette_refresh", "gimp_palettes_refresh" }, { "gimp_layer_set_visible", "gimp_drawable_set_visible" },
{ "gimp_patterns_list", "gimp_patterns_get_list" }, { "gimp_palette_refresh", "gimp_palettes_refresh" },
{ "gimp_undo_push_group_start", "gimp_image_undo_group_start" }, { "gimp_patterns_list", "gimp_patterns_get_list" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" } { "gimp_undo_push_group_start", "gimp_image_undo_group_start" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" }
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));

View File

@ -118,37 +118,38 @@ procedural_db_init_procs (Gimp *gimp,
} }
compat_procs[] = compat_procs[] =
{ {
{ "gimp_brushes_list", "gimp_brushes_get_list" }, { "gimp_brushes_list", "gimp_brushes_get_list" },
{ "gimp_channel_delete", "gimp_drawable_delete" }, { "gimp_channel_delete", "gimp_drawable_delete" },
{ "gimp_channel_get_name", "gimp_drawable_get_name" }, { "gimp_channel_get_name", "gimp_drawable_get_name" },
{ "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_channel_get_visible", "gimp_drawable_get_visible" }, { "gimp_channel_get_visible", "gimp_drawable_get_visible" },
{ "gimp_channel_set_name", "gimp_drawable_set_name" }, { "gimp_channel_set_name", "gimp_drawable_set_name" },
{ "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_channel_set_visible", "gimp_drawable_set_visible" }, { "gimp_channel_set_visible", "gimp_drawable_set_visible" },
{ "gimp_convert_grayscale", "gimp_image_convert_grayscale" }, { "gimp_convert_grayscale", "gimp_image_convert_grayscale" },
{ "gimp_convert_indexed", "gimp_image_convert_indexed" }, { "gimp_convert_indexed", "gimp_image_convert_indexed" },
{ "gimp_convert_rgb", "gimp_image_convert_rgb" }, { "gimp_convert_rgb", "gimp_image_convert_rgb" },
{ "gimp_crop", "gimp_image_crop" }, { "gimp_crop", "gimp_image_crop" },
{ "gimp_drawable_bytes", "gimp_drawable_bpp" }, { "gimp_drawable_bytes", "gimp_drawable_bpp" },
{ "gimp_drawable_image", "gimp_drawable_get_image" }, { "gimp_drawable_image", "gimp_drawable_get_image" },
{ "gimp_gradients_get_active", "gimp_gradients_get_gradient" }, { "gimp_gradients_get_active", "gimp_gradients_get_gradient" },
{ "gimp_gradients_set_active", "gimp_gradients_set_gradient" }, { "gimp_gradients_set_active", "gimp_gradients_set_gradient" },
{ "gimp_image_floating_selection", "gimp_image_get_floating_sel" }, { "gimp_image_active_drawable", "gimp_image_get_active_drawable" },
{ "gimp_layer_delete", "gimp_drawable_delete" }, { "gimp_image_floating_selection", "gimp_image_get_floating_sel" },
{ "gimp_layer_get_linked", "gimp_drawable_get_linked" }, { "gimp_layer_delete", "gimp_drawable_delete" },
{ "gimp_layer_get_name", "gimp_drawable_get_name" }, { "gimp_layer_get_linked", "gimp_drawable_get_linked" },
{ "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_layer_get_name", "gimp_drawable_get_name" },
{ "gimp_layer_get_visible", "gimp_drawable_get_visible" }, { "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_layer_mask", "gimp_layer_get_mask" }, { "gimp_layer_get_visible", "gimp_drawable_get_visible" },
{ "gimp_layer_set_linked", "gimp_drawable_set_linked" }, { "gimp_layer_mask", "gimp_layer_get_mask" },
{ "gimp_layer_set_name", "gimp_drawable_set_name" }, { "gimp_layer_set_linked", "gimp_drawable_set_linked" },
{ "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_layer_set_name", "gimp_drawable_set_name" },
{ "gimp_layer_set_visible", "gimp_drawable_set_visible" }, { "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_palette_refresh", "gimp_palettes_refresh" }, { "gimp_layer_set_visible", "gimp_drawable_set_visible" },
{ "gimp_patterns_list", "gimp_patterns_get_list" }, { "gimp_palette_refresh", "gimp_palettes_refresh" },
{ "gimp_undo_push_group_start", "gimp_image_undo_group_start" }, { "gimp_patterns_list", "gimp_patterns_get_list" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" } { "gimp_undo_push_group_start", "gimp_image_undo_group_start" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" }
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));

View File

@ -67,7 +67,7 @@ static ProcRecord image_crop_proc;
static ProcRecord image_flip_proc; static ProcRecord image_flip_proc;
static ProcRecord image_get_layers_proc; static ProcRecord image_get_layers_proc;
static ProcRecord image_get_channels_proc; static ProcRecord image_get_channels_proc;
static ProcRecord image_active_drawable_proc; static ProcRecord image_get_active_drawable_proc;
static ProcRecord image_unset_active_channel_proc; static ProcRecord image_unset_active_channel_proc;
static ProcRecord image_get_floating_sel_proc; static ProcRecord image_get_floating_sel_proc;
static ProcRecord image_floating_sel_attached_to_proc; static ProcRecord image_floating_sel_attached_to_proc;
@ -130,7 +130,7 @@ register_image_procs (Gimp *gimp)
procedural_db_register (gimp, &image_flip_proc); procedural_db_register (gimp, &image_flip_proc);
procedural_db_register (gimp, &image_get_layers_proc); procedural_db_register (gimp, &image_get_layers_proc);
procedural_db_register (gimp, &image_get_channels_proc); procedural_db_register (gimp, &image_get_channels_proc);
procedural_db_register (gimp, &image_active_drawable_proc); procedural_db_register (gimp, &image_get_active_drawable_proc);
procedural_db_register (gimp, &image_unset_active_channel_proc); procedural_db_register (gimp, &image_unset_active_channel_proc);
procedural_db_register (gimp, &image_get_floating_sel_proc); procedural_db_register (gimp, &image_get_floating_sel_proc);
procedural_db_register (gimp, &image_floating_sel_attached_to_proc); procedural_db_register (gimp, &image_floating_sel_attached_to_proc);
@ -1101,8 +1101,8 @@ static ProcRecord image_get_channels_proc =
}; };
static Argument * static Argument *
image_active_drawable_invoker (Gimp *gimp, image_get_active_drawable_invoker (Gimp *gimp,
Argument *args) Argument *args)
{ {
gboolean success = TRUE; gboolean success = TRUE;
Argument *return_args; Argument *return_args;
@ -1116,7 +1116,7 @@ image_active_drawable_invoker (Gimp *gimp,
if (success) if (success)
success = (drawable = gimp_image_active_drawable (gimage)) != NULL; success = (drawable = gimp_image_active_drawable (gimage)) != NULL;
return_args = procedural_db_return_args (&image_active_drawable_proc, success); return_args = procedural_db_return_args (&image_get_active_drawable_proc, success);
if (success) if (success)
return_args[1].value.pdb_int = gimp_item_get_ID (GIMP_ITEM (drawable)); return_args[1].value.pdb_int = gimp_item_get_ID (GIMP_ITEM (drawable));
@ -1124,7 +1124,7 @@ image_active_drawable_invoker (Gimp *gimp,
return return_args; return return_args;
} }
static ProcArg image_active_drawable_inargs[] = static ProcArg image_get_active_drawable_inargs[] =
{ {
{ {
GIMP_PDB_IMAGE, GIMP_PDB_IMAGE,
@ -1133,7 +1133,7 @@ static ProcArg image_active_drawable_inargs[] =
} }
}; };
static ProcArg image_active_drawable_outargs[] = static ProcArg image_get_active_drawable_outargs[] =
{ {
{ {
GIMP_PDB_DRAWABLE, GIMP_PDB_DRAWABLE,
@ -1142,9 +1142,9 @@ static ProcArg image_active_drawable_outargs[] =
} }
}; };
static ProcRecord image_active_drawable_proc = static ProcRecord image_get_active_drawable_proc =
{ {
"gimp_image_active_drawable", "gimp_image_get_active_drawable",
"Get the image's active drawable", "Get the image's active drawable",
"This procedure returns the ID of the image's active drawable. This can be either a layer, a channel, or a layer mask. The active drawable is specified by the active image channel. If that is -1, then by the active image layer. If the active image layer has a layer mask and the layer mask is in edit mode, then the layer mask is the active drawable.", "This procedure returns the ID of the image's active drawable. This can be either a layer, a channel, or a layer mask. The active drawable is specified by the active image channel. If that is -1, then by the active image layer. If the active image layer has a layer mask and the layer mask is in edit mode, then the layer mask is the active drawable.",
"Spencer Kimball & Peter Mattis", "Spencer Kimball & Peter Mattis",
@ -1152,10 +1152,10 @@ static ProcRecord image_active_drawable_proc =
"1995-1996", "1995-1996",
GIMP_INTERNAL, GIMP_INTERNAL,
1, 1,
image_active_drawable_inargs, image_get_active_drawable_inargs,
1, 1,
image_active_drawable_outargs, image_get_active_drawable_outargs,
{ { image_active_drawable_invoker } } { { image_get_active_drawable_invoker } }
}; };
static Argument * static Argument *

View File

@ -118,37 +118,38 @@ procedural_db_init_procs (Gimp *gimp,
} }
compat_procs[] = compat_procs[] =
{ {
{ "gimp_brushes_list", "gimp_brushes_get_list" }, { "gimp_brushes_list", "gimp_brushes_get_list" },
{ "gimp_channel_delete", "gimp_drawable_delete" }, { "gimp_channel_delete", "gimp_drawable_delete" },
{ "gimp_channel_get_name", "gimp_drawable_get_name" }, { "gimp_channel_get_name", "gimp_drawable_get_name" },
{ "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_channel_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_channel_get_visible", "gimp_drawable_get_visible" }, { "gimp_channel_get_visible", "gimp_drawable_get_visible" },
{ "gimp_channel_set_name", "gimp_drawable_set_name" }, { "gimp_channel_set_name", "gimp_drawable_set_name" },
{ "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_channel_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_channel_set_visible", "gimp_drawable_set_visible" }, { "gimp_channel_set_visible", "gimp_drawable_set_visible" },
{ "gimp_convert_grayscale", "gimp_image_convert_grayscale" }, { "gimp_convert_grayscale", "gimp_image_convert_grayscale" },
{ "gimp_convert_indexed", "gimp_image_convert_indexed" }, { "gimp_convert_indexed", "gimp_image_convert_indexed" },
{ "gimp_convert_rgb", "gimp_image_convert_rgb" }, { "gimp_convert_rgb", "gimp_image_convert_rgb" },
{ "gimp_crop", "gimp_image_crop" }, { "gimp_crop", "gimp_image_crop" },
{ "gimp_drawable_bytes", "gimp_drawable_bpp" }, { "gimp_drawable_bytes", "gimp_drawable_bpp" },
{ "gimp_drawable_image", "gimp_drawable_get_image" }, { "gimp_drawable_image", "gimp_drawable_get_image" },
{ "gimp_gradients_get_active", "gimp_gradients_get_gradient" }, { "gimp_gradients_get_active", "gimp_gradients_get_gradient" },
{ "gimp_gradients_set_active", "gimp_gradients_set_gradient" }, { "gimp_gradients_set_active", "gimp_gradients_set_gradient" },
{ "gimp_image_floating_selection", "gimp_image_get_floating_sel" }, { "gimp_image_active_drawable", "gimp_image_get_active_drawable" },
{ "gimp_layer_delete", "gimp_drawable_delete" }, { "gimp_image_floating_selection", "gimp_image_get_floating_sel" },
{ "gimp_layer_get_linked", "gimp_drawable_get_linked" }, { "gimp_layer_delete", "gimp_drawable_delete" },
{ "gimp_layer_get_name", "gimp_drawable_get_name" }, { "gimp_layer_get_linked", "gimp_drawable_get_linked" },
{ "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" }, { "gimp_layer_get_name", "gimp_drawable_get_name" },
{ "gimp_layer_get_visible", "gimp_drawable_get_visible" }, { "gimp_layer_get_tattoo", "gimp_drawable_get_tattoo" },
{ "gimp_layer_mask", "gimp_layer_get_mask" }, { "gimp_layer_get_visible", "gimp_drawable_get_visible" },
{ "gimp_layer_set_linked", "gimp_drawable_set_linked" }, { "gimp_layer_mask", "gimp_layer_get_mask" },
{ "gimp_layer_set_name", "gimp_drawable_set_name" }, { "gimp_layer_set_linked", "gimp_drawable_set_linked" },
{ "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" }, { "gimp_layer_set_name", "gimp_drawable_set_name" },
{ "gimp_layer_set_visible", "gimp_drawable_set_visible" }, { "gimp_layer_set_tattoo", "gimp_drawable_set_tattoo" },
{ "gimp_palette_refresh", "gimp_palettes_refresh" }, { "gimp_layer_set_visible", "gimp_drawable_set_visible" },
{ "gimp_patterns_list", "gimp_patterns_get_list" }, { "gimp_palette_refresh", "gimp_palettes_refresh" },
{ "gimp_undo_push_group_start", "gimp_image_undo_group_start" }, { "gimp_patterns_list", "gimp_patterns_get_list" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" } { "gimp_undo_push_group_start", "gimp_image_undo_group_start" },
{ "gimp_undo_push_group_end", "gimp_image_undo_group_end" }
}; };
g_return_if_fail (GIMP_IS_GIMP (gimp)); g_return_if_fail (GIMP_IS_GIMP (gimp));

View File

@ -1,3 +1,8 @@
2003-12-08 Michael Natterer <mitch@gimp.org>
* libgimp/libgimp-sections.txt
* libgimp/tmpl/gimpimage.sgml: updated.
2003-12-08 Sven Neumann <sven@gimp.org> 2003-12-08 Sven Neumann <sven@gimp.org>
* Makefile.am: removed unnecessary stuff. * Makefile.am: removed unnecessary stuff.

View File

@ -309,41 +309,40 @@ gimp_help
<FILE>gimpimage</FILE> <FILE>gimpimage</FILE>
gimp_image_list gimp_image_list
gimp_image_new gimp_image_new
gimp_image_duplicate
gimp_image_delete
gimp_image_base_type
gimp_image_width
gimp_image_height
gimp_image_free_shadow
gimp_image_flip gimp_image_flip
gimp_image_resize gimp_image_resize
gimp_image_scale gimp_image_scale
gimp_image_crop gimp_image_crop
gimp_image_delete
gimp_image_free_shadow
gimp_image_get_layers gimp_image_get_layers
gimp_image_get_channels gimp_image_get_channels
gimp_image_get_active_drawable
gimp_image_unset_active_channel gimp_image_unset_active_channel
gimp_image_get_floating_sel
gimp_image_floating_sel_attached_to
gimp_image_pick_correlate_layer gimp_image_pick_correlate_layer
gimp_image_add_layer
gimp_image_remove_layer
gimp_image_raise_layer gimp_image_raise_layer
gimp_image_lower_layer gimp_image_lower_layer
gimp_image_raise_layer_to_top gimp_image_raise_layer_to_top
gimp_image_lower_layer_to_bottom gimp_image_lower_layer_to_bottom
gimp_image_merge_visible_layers
gimp_image_merge_down
gimp_image_flatten
gimp_image_add_layer
gimp_image_remove_layer
gimp_image_add_layer_mask
gimp_image_remove_layer_mask
gimp_image_raise_channel
gimp_image_lower_channel
gimp_image_add_channel gimp_image_add_channel
gimp_image_remove_channel gimp_image_remove_channel
gimp_image_active_drawable gimp_image_raise_channel
gimp_image_base_type gimp_image_lower_channel
gimp_image_flatten
gimp_image_merge_visible_layers
gimp_image_merge_down
gimp_image_add_layer_mask
gimp_image_remove_layer_mask
gimp_image_clean_all gimp_image_clean_all
gimp_image_is_dirty gimp_image_is_dirty
gimp_image_get_floating_sel
gimp_image_floating_sel_attached_to
gimp_image_set_tattoo_state
gimp_image_get_tattoo_state
gimp_image_width
gimp_image_height
gimp_image_get_active_layer gimp_image_get_active_layer
gimp_image_set_active_layer gimp_image_set_active_layer
gimp_image_get_active_channel gimp_image_get_active_channel
@ -360,12 +359,13 @@ gimp_image_get_resolution
gimp_image_set_resolution gimp_image_set_resolution
gimp_image_get_unit gimp_image_get_unit
gimp_image_set_unit gimp_image_set_unit
gimp_image_set_tattoo_state
gimp_image_get_tattoo_state
gimp_image_get_layer_by_tattoo gimp_image_get_layer_by_tattoo
gimp_image_get_channel_by_tattoo gimp_image_get_channel_by_tattoo
gimp_image_get_cmap gimp_image_get_cmap
gimp_image_set_cmap gimp_image_set_cmap
gimp_image_get_thumbnail_data gimp_image_get_thumbnail_data
gimp_image_duplicate
gimp_image_parasite_find gimp_image_parasite_find
gimp_image_parasite_list gimp_image_parasite_list
gimp_image_parasite_attach gimp_image_parasite_attach

View File

@ -36,6 +36,60 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_duplicate ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_delete ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_base_type ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_width ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_height ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_free_shadow ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_flip ##### --> <!-- ##### FUNCTION gimp_image_flip ##### -->
<para> <para>
@ -83,24 +137,6 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_delete ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_free_shadow ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_get_layers ##### --> <!-- ##### FUNCTION gimp_image_get_layers ##### -->
<para> <para>
@ -121,6 +157,15 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_get_active_drawable ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_unset_active_channel ##### --> <!-- ##### FUNCTION gimp_image_unset_active_channel ##### -->
<para> <para>
@ -130,6 +175,24 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_get_floating_sel ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_floating_sel_attached_to ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_pick_correlate_layer ##### --> <!-- ##### FUNCTION gimp_image_pick_correlate_layer ##### -->
<para> <para>
@ -141,6 +204,27 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_add_layer ##### -->
<para>
</para>
@image_ID:
@layer_ID:
@position:
@Returns:
<!-- ##### FUNCTION gimp_image_remove_layer ##### -->
<para>
</para>
@image_ID:
@layer_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_raise_layer ##### --> <!-- ##### FUNCTION gimp_image_raise_layer ##### -->
<para> <para>
@ -181,6 +265,56 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_add_channel ##### -->
<para>
</para>
@image_ID:
@channel_ID:
@position:
@Returns:
<!-- ##### FUNCTION gimp_image_remove_channel ##### -->
<para>
</para>
@image_ID:
@channel_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_raise_channel ##### -->
<para>
</para>
@image_ID:
@channel_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_lower_channel ##### -->
<para>
</para>
@image_ID:
@layer_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_flatten ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_merge_visible_layers ##### --> <!-- ##### FUNCTION gimp_image_merge_visible_layers ##### -->
<para> <para>
@ -202,36 +336,6 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_flatten ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_add_layer ##### -->
<para>
</para>
@image_ID:
@layer_ID:
@position:
@Returns:
<!-- ##### FUNCTION gimp_image_remove_layer ##### -->
<para>
</para>
@image_ID:
@layer_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_add_layer_mask ##### --> <!-- ##### FUNCTION gimp_image_add_layer_mask ##### -->
<para> <para>
@ -254,65 +358,6 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_raise_channel ##### -->
<para>
</para>
@image_ID:
@channel_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_lower_channel ##### -->
<para>
</para>
@image_ID:
@layer_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_add_channel ##### -->
<para>
</para>
@image_ID:
@channel_ID:
@position:
@Returns:
<!-- ##### FUNCTION gimp_image_remove_channel ##### -->
<para>
</para>
@image_ID:
@channel_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_active_drawable ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_base_type ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_clean_all ##### --> <!-- ##### FUNCTION gimp_image_clean_all ##### -->
<para> <para>
@ -331,61 +376,6 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_get_floating_sel ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_floating_sel_attached_to ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_set_tattoo_state ##### -->
<para>
</para>
@image_ID:
@tattoo:
@Returns:
<!-- ##### FUNCTION gimp_image_get_tattoo_state ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_width ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_height ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_get_active_layer ##### --> <!-- ##### FUNCTION gimp_image_get_active_layer ##### -->
<para> <para>
@ -544,6 +534,27 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_set_tattoo_state ##### -->
<para>
</para>
@image_ID:
@tattoo_state:
@Returns:
<!-- # Unused Parameters # -->
@tattoo:
<!-- ##### FUNCTION gimp_image_get_tattoo_state ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_get_layer_by_tattoo ##### --> <!-- ##### FUNCTION gimp_image_get_layer_by_tattoo ##### -->
<para> <para>
@ -597,15 +608,6 @@ and operations involving multiple layers.
@Returns: @Returns:
<!-- ##### FUNCTION gimp_image_duplicate ##### -->
<para>
</para>
@image_ID:
@Returns:
<!-- ##### FUNCTION gimp_image_parasite_find ##### --> <!-- ##### FUNCTION gimp_image_parasite_find ##### -->
<para> <para>

View File

@ -77,6 +77,7 @@ G_BEGIN_DECLS
#define gimp_drawable_visible gimp_drawable_get_visible #define gimp_drawable_visible gimp_drawable_get_visible
#define gimp_drawable_bytes gimp_drawable_bpp #define gimp_drawable_bytes gimp_drawable_bpp
#define gimp_image_active_drawable gimp_image_get_active_drawable
#define gimp_image_floating_selection gimp_image_get_floating_sel #define gimp_image_floating_selection gimp_image_get_floating_sel
#define gimp_gradients_get_active gimp_gradients_get_gradient #define gimp_gradients_get_active gimp_gradients_get_gradient

View File

@ -544,7 +544,7 @@ gimp_image_get_channels (gint32 image_ID,
} }
/** /**
* gimp_image_active_drawable: * gimp_image_get_active_drawable:
* @image_ID: The image. * @image_ID: The image.
* *
* Get the image's active drawable * Get the image's active drawable
@ -559,13 +559,13 @@ gimp_image_get_channels (gint32 image_ID,
* Returns: The active drawable. * Returns: The active drawable.
*/ */
gint32 gint32
gimp_image_active_drawable (gint32 image_ID) gimp_image_get_active_drawable (gint32 image_ID)
{ {
GimpParam *return_vals; GimpParam *return_vals;
gint nreturn_vals; gint nreturn_vals;
gint32 drawable_ID = -1; gint32 drawable_ID = -1;
return_vals = gimp_run_procedure ("gimp_image_active_drawable", return_vals = gimp_run_procedure ("gimp_image_get_active_drawable",
&nreturn_vals, &nreturn_vals,
GIMP_PDB_IMAGE, image_ID, GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_END); GIMP_PDB_END);

View File

@ -58,7 +58,7 @@ gint* gimp_image_get_layers (gint32 ima
gint *num_layers); gint *num_layers);
gint* gimp_image_get_channels (gint32 image_ID, gint* gimp_image_get_channels (gint32 image_ID,
gint *num_channels); gint *num_channels);
gint32 gimp_image_active_drawable (gint32 image_ID); gint32 gimp_image_get_active_drawable (gint32 image_ID);
gboolean gimp_image_unset_active_channel (gint32 image_ID); gboolean gimp_image_unset_active_channel (gint32 image_ID);
gint32 gimp_image_get_floating_sel (gint32 image_ID); gint32 gimp_image_get_floating_sel (gint32 image_ID);
gint32 gimp_image_floating_sel_attached_to (gint32 image_ID); gint32 gimp_image_floating_sel_attached_to (gint32 image_ID);

View File

@ -563,7 +563,7 @@ img_set_active_channel(PyGimpImage *self, PyObject *value, void *closure)
static PyObject * static PyObject *
img_get_active_drawable(PyGimpImage *self, void *closure) img_get_active_drawable(PyGimpImage *self, void *closure)
{ {
gint32 id = gimp_image_active_drawable(self->ID); gint32 id = gimp_image_get_active_drawable(self->ID);
if (id == -1) { if (id == -1) {
Py_INCREF(Py_None); Py_INCREF(Py_None);

View File

@ -76,7 +76,7 @@
(thickness (abs thickness)) (thickness (abs thickness))
(type (car (gimp-drawable-type-with-alpha drawable))) (type (car (gimp-drawable-type-with-alpha drawable)))
(image (if (= work-on-copy TRUE) (car (gimp-image-duplicate img)) img)) (image (if (= work-on-copy TRUE) (car (gimp-image-duplicate img)) img))
(pic-layer (car (gimp-image-active-drawable image))) (pic-layer (car (gimp-image-get-active-drawable image)))
(width (car (gimp-drawable-width pic-layer))) (width (car (gimp-drawable-width pic-layer)))
(height (car (gimp-drawable-height pic-layer))) (height (car (gimp-drawable-height pic-layer)))
(old-bg (car (gimp-palette-get-background))) (old-bg (car (gimp-palette-get-background)))

View File

@ -30,7 +30,7 @@
(feather (carve-scale size 0.3)) (feather (carve-scale size 0.3))
(brush-size (carve-scale size 0.3)) (brush-size (carve-scale size 0.3))
(b-size (+ (carve-scale size 0.5) padding)) (b-size (+ (carve-scale size 0.5) padding))
(layer1 (car (gimp-image-active-drawable img))) (layer1 (car (gimp-image-get-active-drawable img)))
(mask-layer (car (gimp-text-fontname img -1 0 0 text b-size TRUE size PIXELS font))) (mask-layer (car (gimp-text-fontname img -1 0 0 text b-size TRUE size PIXELS font)))
(width (car (gimp-drawable-width mask-layer))) (width (car (gimp-drawable-width mask-layer)))
(height (car (gimp-drawable-height mask-layer))) (height (car (gimp-drawable-height mask-layer)))

View File

@ -64,7 +64,7 @@
(define (script-fu-sota-chrome-it mask-img mask-drawable chrome-saturation (define (script-fu-sota-chrome-it mask-img mask-drawable chrome-saturation
chrome-lightness chrome-factor env-map hc cc carve-white) chrome-lightness chrome-factor env-map hc cc carve-white)
(let* ((banding-img (car (gimp-file-load 1 env-map env-map))) (let* ((banding-img (car (gimp-file-load 1 env-map env-map)))
(banding-layer (car (gimp-image-active-drawable banding-img))) (banding-layer (car (gimp-image-get-active-drawable banding-img)))
(banding-height (car (gimp-drawable-height banding-layer))) (banding-height (car (gimp-drawable-height banding-layer)))
(banding-width (car (gimp-drawable-width banding-layer))) (banding-width (car (gimp-drawable-width banding-layer)))
(banding-type (car (gimp-drawable-type banding-layer))) (banding-type (car (gimp-drawable-type banding-layer)))

View File

@ -62,9 +62,9 @@
(define (script-fu-crystal-logo chrome-factor text size font bg-img env-map) (define (script-fu-crystal-logo chrome-factor text size font bg-img env-map)
(let* ((img (car (gimp-image-new 256 256 GRAY))) (let* ((img (car (gimp-image-new 256 256 GRAY)))
(back-img (car (gimp-file-load 1 bg-img bg-img))) (back-img (car (gimp-file-load 1 bg-img bg-img)))
(back-layer (car (gimp-image-active-drawable back-img))) (back-layer (car (gimp-image-get-active-drawable back-img)))
(banding-img (car (gimp-file-load 1 env-map env-map))) (banding-img (car (gimp-file-load 1 env-map env-map)))
(banding-layer (car (gimp-image-active-drawable banding-img))) (banding-layer (car (gimp-image-get-active-drawable banding-img)))
(banding-height (car (gimp-drawable-height banding-layer))) (banding-height (car (gimp-drawable-height banding-layer)))
(banding-width (car (gimp-drawable-width banding-layer))) (banding-width (car (gimp-drawable-width banding-layer)))
(banding-type (car (gimp-drawable-type banding-layer))) (banding-type (car (gimp-drawable-type banding-layer)))

View File

@ -57,7 +57,7 @@
(car (gimp-image-duplicate img))) (car (gimp-image-duplicate img)))
((= work-on-copy FALSE) ((= work-on-copy FALSE)
img))) img)))
(pic-layer (car (gimp-image-active-drawable image)))) (pic-layer (car (gimp-image-get-active-drawable image))))
(gimp-image-undo-disable image) (gimp-image-undo-disable image)

View File

@ -88,7 +88,7 @@
"Background" "Background"
100 100
NORMAL-MODE))) NORMAL-MODE)))
(pic-layer (car (gimp-image-active-drawable image))) (pic-layer (car (gimp-image-get-active-drawable image)))
(numbera (string-append number "A"))) (numbera (string-append number "A")))

View File

@ -65,7 +65,7 @@
text size fontname env-map hc cc) text size fontname env-map hc cc)
(let* ((img (car (gimp-image-new 256 256 GRAY))) (let* ((img (car (gimp-image-new 256 256 GRAY)))
(banding-img (car (gimp-file-load 1 env-map env-map))) (banding-img (car (gimp-file-load 1 env-map env-map)))
(banding-layer (car (gimp-image-active-drawable banding-img))) (banding-layer (car (gimp-image-get-active-drawable banding-img)))
(banding-height (car (gimp-drawable-height banding-layer))) (banding-height (car (gimp-drawable-height banding-layer)))
(banding-width (car (gimp-drawable-width banding-layer))) (banding-width (car (gimp-drawable-width banding-layer)))
(banding-type (car (gimp-drawable-type banding-layer))) (banding-type (car (gimp-drawable-type banding-layer)))

View File

@ -816,7 +816,7 @@ HELP
%invoke = ( code => 'gimp_image_remove_channel (gimage, channel);' ); %invoke = ( code => 'gimp_image_remove_channel (gimage, channel);' );
} }
sub image_active_drawable { sub image_get_active_drawable {
$blurb = "Get the image's active drawable"; $blurb = "Get the image's active drawable";
$help = <<'HELP'; $help = <<'HELP';
@ -1457,7 +1457,7 @@ unshift @procs, qw(image_list image_new image_duplicate image_delete
image_free_shadow image_free_shadow
image_resize image_scale image_crop image_flip image_resize image_scale image_crop image_flip
image_get_layers image_get_channels image_get_layers image_get_channels
image_active_drawable image_get_active_drawable
image_unset_active_channel image_unset_active_channel
image_get_floating_sel image_floating_sel_attached_to image_get_floating_sel image_floating_sel_attached_to
image_pick_correlate_layer image_pick_correlate_layer