Commit ef6c0e6b authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/gui/Makefile.am removed...

2002-03-16  Michael Natterer  <mitch@gimp.org>

	* app/gui/Makefile.am
	* app/gui/colormap-dialog.[ch]: removed...

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h
	* app/widgets/gimpcolormapeditor.[ch]: ...and added here.

	* app/gui/dialogs-constructors.c: changed accordingly.

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-menu-convert-grayscale.png
	* themes/Default/images/stock-menu-convert-indexed.png
	* themes/Default/images/stock-menu-convert-rgb.png
	* themes/Default/images/stock-menu-merge-down.png
	* themes/Default/images/stock-menu-reshow-filter.png
	* themes/Default/images/stock-menu-rotate-180.png
	* themes/Default/images/stock-menu-rotate-270.png
	* themes/Default/images/stock-menu-rotate-90.png
	* themes/Default/images/stock-menu-scale.png: new icons from Jimmac.

	* themes/Default/images/stock-menu-resize.png: my own doing. Someone
	needs to look at it :)

	* themes/Default/imagerc
	* libgimpwidgets/gimpstock.[ch]: added them.

	* app/gui/menus.c: use them.
parent c1214ea3
2002-03-16 Michael Natterer <mitch@gimp.org>
* app/gui/Makefile.am
* app/gui/colormap-dialog.[ch]: removed...
* app/widgets/Makefile.am
* app/widgets/widgets-types.h
* app/widgets/gimpcolormapeditor.[ch]: ...and added here.
* app/gui/dialogs-constructors.c: changed accordingly.
* themes/Default/images/Makefile.am
* themes/Default/images/stock-menu-convert-grayscale.png
* themes/Default/images/stock-menu-convert-indexed.png
* themes/Default/images/stock-menu-convert-rgb.png
* themes/Default/images/stock-menu-merge-down.png
* themes/Default/images/stock-menu-reshow-filter.png
* themes/Default/images/stock-menu-rotate-180.png
* themes/Default/images/stock-menu-rotate-270.png
* themes/Default/images/stock-menu-rotate-90.png
* themes/Default/images/stock-menu-scale.png: new icons from Jimmac.
* themes/Default/images/stock-menu-resize.png: my own doing. Someone
needs to look at it :)
* themes/Default/imagerc
* libgimpwidgets/gimpstock.[ch]: added them.
* app/gui/menus.c: use them.
2002-03-16 Michael Natterer <mitch@gimp.org>
 
