Commit 038a20e0 authored by Sven Neumann's avatar Sven Neumann Committed by Sven Neumann

app/gui/brushes-menu.c app/gui/channels-menu.c

2003-10-01  Sven Neumann  <sven@gimp.org>

	* app/gui/brushes-menu.c
	* app/gui/channels-menu.c
	* app/gui/colormap-editor-menu.c
	* app/gui/dialogs-menu.c
	* app/gui/documents-menu.c
	* app/gui/image-menu.c
	* app/gui/palettes-menu.c
	* app/gui/templates-menu.c
	* app/gui/toolbox-menu.c
	* app/gui/vectors-menu.c
	* plug-ins/common/uniteditor.c
	* plug-ins/dbbrowser/dbbrowser.c: followed the HIG advisory on
	labelling menus with a trailing ellipsis and removed some.
parent ef94033e
2003-10-01 Sven Neumann <sven@gimp.org>
* app/gui/brushes-menu.c
* app/gui/channels-menu.c
* app/gui/colormap-editor-menu.c
* app/gui/dialogs-menu.c
* app/gui/documents-menu.c
* app/gui/image-menu.c
* app/gui/palettes-menu.c
* app/gui/templates-menu.c
* app/gui/toolbox-menu.c
* app/gui/vectors-menu.c
* plug-ins/common/uniteditor.c
* plug-ins/dbbrowser/dbbrowser.c: followed the HIG advisory on
labelling menus with a trailing ellipsis and removed some.
2003-10-01 Sven Neumann <sven@gimp.org>
* app/widgets/gimppropwidgets.[ch]: renamed
......@@ -42,7 +42,7 @@
GimpItemFactoryEntry brushes_menu_entries[] =
{
{ { N_("/_Edit Brush..."), NULL,
{ { N_("/_Edit Brush"), NULL,
data_edit_data_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_EDIT },
NULL,
......@@ -60,7 +60,7 @@ GimpItemFactoryEntry brushes_menu_entries[] =
"<StockItem>", GIMP_STOCK_DUPLICATE },
NULL,
GIMP_HELP_BRUSH_DUPLICATE, NULL },
{ { N_("/_Delete Brush..."), "",
{ { N_("/_Delete Brush"), "",
data_delete_data_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL,
......@@ -96,11 +96,11 @@ brushes_menu_update (GtkItemFactory *factory,
#define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/Edit Brush...",
SET_SENSITIVE ("/Edit Brush",
brush && GIMP_DATA_FACTORY_VIEW (editor)->data_edit_func);
SET_SENSITIVE ("/Duplicate Brush",
brush && GIMP_DATA_GET_CLASS (data)->duplicate);
SET_SENSITIVE ("/Delete Brush...",
SET_SENSITIVE ("/Delete Brush",
brush && data->writeable && !data->internal);
#undef SET_SENSITIVE
......
......@@ -41,7 +41,7 @@
GimpItemFactoryEntry channels_menu_entries[] =
{
{ { N_("/_Edit Channel Attributes..."), NULL,
{ { N_("/_Edit Channel Attributes"), NULL,
channels_edit_attributes_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_EDIT },
NULL,
......@@ -153,18 +153,18 @@ channels_menu_update (GtkItemFactory *factory,
#define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/Edit Channel Attributes...", !fs && channel);
SET_SENSITIVE ("/Edit Channel Attributes", !fs && channel);
SET_SENSITIVE ("/New Channel...", !fs && gimage);
SET_SENSITIVE ("/Raise Channel", !fs && channel && prev);
SET_SENSITIVE ("/Lower Channel", !fs && channel && next);
SET_SENSITIVE ("/Duplicate Channel", !fs && (channel || component));
SET_SENSITIVE ("/Delete Channel", !fs && channel);
SET_SENSITIVE ("/New Channel...", !fs && gimage);
SET_SENSITIVE ("/Raise Channel", !fs && channel && prev);
SET_SENSITIVE ("/Lower Channel", !fs && channel && next);
SET_SENSITIVE ("/Duplicate Channel", !fs && (channel || component));
SET_SENSITIVE ("/Delete Channel", !fs && channel);
SET_SENSITIVE ("/Channel to Selection", !fs && (channel || component));
SET_SENSITIVE ("/Add to Selection", !fs && (channel || component));
SET_SENSITIVE ("/Subtract from Selection", !fs && (channel || component));
SET_SENSITIVE ("/Intersect with Selection", !fs && (channel || component));
SET_SENSITIVE ("/Channel to Selection", !fs && (channel || component));
SET_SENSITIVE ("/Add to Selection", !fs && (channel || component));
SET_SENSITIVE ("/Subtract from Selection", !fs && (channel || component));
SET_SENSITIVE ("/Intersect with Selection", !fs && (channel || component));
#undef SET_SENSITIVE
}
......@@ -38,7 +38,7 @@
GimpItemFactoryEntry colormap_editor_menu_entries[] =
{
{ { N_("/_Edit Color..."), NULL,
{ { N_("/_Edit Color"), NULL,
colormap_editor_edit_color_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_EDIT },
NULL,
......@@ -79,7 +79,7 @@ colormap_editor_menu_update (GtkItemFactory *factory,
#define SET_SENSITIVE(menu,condition) \
gimp_item_factory_set_sensitive (factory, menu, (condition) != 0)
SET_SENSITIVE ("/Edit Color...", gimage && indexed);
SET_SENSITIVE ("/Edit Color", gimage && indexed);
SET_SENSITIVE ("/Add Color from FG", gimage && indexed && num_colors < 256);
SET_SENSITIVE ("/Add Color from BG", gimage && indexed && num_colors < 256);
......
......@@ -67,60 +67,60 @@ GimpItemFactoryEntry dialogs_menu_entries[] =
MENU_BRANCH (N_("/_Add Tab")),
ADD_TAB (N_("/Add Tab/Tool _Options..."), "gimp-tool-options",
GIMP_STOCK_TOOL_OPTIONS, GIMP_HELP_TOOL_OPTIONS_DIALOG),
ADD_TAB (N_("/Add Tab/_Device Status..."), "gimp-device-status",
GIMP_STOCK_DEVICE_STATUS, GIMP_HELP_DEVICE_STATUS_DIALOG),
ADD_TAB (N_("/Add Tab/Tool _Options"), "gimp-tool-options",
GIMP_STOCK_TOOL_OPTIONS, GIMP_HELP_TOOL_OPTIONS_DIALOG),
ADD_TAB (N_("/Add Tab/_Device Status"), "gimp-device-status",
GIMP_STOCK_DEVICE_STATUS, GIMP_HELP_DEVICE_STATUS_DIALOG),
MENU_SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/_Layers..."), "gimp-layer-list",
GIMP_STOCK_LAYERS, GIMP_HELP_LAYER_DIALOG),
ADD_TAB (N_("/Add Tab/_Channels..."), "gimp-channel-list",
GIMP_STOCK_CHANNELS, GIMP_HELP_CHANNEL_DIALOG),
ADD_TAB (N_("/Add Tab/_Paths..."), "gimp-vectors-list",
GIMP_STOCK_PATHS, GIMP_HELP_PATH_DIALOG),
ADD_TAB (N_("/Add Tab/_Indexed Palette..."), "gimp-indexed-palette",
GIMP_STOCK_INDEXED_PALETTE, GIMP_HELP_INDEXED_PALETTE_DIALOG),
ADD_TAB (N_("/Add Tab/_Selection Editor..."), "gimp-selection-editor",
GIMP_STOCK_TOOL_RECT_SELECT, GIMP_HELP_SELECTION_DIALOG),
ADD_TAB (N_("/Add Tab/Na_vigation..."), "gimp-navigation-view",
GIMP_STOCK_NAVIGATION, GIMP_HELP_NAVIGATION_DIALOG),
ADD_TAB (N_("/Add Tab/_Undo History..."), "gimp-undo-history",
GIMP_STOCK_UNDO_HISTORY, GIMP_HELP_UNDO_DIALOG),
ADD_TAB (N_("/Add Tab/_Layers"), "gimp-layer-list",
GIMP_STOCK_LAYERS, GIMP_HELP_LAYER_DIALOG),
ADD_TAB (N_("/Add Tab/_Channels"), "gimp-channel-list",
GIMP_STOCK_CHANNELS, GIMP_HELP_CHANNEL_DIALOG),
ADD_TAB (N_("/Add Tab/_Paths"), "gimp-vectors-list",
GIMP_STOCK_PATHS, GIMP_HELP_PATH_DIALOG),
ADD_TAB (N_("/Add Tab/_Indexed Palette"), "gimp-indexed-palette",
GIMP_STOCK_INDEXED_PALETTE, GIMP_HELP_INDEXED_PALETTE_DIALOG),
ADD_TAB (N_("/Add Tab/_Selection Editor"), "gimp-selection-editor",
GIMP_STOCK_TOOL_RECT_SELECT, GIMP_HELP_SELECTION_DIALOG),
ADD_TAB (N_("/Add Tab/Na_vigation"), "gimp-navigation-view",
GIMP_STOCK_NAVIGATION, GIMP_HELP_NAVIGATION_DIALOG),
ADD_TAB (N_("/Add Tab/_Undo History"), "gimp-undo-history",
GIMP_STOCK_UNDO_HISTORY, GIMP_HELP_UNDO_DIALOG),
MENU_SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Colo_rs..."), "gimp-color-editor",
GIMP_STOCK_DEFAULT_COLORS, GIMP_HELP_COLOR_DIALOG),
ADD_TAB (N_("/Add Tab/Brus_hes..."), "gimp-brush-grid",
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_HELP_BRUSH_DIALOG),
ADD_TAB (N_("/Add Tab/P_atterns..."), "gimp-pattern-grid",
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_HELP_PATTERN_DIALOG),
ADD_TAB (N_("/Add Tab/_Gradients..."), "gimp-gradient-list",
GIMP_STOCK_TOOL_BLEND, GIMP_HELP_GRADIENT_DIALOG),
ADD_TAB (N_("/Add Tab/Pal_ettes..."), "gimp-palette-list",
GTK_STOCK_SELECT_COLOR, GIMP_HELP_PALETTE_DIALOG),
ADD_TAB (N_("/Add Tab/_Fonts..."), "gimp-font-list",
GTK_STOCK_SELECT_FONT, GIMP_HELP_FONT_DIALOG),
ADD_TAB (N_("/Add Tab/_Buffers..."), "gimp-buffer-list",
GTK_STOCK_PASTE, GIMP_HELP_BUFFER_DIALOG),
ADD_TAB (N_("/Add Tab/Colo_rs"), "gimp-color-editor",
GIMP_STOCK_DEFAULT_COLORS, GIMP_HELP_COLOR_DIALOG),
ADD_TAB (N_("/Add Tab/Brus_hes"), "gimp-brush-grid",
GIMP_STOCK_TOOL_PAINTBRUSH, GIMP_HELP_BRUSH_DIALOG),
ADD_TAB (N_("/Add Tab/P_atterns"), "gimp-pattern-grid",
GIMP_STOCK_TOOL_BUCKET_FILL, GIMP_HELP_PATTERN_DIALOG),
ADD_TAB (N_("/Add Tab/_Gradients"), "gimp-gradient-list",
GIMP_STOCK_TOOL_BLEND, GIMP_HELP_GRADIENT_DIALOG),
ADD_TAB (N_("/Add Tab/Pal_ettes"), "gimp-palette-list",
GTK_STOCK_SELECT_COLOR, GIMP_HELP_PALETTE_DIALOG),
ADD_TAB (N_("/Add Tab/_Fonts"), "gimp-font-list",
GTK_STOCK_SELECT_FONT, GIMP_HELP_FONT_DIALOG),
ADD_TAB (N_("/Add Tab/_Buffers"), "gimp-buffer-list",
GTK_STOCK_PASTE, GIMP_HELP_BUFFER_DIALOG),
MENU_SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/I_mages..."), "gimp-image-list",
GIMP_STOCK_IMAGES, GIMP_HELP_IMAGE_DIALOG),
ADD_TAB (N_("/Add Tab/Document Histor_y..."), "gimp-document-list",
GTK_STOCK_OPEN, GIMP_HELP_DOCUMENT_DIALOG),
ADD_TAB (N_("/Add Tab/_Templates..."), "gimp-template-list",
GIMP_STOCK_TEMPLATE, GIMP_HELP_TEMPLATE_DIALOG),
ADD_TAB (N_("/Add Tab/Error Co_nsole..."), "gimp-error-console",
GIMP_STOCK_WARNING, GIMP_HELP_ERRORS_DIALOG),
ADD_TAB (N_("/Add Tab/I_mages"), "gimp-image-list",
GIMP_STOCK_IMAGES, GIMP_HELP_IMAGE_DIALOG),
ADD_TAB (N_("/Add Tab/Document Histor_y"), "gimp-document-list",
GTK_STOCK_OPEN, GIMP_HELP_DOCUMENT_DIALOG),
ADD_TAB (N_("/Add Tab/_Templates"), "gimp-template-list",
GIMP_STOCK_TEMPLATE, GIMP_HELP_TEMPLATE_DIALOG),
ADD_TAB (N_("/Add Tab/Error Co_nsole"), "gimp-error-console",
GIMP_STOCK_WARNING, GIMP_HELP_ERRORS_DIALOG),
MENU_SEPARATOR ("/Add Tab/---"),
ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list",
GTK_STOCK_MISSING_IMAGE, GIMP_HELP_TOOL_DIALOG),
ADD_TAB (N_("/Add Tab/Tools"), "gimp-tool-list",
GTK_STOCK_MISSING_IMAGE, GIMP_HELP_TOOL_DIALOG),
{ { N_("/_Close Tab"), "",
dialogs_close_tab_cmd_callback, 0,
......
......@@ -50,7 +50,7 @@ GimpItemFactoryEntry documents_menu_entries[] =
"<StockItem>", GTK_STOCK_OPEN },
NULL,
GIMP_HELP_DOCUMENT_OPEN, NULL },
{ { N_("/File Open _Dialog..."), "",
{ { N_("/File Open _Dialog"), "",
documents_file_open_dialog_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
NULL,
......@@ -99,7 +99,7 @@ documents_menu_update (GtkItemFactory *factory,
SET_SENSITIVE ("/Open Image", imagefile);
SET_SENSITIVE ("/Raise or Open Image", imagefile);
SET_SENSITIVE ("/File Open Dialog...", TRUE);
SET_SENSITIVE ("/File Open Dialog", TRUE);
SET_SENSITIVE ("/Remove Entry", imagefile);
SET_SENSITIVE ("/Recreate Preview", imagefile);
SET_SENSITIVE ("/Reload all Previews", imagefile);
......
......@@ -105,7 +105,7 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/File/Open Recent/---"),
{ { N_("/File/Open Recent/Document _History..."), "foo",
{ { N_("/File/Open Recent/Document _History"), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
"gimp-document-list|gimp-document-grid",
......@@ -131,7 +131,7 @@ GimpItemFactoryEntry image_menu_entries[] =
file_save_template_cmd_callback, 0 },
NULL,
GIMP_HELP_FILE_SAVE_AS_TEMPLATE, NULL },
{ { N_("/File/Re_vert..."), NULL,
{ { N_("/File/Re_vert"), NULL,
file_revert_cmd_callback, 0,
"<StockItem>", GTK_STOCK_REVERT_TO_SAVED },
NULL,
......@@ -166,7 +166,7 @@ GimpItemFactoryEntry image_menu_entries[] =
"<StockItem>", GTK_STOCK_REDO },
NULL,
GIMP_HELP_EDIT_REDO, NULL },
{ { N_("/Edit/Undo _History..."), NULL,
{ { N_("/Edit/Undo _History"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_UNDO_HISTORY },
"gimp-undo-history",
......@@ -409,17 +409,17 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/View/---"),
{ { N_("/View/_Info Window..."), "<control><shift>I",
{ { N_("/View/_Info Window"), "<control><shift>I",
view_info_window_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_INFO },
NULL,
GIMP_HELP_INFO_DIALOG, NULL },
{ { N_("/View/Na_vigation Window..."), "<control><shift>N",
{ { N_("/View/Na_vigation Window"), "<control><shift>N",
view_navigation_window_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
NULL,
GIMP_HELP_NAVIGATION_DIALOG, NULL },
{ { N_("/View/Display _Filters..."), NULL,
{ { N_("/View/Display _Filters"), NULL,
view_display_filters_cmd_callback, 0 },
NULL,
GIMP_HELP_DISPLAY_FILTER_DIALOG, NULL },
......@@ -578,7 +578,7 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Image/---"),
{ { N_("/Image/Configure G_rid..."), NULL,
{ { N_("/Image/Configure G_rid"), NULL,
image_configure_grid_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_GRID },
NULL,
......@@ -729,7 +729,7 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Layer/Colors/---"),
{ { N_("/Layer/Colors/_Histogram..."), NULL,
{ { N_("/Layer/Colors/_Histogram"), NULL,
tools_select_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_HISTOGRAM },
"gimp-histogram-tool",
......@@ -913,25 +913,25 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_BRANCH (N_("/Dialogs/Create New Doc_k")),
{ { N_("/Dialogs/Create New Dock/_Layers, Channels & Paths..."), NULL,
{ { N_("/Dialogs/Create New Dock/_Layers, Channels & Paths"), NULL,
dialogs_create_lc_cmd_callback, 0 },
NULL,
NULL, NULL },
{ { N_("/Dialogs/Create New Dock/_Brushes, Patterns & Gradients..."), NULL,
{ { N_("/Dialogs/Create New Dock/_Brushes, Patterns & Gradients"), NULL,
dialogs_create_data_cmd_callback, 0 },
NULL,
NULL, NULL },
{ { N_("/Dialogs/Create New Dock/_Misc. Stuff..."), NULL,
{ { N_("/Dialogs/Create New Dock/_Misc. Stuff"), NULL,
dialogs_create_stuff_cmd_callback, 0 },
NULL,
NULL, NULL },
{ { N_("/Dialogs/Tool _Options..."), NULL,
{ { N_("/Dialogs/Tool _Options"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS },
"gimp-tool-options",
GIMP_HELP_TOOL_OPTIONS_DIALOG, NULL },
{ { N_("/Dialogs/_Device Status..."), NULL,
{ { N_("/Dialogs/_Device Status"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEVICE_STATUS },
"gimp-device-status",
......@@ -939,37 +939,37 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/_Layers..."), "<control>L",
{ { N_("/Dialogs/_Layers"), "<control>L",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LAYERS },
"gimp-layer-list",
GIMP_HELP_LAYER_DIALOG, NULL },
{ { N_("/Dialogs/_Channels..."), NULL,
{ { N_("/Dialogs/_Channels"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CHANNELS },
"gimp-channel-list",
GIMP_HELP_CHANNEL_DIALOG, NULL },
{ { N_("/Dialogs/_Paths..."), NULL,
{ { N_("/Dialogs/_Paths"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATHS },
"gimp-vectors-list",
GIMP_HELP_PATH_DIALOG, NULL },
{ { N_("/Dialogs/_Indexed Palette..."), NULL,
{ { N_("/Dialogs/_Indexed Palette"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-indexed-palette",
GIMP_HELP_INDEXED_PALETTE_DIALOG, NULL },
{ { N_("/Dialogs/_Selection Editor..."), NULL,
{ { N_("/Dialogs/_Selection Editor"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
GIMP_HELP_SELECTION_DIALOG, NULL },
{ { N_("/Dialogs/Na_vigation..."), NULL,
{ { N_("/Dialogs/Na_vigation"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
GIMP_HELP_NAVIGATION_DIALOG, NULL },
{ { N_("/Dialogs/_Undo History..."), NULL,
{ { N_("/Dialogs/_Undo History"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_UNDO_HISTORY },
"gimp-undo-history",
......@@ -977,37 +977,37 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/Colo_rs..."), NULL,
{ { N_("/Dialogs/Colo_rs"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEFAULT_COLORS },
"gimp-color-editor",
GIMP_HELP_COLOR_DIALOG, NULL },
{ { N_("/Dialogs/Brus_hes..."), "<control><shift>B",
{ { N_("/Dialogs/Brus_hes"), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH },
"gimp-brush-grid|gimp-brush-list",
GIMP_HELP_BRUSH_DIALOG, NULL },
{ { N_("/Dialogs/P_atterns..."), "<control><shift>P",
{ { N_("/Dialogs/P_atterns"), "<control><shift>P",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_BUCKET_FILL },
"gimp-pattern-grid|gimp-pattern-list",
GIMP_HELP_PATTERN_DIALOG, NULL },
{ { N_("/Dialogs/_Gradients..."), "<control>G",
{ { N_("/Dialogs/_Gradients"), "<control>G",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_BLEND },
"gimp-gradient-list|gimp-gradient-grid",
GIMP_HELP_GRADIENT_DIALOG, NULL },
{ { N_("/Dialogs/Pal_ettes..."), "<control>P",
{ { N_("/Dialogs/Pal_ettes"), "<control>P",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-palette-list|gimp-palette-grid",
GIMP_HELP_PALETTE_DIALOG, NULL },
{ { N_("/Dialogs/_Fonts..."), NULL,
{ { N_("/Dialogs/_Fonts"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_FONT },
"gimp-font-list|gimp-font-grid",
GIMP_HELP_FONT_DIALOG, NULL },
{ { N_("/Dialogs/_Buffers..."), "foo",
{ { N_("/Dialogs/_Buffers"), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
"gimp-buffer-list|gimp-buffer-grid",
......@@ -1015,22 +1015,22 @@ GimpItemFactoryEntry image_menu_entries[] =
MENU_SEPARATOR ("/Dialogs/---"),
{ { N_("/Dialogs/I_mages..."), NULL,
{ { N_("/Dialogs/I_mages"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_IMAGES },
"gimp-image-list|gimp-image-grid",
GIMP_HELP_IMAGE_DIALOG, NULL },
{ { N_("/Dialogs/Document Histor_y..."), "",
{ { N_("/Dialogs/Document Histor_y"), "",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
"gimp-document-list|gimp-document-grid",
GIMP_HELP_DOCUMENT_DIALOG, NULL },
{ { N_("/Dialogs/_Templates..."), NULL,
{ { N_("/Dialogs/_Templates"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TEMPLATE },
"gimp-template-list|gimp-template-grid",
GIMP_HELP_TEMPLATE_DIALOG, NULL },
{ { N_("/Dialogs/Error Co_nsole..."), NULL,
{ { N_("/Dialogs/Error Co_nsole"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WARNING },
"gimp-error-console",
......@@ -1389,7 +1389,7 @@ image_menu_update (GtkItemFactory *item_factory,
SET_SENSITIVE ("/File/Save as...", gdisp && drawable);
SET_SENSITIVE ("/File/Save a Copy...", gdisp && drawable);
SET_SENSITIVE ("/File/Save as Template...", gdisp);
SET_SENSITIVE ("/File/Revert...", gdisp && GIMP_OBJECT (gimage)->name);
SET_SENSITIVE ("/File/Revert", gdisp && GIMP_OBJECT (gimage)->name);
SET_SENSITIVE ("/File/Close", gdisp);
/* Edit */
......@@ -1487,9 +1487,9 @@ image_menu_update (GtkItemFactory *item_factory,
if (gdisp)
image_menu_set_zoom (item_factory, shell);
SET_SENSITIVE ("/View/Info Window...", gdisp);
SET_SENSITIVE ("/View/Navigation Window...", gdisp);
SET_SENSITIVE ("/View/Display Filters...", gdisp);
SET_SENSITIVE ("/View/Info Window", gdisp);
SET_SENSITIVE ("/View/Navigation Window", gdisp);
SET_SENSITIVE ("/View/Display Filters", gdisp);
SET_SENSITIVE ("/View/Show Selection", gdisp);
SET_ACTIVE ("/View/Show Selection", gdisp && appearance->selection);
......@@ -1536,7 +1536,7 @@ image_menu_update (GtkItemFactory *item_factory,
SET_SENSITIVE ("/Image/Duplicate", gdisp);
SET_SENSITIVE ("/Image/Merge Visible Layers...", gdisp && !fs && !aux && lp);
SET_SENSITIVE ("/Image/Flatten Image", gdisp && !fs && !aux && lp);
SET_SENSITIVE ("/Image/Configure Grid...", gdisp);
SET_SENSITIVE ("/Image/Configure Grid", gdisp);
/* Layer */
......@@ -1580,7 +1580,7 @@ image_menu_update (GtkItemFactory *item_factory,
SET_SENSITIVE ("/Layer/Colors/Desaturate", lp && is_rgb);
SET_SENSITIVE ("/Layer/Colors/Invert", lp && ! is_indexed);
SET_SENSITIVE ("/Layer/Colors/Auto/Equalize", lp && ! is_indexed);
SET_SENSITIVE ("/Layer/Colors/Histogram...", lp);
SET_SENSITIVE ("/Layer/Colors/Histogram", lp);
SET_SENSITIVE ("/Layer/Mask/Add Layer Mask...", lp && !fs && !aux && !lm && alpha);
SET_SENSITIVE ("/Layer/Mask/Apply Layer Mask", lm && !fs && !aux);
......
......@@ -70,7 +70,7 @@ GimpItemFactoryEntry palettes_menu_entries[] =
palettes_merge_palettes_cmd_callback, 0 },
NULL,
GIMP_HELP_PALETTE_MERGE, NULL },
{ { N_("/_Delete Palette..."), "",
{ { N_("/_Delete Palette"), "",
data_delete_data_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL,
......@@ -112,7 +112,7 @@ palettes_menu_update (GtkItemFactory *factory,
palette && GIMP_DATA_GET_CLASS (data)->duplicate);
SET_SENSITIVE ("/Merge Palettes...",
FALSE); /* FIXME palette && GIMP_IS_CONTAINER_LIST_VIEW (editor->view)); */
SET_SENSITIVE ("/Delete Palette...",
SET_SENSITIVE ("/Delete Palette",
palette && data->writeable && !data->internal);
#undef SET_SENSITIVE
......
......@@ -58,12 +58,12 @@ GimpItemFactoryEntry templates_menu_entries[] =
"<StockItem>", GIMP_STOCK_DUPLICATE },
NULL,
GIMP_HELP_TEMPLATE_DUPLICATE, NULL },
{ { N_("/_Edit Template..."), "",
{ { N_("/_Edit Template"), "",
templates_edit_template_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_EDIT },
NULL,
GIMP_HELP_TEMPLATE_EDIT, NULL },
{ { N_("/_Delete Template..."), "",
{ { N_("/_Delete Template"), "",
templates_delete_template_cmd_callback, 0,
"<StockItem>", GTK_STOCK_DELETE },
NULL,
......@@ -90,8 +90,8 @@ templates_menu_update (GtkItemFactory *factory,
SET_SENSITIVE ("/Create Image from Template...", template);
SET_SENSITIVE ("/New Template...", TRUE);
SET_SENSITIVE ("/Duplicate Template...", template);
SET_SENSITIVE ("/Edit Template...", template);
SET_SENSITIVE ("/Delete Template...", template);
SET_SENSITIVE ("/Edit Template", template);
SET_SENSITIVE ("/Delete Template", template);
#undef SET_SENSITIVE
}
......@@ -68,7 +68,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/Open Recent/---"),
{ { N_("/File/Open Recent/Document _History..."), "foo",
{ { N_("/File/Open Recent/Document _History"), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
"gimp-document-list|gimp-document-grid",
......@@ -80,7 +80,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/---"),
{ { N_("/File/_Preferences..."), NULL,
{ { N_("/File/_Preferences"), NULL,
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PREFERENCES },
"gimp-preferences-dialog",
......@@ -92,25 +92,25 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_BRANCH (N_("/File/Dialogs/Create New Doc_k")),
{ { N_("/File/Dialogs/Create New Dock/_Layers, Channels & Paths..."), NULL,
{ { N_("/File/Dialogs/Create New Dock/_Layers, Channels & Paths"), NULL,
dialogs_create_lc_cmd_callback, 0 },
NULL,
NULL, NULL },
{ { N_("/File/Dialogs/Create New Dock/_Brushes, Patterns & Gradients..."), NULL,
{ { N_("/File/Dialogs/Create New Dock/_Brushes, Patterns & Gradients"), NULL,
dialogs_create_data_cmd_callback, 0 },
NULL,
NULL, NULL },
{ { N_("/File/Dialogs/Create New Dock/_Misc. Stuff..."), NULL,
{ { N_("/File/Dialogs/Create New Dock/_Misc. Stuff"), NULL,
dialogs_create_stuff_cmd_callback, 0 },
NULL,
NULL, NULL },
{ { N_("/File/Dialogs/Tool _Options..."), "<control><shift>T",
{ { N_("/File/Dialogs/Tool _Options"), "<control><shift>T",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_OPTIONS },
"gimp-tool-options",
GIMP_HELP_TOOL_OPTIONS_DIALOG, NULL },
{ { N_("/File/Dialogs/_Device Status..."), NULL,
{ { N_("/File/Dialogs/_Device Status"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEVICE_STATUS },
"gimp-device-status",
......@@ -118,37 +118,37 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/_Layers..."), "<control>L",
{ { N_("/File/Dialogs/_Layers"), "<control>L",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_LAYERS },
"gimp-layer-list",
GIMP_HELP_LAYER_DIALOG, NULL },
{ { N_("/File/Dialogs/_Channels..."), NULL,
{ { N_("/File/Dialogs/_Channels"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_CHANNELS },
"gimp-channel-list",
GIMP_HELP_CHANNEL_DIALOG, NULL },
{ { N_("/File/Dialogs/_Paths..."), NULL,
{ { N_("/File/Dialogs/_Paths"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_PATHS },
"gimp-vectors-list",
GIMP_HELP_PATH_DIALOG, NULL },
{ { N_("/File/Dialogs/_Indexed Palette..."), NULL,
{ { N_("/File/Dialogs/_Indexed Palette"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_INDEXED_PALETTE },
"gimp-indexed-palette",
GIMP_HELP_INDEXED_PALETTE_DIALOG, NULL },
{ { N_("/File/Dialogs/_Selection Editor..."), NULL,
{ { N_("/File/Dialogs/_Selection Editor"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_RECT_SELECT },
"gimp-selection-editor",
GIMP_HELP_SELECTION_DIALOG, NULL },
{ { N_("/File/Dialogs/Na_vigation..."), NULL,
{ { N_("/File/Dialogs/Na_vigation"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_NAVIGATION },
"gimp-navigation-view",
GIMP_HELP_NAVIGATION_DIALOG, NULL },
{ { N_("/File/Dialogs/_Undo History..."), NULL,
{ { N_("/File/Dialogs/_Undo History"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_UNDO_HISTORY },
"gimp-undo-history",
......@@ -156,37 +156,37 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/Colo_rs..."), NULL,
{ { N_("/File/Dialogs/Colo_rs"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_DEFAULT_COLORS },
"gimp-color-editor",
GIMP_HELP_COLOR_DIALOG, NULL },
{ { N_("/File/Dialogs/Brus_hes..."), "<control><shift>B",
{ { N_("/File/Dialogs/Brus_hes"), "<control><shift>B",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_PAINTBRUSH },
"gimp-brush-grid",
GIMP_HELP_BRUSH_DIALOG, NULL },
{ { N_("/File/Dialogs/P_atterns..."), "<control><shift>P",
{ { N_("/File/Dialogs/P_atterns"), "<control><shift>P",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_BUCKET_FILL },
"gimp-pattern-grid",
GIMP_HELP_PATTERN_DIALOG, NULL },
{ { N_("/File/Dialogs/_Gradients..."), "<control>G",
{ { N_("/File/Dialogs/_Gradients"), "<control>G",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TOOL_BLEND },
"gimp-gradient-list|gimp-gradient-grid",
GIMP_HELP_GRADIENT_DIALOG, NULL },
{ { N_("/File/Dialogs/Pal_ettes..."), "<control>P",
{ { N_("/File/Dialogs/Pal_ettes"), "<control>P",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_COLOR },
"gimp-palette-list|gimp-palette-list",
GIMP_HELP_PALETTE_DIALOG, NULL },
{ { N_("/File/Dialogs/_Fonts..."), NULL,
{ { N_("/File/Dialogs/_Fonts"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_SELECT_FONT },
"gimp-font-list, gimp-font-grid",
GIMP_HELP_FONT_DIALOG, NULL },
{ { N_("/File/Dialogs/_Buffers..."), "foo",
{ { N_("/File/Dialogs/_Buffers"), "foo",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_PASTE },
"gimp-buffer-list|gimp-buffer-grid",
......@@ -194,22 +194,22 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_SEPARATOR ("/File/Dialogs/---"),
{ { N_("/File/Dialogs/I_mages..."), NULL,
{ { N_("/File/Dialogs/I_mages"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_IMAGES },
"gimp-image-list|gimp-image-grid",
GIMP_HELP_IMAGE_DIALOG, NULL },
{ { N_("/File/Dialogs/Document Histor_y..."), "",
{ { N_("/File/Dialogs/Document Histor_y"), "",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GTK_STOCK_OPEN },
"gimp-document-list|gimp-document-grid",
GIMP_HELP_DOCUMENT_DIALOG, NULL },
{ { N_("/File/Dialogs/_Templates..."), "",
{ { N_("/File/Dialogs/_Templates"), "",
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_TEMPLATE },
"gimp-template-list|gimp-template-grid",
GIMP_HELP_TEMPLATE_DIALOG, NULL },
{ { N_("/File/Dialogs/Error Co_nsole..."), NULL,
{ { N_("/File/Dialogs/Error Co_nsole"), NULL,
dialogs_create_dockable_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WARNING },
"gimp-error-console",
......@@ -238,7 +238,7 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_BRANCH (N_("/_Xtns")),
{ { N_("/Xtns/_Module Manager..."), NULL,
{ { N_("/Xtns/_Module Manager"), NULL,
dialogs_create_toplevel_cmd_callback, 0 },
"gimp-module-manager-dialog",
GIMP_HELP_MODULE_DIALOG, NULL },
......@@ -249,22 +249,22 @@ GimpItemFactoryEntry toolbox_menu_entries[] =
MENU_BRANCH (N_("/_Help")),
{ { N_("/Help/_Help..."), "F1",
{ { N_("/Help/_Help"), "F1",
help_help_cmd_callback, 0,
"<StockItem>", GTK_STOCK_HELP },
NULL,
GIMP_HELP_HELP, NULL },
{ { N_("/Help/_Context Help..."), "<shift>F1",
{ { N_("/Help/_Context Help"), "<shift>F1",
help_context_help_cmd_callback, 0,
"<StockItem>", GTK_STOCK_HELP },
NULL,
GIMP_HELP_HELP_CONTEXT, NULL },
{ { N_("/Help/_Tip of the Day..."), NULL,
{ { N_("/Help/_Tip of the Day"), NULL,
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_INFO },
"gimp-tips-dialog",
GIMP_HELP_TIPS_DIALOG, NULL },
{ { N_("/Help/_About..."), NULL,
{ { N_("/Help/_About"), NULL,
dialogs_create_toplevel_cmd_callback, 0,
"<StockItem>", GIMP_STOCK_WILBER },
"gimp-about-dialog",
......@@ -293,7 +293,7 @@ toolbox_menu_setup (GimpItemFactory *factory)
*/
pos = 1;
menu_item = gtk_item_factory_get_widget (GTK_ITEM_FACTORY (factory),
"/Xtns/Module Manager...");
"/Xtns/Module Manager");
if (menu_item && menu_item->parent && GTK_IS_MENU (menu_item->parent))
{
menu = menu_item->parent;
......