diff --git a/ChangeLog b/ChangeLog index 7c40e11ff9..d79910f8e1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2003-09-16 Michael Natterer + + * app/gui/brushes-menu.c + * app/gui/colormap-editor-menu.c + * app/gui/dialogs-menu.c + * app/gui/documents-menu.c + * app/gui/gradients-menu.c + * app/gui/palettes-menu.c + * app/gui/patterns-menu.c: suppress more standard GTK+ stock item + accelerators in popup menus by specifying "" instead of NULL as + accelerator. + 2003-09-16 Michael Natterer * app/tools/gimpmoveoptions.[ch]: changed "gboolean move_mask" to diff --git a/app/gui/brushes-menu.c b/app/gui/brushes-menu.c index fc1753fe1a..cbe4da70ad 100644 --- a/app/gui/brushes-menu.c +++ b/app/gui/brushes-menu.c @@ -50,7 +50,7 @@ GimpItemFactoryEntry brushes_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/_New Brush"), NULL, + { { N_("/_New Brush"), "", data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, @@ -60,7 +60,7 @@ GimpItemFactoryEntry brushes_menu_entries[] = "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_BRUSH_DUPLICATE, NULL }, - { { N_("/_Delete Brush..."), NULL, + { { N_("/_Delete Brush..."), "", data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, @@ -68,7 +68,7 @@ GimpItemFactoryEntry brushes_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/_Refresh Brushes"), NULL, + { { N_("/_Refresh Brushes"), "", data_refresh_data_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, diff --git a/app/gui/colormap-editor-menu.c b/app/gui/colormap-editor-menu.c index aee89bb97a..ded7cc9ee5 100644 --- a/app/gui/colormap-editor-menu.c +++ b/app/gui/colormap-editor-menu.c @@ -42,7 +42,7 @@ GimpItemFactoryEntry colormap_editor_menu_entries[] = "", GIMP_STOCK_EDIT }, NULL, NULL, NULL }, - { { N_("/_Add Color"), NULL, + { { N_("/_Add Color"), "", colormap_editor_add_color_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, diff --git a/app/gui/dialogs-menu.c b/app/gui/dialogs-menu.c index 504f4e4c48..5d4194283d 100644 --- a/app/gui/dialogs-menu.c +++ b/app/gui/dialogs-menu.c @@ -118,7 +118,7 @@ GimpItemFactoryEntry dialogs_menu_entries[] = ADD_TAB (N_("/Add Tab/Tools..."), "gimp-tool-list", GTK_STOCK_MISSING_IMAGE, GIMP_HELP_TOOL_DIALOG), - { { N_("/_Remove Tab"), NULL, + { { N_("/_Remove Tab"), "", dialogs_remove_tab_cmd_callback, 0, "", GTK_STOCK_REMOVE }, NULL, diff --git a/app/gui/documents-menu.c b/app/gui/documents-menu.c index 900a467a7a..4723a0b8b6 100644 --- a/app/gui/documents-menu.c +++ b/app/gui/documents-menu.c @@ -63,17 +63,17 @@ GimpItemFactoryEntry documents_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/Recreate _Preview"), NULL, + { { N_("/Recreate _Preview"), "", documents_recreate_preview_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, GIMP_HELP_DOCUMENT_REFRESH, NULL }, - { { N_("/Reload _all Previews"), NULL, + { { N_("/Reload _all Previews"), "", documents_reload_previews_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, GIMP_HELP_DOCUMENT_REFRESH, NULL }, - { { N_("/Remove Dangling E_ntries"), NULL, + { { N_("/Remove Dangling E_ntries"), "", documents_delete_dangling_documents_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, diff --git a/app/gui/gradients-menu.c b/app/gui/gradients-menu.c index 361ab5e5f5..cffc1eac80 100644 --- a/app/gui/gradients-menu.c +++ b/app/gui/gradients-menu.c @@ -51,7 +51,7 @@ GimpItemFactoryEntry gradients_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/_New Gradient"), NULL, + { { N_("/_New Gradient"), "", data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, @@ -61,12 +61,12 @@ GimpItemFactoryEntry gradients_menu_entries[] = "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_GRADIENT_DUPLICATE, NULL }, - { { N_("/Save as _POV-Ray..."), NULL, + { { N_("/Save as _POV-Ray..."), "", gradients_save_as_pov_ray_cmd_callback, 0, "", GTK_STOCK_SAVE_AS }, NULL, GIMP_HELP_GRADIENT_SAVE_AS_POV, NULL }, - { { N_("/_Delete Gradient..."), NULL, + { { N_("/_Delete Gradient..."), "", data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, @@ -74,7 +74,7 @@ GimpItemFactoryEntry gradients_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/_Refresh Gradients"), NULL, + { { N_("/_Refresh Gradients"), "", data_refresh_data_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, diff --git a/app/gui/palettes-menu.c b/app/gui/palettes-menu.c index d6abb1d3ae..17d73e4a92 100644 --- a/app/gui/palettes-menu.c +++ b/app/gui/palettes-menu.c @@ -51,12 +51,12 @@ GimpItemFactoryEntry palettes_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/_New Palette"), NULL, + { { N_("/_New Palette"), "", data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, GIMP_HELP_PALETTE_NEW, NULL }, - { { N_("/_Import Palette..."), NULL, + { { N_("/_Import Palette..."), "", palettes_import_palette_cmd_callback, 0, "", GTK_STOCK_CONVERT }, NULL, @@ -70,7 +70,7 @@ GimpItemFactoryEntry palettes_menu_entries[] = palettes_merge_palettes_cmd_callback, 0 }, NULL, GIMP_HELP_PALETTE_MERGE, NULL }, - { { N_("/_Delete Palette..."), NULL, + { { N_("/_Delete Palette..."), "", data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, @@ -78,7 +78,7 @@ GimpItemFactoryEntry palettes_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/_Refresh Palettes"), NULL, + { { N_("/_Refresh Palettes"), "", data_refresh_data_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL, diff --git a/app/gui/patterns-menu.c b/app/gui/patterns-menu.c index 36be3d36bb..0c5dbbefc7 100644 --- a/app/gui/patterns-menu.c +++ b/app/gui/patterns-menu.c @@ -50,7 +50,7 @@ GimpItemFactoryEntry patterns_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/New Pattern"), NULL, + { { N_("/New Pattern"), "", data_new_data_cmd_callback, 0, "", GTK_STOCK_NEW }, NULL, @@ -60,7 +60,7 @@ GimpItemFactoryEntry patterns_menu_entries[] = "", GIMP_STOCK_DUPLICATE }, NULL, GIMP_HELP_PATTERN_DUPLICATE, NULL }, - { { N_("/Delete Pattern..."), NULL, + { { N_("/Delete Pattern..."), "", data_delete_data_cmd_callback, 0, "", GTK_STOCK_DELETE }, NULL, @@ -68,7 +68,7 @@ GimpItemFactoryEntry patterns_menu_entries[] = MENU_SEPARATOR ("/---"), - { { N_("/Refresh Patterns"), NULL, + { { N_("/Refresh Patterns"), "", data_refresh_data_cmd_callback, 0, "", GTK_STOCK_REFRESH }, NULL,