diff --git a/ChangeLog b/ChangeLog index 3ca58f3ea9..d9bc617388 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2004-01-27 Michael Natterer + + * themes/Default/images/Makefile.am + * themes/Default/images/stock-channel-indexed-16.png + * themes/Default/images/stock-channel-indexed-24.png + * themes/Default/images/stock-channel-indexed-32.png + * themes/Default/images/stock-channel-indexed-48.png + * libgimpwidgets/gimpstock.[ch]: added placeholders for an INDEXED + channel icon (copied from the GRAY channel icon). To be replaced... + + * app/widgets/gimppreviewrendererimage.c: use + GIMP_STOCK_CHANNEL_INDEXED instead of GIMP_STOCK_QUESTION for the + indexed channel. + 2004-01-27 Sven Neumann * plug-ins/script-fu/scripts/comic-logo.scm: applied a patch from diff --git a/app/widgets/gimppreviewrendererimage.c b/app/widgets/gimppreviewrendererimage.c index d8f4fc2330..21c4d25283 100644 --- a/app/widgets/gimppreviewrendererimage.c +++ b/app/widgets/gimppreviewrendererimage.c @@ -177,12 +177,12 @@ gimp_preview_renderer_image_render (GimpPreviewRenderer *renderer, switch (rendererimage->channel) { - case GIMP_RED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_RED; break; - case GIMP_GREEN_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GREEN; break; - case GIMP_BLUE_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_BLUE; break; - case GIMP_GRAY_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GRAY; break; - case GIMP_INDEXED_CHANNEL: stock_id = GIMP_STOCK_QUESTION; break; - case GIMP_ALPHA_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_ALPHA; break; + case GIMP_RED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_RED; break; + case GIMP_GREEN_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GREEN; break; + case GIMP_BLUE_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_BLUE; break; + case GIMP_GRAY_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GRAY; break; + case GIMP_INDEXED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_INDEXED; break; + case GIMP_ALPHA_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_ALPHA; break; default: stock_id = gimp_viewable_get_stock_id (renderer->viewable); diff --git a/app/widgets/gimpviewrendererimage.c b/app/widgets/gimpviewrendererimage.c index d8f4fc2330..21c4d25283 100644 --- a/app/widgets/gimpviewrendererimage.c +++ b/app/widgets/gimpviewrendererimage.c @@ -177,12 +177,12 @@ gimp_preview_renderer_image_render (GimpPreviewRenderer *renderer, switch (rendererimage->channel) { - case GIMP_RED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_RED; break; - case GIMP_GREEN_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GREEN; break; - case GIMP_BLUE_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_BLUE; break; - case GIMP_GRAY_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GRAY; break; - case GIMP_INDEXED_CHANNEL: stock_id = GIMP_STOCK_QUESTION; break; - case GIMP_ALPHA_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_ALPHA; break; + case GIMP_RED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_RED; break; + case GIMP_GREEN_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GREEN; break; + case GIMP_BLUE_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_BLUE; break; + case GIMP_GRAY_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_GRAY; break; + case GIMP_INDEXED_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_INDEXED; break; + case GIMP_ALPHA_CHANNEL: stock_id = GIMP_STOCK_CHANNEL_ALPHA; break; default: stock_id = gimp_viewable_get_stock_id (renderer->viewable); diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 860cdb4f7f..36c5148572 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -203,6 +203,7 @@ static GtkStockItem gimp_stock_items[] = { GIMP_STOCK_CHANNEL_GREEN, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CHANNEL_BLUE, NULL, 0, 0, LIBGIMP_DOMAIN }, { GIMP_STOCK_CHANNEL_GRAY, NULL, 0, 0, LIBGIMP_DOMAIN }, + { GIMP_STOCK_CHANNEL_INDEXED, 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 }, @@ -353,6 +354,7 @@ gimp_stock_button_pixbufs[] = { 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_INDEXED, stock_channel_indexed_24 }, { GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_24 }, { GIMP_STOCK_LAYER_MASK, stock_layer_mask_24 }, { GIMP_STOCK_IMAGE, stock_image_24 }, @@ -452,6 +454,7 @@ gimp_stock_menu_pixbufs[] = { 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_INDEXED, stock_channel_indexed_16 }, { GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_16 }, { GIMP_STOCK_LAYER_MASK, stock_layer_mask_16 }, { GIMP_STOCK_IMAGE, stock_image_16 }, @@ -568,6 +571,7 @@ gimp_stock_dnd_pixbufs[] = { 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_INDEXED, stock_channel_indexed_32 }, { GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_32 }, { GIMP_STOCK_LAYER_MASK, stock_layer_mask_32 }, { GIMP_STOCK_IMAGE, stock_image_32 }, @@ -588,6 +592,7 @@ gimp_stock_dialog_pixbufs[] = { 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_INDEXED, stock_channel_indexed_48 }, { GIMP_STOCK_CHANNEL_ALPHA, stock_channel_alpha_48 }, { GIMP_STOCK_LAYER_MASK, stock_layer_mask_48 }, { GIMP_STOCK_IMAGE, stock_image_48 }, diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index 4f81d09b33..53a77b827e 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -158,6 +158,7 @@ G_BEGIN_DECLS #define GIMP_STOCK_CHANNEL_GREEN "gimp-channel-green" #define GIMP_STOCK_CHANNEL_BLUE "gimp-channel-blue" #define GIMP_STOCK_CHANNEL_GRAY "gimp-channel-gray" +#define GIMP_STOCK_CHANNEL_INDEXED "gimp-channel-indexed" #define GIMP_STOCK_CHANNEL_ALPHA "gimp-channel-alpha" #define GIMP_STOCK_LAYER_MASK "gimp-layer-mask" #define GIMP_STOCK_PATH "gimp-path" diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index 0b83eb146e..c4ac242b28 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -31,6 +31,7 @@ STOCK_MENU_IMAGES = \ stock-channel-blue-16.png \ stock-channel-gray-16.png \ stock-channel-green-16.png \ + stock-channel-indexed-16.png \ stock-channel-red-16.png \ stock-channels-16.png \ stock-close-12.png \ @@ -115,6 +116,7 @@ STOCK_BUTTON_IMAGES = \ stock-channel-blue-24.png \ stock-channel-gray-24.png \ stock-channel-green-24.png \ + stock-channel-indexed-24.png \ stock-channel-red-24.png \ stock-channels-24.png \ stock-char-picker-22.png \ @@ -186,6 +188,7 @@ STOCK_DND_IMAGES = \ stock-channel-blue-32.png \ stock-channel-gray-32.png \ stock-channel-green-32.png \ + stock-channel-indexed-32.png \ stock-channel-red-32.png \ stock-floating-selection-32.png \ stock-image-32.png \ @@ -199,6 +202,7 @@ STOCK_DIALOG_IMAGES = \ stock-channel-blue-48.png \ stock-channel-gray-48.png \ stock-channel-green-48.png \ + stock-channel-indexed-48.png \ stock-channel-red-48.png \ stock-error-64.png \ stock-floating-selection-48.png \ diff --git a/themes/Default/images/stock-channel-indexed-16.png b/themes/Default/images/stock-channel-indexed-16.png new file mode 100644 index 0000000000..92ca83cd2d Binary files /dev/null and b/themes/Default/images/stock-channel-indexed-16.png differ diff --git a/themes/Default/images/stock-channel-indexed-24.png b/themes/Default/images/stock-channel-indexed-24.png new file mode 100644 index 0000000000..8ef5bb6e98 Binary files /dev/null and b/themes/Default/images/stock-channel-indexed-24.png differ diff --git a/themes/Default/images/stock-channel-indexed-32.png b/themes/Default/images/stock-channel-indexed-32.png new file mode 100644 index 0000000000..25e48998e4 Binary files /dev/null and b/themes/Default/images/stock-channel-indexed-32.png differ diff --git a/themes/Default/images/stock-channel-indexed-48.png b/themes/Default/images/stock-channel-indexed-48.png new file mode 100644 index 0000000000..3ef58faf10 Binary files /dev/null and b/themes/Default/images/stock-channel-indexed-48.png differ