renamed gimp_vectors_new_from_* to gimp_vectors_import_from_*, as

2006-11-23  Simon Budig  <simon@gimp.org>

	* tools/pdbgen/pdb/vectors.pdb: renamed gimp_vectors_new_from_*
	to gimp_vectors_import_from_*, as discussed in bug #378394.

	* plug-ins/common/svg.c
	* libgimp/gimp.def: changed accordingly.

	* libgimp/gimpvectors_pdb.[ch]
	* app/pdb/vectors_cmds.c: regenerated.
This commit is contained in:
Simon Budig 2006-11-23 21:45:54 +00:00 committed by Simon Budig
parent fa3ed4dbf5
commit d87e5738b6
10 changed files with 67 additions and 50 deletions

View File

@ -1,3 +1,14 @@
2006-11-23 Simon Budig <simon@gimp.org>
* tools/pdbgen/pdb/vectors.pdb: renamed gimp_vectors_new_from_*
to gimp_vectors_import_from_*, as discussed in bug #378394.
* plug-ins/common/svg.c
* libgimp/gimp.def: changed accordingly.
* libgimp/gimpvectors_pdb.[ch]
* app/pdb/vectors_cmds.c: regenerated.
2006-11-23 Simon Budig <simon@gimp.org> 2006-11-23 Simon Budig <simon@gimp.org>
* plug-ins/script-fu/tinyscheme/scheme-private.h * plug-ins/script-fu/tinyscheme/scheme-private.h

View File

