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

libgimp: change the remaining "author" strings and variables to "authors"

This commit is contained in:
Michael Natterer 2019-08-11 17:03:03 +02:00
parent 1c9b3c7055
commit b35dbf0d77
8 changed files with 66 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
app/pdb/pdb-cmds.c
View File

@ -101,7 +101,7 @@ pdb_query_invoker (GimpProcedure *procedure,
const gchar *name;
const gchar *blurb;
const gchar *help;
const gchar *author;
const gchar *authors;
const gchar *copyright;
const gchar *date;
const gchar *proc_type;
@ -111,7 +111,7 @@ pdb_query_invoker (GimpProcedure *procedure,
name = g_value_get_string (gimp_value_array_index (args, 0));
blurb = g_value_get_string (gimp_value_array_index (args, 1));
help = g_value_get_string (gimp_value_array_index (args, 2));
author = g_value_get_string (gimp_value_array_index (args, 3));
authors = g_value_get_string (gimp_value_array_index (args, 3));
copyright = g_value_get_string (gimp_value_array_index (args, 4));
date = g_value_get_string (gimp_value_array_index (args, 5));
proc_type = g_value_get_string (gimp_value_array_index (args, 6));
@ -119,7 +119,7 @@ pdb_query_invoker (GimpProcedure *procedure,
if (success)
{
success = gimp_pdb_query (gimp->pdb,
name, blurb, help, author,
name, blurb, help, authors,
copyright, date, proc_type,
&num_matches, &procedure_names,
error);
@ -196,7 +196,7 @@ pdb_proc_info_invoker (GimpProcedure *procedure,
const gchar *procedure_name;
gchar *blurb = NULL;
gchar *help = NULL;
gchar *author = NULL;
gchar *authors = NULL;
gchar *copyright = NULL;
gchar *date = NULL;
gint32 proc_type = 0;
@ -213,7 +213,7 @@ pdb_proc_info_invoker (GimpProcedure *procedure,
canonical = gimp_canonicalize_identifier (procedure_name);
success = gimp_pdb_proc_info (gimp->pdb, canonical,
&blurb, &help, &author,
&blurb, &help, &authors,
&copyright, &date, &ptype,
&num_args, &num_values,
error);
@ -229,7 +229,7 @@ pdb_proc_info_invoker (GimpProcedure *procedure,
{
g_value_take_string (gimp_value_array_index (return_vals, 1), blurb);
g_value_take_string (gimp_value_array_index (return_vals, 2), help);
g_value_take_string (gimp_value_array_index (return_vals, 3), author);
g_value_take_string (gimp_value_array_index (return_vals, 3), authors);
g_value_take_string (gimp_value_array_index (return_vals, 4), copyright);
g_value_take_string (gimp_value_array_index (return_vals, 5), date);
g_value_set_enum (gimp_value_array_index (return_vals, 6), proc_type);
@ -652,7 +652,7 @@ register_pdb_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-pdb-query",
"Queries the procedural database for its contents using regular expression matching.",
"This procedure queries the contents of the procedural database. It is supplied with seven arguments matching procedures on { name, blurb, help, author, copyright, date, procedure type}. This is accomplished using regular expression matching. For instance, to find all procedures with \"jpeg\" listed in the blurb, all seven arguments can be supplied as \".*\", except for the second, which can be supplied as \".*jpeg.*\". There are two return arguments for this procedure. The first is the number of procedures matching the query. The second is a concatenated list of procedure names corresponding to those matching the query. If no matching entries are found, then the returned string is NULL and the number of entries is 0.",
"This procedure queries the contents of the procedural database. It is supplied with seven arguments matching procedures on { name, blurb, help, authors, copyright, date, procedure type}. This is accomplished using regular expression matching. For instance, to find all procedures with \"jpeg\" listed in the blurb, all seven arguments can be supplied as \".*\", except for the second, which can be supplied as \".*jpeg.*\". There are two return arguments for this procedure. The first is the number of procedures matching the query. The second is a concatenated list of procedure names corresponding to those matching the query. If no matching entries are found, then the returned string is NULL and the number of entries is 0.",
"Spencer Kimball & Peter Mattis",
"Spencer Kimball & Peter Mattis",
"1995-1996",
@ -679,9 +679,9 @@ register_pdb_procs (GimpPDB *pdb)
NULL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_string ("author",
"author",
"The regex for procedure author",
gimp_param_spec_string ("authors",
"authors",
"The regex for procedure authors",
TRUE, FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));
@ -759,7 +759,7 @@ register_pdb_procs (GimpPDB *pdb)
gimp_procedure_set_static_strings (procedure,
"gimp-pdb-proc-info",
"Queries the procedural database for information on the specified procedure.",
"This procedure returns information on the specified procedure. A short blurb, detailed help, author(s), copyright information, procedure type, number of input, and number of return values are returned. For specific information on each input argument and return value, use the 'gimp-procedural-db-proc-arg' and 'gimp-procedural-db-proc-val' procedures.",
"This procedure returns information on the specified procedure. A short blurb, detailed help, authors, copyright information, procedure type, number of input, and number of return values are returned. For specific information on each input argument and return value, use the 'gimp-procedural-db-proc-arg' and 'gimp-procedural-db-proc-val' procedures.",
"Spencer Kimball & Peter Mattis",
"Spencer Kimball & Peter Mattis",
"1997",
@ -786,9 +786,9 @@ register_pdb_procs (GimpPDB *pdb)
NULL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_string ("author",
"author",
"Author(s) of the procedure",
gimp_param_spec_string ("authors",
"authors",
"Authors of the procedure",
FALSE, FALSE, FALSE,
NULL,
GIMP_PARAM_READWRITE));

30
libgimp/gimplegacy.c
View File

@ -126,7 +126,7 @@ gimp_main_legacy (const GimpPlugInInfo *info,
* @blurb: a short text describing what the procedure does.
* @help: the help text for the procedure (usually considerably
* longer than @blurb).
* @author: the procedure's author(s).
* @authors: the procedure's authors.
* @copyright: the procedure's copyright.
* @date: the date the procedure was added.
* @menu_label: the label to use for the procedure's menu entry,
@ -147,7 +147,7 @@ gimp_main_legacy (const GimpPlugInInfo *info,
* overwrite an already existing procedure (overwrite procedures only
* if you know what you're doing).
*
* The @blurb, @help, @author, @copyright and @date parameters are
* The @blurb, @help, @authors, @copyright and @date parameters are
* optional but then you shouldn't write procedures without proper
* documentation, should you.
*
@ -190,7 +190,7 @@ void
gimp_install_procedure (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *menu_label,
@ -218,7 +218,7 @@ gimp_install_procedure (const gchar *name,
proc_install.blurb = (gchar *) blurb;
proc_install.help = (gchar *) help;
proc_install.help_id = (gchar *) name;
proc_install.authors = (gchar *) author;
proc_install.authors = (gchar *) authors;
proc_install.copyright = (gchar *) copyright;
proc_install.date = (gchar *) date;
proc_install.menu_label = (gchar *) menu_label;
@ -269,7 +269,7 @@ gimp_install_procedure (const gchar *name,
* @blurb: a short text describing what the procedure does.
* @help: the help text for the procedure (usually considerably
* longer than @blurb).
* @author: the procedure's author(s).
* @authors: the procedure's authors.
* @copyright: the procedure's copyright.
* @date: the date the procedure was added.
* @menu_label: the procedure's menu label, or %NULL if the procedure has
@ -309,7 +309,7 @@ void
gimp_install_temp_proc (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *menu_label,
@ -333,7 +333,7 @@ gimp_install_temp_proc (const gchar *name,
gimp_install_procedure (name,
blurb, help,
author, copyright, date,
authors, copyright, date,
menu_label,
image_types,
type,
@ -1539,7 +1539,7 @@ gimp_pdb_dump (const gchar *filename)
* @name: The regex for procedure name.
* @blurb: The regex for procedure blurb.
* @help: The regex for procedure help.
* @author: The regex for procedure author.
* @authors: The regex for procedure authors.
* @copyright: The regex for procedure copyright.
* @date: The regex for procedure date.
* @proc_type: The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-in', 'GIMP Extension', 'Temporary Procedure' }.
@ -1551,7 +1551,7 @@ gimp_pdb_dump (const gchar *filename)
*
* This procedure queries the contents of the procedural database. It
* is supplied with seven arguments matching procedures on { name,
* blurb, help, author, copyright, date, procedure type}. This is
* blurb, help, authors, copyright, date, procedure type}. This is
* accomplished using regular expression matching. For instance, to
* find all procedures with \"jpeg\" listed in the blurb, all seven
* arguments can be supplied as \".*\", except for the second, which
@ -1568,7 +1568,7 @@ gboolean
gimp_pdb_query (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *proc_type,
@ -1579,7 +1579,7 @@ gimp_pdb_query (const gchar *name,
return _gimp_pdb_query (name,
blurb, help,
author, copyright, date,
authors, copyright, date,
proc_type,
num_matches, procedure_names);
}
@ -1610,7 +1610,7 @@ gimp_pdb_proc_exists (const gchar *procedure_name)
* @procedure_name: The procedure name.
* @blurb: A short blurb.
* @help: Detailed procedure help.
* @author: Author(s) of the procedure.
* @authors: Authors of the procedure.
* @copyright: The copyright.
* @date: Copyright date.
* @proc_type: The procedure type.
@ -1623,7 +1623,7 @@ gimp_pdb_proc_exists (const gchar *procedure_name)
* procedure.
*
* This procedure returns information on the specified procedure. A
* short blurb, detailed help, author(s), copyright information,
* short blurb, detailed help, authors, copyright information,
* procedure type, number of input, and number of return values are
* returned. Additionally this function returns specific information
* about each input argument and return value.
@ -1634,7 +1634,7 @@ gboolean
gimp_pdb_proc_info (const gchar *procedure_name,
gchar **blurb,
gchar **help,
gchar **author,
gchar **authors,
gchar **copyright,
gchar **date,
GimpPDBProcType *proc_type,
@ -1649,7 +1649,7 @@ gimp_pdb_proc_info (const gchar *procedure_name,
success = _gimp_pdb_proc_info (procedure_name,
blurb,
help,
author,
authors,
copyright,
date,
proc_type,

8
libgimp/gimplegacy.h
View File

@ -242,7 +242,7 @@ gint gimp_main_legacy (const GimpPlugInInfo *info,
void gimp_install_procedure (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *menu_label,
@ -258,7 +258,7 @@ void gimp_install_procedure (const gchar *name,
void gimp_install_temp_proc (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *menu_label,
@ -382,7 +382,7 @@ gboolean gimp_pdb_dump (const gchar *filename);
gboolean gimp_pdb_query (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *proc_type,
@ -392,7 +392,7 @@ gboolean gimp_pdb_proc_exists (const gchar *procedure_name);
gboolean gimp_pdb_proc_info (const gchar *procedure_name,
gchar **blurb,
gchar **help,
gchar **author,
gchar **authors,
gchar **copyright,
gchar **date,
GimpPDBProcType *proc_type,

18
libgimp/gimppdb_pdb.c
View File

@ -109,7 +109,7 @@ _gimp_pdb_dump (const gchar *filename)
* @name: The regex for procedure name.
* @blurb: The regex for procedure blurb.
* @help: The regex for procedure help.
* @author: The regex for procedure author.
* @authors: The regex for procedure authors.
* @copyright: The regex for procedure copyright.
* @date: The regex for procedure date.
* @proc_type: The regex for procedure type: { 'Internal GIMP procedure', 'GIMP Plug-in', 'GIMP Extension', 'Temporary Procedure' }.
@ -121,7 +121,7 @@ _gimp_pdb_dump (const gchar *filename)
*
* This procedure queries the contents of the procedural database. It
* is supplied with seven arguments matching procedures on { name,
* blurb, help, author, copyright, date, procedure type}. This is
* blurb, help, authors, copyright, date, procedure type}. This is
* accomplished using regular expression matching. For instance, to
* find all procedures with \"jpeg\" listed in the blurb, all seven
* arguments can be supplied as \".*\", except for the second, which
@ -138,7 +138,7 @@ gboolean
_gimp_pdb_query (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *proc_type,
@ -154,7 +154,7 @@ _gimp_pdb_query (const gchar *name,
G_TYPE_STRING, name,
G_TYPE_STRING, blurb,
G_TYPE_STRING, help,
G_TYPE_STRING, author,
G_TYPE_STRING, authors,
G_TYPE_STRING, copyright,
G_TYPE_STRING, date,
G_TYPE_STRING, proc_type,
@ -232,7 +232,7 @@ _gimp_pdb_proc_exists (const gchar *procedure_name)
* @procedure_name: The procedure name.
* @blurb: (out) (transfer full): A short blurb.
* @help: (out) (transfer full): Detailed procedure help.
* @author: (out) (transfer full): Author(s) of the procedure.
* @authors: (out) (transfer full): Authors of the procedure.
* @copyright: (out) (transfer full): The copyright.
* @date: (out) (transfer full): Copyright date.
* @proc_type: (out): The procedure type.
@ -243,7 +243,7 @@ _gimp_pdb_proc_exists (const gchar *procedure_name)
* procedure.
*
* This procedure returns information on the specified procedure. A
* short blurb, detailed help, author(s), copyright information,
* short blurb, detailed help, authors, copyright information,
* procedure type, number of input, and number of return values are
* returned. For specific information on each input argument and return
* value, use the gimp_procedural_db_proc_arg() and
@ -255,7 +255,7 @@ gboolean
_gimp_pdb_proc_info (const gchar *procedure_name,
gchar **blurb,
gchar **help,
gchar **author,
gchar **authors,
gchar **copyright,
gchar **date,
GimpPDBProcType *proc_type,
@ -282,7 +282,7 @@ _gimp_pdb_proc_info (const gchar *procedure_name,
*blurb = NULL;
*help = NULL;
*author = NULL;
*authors = NULL;
*copyright = NULL;
*date = NULL;
*proc_type = 0;
@ -295,7 +295,7 @@ _gimp_pdb_proc_info (const gchar *procedure_name,
{
*blurb = g_value_dup_string (gimp_value_array_index (return_vals, 1));
*help = g_value_dup_string (gimp_value_array_index (return_vals, 2));
*author = g_value_dup_string (gimp_value_array_index (return_vals, 3));
*authors = g_value_dup_string (gimp_value_array_index (return_vals, 3));
*copyright = g_value_dup_string (gimp_value_array_index (return_vals, 4));
*date = g_value_dup_string (gimp_value_array_index (return_vals, 5));
*proc_type = g_value_get_enum (gimp_value_array_index (return_vals, 6));

4
libgimp/gimppdb_pdb.h
View File

@ -37,7 +37,7 @@ G_GNUC_INTERNAL gboolean _gimp_pdb_dump (const gchar *file
G_GNUC_INTERNAL gboolean _gimp_pdb_query (const gchar *name,
const gchar *blurb,
const gchar *help,
const gchar *author,
const gchar *authors,
const gchar *copyright,
const gchar *date,
const gchar *proc_type,
@ -47,7 +47,7 @@ G_GNUC_INTERNAL gboolean _gimp_pdb_proc_exists (const gchar *proc
G_GNUC_INTERNAL gboolean _gimp_pdb_proc_info (const gchar *procedure_name,
gchar **blurb,
gchar **help,
gchar **author,
gchar **authors,
gchar **copyright,
gchar **date,
GimpPDBProcType *proc_type,

8
libgimp/gimpprocbrowserdialog.c
View File

@ -63,7 +63,7 @@ typedef enum
SEARCH_TYPE_NAME,
SEARCH_TYPE_BLURB,
SEARCH_TYPE_HELP,
SEARCH_TYPE_AUTHOR,
SEARCH_TYPE_AUTHORS,
SEARCH_TYPE_COPYRIGHT,
SEARCH_TYPE_DATE,
SEARCH_TYPE_PROC_TYPE
@ -164,7 +164,7 @@ gimp_proc_browser_dialog_init (GimpProcBrowserDialog *dialog)
_("by name"), SEARCH_TYPE_NAME,
_("by description"), SEARCH_TYPE_BLURB,
_("by help"), SEARCH_TYPE_HELP,
_("by author"), SEARCH_TYPE_AUTHOR,
_("by authors"), SEARCH_TYPE_AUTHORS,
_("by copyright"), SEARCH_TYPE_COPYRIGHT,
_("by date"), SEARCH_TYPE_DATE,
_("by type"), SEARCH_TYPE_PROC_TYPE,
@ -444,8 +444,8 @@ browser_search (GimpBrowser *browser,
&num_procs, &proc_list);
break;
case SEARCH_TYPE_AUTHOR:
gimp_browser_show_message (browser, _("Searching by author"));
case SEARCH_TYPE_AUTHORS:
gimp_browser_show_message (browser, _("Searching by authors"));
if (gimp_get_plug_in ())
proc_list = gimp_pdb_query_procedures (gimp_get_pdb (),

20
libgimp/gimpprocview.c
View File

@ -95,7 +95,7 @@ gimp_proc_view_new (const gchar *procedure_name,
GtkSizeGroup *desc_group;
gchar *blurb;
gchar *help;
gchar *author;
gchar *authors;
gchar *copyright;
gchar *date;
GimpPDBProcType type;
@ -111,7 +111,7 @@ gimp_proc_view_new (const gchar *procedure_name,
gimp_pdb_proc_info (procedure_name,
&blurb,
&help,
&author,
&authors,
&copyright,
&date,
&type,
@ -122,7 +122,7 @@ gimp_proc_view_new (const gchar *procedure_name,
if (blurb && strlen (blurb) < 2) g_clear_pointer (&blurb, g_free);
if (help && strlen (help) < 2) g_clear_pointer (&help, g_free);
if (author && strlen (author) < 2) g_clear_pointer (&author, g_free);
if (authors && strlen (authors) < 2) g_clear_pointer (&authors, g_free);
if (date && strlen (date) < 2) g_clear_pointer (&date, g_free);
if (copyright && strlen (copyright) < 2) g_clear_pointer (&copyright, g_free);
@ -259,7 +259,7 @@ gimp_proc_view_new (const gchar *procedure_name,
g_object_unref (type_group);
g_object_unref (desc_group);
if (! help && ! author && ! date && ! copyright)
if (! help && ! authors && ! date && ! copyright)
return main_vbox;
frame = gimp_frame_new (_("Additional Information"));
@ -281,9 +281,9 @@ gimp_proc_view_new (const gchar *procedure_name,
gtk_widget_show (label);
}
/* show the author & the copyright */
/* show the authors & the copyright */
if (! author && ! date && ! copyright)
if (! authors && ! date && ! copyright)
goto out;
grid = gtk_grid_new ();
@ -294,16 +294,16 @@ gimp_proc_view_new (const gchar *procedure_name,
row = 0;
if (author)
if (authors)
{
label = gtk_label_new (author);
label = gtk_label_new (authors);
gtk_label_set_selectable (GTK_LABEL (label), TRUE);
gtk_label_set_xalign (GTK_LABEL (label), 0.0);
gtk_label_set_yalign (GTK_LABEL (label), 0.0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gimp_grid_attach_aligned (GTK_GRID (grid), 0, row++,
_("Author:"), 0.0, 0.0,
_("Authors:"), 0.0, 0.0,
label, 3);
}
@ -337,7 +337,7 @@ gimp_proc_view_new (const gchar *procedure_name,
g_free (blurb);
g_free (help);
g_free (author);
g_free (authors);
g_free (copyright);
g_free (date);

16
pdb/groups/pdb.pdb
View File

@ -86,7 +86,7 @@ BLURB
$help = <<'HELP';
This procedure queries the contents of the procedural database. It is supplied
with seven arguments matching procedures on { name, blurb, help, author,
with seven arguments matching procedures on { name, blurb, help, authors,
copyright, date, procedure type}. This is accomplished using regular expression
matching. For instance, to find all procedures with "jpeg" listed in the blurb,
all seven arguments can be supplied as ".*", except for the second, which can
@ -108,8 +108,8 @@ HELP
desc => 'The regex for procedure blurb' },
{ name => 'help', type => 'string', allow_non_utf8 => 1,
desc => 'The regex for procedure help' },
{ name => 'author', type => 'string', allow_non_utf8 => 1,
desc => 'The regex for procedure author' },
{ name => 'authors', type => 'string', allow_non_utf8 => 1,
desc => 'The regex for procedure authors' },
{ name => 'copyright', type => 'string', allow_non_utf8 => 1,
desc => 'The regex for procedure copyright' },
{ name => 'date', type => 'string', allow_non_utf8 => 1,
@ -131,7 +131,7 @@ HELP
code => <<CODE
{
success = gimp_pdb_query (gimp->pdb,
name, blurb, help, author,
name, blurb, help, authors,
copyright, date, proc_type,
&num_matches, &procedure_names,
error);
@ -197,7 +197,7 @@ BLURB
$help = <<'HELP';
This procedure returns information on the specified procedure. A short
blurb, detailed help, author(s), copyright information, procedure
blurb, detailed help, authors, copyright information, procedure
type, number of input, and number of return values are returned. For
specific information on each input argument and return value, use the
gimp_procedural_db_proc_arg() and gimp_procedural_db_proc_val()
@ -219,8 +219,8 @@ HELP
desc => 'A short blurb' },
{ name => 'help', type => 'string',
desc => 'Detailed procedure help' },
{ name => 'author', type => 'string',
desc => 'Author(s) of the procedure' },
{ name => 'authors', type => 'string',
desc => 'Authors of the procedure' },
{ name => 'copyright', type => 'string',
desc => 'The copyright' },
{ name => 'date', type => 'string',
@ -242,7 +242,7 @@ HELP
canonical = gimp_canonicalize_identifier (procedure_name);
success = gimp_pdb_proc_info (gimp->pdb, canonical,
&blurb, &help, &author,
&blurb, &help, &authors,
&copyright, &date, &ptype,
&num_args, &num_values,
error);