From 13b03217708e4c48db50c0d7f23208bf36021221 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Wed, 20 Mar 2002 14:02:12 +0000 Subject: [PATCH] themes/Default/images/Makefile.am one more icon from Jimmac. 2002-03-20 Michael Natterer * themes/Default/images/Makefile.am * themes/Default/images/stock-menu-selection-to-channel.png: one more icon from Jimmac. * libgimpwidgets/gimpstock.[ch] * themes/Default/imagerc: add it. * app/gui/menus.c: use it. --- ChangeLog | 11 +++ app/gui/menus.c | 3 +- app/menus/menus.c | 3 +- libgimpwidgets/gimpstock.c | 28 ++++---- libgimpwidgets/gimpstock.h | 65 +++++++++--------- themes/Default/imagerc | 5 ++ themes/Default/images/Makefile.am | 1 + .../stock-menu-selection-to-channel.png | Bin 0 -> 228 bytes 8 files changed, 69 insertions(+), 47 deletions(-) create mode 100644 themes/Default/images/stock-menu-selection-to-channel.png diff --git a/ChangeLog b/ChangeLog index 2f1e506d6e..a3e85b7367 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2002-03-20 Michael Natterer + + * themes/Default/images/Makefile.am + * themes/Default/images/stock-menu-selection-to-channel.png: one + more icon from Jimmac. + + * libgimpwidgets/gimpstock.[ch] + * themes/Default/imagerc: add it. + + * app/gui/menus.c: use it. + 2002-03-20 Michael Natterer * app/widgets/gimpdockbook.c: fixed a bug i introduced when making diff --git a/app/gui/menus.c b/app/gui/menus.c index f9e04526ba..79e7b91fcc 100644 --- a/app/gui/menus.c +++ b/app/gui/menus.c @@ -453,7 +453,8 @@ static GimpItemFactoryEntry image_entries[] = SEPARATOR ("/Select/---"), { { N_("/Select/Save to Channel"), NULL, - select_save_cmd_callback, 0 }, + select_save_cmd_callback, 0, + "", GIMP_STOCK_SELECTION_TO_CHANNEL }, NULL, "select/save_to_channel.html", NULL }, diff --git a/app/menus/menus.c b/app/menus/menus.c index f9e04526ba..79e7b91fcc 100644 --- a/app/menus/menus.c +++ b/app/menus/menus.c @@ -453,7 +453,8 @@ static GimpItemFactoryEntry image_entries[] = SEPARATOR ("/Select/---"), { { N_("/Select/Save to Channel"), NULL, - select_save_cmd_callback, 0 }, + select_save_cmd_callback, 0, + "", GIMP_STOCK_SELECTION_TO_CHANNEL }, NULL, "select/save_to_channel.html", NULL }, diff --git a/libgimpwidgets/gimpstock.c b/libgimpwidgets/gimpstock.c index 2d0b038a1d..a29b43a706 100644 --- a/libgimpwidgets/gimpstock.c +++ b/libgimpwidgets/gimpstock.c @@ -104,6 +104,7 @@ static GtkStockItem gimp_stock_items[] = { GIMP_STOCK_SELECTION_SUBTRACT, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_SELECTION_INTERSECT, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_SELECTION_STROKE, NULL, 0, 0, "gimp-libgimp" }, + { GIMP_STOCK_SELECTION_TO_CHANNEL, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_SELECTION_TO_PATH, NULL, 0, 0, "gimp-libgimp" }, { GIMP_STOCK_PATH_STROKE, NULL, 0, 0, "gimp-libgimp" }, @@ -242,20 +243,21 @@ static struct } gimp_stock_menu_pixbufs[] = { - { GIMP_STOCK_CONVERT_RGB, stock_menu_convert_rgb }, - { GIMP_STOCK_CONVERT_GRAYSCALE, stock_menu_convert_grayscale }, - { GIMP_STOCK_CONVERT_INDEXED, stock_menu_convert_indexed }, - { GIMP_STOCK_MERGE_DOWN, stock_menu_merge_down }, - { GIMP_STOCK_RESHOW_FILTER, stock_menu_reshow_filter }, - { GIMP_STOCK_ROTATE_90, stock_menu_rotate_90 }, - { GIMP_STOCK_ROTATE_180, stock_menu_rotate_180 }, - { GIMP_STOCK_ROTATE_270, stock_menu_rotate_270 }, - { GIMP_STOCK_RESIZE, stock_menu_resize }, - { GIMP_STOCK_SCALE, stock_menu_scale }, + { GIMP_STOCK_CONVERT_RGB, stock_menu_convert_rgb }, + { GIMP_STOCK_CONVERT_GRAYSCALE, stock_menu_convert_grayscale }, + { GIMP_STOCK_CONVERT_INDEXED, stock_menu_convert_indexed }, + { GIMP_STOCK_MERGE_DOWN, stock_menu_merge_down }, + { GIMP_STOCK_RESHOW_FILTER, stock_menu_reshow_filter }, + { GIMP_STOCK_ROTATE_90, stock_menu_rotate_90 }, + { GIMP_STOCK_ROTATE_180, stock_menu_rotate_180 }, + { GIMP_STOCK_ROTATE_270, stock_menu_rotate_270 }, + { GIMP_STOCK_RESIZE, stock_menu_resize }, + { GIMP_STOCK_SCALE, stock_menu_scale }, + { GIMP_STOCK_SELECTION_TO_CHANNEL, stock_menu_selection_to_channel }, - { GIMP_STOCK_NAVIGATION, stock_menu_navigation }, - { GIMP_STOCK_QMASK_OFF, stock_menu_qmask_off }, - { GIMP_STOCK_QMASK_ON, stock_menu_qmask_on } + { GIMP_STOCK_NAVIGATION, stock_menu_navigation }, + { GIMP_STOCK_QMASK_OFF, stock_menu_qmask_off }, + { GIMP_STOCK_QMASK_ON, stock_menu_qmask_on } }; diff --git a/libgimpwidgets/gimpstock.h b/libgimpwidgets/gimpstock.h index 515b943268..01b2d4a3f4 100644 --- a/libgimpwidgets/gimpstock.h +++ b/libgimpwidgets/gimpstock.h @@ -30,46 +30,47 @@ G_BEGIN_DECLS /* only in button size: */ -#define GIMP_STOCK_ANCHOR "gimp-anchor" -#define GIMP_STOCK_DUPLICATE "gimp-duplicate" -#define GIMP_STOCK_EDIT "gimp-edit" -#define GIMP_STOCK_LINKED "gimp-linked" -#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new" -#define GIMP_STOCK_PASTE_INTO "gimp-paste-into" -#define GIMP_STOCK_RESET "gimp-reset" -#define GIMP_STOCK_VISIBLE "gimp-visible" +#define GIMP_STOCK_ANCHOR "gimp-anchor" +#define GIMP_STOCK_DUPLICATE "gimp-duplicate" +#define GIMP_STOCK_EDIT "gimp-edit" +#define GIMP_STOCK_LINKED "gimp-linked" +#define GIMP_STOCK_PASTE_AS_NEW "gimp-paste-as-new" +#define GIMP_STOCK_PASTE_INTO "gimp-paste-into" +#define GIMP_STOCK_RESET "gimp-reset" +#define GIMP_STOCK_VISIBLE "gimp-visible" -#define GIMP_STOCK_HCHAIN "gimp-hchain" -#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken" -#define GIMP_STOCK_VCHAIN "gimp-vchain" -#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken" +#define GIMP_STOCK_HCHAIN "gimp-hchain" +#define GIMP_STOCK_HCHAIN_BROKEN "gimp-hchain-broken" +#define GIMP_STOCK_VCHAIN "gimp-vchain" +#define GIMP_STOCK_VCHAIN_BROKEN "gimp-vchain-broken" -#define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace" -#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add" -#define GIMP_STOCK_SELECTION_SUBTRACT "gimp-selection-subtract" -#define GIMP_STOCK_SELECTION_INTERSECT "gimp-selection-intersect" -#define GIMP_STOCK_SELECTION_STROKE "gimp-selection-stroke" -#define GIMP_STOCK_SELECTION_TO_PATH "gimp-selection-to-path" +#define GIMP_STOCK_SELECTION_REPLACE "gimp-selection-replace" +#define GIMP_STOCK_SELECTION_ADD "gimp-selection-add" +#define GIMP_STOCK_SELECTION_SUBTRACT "gimp-selection-subtract" +#define GIMP_STOCK_SELECTION_INTERSECT "gimp-selection-intersect" +#define GIMP_STOCK_SELECTION_STROKE "gimp-selection-stroke" +#define GIMP_STOCK_SELECTION_TO_PATH "gimp-selection-to-path" -#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke" +#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke" /* only in menu size: */ -#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_MERGE_DOWN "gimp-merge-down" -#define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter" -#define GIMP_STOCK_ROTATE_90 "gimp-rotate-90" -#define GIMP_STOCK_ROTATE_180 "gimp-rotate-180" -#define GIMP_STOCK_ROTATE_270 "gimp-rotate-270" -#define GIMP_STOCK_RESIZE "gimp-resize" -#define GIMP_STOCK_SCALE "gimp-scale" +#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_MERGE_DOWN "gimp-merge-down" +#define GIMP_STOCK_RESHOW_FILTER "gimp-reshow-filter" +#define GIMP_STOCK_ROTATE_90 "gimp-rotate-90" +#define GIMP_STOCK_ROTATE_180 "gimp-rotate-180" +#define GIMP_STOCK_ROTATE_270 "gimp-rotate-270" +#define GIMP_STOCK_RESIZE "gimp-resize" +#define GIMP_STOCK_SCALE "gimp-scale" +#define GIMP_STOCK_SELECTION_TO_CHANNEL "gimp-selection-to-channel" -#define GIMP_STOCK_NAVIGATION "gimp-navigation" -#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off" -#define GIMP_STOCK_QMASK_ON "gimp-qmask-on" +#define GIMP_STOCK_NAVIGATION "gimp-navigation" +#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off" +#define GIMP_STOCK_QMASK_ON "gimp-qmask-on" /* only in button size: */ diff --git a/themes/Default/imagerc b/themes/Default/imagerc index 599bc54b85..f4f9ace179 100644 --- a/themes/Default/imagerc +++ b/themes/Default/imagerc @@ -158,6 +158,11 @@ style "gimp-icons" { "images/stock-menu-scale.png", *, *, "gtk-menu" }, { "images/stock-menu-scale.png", *, *, * } } + stock["gimp-selection-to-channel"] = + { + { "images/stock-menu-selection-to-channel.png", *, *, "gtk-menu" }, + { "images/stock-menu-selection-to-channel.png", *, *, * } + } # Image window icons # diff --git a/themes/Default/images/Makefile.am b/themes/Default/images/Makefile.am index d8496f44f4..ce2a319802 100644 --- a/themes/Default/images/Makefile.am +++ b/themes/Default/images/Makefile.am @@ -76,6 +76,7 @@ STOCK_MENU_IMAGES = @STRIP_BEGIN@ \ stock-menu-rotate-90.png \ stock-menu-resize.png \ stock-menu-scale.png \ + stock-menu-selection-to-channel.png \ \ stock-menu-navigation.png \ stock-menu-qmask-off.png \ diff --git a/themes/Default/images/stock-menu-selection-to-channel.png b/themes/Default/images/stock-menu-selection-to-channel.png new file mode 100644 index 0000000000000000000000000000000000000000..c7a32be6befe48844e7052f9877152030b0ab428 GIT binary patch literal 228 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt^LJzX3_ zDsHWve3AFC0*}l4MeA;yJ1pRHG4;j)kJu-_1Ur1Prn;Q;Ji(D%T*Y8G{hz9MjL2Wl zNe)7GZLUw&H-{ZD-S5V*erB`kt5;Kt-PV3(Sb1RmlJsT` literal 0 HcmV?d00001