* app/display/gimpdisplayshell-filter-dialog.c: treeviewized
......
......@@ -40,6 +40,7 @@
#include "widgets/gimpbrusheditor.h"
#include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h"
#include "widgets/gimpdataeditor.h"
......@@ -68,7 +69,6 @@
#include "brushes-commands.h"
#include "buffers-commands.h"
#include "channels-commands.h"
#include "colormap-dialog.h"
#include "device-status-dialog.h"
#include "dialogs.h"
#include "dialogs-constructors.h"
......@@ -94,7 +94,7 @@
/* local function prototypes */
static void dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable);
static GtkWidget * dialogs_brush_tab_func (GimpDockable *dockable,
......@@ -141,7 +141,7 @@ static void dialogs_path_view_image_changed (GimpContext *context,
GtkWidget *view);
static void dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage,
GimpColormapDialog *ipal);
GimpColormapEditor *editor);
/**********************/
......@@ -777,7 +777,7 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gimage = gimp_context_get_image (context);
view = gimp_colormap_dialog_new (gimage);
view = gimp_colormap_editor_new (gimage);
dockable = dialogs_dockable_new (view,
"Indexed Palette", "Colormap",
......@@ -903,12 +903,12 @@ dialogs_edit_palette_func (GimpData *data)
/* private functions */
static void
dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable)
{
GimpContext *context;
context = (GimpContext *) g_object_get_data (G_OBJECT (dialog),
context = (GimpContext *) g_object_get_data (G_OBJECT (editor),
"gimp-dialogs-context");
if (context)
......@@ -917,8 +917,8 @@ dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
GimpRGB color;
gint index;
gimage = gimp_colormap_dialog_get_image (dialog);
index = gimp_colormap_dialog_col_index (dialog);
gimage = gimp_colormap_editor_get_image (editor);
index = gimp_colormap_editor_col_index (editor);
gimp_rgba_set_uchar (&color,
gimage->cmap[index * 3],
......@@ -1212,9 +1212,9 @@ static void
dialogs_set_indexed_palette_context_func (GimpDockable *dockable,
GimpContext *context)
{
GimpColormapDialog *view;
GimpColormapEditor *view;
view = (GimpColormapDialog *) g_object_get_data (G_OBJECT (dockable),
view = (GimpColormapEditor *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view");
if (view)
......@@ -1283,7 +1283,7 @@ dialogs_path_view_image_changed (GimpContext *context,
static void
dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage,
GimpColormapDialog *ipal)
GimpColormapEditor *editor)
{
gimp_colormap_dialog_set_image (ipal, gimage);
gimp_colormap_editor_set_image (editor, gimage);
}
......@@ -18,8 +18,6 @@ libappgui_a_SOURCES = @STRIP_BEGIN@ \
color-notebook.h \
color-select.c \
color-select.h \
colormap-dialog.c \
colormap-dialog.h \
commands.c \
commands.h \
convert-dialog.c \
......
This diff is collapsed.
/* The GIMP -- an image manipulation program
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#ifndef __COLORMAP_DIALOG_H__
#define __COLORMAP_DIALOG_H__
#include <gtk/gtkvbox.h>
#define GIMP_TYPE_COLORMAP_DIALOG (gimp_colormap_dialog_get_type ())
#define GIMP_COLORMAP_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialog))
#define GIMP_COLORMAP_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass))
#define GIMP_IS_COLORMAP_DIALOG(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_COLORMAP_DIALOG))
#define GIMP_IS_COLORMAP_DIALOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_COLORMAP_DIALOG))
#define GIMP_COLORMAP_DIALOG_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_COLORMAP_DIALOG, GimpColormapDialogClass))
typedef struct _GimpColormapDialog GimpColormapDialog;
typedef struct _GimpColormapDialogClass GimpColormapDialogClass;
struct _GimpColormapDialog
{
GtkVBox parent_instance;
GimpImage *image;
gint col_index;
gint dnd_col_index;
GtkWidget *palette;
GtkWidget *image_menu;
GtkWidget *popup_menu;
GtkOptionMenu *option_menu;
gint xn;
gint yn;
gint cellsize;
GtkAdjustment *index_adjustment;
GtkWidget *index_spinbutton;
GtkWidget *color_entry;
GtkWidget *add_item;
ColorNotebook *color_notebook;
};
struct _GimpColormapDialogClass
{
GtkVBoxClass parent_class;
void (* selected) (GimpColormapDialog *gcd);
};
GType gimp_colormap_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_colormap_dialog_new (GimpImage *gimage);
void gimp_colormap_dialog_selected (GimpColormapDialog *gcd);
void gimp_colormap_dialog_set_image (GimpColormapDialog *gcd,
GimpImage *gimage);
GimpImage * gimp_colormap_dialog_get_image (GimpColormapDialog *gcd);
gint gimp_colormap_dialog_col_index (GimpColormapDialog *gcd);
#endif /* __COLORMAP_DIALOG_H__ */
......@@ -40,6 +40,7 @@
#include "widgets/gimpbrusheditor.h"
#include "widgets/gimpbrushfactoryview.h"
#include "widgets/gimpbufferview.h"
#include "widgets/gimpcolormapeditor.h"
#include "widgets/gimpcontainerlistview.h"
#include "widgets/gimpcontainergridview.h"
#include "widgets/gimpdataeditor.h"
......@@ -68,7 +69,6 @@
#include "brushes-commands.h"
#include "buffers-commands.h"
#include "channels-commands.h"
#include "colormap-dialog.h"
#include "device-status-dialog.h"
#include "dialogs.h"
#include "dialogs-constructors.h"
......@@ -94,7 +94,7 @@
/* local function prototypes */
static void dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
static void dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable);
static GtkWidget * dialogs_brush_tab_func (GimpDockable *dockable,
......@@ -141,7 +141,7 @@ static void dialogs_path_view_image_changed (GimpContext *context,
GtkWidget *view);
static void dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage,
GimpColormapDialog *ipal);
GimpColormapEditor *editor);
/**********************/
......@@ -777,7 +777,7 @@ dialogs_indexed_palette_new (GimpDialogFactory *factory,
gimage = gimp_context_get_image (context);
view = gimp_colormap_dialog_new (gimage);
view = gimp_colormap_editor_new (gimage);
dockable = dialogs_dockable_new (view,
"Indexed Palette", "Colormap",
......@@ -903,12 +903,12 @@ dialogs_edit_palette_func (GimpData *data)
/* private functions */
static void
dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
dialogs_indexed_palette_selected (GimpColormapEditor *editor,
GimpDockable *dockable)
{
GimpContext *context;
context = (GimpContext *) g_object_get_data (G_OBJECT (dialog),
context = (GimpContext *) g_object_get_data (G_OBJECT (editor),
"gimp-dialogs-context");
if (context)
......@@ -917,8 +917,8 @@ dialogs_indexed_palette_selected (GimpColormapDialog *dialog,
GimpRGB color;
gint index;
gimage = gimp_colormap_dialog_get_image (dialog);
index = gimp_colormap_dialog_col_index (dialog);
gimage = gimp_colormap_editor_get_image (editor);
index = gimp_colormap_editor_col_index (editor);
gimp_rgba_set_uchar (&color,
gimage->cmap[index * 3],
......@@ -1212,9 +1212,9 @@ static void
dialogs_set_indexed_palette_context_func (GimpDockable *dockable,
GimpContext *context)
{
GimpColormapDialog *view;
GimpColormapEditor *view;
view = (GimpColormapDialog *) g_object_get_data (G_OBJECT (dockable),
view = (GimpColormapEditor *) g_object_get_data (G_OBJECT (dockable),
"gimp-dialogs-view");
if (view)
......@@ -1283,7 +1283,7 @@ dialogs_path_view_image_changed (GimpContext *context,
static void
dialogs_indexed_palette_image_changed (GimpContext *context,
GimpImage *gimage,
GimpColormapDialog *ipal)
GimpColormapEditor *editor)
{
gimp_colormap_dialog_set_image (ipal, gimage);
gimp_colormap_editor_set_image (editor, gimage);
}
......@@ -596,17 +596,17 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Image/Mode/RGB"), "<alt>R",
image_convert_rgb_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
"<StockItem>", GIMP_STOCK_CONVERT_RGB },
NULL,
"image/mode/convert_to_rgb.html", NULL },
{ { N_("/Image/Mode/Grayscale"), "<alt>G",
image_convert_grayscale_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
"<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL,
"image/mode/convert_to_grayscale.html", NULL },
{ { N_("/Image/Mode/Indexed..."), "<alt>I",
image_convert_indexed_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
"<StockItem>", GIMP_STOCK_CONVERT_INDEXED },
NULL,
"image/mode/dialogs/convert_to_indexed.html", NULL },
......@@ -621,12 +621,13 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Image/---"),
{ { N_("/Image/Canvas Size..."), NULL,
image_resize_cmd_callback, 0 },
image_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"image/dialogs/set_canvas_size.html", NULL },
{ { N_("/Image/Scale Image..."), NULL,
image_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"image/dialogs/scale_image.html", NULL },
{ { N_("/Image/Crop Image"), NULL,
......@@ -709,7 +710,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/anchor_layer.html", NULL },
{ { N_("/Layer/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 },
layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL,
"layers/merge_visible_layers.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL,
......@@ -721,18 +723,20 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Layer/---"),
{ { N_("/Layer/Layer Boundary Size..."), NULL,
layers_resize_cmd_callback, 0 },
layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"layers/dialogs/layer_boundary_size.html", NULL },
{ { N_("/Layer/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"layers/layer_to_image_size.html", NULL },
{ { N_("/Layer/Scale Layer..."), NULL,
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"layers/dialogs/scale_layer.html", NULL },
{ { N_("/Layer/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 },
NULL,
"layers/layer_to_image_size.html", NULL },
/* <Image>/Layer/Transform */
......@@ -748,7 +752,8 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Layer/Colors */
{ { N_("/Layer/Colors/Desaturate"), NULL,
drawable_desaturate_cmd_callback, 0 },
drawable_desaturate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL,
"layers/colors/desaturate.html", NULL },
{ { N_("/Layer/Colors/Invert"), NULL,
......@@ -778,11 +783,13 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/apply_mask.html", NULL },
{ { N_("/Layer/Mask/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 },
layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"layers/delete_mask.html", NULL },
{ { N_("/Layer/Mask/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 },
layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"layers/mask_to_selection.html", NULL },
......@@ -793,7 +800,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/add_alpha_channel.html", NULL },
{ { N_("/Layer/Alpha/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 },
layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"layers/alpha_to_selection.html", NULL },
......@@ -900,7 +908,7 @@ static GimpItemFactoryEntry image_entries[] =
"filters/repeat_last.html", NULL },
{ { N_("/Filters/Re-Show Last"), "<alt><shift>F",
filters_repeat_cmd_callback, (guint) TRUE,
"<StockItem>", GTK_STOCK_EXECUTE },
"<StockItem>", GIMP_STOCK_RESHOW_FILTER },
NULL,
"filters/reshow_last.html", NULL },
......@@ -1003,7 +1011,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL,
"anchor_layer.html", NULL },
{ { N_("/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 },
layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL,
"merge_down.html", NULL },
{ { N_("/Delete Layer"), "<control>X",
......@@ -1015,18 +1024,20 @@ static GimpItemFactoryEntry layers_entries[] =
SEPARATOR ("/---"),
{ { N_("/Layer Boundary Size..."), "<control>R",
layers_resize_cmd_callback, 0 },
layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"dialogs/layer_boundary_size.html", NULL },
{ { N_("/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"layer_to_image_size.html", NULL },
{ { N_("/Scale Layer..."), "<control>S",
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"dialogs/scale_layer.html", NULL },
{ { N_("/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 },
NULL,
"layer_to_image_size.html", NULL },
SEPARATOR ("/---"),
......@@ -1039,11 +1050,13 @@ static GimpItemFactoryEntry layers_entries[] =
NULL,
"apply_mask.html", NULL },
{ { N_("/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 },
layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"delete_mask.html", NULL },
{ { N_("/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 },
layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"mask_to_selection.html", NULL },
......@@ -1054,7 +1067,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL,
"add_alpha_channel.html", NULL },
{ { N_("/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 },
layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"alpha_to_selection.html", NULL },
......
......@@ -596,17 +596,17 @@ static GimpItemFactoryEntry image_entries[] =
{ { N_("/Image/Mode/RGB"), "<alt>R",
image_convert_rgb_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
"<StockItem>", GIMP_STOCK_CONVERT_RGB },
NULL,
"image/mode/convert_to_rgb.html", NULL },
{ { N_("/Image/Mode/Grayscale"), "<alt>G",
image_convert_grayscale_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
"<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL,
"image/mode/convert_to_grayscale.html", NULL },
{ { N_("/Image/Mode/Indexed..."), "<alt>I",
image_convert_indexed_cmd_callback, 0,
"<StockItem>", GTK_STOCK_CONVERT },
"<StockItem>", GIMP_STOCK_CONVERT_INDEXED },
NULL,
"image/mode/dialogs/convert_to_indexed.html", NULL },
......@@ -621,12 +621,13 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Image/---"),
{ { N_("/Image/Canvas Size..."), NULL,
image_resize_cmd_callback, 0 },
image_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"image/dialogs/set_canvas_size.html", NULL },
{ { N_("/Image/Scale Image..."), NULL,
image_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"image/dialogs/scale_image.html", NULL },
{ { N_("/Image/Crop Image"), NULL,
......@@ -709,7 +710,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/anchor_layer.html", NULL },
{ { N_("/Layer/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 },
layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL,
"layers/merge_visible_layers.html", NULL },
{ { N_("/Layer/Delete Layer"), NULL,
......@@ -721,18 +723,20 @@ static GimpItemFactoryEntry image_entries[] =
SEPARATOR ("/Layer/---"),
{ { N_("/Layer/Layer Boundary Size..."), NULL,
layers_resize_cmd_callback, 0 },
layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"layers/dialogs/layer_boundary_size.html", NULL },
{ { N_("/Layer/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"layers/layer_to_image_size.html", NULL },
{ { N_("/Layer/Scale Layer..."), NULL,
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"layers/dialogs/scale_layer.html", NULL },
{ { N_("/Layer/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 },
NULL,
"layers/layer_to_image_size.html", NULL },
/* <Image>/Layer/Transform */
......@@ -748,7 +752,8 @@ static GimpItemFactoryEntry image_entries[] =
/* <Image>/Layer/Colors */
{ { N_("/Layer/Colors/Desaturate"), NULL,
drawable_desaturate_cmd_callback, 0 },
drawable_desaturate_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CONVERT_GRAYSCALE },
NULL,
"layers/colors/desaturate.html", NULL },
{ { N_("/Layer/Colors/Invert"), NULL,
......@@ -778,11 +783,13 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/apply_mask.html", NULL },
{ { N_("/Layer/Mask/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 },
layers_delete_layer_mask_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL,
"layers/delete_mask.html", NULL },
{ { N_("/Layer/Mask/Mask to Selection"), NULL,
layers_mask_select_cmd_callback, 0 },
layers_mask_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"layers/mask_to_selection.html", NULL },
......@@ -793,7 +800,8 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"layers/add_alpha_channel.html", NULL },
{ { N_("/Layer/Alpha/Alpha to Selection"), NULL,
layers_alpha_select_cmd_callback, 0 },
layers_alpha_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_REPLACE },
NULL,
"layers/alpha_to_selection.html", NULL },
......@@ -900,7 +908,7 @@ static GimpItemFactoryEntry image_entries[] =
"filters/repeat_last.html", NULL },
{ { N_("/Filters/Re-Show Last"), "<alt><shift>F",
filters_repeat_cmd_callback, (guint) TRUE,
"<StockItem>", GTK_STOCK_EXECUTE },
"<StockItem>", GIMP_STOCK_RESHOW_FILTER },
NULL,
"filters/reshow_last.html", NULL },
......@@ -1003,7 +1011,8 @@ static GimpItemFactoryEntry layers_entries[] =
NULL,
"anchor_layer.html", NULL },
{ { N_("/Merge Down"), "<control><shift>M",
layers_merge_down_cmd_callback, 0 },
layers_merge_down_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_MERGE_DOWN },
NULL,
"merge_down.html", NULL },
{ { N_("/Delete Layer"), "<control>X",
......@@ -1015,18 +1024,20 @@ static GimpItemFactoryEntry layers_entries[] =
SEPARATOR ("/---"),
{ { N_("/Layer Boundary Size..."), "<control>R",
layers_resize_cmd_callback, 0 },
layers_resize_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"dialogs/layer_boundary_size.html", NULL },
{ { N_("/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_RESIZE },
NULL,
"layer_to_image_size.html", NULL },
{ { N_("/Scale Layer..."), "<control>S",
layers_scale_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_SCALE },
"<StockItem>", GIMP_STOCK_SCALE },
NULL,
"dialogs/scale_layer.html", NULL },
{ { N_("/Layer to Imagesize"), NULL,
layers_resize_to_image_cmd_callback, 0 },
NULL,
"layer_to_image_size.html", NULL },
SEPARATOR ("/---"),
......@@ -1039,11 +1050,13 @@ static GimpItemFactoryEntry layers_entries[] =
NULL,
"apply_mask.html", NULL },
{ { N_("/Delete Layer Mask"), NULL,
layers_delete_layer_mask_cmd_callback, 0 },
layers_delete_layer_mask_cmd_callback, 0,