diff --git a/ChangeLog b/ChangeLog index ae079974f6..b72dc9d44d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,15 @@ +2004-04-21 Michael Natterer + + * app/actions/actions.c: forgot to register the "patterns" actions. + + * app/actions/*-actions.c: added actions representing the toplevel + menus (popups and menubars). Fixed some typos. + + * menus/*-menu.xml: added action="foo" attributes to all toplevel + menus. Fixed typos here too. + + * menus/gtkuimanager.dtd: fixed possible attributes. + 2004-04-21 Sven Neumann * libgimp/gimpmenu.c (gimp_menu_add_none): use the same label as diff --git a/app/actions/actions.c b/app/actions/actions.c index 65b1e4e65b..2394277a21 100644 --- a/app/actions/actions.c +++ b/app/actions/actions.c @@ -132,6 +132,9 @@ static GimpActionFactoryEntry action_groups[] = { "palettes", palettes_actions_setup, palettes_actions_update }, + { "patterns", + patterns_actions_setup, + patterns_actions_update }, { "plug-in", plug_in_actions_setup, plug_in_actions_update }, diff --git a/app/actions/brushes-actions.c b/app/actions/brushes-actions.c index 91ba87ecd2..e388abfb1a 100644 --- a/app/actions/brushes-actions.c +++ b/app/actions/brushes-actions.c @@ -41,6 +41,8 @@ static GimpActionEntry brushes_actions[] = { + { "brushes-popup", NULL, N_("Brushes Menu") }, + { "brushes-edit", GIMP_STOCK_EDIT, N_("_Edit Brush..."), NULL, NULL, G_CALLBACK (data_edit_data_cmd_callback), diff --git a/app/actions/buffers-actions.c b/app/actions/buffers-actions.c index 98b6a524b1..a38a535c2b 100644 --- a/app/actions/buffers-actions.c +++ b/app/actions/buffers-actions.c @@ -39,12 +39,14 @@ static GimpActionEntry buffers_actions[] = { + { "buffers-popup", NULL, N_("Buffers Menu") }, + { "buffers-paste", GTK_STOCK_PASTE, N_("_Paste Buffer"), "", NULL, G_CALLBACK (buffers_paste_buffer_cmd_callback), GIMP_HELP_BUFFER_PASTE }, - { "buffers-paste-info", GIMP_STOCK_PASTE_INTO, + { "buffers-paste-into", GIMP_STOCK_PASTE_INTO, N_("Paste Buffer _Into"), NULL, NULL, G_CALLBACK (buffers_paste_buffer_into_cmd_callback), GIMP_HELP_BUFFER_PASTE_INTO }, diff --git a/app/actions/channels-actions.c b/app/actions/channels-actions.c index 12d03f24e5..38ad1f5304 100644 --- a/app/actions/channels-actions.c +++ b/app/actions/channels-actions.c @@ -40,6 +40,8 @@ static GimpActionEntry channels_actions[] = { + { "channels-popup", NULL, N_("Channels Menu") }, + { "channels-edit-attributes", GIMP_STOCK_EDIT, N_("_Edit Channel Attributes..."), NULL, NULL, G_CALLBACK (channels_edit_attributes_cmd_callback), diff --git a/app/actions/colormap-actions.c b/app/actions/colormap-actions.c index ef506aaf73..a916452760 100644 --- a/app/actions/colormap-actions.c +++ b/app/actions/colormap-actions.c @@ -38,6 +38,8 @@ static GimpActionEntry colormap_editor_actions[] = { + { "colormap-editor-popup", NULL, N_("Indexed Palette Menu") }, + { "colormap-editor-edit-color", GIMP_STOCK_EDIT, N_("_Edit Color..."), NULL, NULL, G_CALLBACK (colormap_editor_edit_color_cmd_callback), diff --git a/app/actions/colormap-editor-actions.c b/app/actions/colormap-editor-actions.c index ef506aaf73..a916452760 100644 --- a/app/actions/colormap-editor-actions.c +++ b/app/actions/colormap-editor-actions.c @@ -38,6 +38,8 @@ static GimpActionEntry colormap_editor_actions[] = { + { "colormap-editor-popup", NULL, N_("Indexed Palette Menu") }, + { "colormap-editor-edit-color", GIMP_STOCK_EDIT, N_("_Edit Color..."), NULL, NULL, G_CALLBACK (colormap_editor_edit_color_cmd_callback), diff --git a/app/actions/dockable-actions.c b/app/actions/dockable-actions.c index 78ca240ce1..075b26d576 100644 --- a/app/actions/dockable-actions.c +++ b/app/actions/dockable-actions.c @@ -45,16 +45,11 @@ static GimpActionEntry dockable_actions[] = { - { "dockable-menu", GTK_STOCK_MISSING_IMAGE, NULL }, - - { "dockable-add-tab-menu", NULL, - N_("_Add Tab") }, - - { "dockable-preview-size-menu", NULL, - N_("Preview Si_ze") }, - - { "dockable-tab-style-menu", NULL, - N_("/_Tab Style") }, + { "dockable-popup", NULL, N_("Dialogs Menu") }, + { "dockable-menu", GTK_STOCK_MISSING_IMAGE, NULL }, + { "dockable-add-tab-menu", NULL, N_("_Add Tab") }, + { "dockable-preview-size-menu", NULL, N_("Preview Si_ze") }, + { "dockable-tab-style-menu", NULL, N_("/_Tab Style") }, { "dockable-close-tab", GTK_STOCK_CLOSE, N_("_Close Tab"), "", NULL, diff --git a/app/actions/documents-actions.c b/app/actions/documents-actions.c index d3196e38ca..097e89ab46 100644 --- a/app/actions/documents-actions.c +++ b/app/actions/documents-actions.c @@ -39,6 +39,8 @@ static GimpActionEntry documents_actions[] = { + { "ducuments-popup", NULL, N_("Documents Menu") }, + { "documents-open", GTK_STOCK_OPEN, N_("_Open Image"), "", NULL, G_CALLBACK (documents_open_document_cmd_callback), diff --git a/app/actions/fonts-actions.c b/app/actions/fonts-actions.c index 38f6d90f02..aebd668eb9 100644 --- a/app/actions/fonts-actions.c +++ b/app/actions/fonts-actions.c @@ -41,6 +41,8 @@ static GimpActionEntry fonts_actions[] = { + { "fonts-popup", NULL, N_("Fonts Menu") }, + { "fonts-refresh", GTK_STOCK_REFRESH, N_("_Rescan Font List"), "", NULL, G_CALLBACK (fonts_refresh_cmd_callback), diff --git a/app/actions/gradient-editor-actions.c b/app/actions/gradient-editor-actions.c index d5a60dcc4a..b3c0811a12 100644 --- a/app/actions/gradient-editor-actions.c +++ b/app/actions/gradient-editor-actions.c @@ -42,6 +42,8 @@ static GimpActionEntry gradient_editor_actions[] = { + { "gradient-editor-popup", NULL, N_("Gradient Editor Menu") }, + { "gradient-editor-left-color", NULL, N_("L_eft Endpoint's Color..."), NULL, NULL, G_CALLBACK (gradient_editor_left_color_cmd_callback), diff --git a/app/actions/gradients-actions.c b/app/actions/gradients-actions.c index 9916bbd0b6..e487a8c7f0 100644 --- a/app/actions/gradients-actions.c +++ b/app/actions/gradients-actions.c @@ -42,6 +42,8 @@ static GimpActionEntry gradients_actions[] = { + { "gradients-popup", NULL, N_("Gradients Menu") }, + { "gradients-edit", GIMP_STOCK_EDIT, N_("_Edit Gradient..."), NULL, NULL, G_CALLBACK (data_edit_data_cmd_callback), diff --git a/app/actions/image-actions.c b/app/actions/image-actions.c index 463b87c309..7ec9c8f267 100644 --- a/app/actions/image-actions.c +++ b/app/actions/image-actions.c @@ -45,6 +45,7 @@ static GimpActionEntry image_actions[] = { + { "toolbox-menubar", NULL, N_("Toolbox Menu") }, { "image-menubar", NULL, N_("Image Menu") }, { "image-menu", NULL, N_("_Image") }, { "image-mode-menu", NULL, N_("_Mode") }, diff --git a/app/actions/images-actions.c b/app/actions/images-actions.c index 6124b46ab2..6e3c19a27c 100644 --- a/app/actions/images-actions.c +++ b/app/actions/images-actions.c @@ -39,6 +39,8 @@ static GimpActionEntry images_actions[] = { + { "images-popup", NULL, N_("Images Menu") }, + { "images-raise-views", GTK_STOCK_GOTO_TOP, N_("_Raise Views"), "", NULL, G_CALLBACK (images_raise_views_cmd_callback), diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c index 81bb1e9079..aaa0368d06 100644 --- a/app/actions/layers-actions.c +++ b/app/actions/layers-actions.c @@ -45,26 +45,14 @@ static GimpActionEntry layers_actions[] = { - { "layers-menu", NULL, - N_("_Layer") }, - - { "layers-stack-menu", NULL, - N_("Stac_k") }, - - { "layers-colors-menu", NULL, - N_("_Colors") }, - - { "layers-colors-auto-menu", NULL, - N_("_Auto") }, - - { "layers-mask-menu", NULL, - N_("_Mask") }, - - { "layers-transparency-menu", NULL, - N_("Tr_ansparency") }, - - { "layers-transform-menu", NULL, - N_("_Transform") }, + { "layers-popup", NULL, N_("Layers Menu") }, + { "layers-menu", NULL, N_("_Layer") }, + { "layers-stack-menu", NULL, N_("Stac_k") }, + { "layers-colors-menu", NULL, N_("_Colors") }, + { "layers-colors-auto-menu", NULL, N_("_Auto") }, + { "layers-mask-menu", NULL, N_("_Mask") }, + { "layers-transparency-menu", NULL, N_("Tr_ansparency") }, + { "layers-transform-menu", NULL, N_("_Transform") }, { "layers-text-tool", GIMP_STOCK_TOOL_TEXT, N_("Te_xt Tool"), NULL, NULL, diff --git a/app/actions/palette-editor-actions.c b/app/actions/palette-editor-actions.c index e253401bc3..85816eb940 100644 --- a/app/actions/palette-editor-actions.c +++ b/app/actions/palette-editor-actions.c @@ -36,6 +36,8 @@ static GimpActionEntry palette_editor_actions[] = { + { "palette-editor-popup", NULL, N_("Palette Editor Menu") }, + { "palette-editor-edit-color", GIMP_STOCK_EDIT, N_("_Edit Color..."), "", NULL, G_CALLBACK (palette_editor_edit_color_cmd_callback), diff --git a/app/actions/palettes-actions.c b/app/actions/palettes-actions.c index 956850e5f0..13bb580a37 100644 --- a/app/actions/palettes-actions.c +++ b/app/actions/palettes-actions.c @@ -42,6 +42,8 @@ static GimpActionEntry palettes_actions[] = { + { "palettes-popup", NULL, N_("Palettes Menu") }, + { "palettes-edit", GIMP_STOCK_EDIT, N_("_Edit Palette..."), NULL, NULL, G_CALLBACK (data_edit_data_cmd_callback), diff --git a/app/actions/patterns-actions.c b/app/actions/patterns-actions.c index 4742adfb95..612612e9ba 100644 --- a/app/actions/patterns-actions.c +++ b/app/actions/patterns-actions.c @@ -41,6 +41,8 @@ static GimpActionEntry patterns_actions[] = { + { "patterns-popup", NULL, N_("Patterns Menu") }, + { "patterns-edit", GIMP_STOCK_EDIT, N_("_Edit Pattern..."), NULL, NULL, G_CALLBACK (data_edit_data_cmd_callback), diff --git a/app/actions/qmask-actions.c b/app/actions/qmask-actions.c index 59addb0c21..b4e2e8db0d 100644 --- a/app/actions/qmask-actions.c +++ b/app/actions/qmask-actions.c @@ -40,6 +40,8 @@ static GimpActionEntry qmask_actions[] = { + { "qmask-popup", NULL, N_("QMask Menu") }, + { "qmask-configure", NULL, N_("_Configure Color and Opacity..."), NULL, NULL, G_CALLBACK (qmask_configure_cmd_callback), diff --git a/app/actions/quick-mask-actions.c b/app/actions/quick-mask-actions.c index 59addb0c21..b4e2e8db0d 100644 --- a/app/actions/quick-mask-actions.c +++ b/app/actions/quick-mask-actions.c @@ -40,6 +40,8 @@ static GimpActionEntry qmask_actions[] = { + { "qmask-popup", NULL, N_("QMask Menu") }, + { "qmask-configure", NULL, N_("_Configure Color and Opacity..."), NULL, NULL, G_CALLBACK (qmask_configure_cmd_callback), diff --git a/app/actions/templates-actions.c b/app/actions/templates-actions.c index 3ecd1dc53a..dcadf9fe71 100644 --- a/app/actions/templates-actions.c +++ b/app/actions/templates-actions.c @@ -39,6 +39,8 @@ static GimpActionEntry templates_actions[] = { + { "templates-popup", NULL, N_("Templates Menu") }, + { "templates-create-image", GIMP_STOCK_IMAGE, N_("_Create Image from Template..."), "", NULL, G_CALLBACK (templates_create_image_cmd_callback), diff --git a/app/actions/tool-options-actions.c b/app/actions/tool-options-actions.c index bd705a2214..ab5c8566b8 100644 --- a/app/actions/tool-options-actions.c +++ b/app/actions/tool-options-actions.c @@ -53,23 +53,17 @@ static void tool_options_actions_update_presets (GimpActionGroup *group, static GimpActionEntry tool_options_actions[] = { - { "tool-options-save-menu", NULL, - N_("_Save Options to") }, + { "tool-options-popup", NULL, N_("Tool Options Menu") }, + { "tool-options-save-menu", NULL, N_("_Save Options to") }, + { "tool-options-restore-menu", NULL, N_("_Restore Options from") }, + { "tool-options-rename-menu", NULL, N_("Re_name Saved Options") }, + { "tool-options-delete-menu", NULL, N_("_Delete Saved Options") }, { "tool-options-save-new", GTK_STOCK_NEW, N_("_New Entry..."), "", NULL, G_CALLBACK (tool_options_save_new_cmd_callback), GIMP_HELP_TOOL_OPTIONS_SAVE }, - { "tool-options-restore-menu", NULL, - N_("_Restore Options from") }, - - { "tool-options-rename-menu", NULL, - N_("Re_name Saved Options") }, - - { "tool-options-delete-menu", NULL, - N_("_Delete Saved Options") }, - { "tool-options-reset", GIMP_STOCK_RESET, N_("R_eset Tool Options"), "", NULL, G_CALLBACK (tool_options_reset_cmd_callback), diff --git a/app/actions/vectors-actions.c b/app/actions/vectors-actions.c index 4325722355..36f54dd7ea 100644 --- a/app/actions/vectors-actions.c +++ b/app/actions/vectors-actions.c @@ -40,6 +40,8 @@ static GimpActionEntry vectors_actions[] = { + { "vectors-popup", NULL, N_("Paths Menu") }, + { "vectors-path-tool", GIMP_STOCK_TOOL_PATH, N_("Path _Tool"), NULL, NULL, G_CALLBACK (vectors_vectors_tool_cmd_callback), diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c index da1797d7e1..373f73fe7a 100644 --- a/app/actions/view-actions.c +++ b/app/actions/view-actions.c @@ -225,7 +225,7 @@ static GimpRadioActionEntry view_zoom_actions[] = GIMP_HELP_VIEW_ZOOM_OUT }, { "view-zoom-other", NULL, - "/View/Zoom/O_ther...", NULL, NULL, + "O_ther...", NULL, NULL, 0, GIMP_HELP_VIEW_ZOOM_OTHER } }; @@ -386,7 +386,7 @@ view_actions_set_zoom (GimpActionGroup *group, if (!action) { - action = "/View/Zoom/Other..."; + action = "view-zoom-other"; label = g_strdup_printf (_("Other (%s) ..."), buf); gimp_action_group_set_action_label (group, action, label); diff --git a/menus/buffers-menu.xml b/menus/buffers-menu.xml index 321c2967b5..89c4d12ea2 100644 --- a/menus/buffers-menu.xml +++ b/menus/buffers-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/channels-menu.xml b/menus/channels-menu.xml index 1e0512c2eb..e4139c250a 100644 --- a/menus/channels-menu.xml +++ b/menus/channels-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/dockable-menu.xml b/menus/dockable-menu.xml index e40ebbb0d9..3c7add4b1d 100644 --- a/menus/dockable-menu.xml +++ b/menus/dockable-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/documents-menu.xml b/menus/documents-menu.xml index 787b1ac8bb..80213194e7 100644 --- a/menus/documents-menu.xml +++ b/menus/documents-menu.xml @@ -2,10 +2,10 @@ - + - + diff --git a/menus/error-console-menu.xml b/menus/error-console-menu.xml index b6e70b8a8d..a4b0a2d639 100644 --- a/menus/error-console-menu.xml +++ b/menus/error-console-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/fonts-menu.xml b/menus/fonts-menu.xml index 3576bb4283..ca1e4ab7a9 100644 --- a/menus/fonts-menu.xml +++ b/menus/fonts-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/gradient-editor-menu.xml b/menus/gradient-editor-menu.xml index 663aa425eb..9ff54c50bc 100644 --- a/menus/gradient-editor-menu.xml +++ b/menus/gradient-editor-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/gradients-menu.xml b/menus/gradients-menu.xml index 372a597515..5e5f7f7a7b 100644 --- a/menus/gradients-menu.xml +++ b/menus/gradients-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/gtkuimanager.dtd b/menus/gtkuimanager.dtd index 6bf7a3afed..8cadbf5894 100644 --- a/menus/gtkuimanager.dtd +++ b/menus/gtkuimanager.dtd @@ -10,10 +10,14 @@ - - - - + + + + diff --git a/menus/images-menu.xml b/menus/images-menu.xml index 144f3f16db..d81c87fabd 100644 --- a/menus/images-menu.xml +++ b/menus/images-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/layers-menu.xml b/menus/layers-menu.xml index ef46c67bb2..1efa71a911 100644 --- a/menus/layers-menu.xml +++ b/menus/layers-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/palette-editor-menu.xml b/menus/palette-editor-menu.xml index 184be99d9f..86b44b0fd6 100644 --- a/menus/palette-editor-menu.xml +++ b/menus/palette-editor-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/palettes-menu.xml b/menus/palettes-menu.xml index b8fd7ee42e..ed568eee47 100644 --- a/menus/palettes-menu.xml +++ b/menus/palettes-menu.xml @@ -2,7 +2,7 @@ - + diff --git a/menus/patterns-menu.xml b/menus/patterns-menu.xml index 586f61aae4..6c1a9a2adf 100644 --- a/menus/patterns-menu.xml +++ b/menus/patterns-menu.xml @@ -2,7 +2,7 @@ - +