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

themes/Default/imagerc themes/Default/images/Makefile.am register the new 

2002-06-09  Michael Natterer  <mitch@gimp.org>

	* themes/Default/imagerc
	* themes/Default/images/Makefile.am
	* libgimpwidgets/gimpstock.[ch]: register the new "Swap" and
	"Default" icons in "menu" size.

	* app/gui/menus.c: use them here.

	* app/widgets/gimptoolbox-color-area.c: changed accordingly.
This commit is contained in:
Michael Natterer 2002-06-09 15:29:43 +00:00 committed by Michael Natterer
parent 4163623b27
commit f2745d8880
8 changed files with 43 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ChangeLog
View File

@ -1,3 +1,14 @@
2002-06-09 Michael Natterer <mitch@gimp.org>
* themes/Default/imagerc
* themes/Default/images/Makefile.am
* libgimpwidgets/gimpstock.[ch]: register the new "Swap" and
"Default" icons in "menu" size.
* app/gui/menus.c: use them here.
* app/widgets/gimptoolbox-color-area.c: changed accordingly.
2002-06-09 Michael Natterer <mitch@gimp.org>
Paint cleanup:

6
app/gui/menus.c
View File

@ -846,11 +846,13 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"toolbox/toolbox.html", NULL },
{ { N_("/Tools/Default Colors"), "D",
tools_default_colors_cmd_callback, 0 },
tools_default_colors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEFAULT_COLORS },
NULL,
"toolbox/toolbox.html#default_colors", NULL },
{ { N_("/Tools/Swap Colors"), "X",
tools_swap_colors_cmd_callback, 0 },
tools_swap_colors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SWAP_COLORS },
NULL,
"toolbox/toolbox.html#swap_colors", NULL },
{ { N_("/Tools/Swap Contexts"), "<alt>X",

6
app/menus/menus.c
View File

@ -846,11 +846,13 @@ static GimpItemFactoryEntry image_entries[] =
NULL,
"toolbox/toolbox.html", NULL },
{ { N_("/Tools/Default Colors"), "D",
tools_default_colors_cmd_callback, 0 },
tools_default_colors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEFAULT_COLORS },
NULL,
"toolbox/toolbox.html#default_colors", NULL },
{ { N_("/Tools/Swap Colors"), "X",
tools_swap_colors_cmd_callback, 0 },
tools_swap_colors_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_SWAP_COLORS },
NULL,
"toolbox/toolbox.html#swap_colors", NULL },
{ { N_("/Tools/Swap Contexts"), "<alt>X",

4
app/widgets/gimptoolbox-color-area.c
View File

@ -323,7 +323,7 @@ color_area_draw (GimpContext *context)
/* draw the default colors pixbuf */
pixbuf = gtk_widget_render_icon (color_area, GIMP_STOCK_DEFAULT_COLORS,
GTK_ICON_SIZE_BUTTON, NULL);
GTK_ICON_SIZE_MENU, NULL);
w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf);
gdk_pixbuf_render_to_drawable_alpha (pixbuf, color_area->window,
@ -334,7 +334,7 @@ color_area_draw (GimpContext *context)
/* draw the swap colors pixbuf */
pixbuf = gtk_widget_render_icon (color_area, GIMP_STOCK_SWAP_COLORS,
GTK_ICON_SIZE_BUTTON, NULL);
GTK_ICON_SIZE_MENU, NULL);
w = gdk_pixbuf_get_width (pixbuf);
h = gdk_pixbuf_get_height (pixbuf);
gdk_pixbuf_render_to_drawable_alpha (pixbuf, color_area->window,

6
libgimpwidgets/gimpstock.c
View File

@ -199,9 +199,6 @@ gimp_stock_button_pixbufs[] =
{ GIMP_STOCK_PATH_STROKE, stock_path_stroke_16 },
{ GIMP_STOCK_DEFAULT_COLORS, stock_default_colors_12 },
{ GIMP_STOCK_SWAP_COLORS, stock_swap_colors_12 },
{ GIMP_STOCK_TOOL_AIRBRUSH, stock_tool_airbrush_22 },
{ GIMP_STOCK_TOOL_BEZIER_SELECT, stock_tool_bezier_select_22 },
{ GIMP_STOCK_TOOL_BLEND, stock_tool_blend_22 },
@ -269,6 +266,9 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_QMASK_OFF, stock_qmask_off_16 },
{ GIMP_STOCK_QMASK_ON, stock_qmask_on_16 },
{ GIMP_STOCK_DEFAULT_COLORS, stock_default_colors_12 },
{ GIMP_STOCK_SWAP_COLORS, stock_swap_colors_12 },
{ GIMP_STOCK_TOOL_OPTIONS, stock_tool_options_16 },
{ GIMP_STOCK_INFO, stock_info_16 },
{ GIMP_STOCK_WARNING, stock_warning_16 },

6
libgimpwidgets/gimpstock.h
View File

@ -53,9 +53,6 @@ G_BEGIN_DECLS
#define GIMP_STOCK_PATH_STROKE "gimp-path-stroke"
#define GIMP_STOCK_DEFAULT_COLORS "gimp-default-colors"
#define GIMP_STOCK_SWAP_COLORS "gimp-swap-colors"
/* only in menu size: */
@ -75,6 +72,9 @@ G_BEGIN_DECLS
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
#define GIMP_STOCK_DEFAULT_COLORS "gimp-default-colors"
#define GIMP_STOCK_SWAP_COLORS "gimp-swap-colors"
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
#define GIMP_STOCK_INFO "gimp-info"
#define GIMP_STOCK_WARNING "gimp-warning"

13
themes/Default/imagerc
View File

@ -199,6 +199,19 @@ style "gimp-icons"
{ "images/stock-qmask-on-16.png", *, *, * }
}
# Toolbox icons
#
stock["gimp-default-colors"] =
{
{ "images/stock-default-colors-12.png", *, *, "gtk-menu" },
{ "images/stock-default-colors-12.png", *, *, * }
}
stock["gimp-swap-colors"] =
{
{ "images/stock-swap-colors-12.png", *, *, "gtk-menu" },
{ "images/stock-swap-colors-12.png", *, *, * }
}
# X & Y linked or not
#
stock["gimp-hchain"] =

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

@ -60,9 +60,7 @@ STOCK_BUTTON_IMAGES = \
stock-vchain-24.png \
stock-vchain-broken-24.png \
stock-info-24.png \
stock-warning-24.png \
stock-default-colors-12.png \
stock-swap-colors-12.png
stock-warning-24.png
STOCK_MENU_IMAGES = \
stock-convert-grayscale-16.png \
@ -80,6 +78,8 @@ STOCK_MENU_IMAGES = \
stock-navigation-16.png \
stock-qmask-off-16.png \
stock-qmask-on-16.png \
stock-default-colors-12.png \
stock-swap-colors-12.png \
stock-tool-options-16.png \
stock-info-16.png \
stock-warning-16.png \