@ -1106,11 +1106,11 @@ vectors_to_selection_invoker (GimpProcedure *procedure,
} }
static GValueArray * static GValueArray *
vectors_new_from_file_invoker (GimpProcedure *procedure, vectors_import_from_file_invoker (GimpProcedure *procedure,
Gimp *gimp, Gimp *gimp,
GimpContext *context, GimpContext *context,
GimpProgress *progress, GimpProgress *progress,
const GValueArray *args) const GValueArray *args)
{ {
gboolean success = TRUE; gboolean success = TRUE;
GValueArray *return_vals; GValueArray *return_vals;
@ -1164,11 +1164,11 @@ vectors_new_from_file_invoker (GimpProcedure *procedure,
} }
static GValueArray * static GValueArray *
vectors_new_from_string_invoker (GimpProcedure *procedure, vectors_import_from_string_invoker (GimpProcedure *procedure,
Gimp *gimp, Gimp *gimp,
GimpContext *context, GimpContext *context,
GimpProgress *progress, GimpProgress *progress,
const GValueArray *args) const GValueArray *args)
{ {
gboolean success = TRUE; gboolean success = TRUE;
GValueArray *return_vals; GValueArray *return_vals;
@ -2394,12 +2394,12 @@ register_vectors_procs (GimpPDB *pdb)
g_object_unref (procedure); g_object_unref (procedure);
/* /*
* gimp-vectors-new-from-file * gimp-vectors-import-from-file
*/ */
procedure = gimp_procedure_new (vectors_new_from_file_invoker); procedure = gimp_procedure_new (vectors_import_from_file_invoker);
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-vectors-new-from-file"); gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-vectors-import-from-file");
gimp_procedure_set_static_strings (procedure, gimp_procedure_set_static_strings (procedure,
"gimp-vectors-new-from-file", "gimp-vectors-import-from-file",
"Import paths from an SVG file.", "Import paths from an SVG file.",
"This procedure imports paths from an SVG file. SVG elements other than paths and basic shapes are ignored.", "This procedure imports paths from an SVG file. SVG elements other than paths and basic shapes are ignored.",
"Simon Budig", "Simon Budig",
@ -2446,12 +2446,12 @@ register_vectors_procs (GimpPDB *pdb)
g_object_unref (procedure); g_object_unref (procedure);
/* /*
* gimp-vectors-new-from-string * gimp-vectors-import-from-string
*/ */
procedure = gimp_procedure_new (vectors_new_from_string_invoker); procedure = gimp_procedure_new (vectors_import_from_string_invoker);
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-vectors-new-from-string"); gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-vectors-import-from-string");
gimp_procedure_set_static_strings (procedure, gimp_procedure_set_static_strings (procedure,
"gimp-vectors-new-from-string", "gimp-vectors-import-from-string",
"Import paths from an SVG string.", "Import paths from an SVG string.",
"This procedure works like 'gimp-vectors-new-from-file' but takes a string rather than reading the SVG from a file. This allows you to write scripts that generate SVG and feed it to GIMP.", "This procedure works like 'gimp-vectors-new-from-file' but takes a string rather than reading the SVG from a file. This allows you to write scripts that generate SVG and feed it to GIMP.",
"Simon Budig", "Simon Budig",

View File

@ -1,3 +1,9 @@
2006-11-23 Simon Budig <simon@gimp.org>
* libgimp/libgimp-sections.txt: follow name change.
* libgimp/tmpl/gimpvectors.sgml: regenerated.
2006-11-23 Sven Neumann <sven@gimp.org> 2006-11-23 Sven Neumann <sven@gimp.org>
* libgimp/libgimp-sections.txt: added new symbols. * libgimp/libgimp-sections.txt: added new symbols.

View File

@ -889,8 +889,8 @@ gimp_image_undo_thaw
<SECTION> <SECTION>
<FILE>gimpvectors</FILE> <FILE>gimpvectors</FILE>
gimp_vectors_new gimp_vectors_new
gimp_vectors_new_from_file gimp_vectors_import_from_file
gimp_vectors_new_from_string gimp_vectors_import_from_string
gimp_vectors_get_strokes gimp_vectors_get_strokes
gimp_vectors_get_image gimp_vectors_get_image
gimp_vectors_get_linked gimp_vectors_get_linked

View File

@ -27,7 +27,7 @@ gimpvectors
@Returns: @Returns:
<!-- ##### FUNCTION gimp_vectors_new_from_file ##### --> <!-- ##### FUNCTION gimp_vectors_import_from_file ##### -->
<para> <para>
</para> </para>
@ -41,7 +41,7 @@ gimpvectors
@Returns: @Returns:
<!-- ##### FUNCTION gimp_vectors_new_from_string ##### --> <!-- ##### FUNCTION gimp_vectors_import_from_string ##### -->
<para> <para>
</para> </para>

View File

@ -625,9 +625,9 @@ EXPORTS
gimp_vectors_get_strokes gimp_vectors_get_strokes
gimp_vectors_get_tattoo gimp_vectors_get_tattoo
gimp_vectors_get_visible gimp_vectors_get_visible
gimp_vectors_import_from_file
gimp_vectors_import_from_string
gimp_vectors_new gimp_vectors_new
gimp_vectors_new_from_file
gimp_vectors_new_from_string
gimp_vectors_parasite_attach gimp_vectors_parasite_attach
gimp_vectors_parasite_detach gimp_vectors_parasite_detach
gimp_vectors_parasite_find gimp_vectors_parasite_find

View File

@ -1214,7 +1214,7 @@ gimp_vectors_to_selection (gint32 vectors_ID,
} }
/** /**
* gimp_vectors_new_from_file: * gimp_vectors_import_from_file:
* @image_ID: The image. * @image_ID: The image.
* @filename: The name of the SVG file to import. * @filename: The name of the SVG file to import.
* @merge: Merge paths into a single vectors object. * @merge: Merge paths into a single vectors object.
@ -1232,18 +1232,18 @@ gimp_vectors_to_selection (gint32 vectors_ID,
* Since: GIMP 2.4 * Since: GIMP 2.4
*/ */
gboolean gboolean
gimp_vectors_new_from_file (gint32 image_ID, gimp_vectors_import_from_file (gint32 image_ID,
const gchar *filename, const gchar *filename,
gboolean merge, gboolean merge,
gboolean scale, gboolean scale,
gint *num_vectors, gint *num_vectors,
gint32 **vectors_ids) gint32 **vectors_ids)
{ {
GimpParam *return_vals; GimpParam *return_vals;
gint nreturn_vals; gint nreturn_vals;
gboolean success = TRUE; gboolean success = TRUE;
return_vals = gimp_run_procedure ("gimp-vectors-new-from-file", return_vals = gimp_run_procedure ("gimp-vectors-import-from-file",
&nreturn_vals, &nreturn_vals,
GIMP_PDB_IMAGE, image_ID, GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_STRING, filename, GIMP_PDB_STRING, filename,
@ -1271,7 +1271,7 @@ gimp_vectors_new_from_file (gint32 image_ID,
} }
/** /**
* gimp_vectors_new_from_string: * gimp_vectors_import_from_string:
* @image_ID: The image. * @image_ID: The image.
* @string: A string that must be a complete and valid SVG document. * @string: A string that must be a complete and valid SVG document.
* @length: Number of bytes in string or -1 if the string is NULL terminated. * @length: Number of bytes in string or -1 if the string is NULL terminated.
@ -1291,19 +1291,19 @@ gimp_vectors_new_from_file (gint32 image_ID,
* Since: GIMP 2.4 * Since: GIMP 2.4
*/ */
gboolean gboolean
gimp_vectors_new_from_string (gint32 image_ID, gimp_vectors_import_from_string (gint32 image_ID,
const gchar *string, const gchar *string,
gint length, gint length,
gboolean merge, gboolean merge,
gboolean scale, gboolean scale,
gint *num_vectors, gint *num_vectors,
gint32 **vectors_ids) gint32 **vectors_ids)
{ {
GimpParam *return_vals; GimpParam *return_vals;
gint nreturn_vals; gint nreturn_vals;
gboolean success = TRUE; gboolean success = TRUE;
return_vals = gimp_run_procedure ("gimp-vectors-new-from-string", return_vals = gimp_run_procedure ("gimp-vectors-import-from-string",
&nreturn_vals, &nreturn_vals,
GIMP_PDB_IMAGE, image_ID, GIMP_PDB_IMAGE, image_ID,
GIMP_PDB_STRING, string, GIMP_PDB_STRING, string,

View File

@ -132,13 +132,13 @@ gboolean gimp_vectors_to_selection (gint32
gboolean feather, gboolean feather,
gdouble feather_radius_x, gdouble feather_radius_x,
gdouble feather_radius_y); gdouble feather_radius_y);
gboolean gimp_vectors_new_from_file (gint32 image_ID, gboolean gimp_vectors_import_from_file (gint32 image_ID,
const gchar *filename, const gchar *filename,
gboolean merge, gboolean merge,
gboolean scale, gboolean scale,
gint *num_vectors, gint *num_vectors,
gint32 **vectors_ids); gint32 **vectors_ids);
gboolean gimp_vectors_new_from_string (gint32 image_ID, gboolean gimp_vectors_import_from_string (gint32 image_ID,
const gchar *string, const gchar *string,
gint length, gint length,
gboolean merge, gboolean merge,

View File

@ -231,9 +231,9 @@ run (const gchar *name,
gint num_vectors; gint num_vectors;
gint32 *vectors; gint32 *vectors;
gimp_vectors_new_from_file (image_ID, filename, gimp_vectors_import_from_file (image_ID, filename,
load_vals.merge, TRUE, load_vals.merge, TRUE,
&num_vectors, &vectors); &num_vectors, &vectors);
if (num_vectors) if (num_vectors)
g_free (vectors); g_free (vectors);
} }

View File

@ -1123,7 +1123,7 @@ CODE
} }
sub vectors_new_from_file { sub vectors_import_from_file {
$blurb = 'Import paths from an SVG file.'; $blurb = 'Import paths from an SVG file.';
$help = <<'HELP'; $help = <<'HELP';
@ -1182,7 +1182,7 @@ CODE
); );
} }
sub vectors_new_from_string { sub vectors_import_from_string {
$blurb = 'Import paths from an SVG string.'; $blurb = 'Import paths from an SVG string.';
$help = <<'HELP'; $help = <<'HELP';
@ -1278,8 +1278,8 @@ CODE
vectors_bezier_stroke_cubicto vectors_bezier_stroke_cubicto
vectors_bezier_stroke_new_ellipse vectors_bezier_stroke_new_ellipse
vectors_to_selection vectors_to_selection
vectors_new_from_file vectors_import_from_file
vectors_new_from_string); vectors_import_from_string);
%exports = (app => [@procs], lib => [@procs]); %exports = (app => [@procs], lib => [@procs]);