[gimp] libgimpbase, *: add enum value GIMP_ICON_TYPE_ICON_NAME
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] libgimpbase, *: add enum value GIMP_ICON_TYPE_ICON_NAME
- Date: Sun, 11 May 2014 21:59:29 +0000 (UTC)
commit de08267f06927e595ec8510134aa45562f21f840
Author: Michael Natterer <mitch gimp org>
Date: Sun May 11 23:56:30 2014 +0200
libgimpbase, *: add enum value GIMP_ICON_TYPE_ICON_NAME
and keep GIMP_ICON_TYPE_STOCK_ID as a deprecated alias. Change all
plug-ins accordingly and increase the pluginrc file version number so
it gets regenerated with "icon-name" instead of "stock-id".
app/pdb/plug-in-cmds.c | 2 +-
app/plug-in/gimppluginprocedure.c | 6 +++---
app/plug-in/plug-in-rc.c | 6 +++---
app/xcf/xcf.c | 4 ++--
libgimp/gimpplugin.c | 2 +-
libgimpbase/gimpbaseenums.c | 4 ++--
libgimpbase/gimpbaseenums.h | 8 ++++++--
plug-ins/common/animation-play.c | 4 ++--
plug-ins/common/colormap-remap.c | 2 +-
plug-ins/common/file-gbr.c | 4 ++--
plug-ins/common/file-gih.c | 4 ++--
plug-ins/common/file-pat.c | 4 ++--
plug-ins/common/plugin-browser.c | 2 +-
plug-ins/common/unit-editor.c | 2 +-
plug-ins/file-uri/uri.c | 4 ++--
plug-ins/print/print.c | 8 ++++----
tools/pdbgen/enums.pl | 4 ++--
17 files changed, 37 insertions(+), 33 deletions(-)
---
diff --git a/app/pdb/plug-in-cmds.c b/app/pdb/plug-in-cmds.c
index 6e785ac..0984670 100644
--- a/app/pdb/plug-in-cmds.c
+++ b/app/pdb/plug-in-cmds.c
@@ -645,7 +645,7 @@ register_plug_in_procs (GimpPDB *pdb)
"icon type",
"The type of the icon",
GIMP_TYPE_ICON_TYPE,
- GIMP_ICON_TYPE_STOCK_ID,
+ GIMP_ICON_TYPE_ICON_NAME,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
gimp_param_spec_int32 ("icon-data-length",
diff --git a/app/plug-in/gimppluginprocedure.c b/app/plug-in/gimppluginprocedure.c
index 45d386a..9efa5ea 100644
--- a/app/plug-in/gimppluginprocedure.c
+++ b/app/plug-in/gimppluginprocedure.c
@@ -165,7 +165,7 @@ gimp_plug_in_procedure_get_memsize (GimpObject *object,
switch (proc->icon_type)
{
- case GIMP_ICON_TYPE_STOCK_ID:
+ case GIMP_ICON_TYPE_ICON_NAME:
case GIMP_ICON_TYPE_IMAGE_FILE:
memsize += gimp_string_get_memsize ((const gchar *) proc->icon_data);
break;
@@ -604,7 +604,7 @@ gimp_plug_in_procedure_set_icon (GimpPlugInProcedure *proc,
switch (proc->icon_type)
{
- case GIMP_ICON_TYPE_STOCK_ID:
+ case GIMP_ICON_TYPE_ICON_NAME:
case GIMP_ICON_TYPE_IMAGE_FILE:
proc->icon_data_length = -1;
proc->icon_data = (guint8 *) g_strdup ((gchar *) icon_data);
@@ -624,7 +624,7 @@ gimp_plug_in_procedure_get_icon_name (const GimpPlugInProcedure *proc)
switch (proc->icon_type)
{
- case GIMP_ICON_TYPE_STOCK_ID:
+ case GIMP_ICON_TYPE_ICON_NAME:
return (gchar *) proc->icon_data;
default:
diff --git a/app/plug-in/plug-in-rc.c b/app/plug-in/plug-in-rc.c
index c6414eb..c436f13 100644
--- a/app/plug-in/plug-in-rc.c
+++ b/app/plug-in/plug-in-rc.c
@@ -39,7 +39,7 @@
#include "gimp-intl.h"
-#define PLUG_IN_RC_FILE_VERSION 2
+#define PLUG_IN_RC_FILE_VERSION 3
/*
@@ -535,7 +535,7 @@ plug_in_icon_deserialize (GScanner *scanner,
switch (icon_type)
{
- case GIMP_ICON_TYPE_STOCK_ID:
+ case GIMP_ICON_TYPE_ICON_NAME:
case GIMP_ICON_TYPE_IMAGE_FILE:
icon_data_length = -1;
@@ -880,7 +880,7 @@ plug_in_rc_write (GSList *plug_in_defs,
switch (proc->icon_type)
{
- case GIMP_ICON_TYPE_STOCK_ID:
+ case GIMP_ICON_TYPE_ICON_NAME:
case GIMP_ICON_TYPE_IMAGE_FILE:
gimp_config_writer_string (writer, (gchar *) proc->icon_data);
break;
diff --git a/app/xcf/xcf.c b/app/xcf/xcf.c
index 9f96f4e..7634e95 100644
--- a/app/xcf/xcf.c
+++ b/app/xcf/xcf.c
@@ -102,7 +102,7 @@ xcf_init (Gimp *gimp)
proc = GIMP_PLUG_IN_PROCEDURE (procedure);
proc->menu_label = g_strdup (N_("GIMP XCF image"));
- gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) "gimp-wilber",
strlen ("gimp-wilber") + 1);
gimp_plug_in_procedure_set_image_types (proc, "RGB*, GRAY*, INDEXED*");
@@ -173,7 +173,7 @@ xcf_init (Gimp *gimp)
proc = GIMP_PLUG_IN_PROCEDURE (procedure);
proc->menu_label = g_strdup (N_("GIMP XCF image"));
- gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plug_in_procedure_set_icon (proc, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) "gimp-wilber",
strlen ("gimp-wilber") + 1);
gimp_plug_in_procedure_set_image_types (proc, NULL);
diff --git a/libgimp/gimpplugin.c b/libgimp/gimpplugin.c
index 6bdd0aa..74c27d2 100644
--- a/libgimp/gimpplugin.c
+++ b/libgimp/gimpplugin.c
@@ -36,7 +36,7 @@ gimp_plugin_icon_register (const gchar *procedure_name,
switch (icon_type)
{
- case GIMP_ICON_TYPE_STOCK_ID:
+ case GIMP_ICON_TYPE_ICON_NAME:
case GIMP_ICON_TYPE_IMAGE_FILE:
icon_data_length = strlen ((const gchar *) icon_data) + 1;
break;
diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c
index 8e5b029..78d4e7c 100644
--- a/libgimpbase/gimpbaseenums.c
+++ b/libgimpbase/gimpbaseenums.c
@@ -497,7 +497,7 @@ gimp_icon_type_get_type (void)
{
static const GEnumValue values[] =
{
- { GIMP_ICON_TYPE_STOCK_ID, "GIMP_ICON_TYPE_STOCK_ID", "stock-id" },
+ { GIMP_ICON_TYPE_ICON_NAME, "GIMP_ICON_TYPE_ICON_NAME", "icon-name" },
{ GIMP_ICON_TYPE_INLINE_PIXBUF, "GIMP_ICON_TYPE_INLINE_PIXBUF", "inline-pixbuf" },
{ GIMP_ICON_TYPE_IMAGE_FILE, "GIMP_ICON_TYPE_IMAGE_FILE", "image-file" },
{ 0, NULL, NULL }
@@ -505,7 +505,7 @@ gimp_icon_type_get_type (void)
static const GimpEnumDesc descs[] =
{
- { GIMP_ICON_TYPE_STOCK_ID, NC_("icon-type", "Stock ID"), NULL },
+ { GIMP_ICON_TYPE_ICON_NAME, NC_("icon-type", "Icon name"), NULL },
{ GIMP_ICON_TYPE_INLINE_PIXBUF, NC_("icon-type", "Inline pixbuf"), NULL },
{ GIMP_ICON_TYPE_IMAGE_FILE, NC_("icon-type", "Image file"), NULL },
{ 0, NULL, NULL }
diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h
index c34d2de..586350f 100644
--- a/libgimpbase/gimpbaseenums.h
+++ b/libgimpbase/gimpbaseenums.h
@@ -258,9 +258,13 @@ GType gimp_icon_type_get_type (void) G_GNUC_CONST;
typedef enum
{
- GIMP_ICON_TYPE_STOCK_ID, /*< desc="Stock ID" >*/
+ GIMP_ICON_TYPE_ICON_NAME, /*< desc="Icon name" >*/
GIMP_ICON_TYPE_INLINE_PIXBUF, /*< desc="Inline pixbuf" >*/
- GIMP_ICON_TYPE_IMAGE_FILE /*< desc="Image file" >*/
+ GIMP_ICON_TYPE_IMAGE_FILE, /*< desc="Image file" >*/
+
+#ifndef GIMP_DISABLE_DEPRECATED
+ GIMP_ICON_TYPE_STOCK_ID = GIMP_ICON_TYPE_ICON_NAME /*< skip, pdb-skip >*/
+#endif
} GimpIconType;
diff --git a/plug-ins/common/animation-play.c b/plug-ins/common/animation-play.c
index e7925c8..8ddce9b 100644
--- a/plug-ins/common/animation-play.c
+++ b/plug-ins/common/animation-play.c
@@ -219,8 +219,8 @@ query (void)
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Filters/Animation");
- gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_STOCK_ID,
- (const guint8 *) GTK_STOCK_MEDIA_PLAY);
+ gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_ICON_NAME,
+ (const guint8 *) "media-playback-start");
}
static void
diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c
index b7de668..746e0d6 100644
--- a/plug-ins/common/colormap-remap.c
+++ b/plug-ins/common/colormap-remap.c
@@ -109,7 +109,7 @@ query (void)
gimp_plugin_menu_register (PLUG_IN_PROC_REMAP, "<Image>/Colors/Map/Colormap");
gimp_plugin_menu_register (PLUG_IN_PROC_REMAP, "<Colormap>");
- gimp_plugin_icon_register (PLUG_IN_PROC_REMAP, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (PLUG_IN_PROC_REMAP, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_COLORMAP);
gimp_install_procedure (PLUG_IN_PROC_SWAP,
diff --git a/plug-ins/common/file-gbr.c b/plug-ins/common/file-gbr.c
index 0c3f8aa..05662ea 100644
--- a/plug-ins/common/file-gbr.c
+++ b/plug-ins/common/file-gbr.c
@@ -135,7 +135,7 @@ query (void)
G_N_ELEMENTS (load_return_vals),
load_args, load_return_vals);
- gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_BRUSH);
gimp_register_file_handler_mime (LOAD_PROC, "image/x-gimp-gbr");
gimp_register_file_handler_uri (LOAD_PROC);
@@ -156,7 +156,7 @@ query (void)
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
- gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_BRUSH);
gimp_register_file_handler_mime (SAVE_PROC, "image/x-gimp-gbr");
gimp_register_file_handler_uri (SAVE_PROC);
diff --git a/plug-ins/common/file-gih.c b/plug-ins/common/file-gih.c
index b3840a8..bae1f00 100644
--- a/plug-ins/common/file-gih.c
+++ b/plug-ins/common/file-gih.c
@@ -194,7 +194,7 @@ query (void)
G_N_ELEMENTS (gih_load_return_vals),
gih_load_args, gih_load_return_vals);
- gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_BRUSH);
gimp_register_file_handler_mime (LOAD_PROC, "image/x-gimp-gih");
gimp_register_file_handler_uri (LOAD_PROC);
@@ -217,7 +217,7 @@ query (void)
G_N_ELEMENTS (gih_save_args), 0,
gih_save_args, NULL);
- gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_BRUSH);
gimp_register_file_handler_mime (SAVE_PROC, "image/x-gimp-gih");
gimp_register_file_handler_uri (SAVE_PROC);
diff --git a/plug-ins/common/file-pat.c b/plug-ins/common/file-pat.c
index ed95ad7..ec4666c 100644
--- a/plug-ins/common/file-pat.c
+++ b/plug-ins/common/file-pat.c
@@ -107,7 +107,7 @@ query (void)
G_N_ELEMENTS (load_return_vals),
load_args, load_return_vals);
- gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_PATTERN);
gimp_register_file_handler_mime (LOAD_PROC, "image/x-gimp-pat");
gimp_register_file_handler_uri (LOAD_PROC);
@@ -129,7 +129,7 @@ query (void)
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
- gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_PATTERN);
gimp_register_file_handler_mime (SAVE_PROC, "image/x-gimp-pat");
gimp_register_file_handler_uri (SAVE_PROC);
diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c
index 08ee2f9..80e6e9e 100644
--- a/plug-ins/common/plugin-browser.c
+++ b/plug-ins/common/plugin-browser.c
@@ -148,7 +148,7 @@ query (void)
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Help/Programming");
- gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_PLUGIN);
}
diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c
index a92563c..1ae786e 100644
--- a/plug-ins/common/unit-editor.c
+++ b/plug-ins/common/unit-editor.c
@@ -154,7 +154,7 @@ query (void)
args, NULL);
gimp_plugin_menu_register (PLUG_IN_PROC, "<Image>/Edit/Preferences");
- gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (PLUG_IN_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_TOOL_MEASURE);
}
diff --git a/plug-ins/file-uri/uri.c b/plug-ins/file-uri/uri.c
index 049a30f..8e56bbd 100644
--- a/plug-ins/file-uri/uri.c
+++ b/plug-ins/file-uri/uri.c
@@ -126,7 +126,7 @@ query (void)
G_N_ELEMENTS (load_return_vals),
load_args, load_return_vals);
- gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (LOAD_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_WEB);
gimp_register_load_handler (LOAD_PROC,
"", uri_backend_get_load_protocols ());
@@ -146,7 +146,7 @@ query (void)
G_N_ELEMENTS (save_args), 0,
save_args, NULL);
- gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_STOCK_ID,
+ gimp_plugin_icon_register (SAVE_PROC, GIMP_ICON_TYPE_ICON_NAME,
(const guint8 *) GIMP_STOCK_WEB);
gimp_register_save_handler (SAVE_PROC,
"", uri_backend_get_save_protocols ());
diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c
index 07e7c2b..2eabc3b 100644
--- a/plug-ins/print/print.c
+++ b/plug-ins/print/print.c
@@ -117,8 +117,8 @@ query (void)
print_args, NULL);
gimp_plugin_menu_register (PRINT_PROC_NAME, "<Image>/File/Send");
- gimp_plugin_icon_register (PRINT_PROC_NAME, GIMP_ICON_TYPE_STOCK_ID,
- (const guint8 *) GTK_STOCK_PRINT);
+ gimp_plugin_icon_register (PRINT_PROC_NAME, GIMP_ICON_TYPE_ICON_NAME,
+ (const guint8 *) "document-print");
#ifndef EMBED_PAGE_SETUP
gimp_install_procedure (PAGE_SETUP_PROC_NAME,
@@ -135,8 +135,8 @@ query (void)
print_args, NULL);
gimp_plugin_menu_register (PAGE_SETUP_PROC_NAME, "<Image>/File/Send");
- gimp_plugin_icon_register (PAGE_SETUP_PROC_NAME, GIMP_ICON_TYPE_STOCK_ID,
- (const guint8 *) GTK_STOCK_PAGE_SETUP);
+ gimp_plugin_icon_register (PAGE_SETUP_PROC_NAME, GIMP_ICON_TYPE_ICON_NAME,
+ (const guint8 *) "document-page-setup");
#endif
}
diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl
index 13d4099..3b470f9 100644
--- a/tools/pdbgen/enums.pl
+++ b/tools/pdbgen/enums.pl
@@ -154,10 +154,10 @@ package Gimp::CodeGen::enums;
GimpIconType =>
{ contig => 1,
header => 'libgimpbase/gimpbaseenums.h',
- symbols => [ qw(GIMP_ICON_TYPE_STOCK_ID
+ symbols => [ qw(GIMP_ICON_TYPE_ICON_NAME
GIMP_ICON_TYPE_INLINE_PIXBUF
GIMP_ICON_TYPE_IMAGE_FILE) ],
- mapping => { GIMP_ICON_TYPE_STOCK_ID => '0',
+ mapping => { GIMP_ICON_TYPE_ICON_NAME => '0',
GIMP_ICON_TYPE_INLINE_PIXBUF => '1',
GIMP_ICON_TYPE_IMAGE_FILE => '2' }
},
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]