Commit 614ff006 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer

themes/Default/images/stock-channels-16.png

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

	* themes/Default/images/stock-channels-16.png
	* themes/Default/images/stock-device-status-16.png
	* themes/Default/images/stock-images-16.png
	* themes/Default/images/stock-layers-16.png
	* themes/Default/images/stock-paths-16.png: new icons from Jimmac.

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

	* app/gui/dialogs-menu.c
	* app/gui/image-menu.c
	* app/gui/toolbox-menu.c: use them.
parent c5603d81
2003-03-05 Michael Natterer <mitch@gimp.org>
* themes/Default/images/stock-channels-16.png
* themes/Default/images/stock-device-status-16.png
* themes/Default/images/stock-images-16.png
* themes/Default/images/stock-layers-16.png
* themes/Default/images/stock-paths-16.png: new icons from Jimmac.
* themes/Default/imagerc
* themes/Default/images/Makefile.am
* libgimpwidgets/gimpstock.[ch]: add them to the stock system.
* app/gui/dialogs-menu.c
* app/gui/image-menu.c
* app/gui/toolbox-menu.c: use them.
2003-03-05 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpbrusheditor.[ch]: undeprecated and simplified a
......@@ -58,9 +58,12 @@ GimpItemFactoryEntry dialogs_menu_entries[] =
MENU_SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Layers..."), "gimp-layer-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Channels..."), "gimp-channel-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Paths..."), "gimp-vectors-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Layers..."), "gimp-layer-list",
"<StockItem>", GIMP_STOCK_LAYERS),
ADD_TAB (N_("/Add Tab/Channels..."), "gimp-channel-list",
"<StockItem>", GIMP_STOCK_CHANNELS),
ADD_TAB (N_("/Add Tab/Paths..."), "gimp-vectors-list",
"<StockItem>", GIMP_STOCK_PATHS),
ADD_TAB (N_("/Add Tab/Indexed Palette..."), "gimp-indexed-palette",
"<StockItem>", GTK_STOCK_SELECT_COLOR),
ADD_TAB (N_("/Add Tab/Selection Editor..."), "gimp-selection-editor",
......@@ -87,7 +90,8 @@ GimpItemFactoryEntry dialogs_menu_entries[] =
MENU_SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Images..."), "gimp-image-list", NULL, NULL),
ADD_TAB (N_("/Add Tab/Images..."), "gimp-image-list",
"<StockItem>", GIMP_STOCK_IMAGES),
ADD_TAB (N_("/Add Tab/Document History..."), "gimp-document-list",
"<StockItem>", GTK_STOCK_OPEN),
ADD_TAB (N_("/Add Tab/Error Console..."), "gimp-error-console",
......@@ -165,7 +169,7 @@ dialogs_menu_update (GtkItemFactory *factory,
gboolean list_view_available = FALSE;
gboolean grid_view_available = FALSE;
gboolean tree_view_available = FALSE;
GimpPreviewSize preview_size = GIMP_PREVIEW_SIZE_NONE;
GimpPreviewSize preview_size = -1;
page_num = gtk_notebook_get_current_page (GTK_NOTEBOOK (dockbook));
......@@ -223,11 +227,11 @@ dialogs_menu_update (GtkItemFactory *factory,
gimp_item_factory_set_sensitive (factory, (path), (sensitive))
SET_VISIBLE ("/view-type-separator",
preview_size != GIMP_PREVIEW_SIZE_NONE || view_type != -1);
preview_size != -1 || view_type != -1);
SET_VISIBLE ("/Preview Size", preview_size != GIMP_PREVIEW_SIZE_NONE);
SET_VISIBLE ("/Preview Size", preview_size != -1);
if (preview_size != GIMP_PREVIEW_SIZE_NONE)
if (preview_size != -1)
{
if (preview_size >= GIMP_PREVIEW_SIZE_GIGANTIC)
{
......
......@@ -679,22 +679,26 @@ GimpItemFactoryEntry image_menu_entries[] =
"gimp-tool-options",
"dialogs/tool_options.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEVICE_STATUS },
"gimp-device-status-dialog",
"dialogs/device_status.html", NULL },
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LAYERS },
"gimp-layer-list",
NULL, NULL },
{ { N_("/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CHANNELS },
"gimp-channel-list",
NULL, NULL },
{ { N_("/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATHS },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/Dialogs/Indexed Palette..."), NULL,
......@@ -754,7 +758,8 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_IMAGES },
"gimp-image-list",
NULL, NULL },
{ { N_("/Dialogs/Document History..."), "foo",
......
......@@ -92,22 +92,26 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
"gimp-tool-options",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEVICE_STATUS },
"gimp-device-status-dialog",
"file/dialogs/device_status.html", NULL },
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LAYERS },
"gimp-layer-list",
NULL, NULL },
{ { N_("/File/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CHANNELS },
"gimp-channel-list",
NULL, NULL },
{ { N_("/File/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATHS },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/File/Dialogs/Indexed Palette..."), NULL,
......@@ -167,7 +171,8 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_IMAGES },
"gimp-image-list",
NULL, NULL },
{ { N_("/File/Dialogs/Document History..."), "foo",
......
......@@ -679,22 +679,26 @@ GimpItemFactoryEntry image_menu_entries[] =
"gimp-tool-options",
"dialogs/tool_options.html", NULL },
{ { N_("/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEVICE_STATUS },
"gimp-device-status-dialog",
"dialogs/device_status.html", NULL },
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LAYERS },
"gimp-layer-list",
NULL, NULL },
{ { N_("/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CHANNELS },
"gimp-channel-list",
NULL, NULL },
{ { N_("/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATHS },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/Dialogs/Indexed Palette..."), NULL,
......@@ -754,7 +758,8 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_IMAGES },
"gimp-image-list",
NULL, NULL },
{ { N_("/Dialogs/Document History..."), "foo",
......
......@@ -92,22 +92,26 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
"gimp-tool-options",
"file/dialogs/tool_options.html", NULL },
{ { N_("/File/Dialogs/Device Status..."), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEVICE_STATUS },
"gimp-device-status-dialog",
"file/dialogs/device_status.html", NULL },
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Layers..."), "<control>L",
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LAYERS },
"gimp-layer-list",
NULL, NULL },
{ { N_("/File/Dialogs/Channels..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CHANNELS },
"gimp-channel-list",
NULL, NULL },
{ { N_("/File/Dialogs/Paths..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATHS },
"gimp-vectors-list",
NULL, NULL },
{ { N_("/File/Dialogs/Indexed Palette..."), NULL,
......@@ -167,7 +171,8 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Images..."), NULL,
dialogs_create_dockable_cmd_callback, 0 },
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_IMAGES },
"gimp-image-list",
NULL, NULL },
{ { N_("/File/Dialogs/Document History..."), "foo",
......
......@@ -149,12 +149,18 @@ static GtkStockItem gimp_stock_items[] =
{ GIMP_STOCK_LETTER_SPACING, N_("L_etter Spacing"), 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_LINE_SPACING, N_("L_ine Spacing"), 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_IMAGES, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_LAYERS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_CHANNELS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_PATHS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_NAVIGATION, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_QMASK_OFF, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_QMASK_ON, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_TOOL_OPTIONS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_INFO, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_DEVICE_STATUS, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_WARNING, NULL, 0, 0, LIBGIMP_DOMAIN },
{ GIMP_STOCK_WILBER, NULL, 0, 0, LIBGIMP_DOMAIN },
......@@ -310,6 +316,11 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_RESIZE, stock_resize_16 },
{ GIMP_STOCK_SCALE, stock_scale_16 },
{ GIMP_STOCK_IMAGES, stock_images_16 },
{ GIMP_STOCK_LAYERS, stock_layers_16 },
{ GIMP_STOCK_CHANNELS, stock_channels_16 },
{ GIMP_STOCK_PATHS, stock_paths_16 },
{ GIMP_STOCK_SELECTION_ALL, stock_selection_all_16 },
{ GIMP_STOCK_SELECTION_NONE, stock_selection_none_16 },
{ GIMP_STOCK_SELECTION_GROW, stock_selection_grow_16 },
......@@ -323,6 +334,7 @@ gimp_stock_menu_pixbufs[] =
{ GIMP_STOCK_SWAP_COLORS, stock_swap_colors_12 },
{ GIMP_STOCK_TOOL_OPTIONS, stock_tool_options_16 },
{ GIMP_STOCK_DEVICE_STATUS, stock_device_status_16 },
{ GIMP_STOCK_INFO, stock_info_16 },
{ GIMP_STOCK_WARNING, stock_warning_16 },
......
......@@ -92,6 +92,11 @@ G_BEGIN_DECLS
#define GIMP_STOCK_SCALE "gimp-scale"
#define GIMP_STOCK_SELECTION_TO_CHANNEL "gimp-selection-to-channel"
#define GIMP_STOCK_IMAGES "gimp-images"
#define GIMP_STOCK_LAYERS "gimp-layers"
#define GIMP_STOCK_CHANNELS "gimp-channels"
#define GIMP_STOCK_PATHS "gimp-paths"
#define GIMP_STOCK_NAVIGATION "gimp-navigation"
#define GIMP_STOCK_QMASK_OFF "gimp-qmask-off"
#define GIMP_STOCK_QMASK_ON "gimp-qmask-on"
......@@ -100,6 +105,8 @@ G_BEGIN_DECLS
#define GIMP_STOCK_SWAP_COLORS "gimp-swap-colors"
#define GIMP_STOCK_TOOL_OPTIONS "gimp-tool-options"
#define GIMP_STOCK_DEVICE_STATUS "gimp-device-status"
#define GIMP_STOCK_INFO "gimp-info"
#define GIMP_STOCK_WARNING "gimp-warning"
#define GIMP_STOCK_WILBER "gimp-wilber"
......
......@@ -205,11 +205,36 @@ style "gimp-icons"
{ "images/stock-tool-options-16.png", *, *, "gtk-menu" },
{ "images/stock-tool-options-16.png", *, *, * }
}
stock["gimp-device-status"] =
{
{ "images/stock-device-status-16.png", *, *, "gtk-menu" },
{ "images/stock-device-status-16.png", *, *, * }
}
stock["gimp-layer-to-imagesize"] =
{
{ "images/stock-layer-to-imagesize-16.png", *, *, "gtk-menu" },
{ "images/stock-layer-to-imagesize-16.png", *, *, * }
}
stock["gimp-images"] =
{
{ "images/stock-images-16.png", *, *, "gtk-menu" },
{ "images/stock-images-16.png", *, *, * }
}
stock["gimp-layers"] =
{
{ "images/stock-layers-16.png", *, *, "gtk-menu" },
{ "images/stock-layers-16.png", *, *, * }
}
stock["gimp-channes"] =
{
{ "images/stock-channels-16.png", *, *, "gtk-menu" },
{ "images/stock-channels-16.png", *, *, * }
}
stock["gimp-paths"] =
{
{ "images/stock-paths-16.png", *, *, "gtk-menu" },
{ "images/stock-paths-16.png", *, *, * }
}
# Image window icons
#
......
......@@ -93,6 +93,10 @@ STOCK_MENU_IMAGES = \
stock-rotate-90-16.png \
stock-resize-16.png \
stock-scale-16.png \
stock-images-16.png \
stock-layers-16.png \
stock-channels-16.png \
stock-paths-16.png \
stock-selection-all-16.png \
stock-selection-none-16.png \
stock-selection-grow-16.png \
......@@ -103,6 +107,7 @@ STOCK_MENU_IMAGES = \
stock-default-colors-12.png \
stock-swap-colors-12.png \
stock-tool-options-16.png \
stock-device-status-16.png \
stock-info-16.png \
stock-warning-16.png \
stock-wilber-16.png
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment