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

More great icons from Jimmac: 

2003-03-27  Michael Natterer  <mitch@gimp.org>

	More great icons from Jimmac:

	* themes/Default/images/stock-channel-16.png
	* themes/Default/images/stock-channel-24.png
	* themes/Default/images/stock-channel-blue-16.png
	* themes/Default/images/stock-channel-blue-24.png
	* themes/Default/images/stock-channel-gray-16.png
	* themes/Default/images/stock-channel-gray-24.png
	* themes/Default/images/stock-channel-green-16.png
	* themes/Default/images/stock-channel-green-24.png
	* themes/Default/images/stock-channel-red-16.png
	* themes/Default/images/stock-channel-red-24.png: updated.

	* themes/Default/images/stock-channel-32.png
	* themes/Default/images/stock-channel-48.png
	* themes/Default/images/stock-channel-blue-32.png
	* themes/Default/images/stock-channel-blue-48.png
	* themes/Default/images/stock-channel-gray-32.png
	* themes/Default/images/stock-channel-gray-48.png
	* themes/Default/images/stock-channel-green-32.png
	* themes/Default/images/stock-channel-green-48.png
	* themes/Default/images/stock-channel-red-32.png
	* themes/Default/images/stock-channel-red-48.png
	* themes/Default/images/stock-grid-16.png
	* themes/Default/images/stock-image-32.png
	* themes/Default/images/stock-image-48.png
	* themes/Default/images/stock-layer-32.png
	* themes/Default/images/stock-layer-48.png
	* themes/Default/images/stock-list-16.png
	* themes/Default/images/stock-text-layer-16.png
	* themes/Default/images/stock-text-layer-24.png
	* themes/Default/images/stock-text-layer-32.png
	* themes/Default/images/stock-text-layer-48.png: new ones.

	* themes/Default/images/Makefile.am
	* libgimpwidgets/gimpstock.[ch]: added them to the stock system.

	* app/text/gimptextlayer.c: use GIMP_STOCK_TEXT_LAYER.
This commit is contained in:
Michael Natterer 2003-03-27 12:29:54 +00:00 committed by Michael Natterer
parent ce80c4c0b8
commit e2bdd74617
35 changed files with 118 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
ChangeLog
View File

@ -1,3 +1,44 @@
2003-03-27 Michael Natterer <mitch@gimp.org>
More great icons from Jimmac:
* themes/Default/images/stock-channel-16.png
* themes/Default/images/stock-channel-24.png
* themes/Default/images/stock-channel-blue-16.png
* themes/Default/images/stock-channel-blue-24.png
* themes/Default/images/stock-channel-gray-16.png
* themes/Default/images/stock-channel-gray-24.png
* themes/Default/images/stock-channel-green-16.png
* themes/Default/images/stock-channel-green-24.png
* themes/Default/images/stock-channel-red-16.png
* themes/Default/images/stock-channel-red-24.png: updated.
* themes/Default/images/stock-channel-32.png
* themes/Default/images/stock-channel-48.png
* themes/Default/images/stock-channel-blue-32.png
* themes/Default/images/stock-channel-blue-48.png
* themes/Default/images/stock-channel-gray-32.png
* themes/Default/images/stock-channel-gray-48.png
* themes/Default/images/stock-channel-green-32.png
* themes/Default/images/stock-channel-green-48.png
* themes/Default/images/stock-channel-red-32.png
* themes/Default/images/stock-channel-red-48.png
* themes/Default/images/stock-grid-16.png
* themes/Default/images/stock-image-32.png
* themes/Default/images/stock-image-48.png
* themes/Default/images/stock-layer-32.png
* themes/Default/images/stock-layer-48.png
* themes/Default/images/stock-list-16.png
* themes/Default/images/stock-text-layer-16.png
* themes/Default/images/stock-text-layer-24.png
* themes/Default/images/stock-text-layer-32.png
* themes/Default/images/stock-text-layer-48.png: new ones.
* themes/Default/images/Makefile.am
* libgimpwidgets/gimpstock.[ch]: added them to the stock system.
* app/text/gimptextlayer.c: use GIMP_STOCK_TEXT_LAYER.
2003-03-27 Sven Neumann <sven@gimp.org>
* app/core/gimpmarshal.list: added a new marshaller.

2
app/text/gimptextlayer.c
View File

@ -110,7 +110,7 @@ gimp_text_layer_class_init (GimpTextLayerClass *klass)
gimp_object_class->get_memsize = gimp_text_layer_get_memsize;
viewable_class->default_stock_id = "gimp-tool-text";
viewable_class->default_stock_id = "gimp-text-layer";
viewable_class->get_preview = gimp_text_layer_get_preview;
item_class->duplicate = gimp_text_layer_duplicate;

53
libgimpwidgets/gimpstock.c
View File

