Commit 0d5e9ed4 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

themes/Default/images/Makefile.am

2006-06-16  Sven Neumann  <neumann@jpk.com>

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-colormap-*.png
	* themes/Default/images/stock-indexed-palette-*.png: renamed
	stock-indexed-palette to stock-colormap.

	* libgimpwidgets/gimpstock.[ch]: deprecated
	GIMP_STOCK_INDEXED_PALETTE in favor of GIMP_STOCK_COLORMAP.

	* app/actions/actions.c
	* app/actions/colormap-editor-actions.c
	* app/actions/colormap-editor-commands.c
	* app/actions/context-actions.c
	* app/actions/dialogs-actions.c
	* app/dialogs/dialogs.c: use the new stock-id.
parent e46688bc
2006-06-16 Sven Neumann <neumann@jpk.com>
* themes/Default/images/Makefile.am
* themes/Default/images/stock-colormap-*.png
* themes/Default/images/stock-indexed-palette-*.png: renamed
stock-indexed-palette to stock-colormap.
* libgimpwidgets/gimpstock.[ch]: deprecated
GIMP_STOCK_INDEXED_PALETTE in favor of GIMP_STOCK_COLORMAP.
* app/actions/actions.c
* app/actions/colormap-editor-actions.c
* app/actions/colormap-editor-commands.c
* app/actions/context-actions.c
* app/actions/dialogs-actions.c
* app/dialogs/dialogs.c: use the new stock-id.
2006-06-16 Sven Neumann <neumann@jpk.com>
* app/pdb/gimppluginprocedure.c (gimp_plug_in_procedure_get_label):
......
......@@ -107,7 +107,7 @@ static GimpActionFactoryEntry action_groups[] =
{ "channels", N_("Channels"), GIMP_STOCK_CHANNEL,
channels_actions_setup,
channels_actions_update },
{ "colormap-editor", N_("Colormap Editor"), GIMP_STOCK_INDEXED_PALETTE,
{ "colormap-editor", N_("Colormap Editor"), GIMP_STOCK_COLORMAP,
colormap_editor_actions_setup,
colormap_editor_actions_update },
{ "context", N_("Context"), NULL,
......
......@@ -39,7 +39,7 @@
static const GimpActionEntry colormap_editor_actions[] =
{
{ "colormap-editor-popup", GIMP_STOCK_INDEXED_PALETTE,
{ "colormap-editor-popup", GIMP_STOCK_COLORMAP,
N_("Colormap Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
......
......@@ -74,7 +74,7 @@ colormap_editor_edit_color_cmd_callback (GtkAction *action,
editor->color_dialog =
gimp_color_dialog_new (GIMP_VIEWABLE (image),
_("Edit Colormap Entry"),
GIMP_STOCK_INDEXED_PALETTE,
GIMP_STOCK_COLORMAP,
desc,
GTK_WIDGET (editor),
gimp_dialog_factory_from_name ("toplevel"),
......
......@@ -39,7 +39,7 @@
static const GimpActionEntry colormap_editor_actions[] =
{
{ "colormap-editor-popup", GIMP_STOCK_INDEXED_PALETTE,
{ "colormap-editor-popup", GIMP_STOCK_COLORMAP,
N_("Colormap Menu"), NULL, NULL, NULL,
GIMP_HELP_INDEXED_PALETTE_DIALOG },
......
......@@ -74,7 +74,7 @@ colormap_editor_edit_color_cmd_callback (GtkAction *action,
editor->color_dialog =
gimp_color_dialog_new (GIMP_VIEWABLE (image),
_("Edit Colormap Entry"),
GIMP_STOCK_INDEXED_PALETTE,
GIMP_STOCK_COLORMAP,
desc,
GTK_WIDGET (editor),
gimp_dialog_factory_from_name ("toplevel"),
......
......@@ -140,31 +140,31 @@ static GimpEnumActionEntry context_palette_background_actions[] =
static GimpEnumActionEntry context_colormap_foreground_actions[] =
{
{ "context-colormap-foreground-set", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-set", GIMP_STOCK_COLORMAP,
"Foreground Colormap color Set", NULL, NULL,
GIMP_ACTION_SELECT_SET, FALSE,
NULL },
{ "context-colormap-foreground-first", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-first", GIMP_STOCK_COLORMAP,
"Foreground Colormap color First", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
{ "context-colormap-foreground-last", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-last", GIMP_STOCK_COLORMAP,
"Foreground Colormap color Last", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
{ "context-colormap-foreground-previous", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-previous", GIMP_STOCK_COLORMAP,
"Foreground Colormap color Previous", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
{ "context-colormap-foreground-next", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-next", GIMP_STOCK_COLORMAP,
"Foreground Colormap color Next", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
{ "context-colormap-foreground-previous-skip", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-previous-skip", GIMP_STOCK_COLORMAP,
"Foreground Colormap color Skip Back", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
{ "context-colormap-foreground-next-skip", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-foreground-next-skip", GIMP_STOCK_COLORMAP,
"Foreground Colormap color Skip Forward", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }
......@@ -172,31 +172,31 @@ static GimpEnumActionEntry context_colormap_foreground_actions[] =
static GimpEnumActionEntry context_colormap_background_actions[] =
{
{ "context-colormap-background-set", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-set", GIMP_STOCK_COLORMAP,
"Background Colormap color Set", NULL, NULL,
GIMP_ACTION_SELECT_SET, FALSE,
NULL },
{ "context-colormap-background-first", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-first", GIMP_STOCK_COLORMAP,
"Background Colormap color First", NULL, NULL,
GIMP_ACTION_SELECT_FIRST, FALSE,
NULL },
{ "context-colormap-background-last", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-last", GIMP_STOCK_COLORMAP,
"Background Colormap color Last", NULL, NULL,
GIMP_ACTION_SELECT_LAST, FALSE,
NULL },
{ "context-colormap-background-previous", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-previous", GIMP_STOCK_COLORMAP,
"Background Colormap color Previous", NULL, NULL,
GIMP_ACTION_SELECT_PREVIOUS, FALSE,
NULL },
{ "context-colormap-background-next", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-next", GIMP_STOCK_COLORMAP,
"Background Colormap color Next", NULL, NULL,
GIMP_ACTION_SELECT_NEXT, FALSE,
NULL },
{ "context-colormap-background-previous-skip", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-previous-skip", GIMP_STOCK_COLORMAP,
"Background Colormap color Skip Back", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_PREVIOUS, FALSE,
NULL },
{ "context-colormap-background-next-skip", GIMP_STOCK_INDEXED_PALETTE,
{ "context-colormap-background-next-skip", GIMP_STOCK_COLORMAP,
"Background Colormap color Skip ahead", NULL, NULL,
GIMP_ACTION_SELECT_SKIP_NEXT, FALSE,
NULL }
......
......@@ -86,7 +86,7 @@ const GimpStringActionEntry dialogs_dockable_actions[] =
"gimp-vectors-list",
GIMP_HELP_PATH_DIALOG },
{ "dialogs-indexed-palette", GIMP_STOCK_INDEXED_PALETTE,
{ "dialogs-indexed-palette", GIMP_STOCK_COLORMAP,
N_("Color_map"), NULL, N_("Colormap"),
"gimp-indexed-palette",
GIMP_HELP_INDEXED_PALETTE_DIALOG },
......
......@@ -176,7 +176,7 @@ static const GimpDialogFactoryEntry dock_entries[] =
GIMP_HELP_PATH_DIALOG,
dialogs_vectors_list_view_new, 0, FALSE),
DOCKABLE ("gimp-indexed-palette",
N_("Colormap"), NULL, GIMP_STOCK_INDEXED_PALETTE,
N_("Colormap"), NULL, GIMP_STOCK_COLORMAP,
GIMP_HELP_INDEXED_PALETTE_DIALOG,
dialogs_colormap_editor_new, 0, FALSE),
DOCKABLE ("gimp-histogram-editor",
......
......@@ -217,7 +217,8 @@ static const GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_LAYER_MASK, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_PATH, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TEMPLATE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_INDEXED_PALETTE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_COLORMAP, NULL, 0, 0, LIBGIMP_DOMAIN },
{ "gimp-indexed-palette", /* compat */ NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_HISTOGRAM, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_HISTOGRAM_LINEAR, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_HISTOGRAM_LOGARITHMIC, NULL, 0, 0, LIBGIMP_DOMAIN },
......@@ -390,7 +391,8 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_FLOATING_SELECTION, stock_floating_selection_24 },
{ GIMP_STOCK_PATH, stock_path_22 },
{ GIMP_STOCK_TEMPLATE, stock_template_24 },
{ GIMP_STOCK_INDEXED_PALETTE, stock_indexed_palette_24 },
{ GIMP_STOCK_COLORMAP, stock_colormap_24 },
{ "gimp-indexed-palette", /* compat */ stock_colormap_24 },
{ GIMP_STOCK_HISTOGRAM, stock_histogram_22 },
{ GIMP_STOCK_UNDO_HISTORY, stock_undo_history_24 },
{ GIMP_STOCK_TRANSPARENCY, stock_transparency_24 },
......@@ -499,7 +501,8 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_FLOATING_SELECTION, stock_floating_selection_16 },
{ GIMP_STOCK_PATH, stock_path_16 },
{ GIMP_STOCK_TEMPLATE, stock_template_16 },
{ GIMP_STOCK_INDEXED_PALETTE, stock_indexed_palette_16 },
{ GIMP_STOCK_COLORMAP, stock_colormap_16 },
{ "gimp-indexed-palette", /* compat */ stock_colormap_16 },
{ GIMP_STOCK_HISTOGRAM, stock_histogram_16 },
{ GIMP_STOCK_HISTOGRAM_LINEAR, stock_histogram_linear_16 },
{ GIMP_STOCK_HISTOGRAM_LOGARITHMIC, stock_histogram_logarithmic_16 },
......
......@@ -171,8 +171,12 @@ G_BEGIN_DECLS
#define GIMP_STOCK_LAYER_MASK "gimp-layer-mask"
#define GIMP_STOCK_PATH "gimp-path"
#define GIMP_STOCK_TEMPLATE "gimp-template"
#define GIMP_STOCK_INDEXED_PALETTE "gimp-indexed-palette"
#define GIMP_STOCK_TRANSPARENCY "gimp-transparency"
#define GIMP_STOCK_COLORMAP "gimp-colormap"
#ifndef GIMP_DISABLE_DEPRECATED
#define GIMP_STOCK_INDEXED_PALETTE "gimp-colormap"
#endif /* GIMP_DISABLE_DEPRECATED */
#define GIMP_STOCK_IMAGES "gimp-images"
#define GIMP_STOCK_LAYERS "gimp-layers"
......
......@@ -30,6 +30,7 @@ STOCK_MENU_IMAGES = \
stock-channel-red-16.png \
stock-channels-16.png \
stock-close-12.png \
stock-colormap-16.png \
stock-convert-grayscale-16.png \
stock-convert-indexed-16.png \
stock-convert-rgb-16.png \
......@@ -59,7 +60,6 @@ STOCK_MENU_IMAGES = \
stock-image-16.png \
stock-images-16.png \
stock-info-16.png \
stock-indexed-palette-16.png \
stock-invert-16.png \
stock-join-bevel-16.png \
stock-join-miter-16.png \
......@@ -129,6 +129,7 @@ STOCK_BUTTON_IMAGES = \
stock-color-picker-white-18.png \
stock-color-pick-from-screen-16.png \
stock-color-triangle-16.png \
stock-colormap-24.png \
stock-cursor-24.png \
stock-curve-free-16.png \
stock-curve-smooth-16.png \
......@@ -152,7 +153,6 @@ STOCK_BUTTON_IMAGES = \
stock-histogram-22.png \
stock-image-24.png \
stock-images-24.png \
stock-indexed-palette-24.png \
stock-info-24.png \
stock-layer-24.png \
stock-layer-mask-24.png \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment