? app/gui/st55nTYh Index: app/gui/brushes-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/brushes-menu.c,v retrieving revision 1.5 diff -u -p -r1.5 brushes-menu.c --- app/gui/brushes-menu.c 21 Aug 2003 15:54:43 -0000 1.5 +++ app/gui/brushes-menu.c 4 Jan 1997 04:04:33 -0000 @@ -42,6 +42,14 @@ GimpItemFactoryEntry brushes_menu_entries[] = { + { { N_("/_Edit Brush..."), NULL, + data_edit_data_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_BRUSH_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Brush"), NULL, data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -52,11 +60,6 @@ GimpItemFactoryEntry brushes_menu_entrie "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_BRUSH_DUPLICATE, NULL }, - { { N_("/_Edit Brush..."), NULL, - data_edit_data_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, - NULL, - GIMP_HELP_BRUSH_EDIT, NULL }, { { N_("/_Delete Brush..."), NULL, data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, @@ -93,10 +96,10 @@ brushes_menu_update (GtkItemFactory *fac #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/Duplicate Brush", - brush && GIMP_DATA_GET_CLASS (data)->duplicate); 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...", brush && data->writeable && !data->internal); Index: app/gui/buffers-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/buffers-menu.c,v retrieving revision 1.4 diff -u -p -r1.4 buffers-menu.c --- app/gui/buffers-menu.c 21 Aug 2003 15:54:43 -0000 1.4 +++ app/gui/buffers-menu.c 4 Jan 1997 04:04:33 -0000 @@ -39,7 +39,7 @@ GimpItemFactoryEntry buffers_menu_entries[] = { - { { N_("/_Paste Buffer"), NULL, + { { N_("/_Paste Buffer"), "", buffers_paste_buffer_cmd_callback, 0, "", GTK_STOCK_PASTE }, NULL, @@ -54,7 +54,7 @@ GimpItemFactoryEntry buffers_menu_entrie "", GIMP_STOCK_PASTE_AS_NEW }, NULL, GIMP_HELP_BUFFER_PASTE_AS_NEW, NULL }, - { { N_("/_Delete Buffer"), NULL, + { { N_("/_Delete Buffer"), "", buffers_delete_buffer_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, Index: app/gui/channels-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/channels-menu.c,v retrieving revision 1.11 diff -u -p -r1.11 channels-menu.c --- app/gui/channels-menu.c 1 Sep 2003 17:04:57 -0000 1.11 +++ app/gui/channels-menu.c 4 Jan 1997 04:04:33 -0000 @@ -41,6 +41,14 @@ GimpItemFactoryEntry channels_menu_entries[] = { + { { N_("/_Edit Channel Attributes..."), NULL, + channels_edit_attributes_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_CHANNEL_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Channel..."), "", channels_new_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -88,15 +96,7 @@ GimpItemFactoryEntry channels_menu_entri channels_to_selection_cmd_callback, GIMP_CHANNEL_OP_INTERSECT, "", GIMP_STOCK_SELECTION_INTERSECT }, NULL, - GIMP_HELP_CHANNEL_SELECTION_INTERSECT, NULL }, - - MENU_SEPARATOR ("/---"), - - { { N_("/_Edit Channel Attributes..."), NULL, - channels_edit_attributes_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, - NULL, - GIMP_HELP_CHANNEL_EDIT, NULL } + GIMP_HELP_CHANNEL_SELECTION_INTERSECT, NULL } }; gint n_channels_menu_entries = G_N_ELEMENTS (channels_menu_entries); @@ -153,6 +153,8 @@ channels_menu_update (GtkItemFactory *fa #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) + 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); @@ -163,8 +165,6 @@ channels_menu_update (GtkItemFactory *fa 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 ("/Edit Channel Attributes...", !fs && channel); #undef SET_SENSITIVE } Index: app/gui/colormap-editor-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/colormap-editor-menu.c,v retrieving revision 1.4 diff -u -p -r1.4 colormap-editor-menu.c --- app/gui/colormap-editor-menu.c 11 Aug 2003 17:14:11 -0000 1.4 +++ app/gui/colormap-editor-menu.c 4 Jan 1997 04:04:33 -0000 @@ -37,16 +37,16 @@ GimpItemFactoryEntry colormap_editor_menu_entries[] = { - { { N_("/_Add Color"), NULL, - colormap_editor_add_color_cmd_callback, 0, - "", GTK_STOCK_NEW }, - NULL, - NULL, NULL }, { { N_("/_Edit Color..."), NULL, colormap_editor_edit_color_cmd_callback, 0, "", GIMP_STOCK_EDIT }, NULL, NULL, NULL }, + { { N_("/_Add Color"), NULL, + colormap_editor_add_color_cmd_callback, 0, + "", GTK_STOCK_NEW }, + NULL, + NULL, NULL } }; gint n_colormap_editor_menu_entries = G_N_ELEMENTS (colormap_editor_menu_entries); @@ -71,8 +71,8 @@ colormap_editor_menu_update (GtkItemFact #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/Add Color", gimage && num_colors < 256); SET_SENSITIVE ("/Edit Color...", gimage); + SET_SENSITIVE ("/Add Color", gimage && num_colors < 256); #undef SET_SENSITIVE } Index: app/gui/gradients-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/gradients-menu.c,v retrieving revision 1.5 diff -u -p -r1.5 gradients-menu.c --- app/gui/gradients-menu.c 21 Aug 2003 15:54:43 -0000 1.5 +++ app/gui/gradients-menu.c 4 Jan 1997 04:04:33 -0000 @@ -43,6 +43,14 @@ GimpItemFactoryEntry gradients_menu_entries[] = { + { { N_("/_Edit Gradient..."), NULL, + data_edit_data_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_GRADIENT_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Gradient"), NULL, data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -53,11 +61,11 @@ GimpItemFactoryEntry gradients_menu_entr "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_GRADIENT_DUPLICATE, NULL }, - { { N_("/_Edit Gradient..."), NULL, - data_edit_data_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, + { { N_("/Save as _POV-Ray..."), NULL, + gradients_save_as_pov_ray_cmd_callback, 0, + "", GTK_STOCK_SAVE_AS }, NULL, - GIMP_HELP_GRADIENT_EDIT, NULL }, + GIMP_HELP_GRADIENT_SAVE_AS_POV, NULL }, { { N_("/_Delete Gradient..."), NULL, data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, @@ -70,15 +78,7 @@ GimpItemFactoryEntry gradients_menu_entr data_refresh_data_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, - GIMP_HELP_GRADIENT_REFRESH, NULL }, - - MENU_SEPARATOR ("/---"), - - { { N_("/Save as _POV-Ray..."), NULL, - gradients_save_as_pov_ray_cmd_callback, 0, - "", GTK_STOCK_SAVE_AS }, - NULL, - GIMP_HELP_GRADIENT_SAVE_AS_POV, NULL } + GIMP_HELP_GRADIENT_REFRESH, NULL } }; gint n_gradients_menu_entries = G_N_ELEMENTS (gradients_menu_entries); @@ -102,14 +102,14 @@ gradients_menu_update (GtkItemFactory *f #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/Duplicate Gradient", - gradient && GIMP_DATA_GET_CLASS (data)->duplicate); SET_SENSITIVE ("/Edit Gradient...", gradient && GIMP_DATA_FACTORY_VIEW (editor)->data_edit_func); - SET_SENSITIVE ("/Delete Gradient...", - gradient && data->writeable && !data->internal); + SET_SENSITIVE ("/Duplicate Gradient", + gradient && GIMP_DATA_GET_CLASS (data)->duplicate); SET_SENSITIVE ("/Save as POV-Ray...", gradient); + SET_SENSITIVE ("/Delete Gradient...", + gradient && data->writeable && !data->internal); #undef SET_SENSITIVE } Index: app/gui/images-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/images-menu.c,v retrieving revision 1.3 diff -u -p -r1.3 images-menu.c --- app/gui/images-menu.c 11 Aug 2003 17:14:11 -0000 1.3 +++ app/gui/images-menu.c 4 Jan 1997 04:04:33 -0000 @@ -39,15 +39,15 @@ GimpItemFactoryEntry images_menu_entries[] = { - { { N_("/_Raise Displays"), NULL, + { { N_("/_Raise Displays"), "", images_raise_displays_cmd_callback, 0, "", GTK_STOCK_GOTO_TOP }, NULL, NULL, NULL }, - { { N_("/_New Display"), NULL, + { { N_("/_New Display"), "", images_new_display_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, NULL, NULL }, - { { N_("/_Delete Image"), NULL, + { { N_("/_Delete Image"), "", images_delete_image_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, NULL, NULL } Index: app/gui/layers-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/layers-menu.c,v retrieving revision 1.12 diff -u -p -r1.12 layers-menu.c --- app/gui/layers-menu.c 1 Sep 2003 17:04:57 -0000 1.12 +++ app/gui/layers-menu.c 4 Jan 1997 04:04:34 -0000 @@ -41,6 +41,14 @@ GimpItemFactoryEntry layers_menu_entries[] = { + { { N_("/_Edit Layer Attributes..."), NULL, + layers_edit_attributes_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_LAYER_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Layer..."), "", layers_new_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -151,15 +159,7 @@ GimpItemFactoryEntry layers_menu_entries layers_flatten_image_cmd_callback, 0, NULL, NULL }, NULL, - GIMP_HELP_IMAGE_FLATTEN, NULL }, - - MENU_SEPARATOR ("/---"), - - { { N_("/_Edit Layer Attributes..."), NULL, - layers_edit_attributes_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, - NULL, - GIMP_HELP_LAYER_EDIT, NULL } + GIMP_HELP_IMAGE_FLATTEN, NULL } }; gint n_layers_menu_entries = G_N_ELEMENTS (layers_menu_entries); @@ -219,6 +219,8 @@ layers_menu_update (GtkItemFactory *fact #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) + SET_SENSITIVE ("/Edit Layer Attributes...", layer && !fs && !ac); + SET_SENSITIVE ("/New Layer...", gimage); SET_SENSITIVE ("/Raise Layer", layer && !fs && !ac && alpha && prev); @@ -246,8 +248,6 @@ layers_menu_update (GtkItemFactory *fact SET_SENSITIVE ("/Merge Visible Layers...", layer && !fs && !ac); SET_SENSITIVE ("/Flatten Image", layer && !fs && !ac); - - SET_SENSITIVE ("/Edit Layer Attributes...", layer && !fs && !ac); #undef SET_SENSITIVE } Index: app/gui/palette-editor-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/palette-editor-menu.c,v retrieving revision 1.6 diff -u -p -r1.6 palette-editor-menu.c --- app/gui/palette-editor-menu.c 25 Aug 2003 17:11:03 -0000 1.6 +++ app/gui/palette-editor-menu.c 4 Jan 1997 04:04:34 -0000 @@ -28,6 +28,7 @@ #include "widgets/gimpitemfactory.h" #include "widgets/gimppaletteeditor.h" +#include "menus.h" #include "palette-editor-commands.h" #include "palette-editor-menu.h" @@ -36,23 +37,26 @@ GimpItemFactoryEntry palette_editor_menu_entries[] = { - { { N_("/_New Color"), "", - palette_editor_new_color_cmd_callback, 0, - "", GTK_STOCK_NEW }, - NULL, - GIMP_HELP_PALETTE_EDITOR_NEW, NULL }, { { N_("/_Edit Color..."), "", palette_editor_edit_color_cmd_callback, 0, "", GIMP_STOCK_EDIT }, NULL, GIMP_HELP_PALETTE_EDITOR_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + + { { N_("/_New Color"), "", + palette_editor_new_color_cmd_callback, 0, + "", GTK_STOCK_NEW }, + NULL, + GIMP_HELP_PALETTE_EDITOR_NEW, NULL }, { { N_("/_Delete Color"), "", palette_editor_delete_color_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, GIMP_HELP_PALETTE_EDITOR_DELETE, NULL }, - { { "/---", NULL, NULL, 0, "", NULL }, NULL, NULL, NULL }, + MENU_SEPARATOR ("/---"), { { N_("/Zoom _Out"), "", palette_editor_zoom_out_cmd_callback, 0, @@ -91,8 +95,8 @@ palette_editor_menu_update (GtkItemFacto #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/New Color", editable); SET_SENSITIVE ("/Edit Color...", editable && editor->color); + SET_SENSITIVE ("/New Color", editable); SET_SENSITIVE ("/Delete Color", editable && editor->color); SET_SENSITIVE ("/Zoom Out", data_editor->data); Index: app/gui/palettes-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/palettes-menu.c,v retrieving revision 1.5 diff -u -p -r1.5 palettes-menu.c --- app/gui/palettes-menu.c 21 Aug 2003 15:54:43 -0000 1.5 +++ app/gui/palettes-menu.c 4 Jan 1997 04:04:34 -0000 @@ -43,21 +43,33 @@ GimpItemFactoryEntry palettes_menu_entries[] = { + { { N_("/_Edit Palette..."), NULL, + data_edit_data_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_PALETTE_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Palette"), NULL, data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, GIMP_HELP_PALETTE_NEW, NULL }, + { { N_("/_Import Palette..."), NULL, + palettes_import_palette_cmd_callback, 0, + "", GTK_STOCK_CONVERT }, + NULL, + GIMP_HELP_PALETTE_IMPORT, NULL }, { { N_("/D_uplicate Palette"), NULL, data_duplicate_data_cmd_callback, 0, "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_PALETTE_DUPLICATE, NULL }, - { { N_("/_Edit Palette..."), NULL, - data_edit_data_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, + { { N_("/_Merge Palettes..."), NULL, + palettes_merge_palettes_cmd_callback, 0 }, NULL, - GIMP_HELP_PALETTE_EDIT, NULL }, + GIMP_HELP_PALETTE_MERGE, NULL }, { { N_("/_Delete Palette..."), NULL, data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, @@ -70,19 +82,7 @@ GimpItemFactoryEntry palettes_menu_entri data_refresh_data_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, - GIMP_HELP_PALETTE_REFRESH, NULL }, - - MENU_SEPARATOR ("/---"), - - { { N_("/_Import Palette..."), NULL, - palettes_import_palette_cmd_callback, 0, - "", GTK_STOCK_CONVERT }, - NULL, - GIMP_HELP_PALETTE_IMPORT, NULL }, - { { N_("/_Merge Palettes..."), NULL, - palettes_merge_palettes_cmd_callback, 0 }, - NULL, - GIMP_HELP_PALETTE_MERGE, NULL } + GIMP_HELP_PALETTE_REFRESH, NULL } }; gint n_palettes_menu_entries = G_N_ELEMENTS (palettes_menu_entries); @@ -106,14 +106,14 @@ palettes_menu_update (GtkItemFactory *fa #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/Duplicate Palette", - palette && GIMP_DATA_GET_CLASS (data)->duplicate); SET_SENSITIVE ("/Edit Palette...", palette && GIMP_DATA_FACTORY_VIEW (editor)->data_edit_func); - SET_SENSITIVE ("/Delete Palette...", - palette && data->writeable && !data->internal); + SET_SENSITIVE ("/Duplicate Palette", + 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...", + palette && data->writeable && !data->internal); #undef SET_SENSITIVE } Index: app/gui/patterns-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/patterns-menu.c,v retrieving revision 1.4 diff -u -p -r1.4 patterns-menu.c --- app/gui/patterns-menu.c 21 Aug 2003 15:54:43 -0000 1.4 +++ app/gui/patterns-menu.c 4 Jan 1997 04:04:34 -0000 @@ -42,6 +42,14 @@ GimpItemFactoryEntry patterns_menu_entries[] = { + { { N_("/Edit Pattern..."), NULL, + data_edit_data_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_PATTERN_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/New Pattern"), NULL, data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -52,11 +60,6 @@ GimpItemFactoryEntry patterns_menu_entri "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_PATTERN_DUPLICATE, NULL }, - { { N_("/Edit Pattern..."), NULL, - data_edit_data_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, - NULL, - GIMP_HELP_PATTERN_EDIT, NULL }, { { N_("/Delete Pattern..."), NULL, data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, @@ -93,10 +96,10 @@ patterns_menu_update (GtkItemFactory *fa #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) - SET_SENSITIVE ("/Duplicate Pattern", - pattern && GIMP_DATA_GET_CLASS (data)->duplicate); SET_SENSITIVE ("/Edit Pattern...", pattern && GIMP_DATA_FACTORY_VIEW (editor)->data_edit_func); + SET_SENSITIVE ("/Duplicate Pattern", + pattern && GIMP_DATA_GET_CLASS (data)->duplicate); SET_SENSITIVE ("/Delete Pattern...", pattern && data->writeable && !data->internal); Index: app/gui/templates-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/templates-menu.c,v retrieving revision 1.4 diff -u -p -r1.4 templates-menu.c --- app/gui/templates-menu.c 21 Aug 2003 15:54:43 -0000 1.4 +++ app/gui/templates-menu.c 4 Jan 1997 04:04:37 -0000 @@ -40,6 +40,14 @@ GimpItemFactoryEntry templates_menu_entries[] = { + { { N_("/_Create Image from Template..."), "", + templates_create_image_cmd_callback, 0, + "", GIMP_STOCK_IMAGE }, + NULL, + GIMP_HELP_TEMPLATE_IMAGE_NEW, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Template..."), "", templates_new_template_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -55,11 +63,6 @@ GimpItemFactoryEntry templates_menu_entr "", GIMP_STOCK_EDIT }, NULL, GIMP_HELP_TEMPLATE_EDIT, NULL }, - { { N_("/_Create Image from Template..."), "", - templates_create_image_cmd_callback, 0, - "", GIMP_STOCK_IMAGE }, - NULL, - GIMP_HELP_TEMPLATE_IMAGE_NEW, NULL }, { { N_("/_Delete Template..."), "", templates_delete_template_cmd_callback, 0, "", GTK_STOCK_DELETE }, @@ -84,10 +87,10 @@ templates_menu_update (GtkItemFactory *f #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) + SET_SENSITIVE ("/Create Image from Template...", template); SET_SENSITIVE ("/New Template...", TRUE); SET_SENSITIVE ("/Duplicate Template...", template); SET_SENSITIVE ("/Edit Template...", template); - SET_SENSITIVE ("/Create Image from Template...", template); SET_SENSITIVE ("/Delete Template...", template); #undef SET_SENSITIVE Index: app/gui/vectors-menu.c =================================================================== RCS file: /cvs/gnome/gimp/app/gui/vectors-menu.c,v retrieving revision 1.12 diff -u -p -r1.12 vectors-menu.c --- app/gui/vectors-menu.c 3 Sep 2003 15:13:15 -0000 1.12 +++ app/gui/vectors-menu.c 4 Jan 1997 04:04:37 -0000 @@ -41,6 +41,19 @@ GimpItemFactoryEntry vectors_menu_entries[] = { + { { N_("/Path _Tool"), NULL, + vectors_vectors_tool_cmd_callback, 0, + "", GIMP_STOCK_TOOL_PATH }, + NULL, + GIMP_HELP_TOOL_VECTORS, NULL }, + { { N_("/_Edit Path Attributes..."), NULL, + vectors_edit_attributes_cmd_callback, 0, + "", GIMP_STOCK_EDIT }, + NULL, + GIMP_HELP_PATH_EDIT, NULL }, + + MENU_SEPARATOR ("/---"), + { { N_("/_New Path..."), "", vectors_new_cmd_callback, 0, "", GTK_STOCK_NEW }, @@ -123,20 +136,7 @@ GimpItemFactoryEntry vectors_menu_entrie vectors_export_cmd_callback, 0, "", GTK_STOCK_SAVE }, NULL, - GIMP_HELP_PATH_EXPORT, NULL }, - - MENU_SEPARATOR ("/---"), - - { { N_("/Path _Tool"), NULL, - vectors_vectors_tool_cmd_callback, 0, - "", GIMP_STOCK_TOOL_PATH }, - NULL, - GIMP_HELP_TOOL_VECTORS, NULL }, - { { N_("/_Edit Path Attributes..."), NULL, - vectors_edit_attributes_cmd_callback, 0, - "", GIMP_STOCK_EDIT }, - NULL, - GIMP_HELP_PATH_EDIT, NULL } + GIMP_HELP_PATH_EXPORT, NULL } }; gint n_vectors_menu_entries = G_N_ELEMENTS (vectors_menu_entries); @@ -181,6 +181,9 @@ vectors_menu_update (GtkItemFactory *fac #define SET_SENSITIVE(menu,condition) \ gimp_item_factory_set_sensitive (factory, menu, (condition) != 0) + SET_SENSITIVE ("/Path Tool", vectors); + SET_SENSITIVE ("/Edit Path Attributes...", vectors); + SET_SENSITIVE ("/New Path...", gimage); SET_SENSITIVE ("/Raise Path", vectors && prev); SET_SENSITIVE ("/Lower Path", vectors && next); @@ -199,10 +202,6 @@ vectors_menu_update (GtkItemFactory *fac SET_SENSITIVE ("/Paste Path", global_buf); SET_SENSITIVE ("/Import Path...", gimage); SET_SENSITIVE ("/Export Path...", vectors); - - SET_SENSITIVE ("/Path Tool", vectors); - - SET_SENSITIVE ("/Edit Path Attributes...", vectors); #undef SET_SENSITIVE }