diff --git a/ChangeLog b/ChangeLog index 7253b650a5..9fa7b38faf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2002-06-16 Michael Natterer + + * libgimpwidgets/gimpstock.[ch]: register the new "invert" and + "layer to imagesize" PNGs as stock icons. + + * app/gui/menus.c: use them here. + + * themes/Default/images/Makefile.am: fixed indentation. + 2002-06-16 Sven Neumann * app/gui/menus.c: use the new paste icons in the menu. diff --git a/app/gui/menus.c b/app/gui/menus.c index d046a84798..9d3cdd52f5 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -438,7 +438,8 @@ static GimpItemFactoryEntry image_entries[] = /* /Select */ { { N_("/Select/Invert"), "I", - select_invert_cmd_callback, 0 }, + select_invert_cmd_callback, 0, + "", GIMP_STOCK_INVERT }, NULL, "select/invert.html", NULL }, { { N_("/Select/All"), "A", @@ -752,7 +753,7 @@ static GimpItemFactoryEntry image_entries[] = "layers/dialogs/layer_boundary_size.html", NULL }, { { N_("/Layer/Layer to Imagesize"), NULL, layers_resize_to_image_cmd_callback, 0, - "", GIMP_STOCK_RESIZE }, + "", GIMP_STOCK_LAYER_TO_IMAGESIZE }, NULL, "layers/layer_to_image_size.html", NULL }, { { N_("/Layer/Scale Layer..."), NULL, @@ -787,7 +788,8 @@ static GimpItemFactoryEntry image_entries[] = NULL, "layers/colors/desaturate.html", NULL }, { { N_("/Layer/Colors/Invert"), NULL, - drawable_invert_cmd_callback, 0 }, + drawable_invert_cmd_callback, 0, + "", GIMP_STOCK_INVERT }, NULL, "layers/colors/invert.html", NULL }, @@ -1074,7 +1076,7 @@ static GimpItemFactoryEntry layers_entries[] = "dialogs/layer_boundary_size.html", NULL }, { { N_("/Layer to Imagesize"), NULL, layers_resize_to_image_cmd_callback, 0, - "", GIMP_STOCK_RESIZE }, + "", GIMP_STOCK_LAYER_TO_IMAGESIZE }, NULL, "layer_to_image_size.html", NULL }, { { N_("/Scale Layer..."), "S", diff --git a/app/menus/menus.c b/app/menus/menus.c index d046a84798..9d3cdd52f5 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -438,7 +438,8 @@ static GimpItemFactoryEntry image_entries[] = /* /Select */ { { N_("/Select/Invert"), "I", - select_invert_cmd_callback, 0 }, + select_invert_cmd_callback, 0, + "", GIMP_STOCK_INVERT }, NULL, "select/invert.html", NULL }, { { N_("/Select/All"), "A", @@ -752,7 +753,7 @@ static GimpItemFactoryEntry image_entries[] = "layers/dialogs/layer_boundary_size.html", NULL }, { { N_("/Layer/Layer to Imagesize"), NULL, layers_resize_to_image_cmd_callback, 0, - "", GIMP_STOCK_RESIZE }, + "", GIMP_STOCK_LAYER_TO_IMAGESIZE }, NULL, "layers/layer_to_image_size.html", NULL }, { { N_("/Layer/Scale Layer..."), NULL, @@ -787,7 +788,8 @@ static GimpItemFactoryEntry image_entries[] = NULL, "layers/colors/desaturate.html", NULL }, { { N_("/Layer/Colors/Invert"), NULL, - drawable_invert_cmd_callback, 0 }, + drawable_invert_cmd_callback, 0, + "", GIMP_STOCK_INVERT }, NULL, "layers/colors/invert.html", NULL }, @@ -1074,7 +1076,7 @@ static GimpItemFactoryEntry layers_entries[] = "dialogs/layer_boundary_size.html", NULL }, { { N_("/Layer to Imagesize"), NULL, layers_resize_to_image_cmd_callback, 0, - "", GIMP_STOCK_RESIZE }, + "", GIMP_STOCK_LAYER_TO_IMAGESIZE }, NULL, "layer_to_image_size.html", NULL }, { { N_("/Scale Layer..."), "S", diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index d8dfc700a8..003768afab 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -112,7 +112,10 @@ static GtkStockItem gimp_stock_items[] = { GIMP_STOCK_CONVERT_RGB, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_CONVERT_GRAYSCALE, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_CONVERT_INDEXED, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_INVERT, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_MERGE_DOWN, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_LAYER_TO_IMAGESIZE, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_PLUGIN, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_RESHOW_FILTER, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_ROTATE_90, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_ROTATE_180, NULL, 0, 0, "gimp-libgimp" }, @@ -253,7 +256,10 @@ gimp_stock_menu_pixbufs[] = { GIMP_STOCK_CONVERT_RGB, stock_convert_rgb_16 }, { GIMP_STOCK_CONVERT_GRAYSCALE, stock_convert_grayscale_16 }, { GIMP_STOCK_CONVERT_INDEXED, stock_convert_indexed_16 }, + { GIMP_STOCK_INVERT, stock_invert_16 }, { GIMP_STOCK_MERGE_DOWN, stock_merge_down_16 }, + { GIMP_STOCK_LAYER_TO_IMAGESIZE, stock_layer_to_imagesize_16 }, + { GIMP_STOCK_PLUGIN, stock_plugin_16 }, { GIMP_STOCK_RESHOW_FILTER, stock_reshow_filter_16 }, { GIMP_STOCK_ROTATE_90, stock_rotate_90_16 }, { GIMP_STOCK_ROTATE_180, stock_rotate_180_16 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index ea594e28d0..1877c25006 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -59,7 +59,10 @@ G_BEGIN_DECLS #define GIMP_STOCK_CONVERT_RGB "gimp-convert-rgb" #define GIMP_STOCK_CONVERT_GRAYSCALE "gimp-convert-grayscale" #define GIMP_STOCK_CONVERT_INDEXED "gimp-convert-indexed" +#define GIMP_STOCK_INVERT "gimp-invert" #define GIMP_STOCK_MERGE_DOWN "gimp-merge-down" +#define GIMP_STOCK_LAYER_TO_IMAGESIZE "gimp-layer-to-imagesize" +#define GIMP_STOCK_PLUGIN "gimp-plugin" #define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter" #define GIMP_STOCK_ROTATE_90 "gimp-rotate-90" #define GIMP_STOCK_ROTATE_180 "gimp-rotate-180" diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index ec014fac29..23d8fa2259 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -66,9 +66,9 @@ STOCK_MENU_IMAGES = \ stock-convert-grayscale-16.png \ stock-convert-indexed-16.png \ stock-convert-rgb-16.png \ - stock-invert-16.png \ - stock-layer-to-imagesize-16.png \ + stock-invert-16.png \ stock-merge-down-16.png \ + stock-layer-to-imagesize-16.png \ stock-plugin-16.png \ stock-reshow-filter-16.png \ stock-rotate-180-16.png \