@ -165,6 +165,7 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_IMAGE, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_LAYER, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TEXT_LAYER, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNEL, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNEL_RED, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNEL_GREEN, NULL, 0, 0, LIBGIMP_DOMAIN },
@ -181,6 +182,9 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_QMASK_OFF, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_QMASK_ON, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_LIST, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_GRID, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_ERROR, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_INFO, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_QUESTION, NULL, 0, 0, LIBGIMP_DOMAIN },
@ -282,14 +286,15 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_CHANNELS, stock_channels_24 },
{ GIMP_STOCK_PATHS, stock_paths_22 },
{ GIMP_STOCK_IMAGE, stock_image_24 },
{ GIMP_STOCK_LAYER, stock_layer_24 },
{ GIMP_STOCK_CHANNEL, stock_channel_24 },
{ GIMP_STOCK_CHANNEL_RED, stock_channel_red_24 },
{ GIMP_STOCK_CHANNEL_GREEN, stock_channel_green_24 },
{ 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_IMAGE, stock_image_24 },
{ GIMP_STOCK_LAYER, stock_layer_24 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_24 },
{ GIMP_STOCK_LINKED, stock_linked_20 },
{ GIMP_STOCK_VISIBLE, stock_eye_20 },
@ -366,14 +371,15 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_CHANNELS, stock_channels_16 },
{ GIMP_STOCK_PATHS, stock_paths_16 },
{ GIMP_STOCK_IMAGE, stock_image_16 },
{ GIMP_STOCK_LAYER, stock_layer_16 },
{ GIMP_STOCK_CHANNEL, stock_channel_16 },
{ GIMP_STOCK_CHANNEL_RED, stock_channel_red_16 },
{ GIMP_STOCK_CHANNEL_GREEN, stock_channel_green_16 },
{ 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_IMAGE, stock_image_16 },
{ GIMP_STOCK_LAYER, stock_layer_16 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_16 },
{ GIMP_STOCK_LINKED, stock_linked_12 },
{ GIMP_STOCK_VISIBLE, stock_eye_12 },
@ -387,6 +393,9 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_QMASK_OFF, stock_qmask_off_16 },
{ GIMP_STOCK_QMASK_ON, stock_qmask_on_16 },
{ GIMP_STOCK_LIST, stock_list_16 },
{ GIMP_STOCK_GRID, stock_grid_16 },
{ GIMP_STOCK_DEFAULT_COLORS, stock_default_colors_12 },
{ GIMP_STOCK_SWAP_COLORS, stock_swap_colors_12 },
@ -433,6 +442,24 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_WILBER, stock_wilber_16 }
};
static struct
{
const gchar *stock_id;
gconstpointer inline_data;
}
gimp_stock_dnd_pixbufs[] =
{
{ GIMP_STOCK_CHANNEL, stock_channel_32 },
{ GIMP_STOCK_CHANNEL_RED, stock_channel_red_32 },
{ GIMP_STOCK_CHANNEL_GREEN, stock_channel_green_32 },
{ 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_IMAGE, stock_image_32 },
{ GIMP_STOCK_LAYER, stock_layer_32 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_32 }
};
static struct
{
const gchar *stock_id;
@ -440,6 +467,16 @@ static struct
}
gimp_stock_dialog_pixbufs[] =
{
{ GIMP_STOCK_CHANNEL, stock_channel_48 },
{ GIMP_STOCK_CHANNEL_RED, stock_channel_red_48 },
{ GIMP_STOCK_CHANNEL_GREEN, stock_channel_green_48 },
{ 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_IMAGE, stock_image_48 },
{ GIMP_STOCK_LAYER, stock_layer_48 },
{ GIMP_STOCK_TEXT_LAYER, stock_text_layer_48 },
{ GIMP_STOCK_ERROR, stock_error_64 },
{ GIMP_STOCK_INFO, stock_info_64 },
{ GIMP_STOCK_QUESTION, stock_question_64 },
@ -468,6 +505,14 @@ gimp_stock_init (void)
gimp_stock_dialog_pixbufs[i].stock_id);
}
for (i = 0; i < G_N_ELEMENTS (gimp_stock_dnd_pixbufs); i++)
{
add_sized_with_same_fallback (gimp_stock_factory,
gimp_stock_dnd_pixbufs[i].inline_data,
GTK_ICON_SIZE_DND,
gimp_stock_dnd_pixbufs[i].stock_id);
}
for (i = 0; i < G_N_ELEMENTS (gimp_stock_button_pixbufs); i++)
{
add_sized_with_same_fallback (gimp_stock_factory,

4
libgimpwidgets/gimpstock.h
View File

@ -132,6 +132,7 @@ G_BEGIN_DECLS
#define GIMP_STOCK_IMAGE "gimp-image"
#define GIMP_STOCK_LAYER "gimp-layer"
#define GIMP_STOCK_TEXT_LAYER "gimp-text-layer"
#define GIMP_STOCK_CHANNEL "gimp-channel"
#define GIMP_STOCK_CHANNEL_RED "gimp-channel-red"
#define GIMP_STOCK_CHANNEL_GREEN "gimp-channel-green"
@ -159,6 +160,9 @@ G_BEGIN_DECLS
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
#define GIMP_STOCK_DEVICE_STATUS "gimp-device-status"
#define GIMP_STOCK_LIST "gimp-list"
#define GIMP_STOCK_GRID "gimp-grid"
/* in dialog size: */
#define GIMP_STOCK_ERROR "gimp-error"

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

@ -36,6 +36,7 @@ STOCK_MENU_IMAGES = \
stock-default-colors-12.png \
stock-device-status-16.png \
stock-eye-12.png \
stock-grid-16.png \
stock-image-16.png \
stock-images-16.png \
stock-info-16.png \
@ -43,6 +44,7 @@ STOCK_MENU_IMAGES = \
stock-layer-16.png \
stock-layer-to-imagesize-16.png \
stock-layers-16.png \
stock-list-16.png \
stock-merge-down-16.png \
stock-navigation-16.png \
stock-paths-16.png \
@ -60,6 +62,7 @@ STOCK_MENU_IMAGES = \
stock-selection-none-16.png \
stock-selection-shrink-16.png \
stock-swap-colors-12.png \
stock-text-layer-16.png \
stock-tool-options-16.png \
stock-warning-16.png \
stock-wilber-16.png
@ -114,14 +117,33 @@ STOCK_BUTTON_IMAGES = \
stock-selection-subtract-16.png \
stock-selection-to-channel-16.png \
stock-selection-to-path-16.png \
stock-text-layer-24.png \
stock-vchain-24.png \
stock-vchain-broken-24.png \
stock-warning-24.png
STOCK_DND_IMAGES = \
stock-channel-32.png \
stock-channel-blue-32.png \
stock-channel-gray-32.png \
stock-channel-green-32.png \
stock-channel-red-32.png \
stock-image-32.png \
stock-layer-32.png \
stock-text-layer-32.png
STOCK_DIALOG_IMAGES = \
stock-channel-48.png \
stock-channel-blue-48.png \
stock-channel-gray-48.png \
stock-channel-green-48.png \
stock-channel-red-48.png \
stock-error-64.png \
stock-image-48.png \
stock-info-64.png \
stock-layer-48.png \
stock-question-64.png \
stock-text-layer-48.png \
stock-warning-64.png \
stock-wilber-64.png \
stock-wilber-eek-64.png
@ -207,6 +229,7 @@ STOCK_TOOL_IMAGES = \
STOCK_IMAGES = \
$(STOCK_MENU_IMAGES) \
$(STOCK_BUTTON_IMAGES) \
$(STOCK_DND_IMAGES) \
$(STOCK_DIALOG_IMAGES) \
$(STOCK_TOOL_IMAGES)

BIN
themes/Default/images/stock-channel-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 450 B

After

Width:  |  Height:  |  Size: 401 B

BIN
themes/Default/images/stock-channel-24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 644 B

After

Width:  |  Height:  |  Size: 622 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 977 B

BIN
themes/Default/images/stock-channel-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-channel-blue-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 440 B

After

Width:  |  Height:  |  Size: 451 B

BIN
themes/Default/images/stock-channel-blue-24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 634 B

After

Width:  |  Height:  |  Size: 654 B

BIN
themes/Default/images/stock-channel-blue-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
themes/Default/images/stock-channel-blue-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
themes/Default/images/stock-channel-gray-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 416 B

After

Width:  |  Height:  |  Size: 426 B

BIN
themes/Default/images/stock-channel-gray-24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 598 B

After

Width:  |  Height:  |  Size: 632 B

BIN
themes/Default/images/stock-channel-gray-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

BIN
themes/Default/images/stock-channel-gray-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

BIN
themes/Default/images/stock-channel-green-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 438 B

After

Width:  |  Height:  |  Size: 463 B

BIN
themes/Default/images/stock-channel-green-24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 670 B

BIN
themes/Default/images/stock-channel-green-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
themes/Default/images/stock-channel-green-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

BIN
themes/Default/images/stock-channel-red-16.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 439 B

After

Width:  |  Height:  |  Size: 456 B

BIN
themes/Default/images/stock-channel-red-24.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 629 B

After

Width:  |  Height:  |  Size: 668 B

BIN
themes/Default/images/stock-channel-red-32.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
themes/Default/images/stock-channel-red-48.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 136 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.0 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 836 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 155 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 291 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 627 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 785 B

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

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB