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

themes/Default/images/Makefile.am 

2004-01-27  Michael Natterer  <mitch@gimp.org>

	* themes/Default/images/Makefile.am
	* themes/Default/images/stock-layer-mask-16.png
	* themes/Default/images/stock-layer-mask-24.png
	* themes/Default/images/stock-layer-mask-32.png
	* themes/Default/images/stock-layer-mask-48.png
	* themes/Default/images/stock-selection-border-16.png
	* libgimpwidgets/gimpstock.[ch]: added forgotten layer mask and
	new "border selection" icons from Jimmac (-32 and -48 ones to be
	updated, they are currently copies of the channel icons).

	* app/core/gimplayermask.c (gimp_layer_mask_class_init)
	* app/gui/image-menu.c (image_menu_entries): use them.
This commit is contained in:
Michael Natterer 2004-01-27 02:51:19 +00:00 committed by Michael Natterer
parent e753735a3a
commit d0c75eb537
12 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2004-01-27 Michael Natterer <mitch@gimp.org>
* themes/Default/images/Makefile.am
* themes/Default/images/stock-layer-mask-16.png
* themes/Default/images/stock-layer-mask-24.png
* themes/Default/images/stock-layer-mask-32.png
* themes/Default/images/stock-layer-mask-48.png
* themes/Default/images/stock-selection-border-16.png
* libgimpwidgets/gimpstock.[ch]: added forgotten layer mask and
new "border selection" icons from Jimmac (-32 and -48 ones to be
updated, they are currently copies of the channel icons).
* app/core/gimplayermask.c (gimp_layer_mask_class_init)
* app/gui/image-menu.c (image_menu_entries): use them.
2004-01-27 Sven Neumann <sven@gimp.org>
* plug-ins/gimpressionist/brush.c

8
app/core/gimplayermask.c
View File

@ -89,9 +89,11 @@ gimp_layer_mask_get_type (void)
static void
gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
{
GimpItemClass *item_class;
GimpItemClass *item_class;
GimpViewableClass *viewable_class;
item_class = GIMP_ITEM_CLASS (klass);
item_class = GIMP_ITEM_CLASS (klass);
viewable_class = GIMP_VIEWABLE_CLASS (klass);
parent_class = g_type_class_peek_parent (klass);
@ -122,6 +124,8 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
gimp_marshal_VOID__VOID,
G_TYPE_NONE, 0);
viewable_class->default_stock_id = "gimp-layer-mask";
item_class->is_attached = gimp_layer_mask_is_attached;
item_class->duplicate = gimp_layer_mask_duplicate;
}

3
app/gui/image-menu.c
View File

@ -308,7 +308,8 @@ GimpItemFactoryEntry image_menu_entries[] =
NULL,
GIMP_HELP_SELECTION_GROW, NULL },
{ { N_("/Select/Bo_rder..."), NULL,
select_border_cmd_callback, 0 },
select_border_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_BORDER },
NULL,
GIMP_HELP_SELECTION_BORDER, NULL },

3
app/menus/image-menu.c
View File

@ -308,7 +308,8 @@ GimpItemFactoryEntry image_menu_entries[] =
NULL,
GIMP_HELP_SELECTION_GROW, NULL },
{ { N_("/Select/Bo_rder..."), NULL,
select_border_cmd_callback, 0 },
select_border_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SELECTION_BORDER },
NULL,
GIMP_HELP_SELECTION_BORDER, NULL },

7
libgimpwidgets/gimpstock.c
View File

@ -204,6 +204,7 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_CHANNEL_BLUE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNEL_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNEL_ALPHA, NULL, 0, 0, LIBGIMP_DOMAIN },
{ 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 },
@ -217,6 +218,7 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_SELECTION_NONE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_SELECTION_GROW, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_SELECTION_SHRINK, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_SELECTION_BORDER, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_NAVIGATION, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TEXTURE, NULL, 0, 0, LIBGIMP_DOMAIN },
@ -352,6 +354,7 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_CHANNEL_BLUE, stock_channel_blue_24 },
{ GIMP_STOCK_CHANNEL_GRAY, stock_channel_gray_24 },
{ GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_24 },
{ GIMP_STOCK_LAYER_MASK, stock_layer_mask_24 },
{ GIMP_STOCK_IMAGE, stock_image_24 },
{ GIMP_STOCK_LAYER, stock_layer_24 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_24 },
@ -450,6 +453,7 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_CHANNEL_BLUE, stock_channel_blue_16 },
{ GIMP_STOCK_CHANNEL_GRAY, stock_channel_gray_16 },
{ GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_16 },
{ GIMP_STOCK_LAYER_MASK, stock_layer_mask_16 },
{ GIMP_STOCK_IMAGE, stock_image_16 },
{ GIMP_STOCK_LAYER, stock_layer_16 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_16 },
@ -470,6 +474,7 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_SELECTION_NONE, stock_selection_none_16 },
{ GIMP_STOCK_SELECTION_GROW, stock_selection_grow_16 },
{ GIMP_STOCK_SELECTION_SHRINK, stock_selection_shrink_16 },
{ GIMP_STOCK_SELECTION_BORDER, stock_selection_border_16 },
{ GIMP_STOCK_NAVIGATION, stock_navigation_16 },
{ GIMP_STOCK_QMASK_OFF, stock_qmask_off_16 },
@ -564,6 +569,7 @@ gimp_stock_dnd_pixbufs[] =
{ GIMP_STOCK_CHANNEL_BLUE, stock_channel_blue_32 },
{ GIMP_STOCK_CHANNEL_GRAY, stock_channel_gray_32 },
{ GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_32 },
{ GIMP_STOCK_LAYER_MASK, stock_layer_mask_32 },
{ GIMP_STOCK_IMAGE, stock_image_32 },
{ GIMP_STOCK_LAYER, stock_layer_32 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_32 },
@ -583,6 +589,7 @@ gimp_stock_dialog_pixbufs[] =
{ GIMP_STOCK_CHANNEL_BLUE, stock_channel_blue_48 },
{ GIMP_STOCK_CHANNEL_GRAY, stock_channel_gray_48 },
{ GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_48 },
{ GIMP_STOCK_LAYER_MASK, stock_layer_mask_48 },
{ GIMP_STOCK_IMAGE, stock_image_48 },
{ GIMP_STOCK_LAYER, stock_layer_48 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_48 },

2
libgimpwidgets/gimpstock.h
View File

@ -159,6 +159,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_CHANNEL_BLUE "gimp-channel-blue"
#define GIMP_STOCK_CHANNEL_GRAY "gimp-channel-gray"
#define GIMP_STOCK_CHANNEL_ALPHA "gimp-channel-alpha"
#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"
@ -173,6 +174,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_SELECTION_NONE "gimp-selection-none"
#define GIMP_STOCK_SELECTION_GROW "gimp-selection-grow"
#define GIMP_STOCK_SELECTION_SHRINK "gimp-selection-shrink"
#define GIMP_STOCK_SELECTION_BORDER "gimp-selection-border"
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"

5
themes/Default/images/Makefile.am
View File

@ -68,6 +68,7 @@ STOCK_MENU_IMAGES = \
stock-join-round-16.png \
stock-landscape-16.png \
stock-layer-16.png \
stock-layer-mask-16.png \
stock-layer-to-imagesize-16.png \
stock-layers-16.png \
stock-list-16.png \
@ -93,6 +94,7 @@ STOCK_MENU_IMAGES = \
stock-selection-grow-16.png \
stock-selection-none-16.png \
stock-selection-shrink-16.png \
stock-selection-border-16.png \
stock-swap-colors-12.png \
stock-template-16.png \
stock-text-layer-16.png \
@ -143,6 +145,7 @@ STOCK_BUTTON_IMAGES = \
stock-indexed-palette-24.png \
stock-info-24.png \
stock-layer-24.png \
stock-layer-mask-24.png \
stock-layers-24.png \
stock-letter-spacing-22.png \
stock-line-spacing-22.png \
@ -187,6 +190,7 @@ STOCK_DND_IMAGES = \
stock-floating-selection-32.png \
stock-image-32.png \
stock-layer-32.png \
stock-layer-mask-32.png \
stock-text-layer-32.png
STOCK_DIALOG_IMAGES = \
@ -201,6 +205,7 @@ STOCK_DIALOG_IMAGES = \
stock-image-48.png \
stock-info-64.png \
stock-layer-48.png \
stock-layer-mask-48.png \
stock-question-64.png \
stock-text-layer-48.png \
stock-texture-64.png \

BIN
themes/Default/images/stock-layer-mask-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 587 B

BIN
themes/Default/images/stock-layer-mask-24.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 911 B

BIN
themes/Default/images/stock-layer-mask-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 977 B

BIN
themes/Default/images/stock-layer-mask-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

BIN
themes/Default/images/stock-selection-border-16.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 372 B