From 9ad5049decd9954f20f09ffdd304ee7eb601bb29 Mon Sep 17 00:00:00 2001 From: Jehan Date: Thu, 13 Jul 2023 15:34:40 +0200 Subject: [PATCH] menus, plug-ins: now place various plug-ins in the right menu sections. This removes a bunch of inconsistencies we had from the before-2.99.16 version because new items from plug-ins were all added at the bottom of their respective submenu. --- menus/image-menu.ui.in.in | 98 +++++++++---------- plug-ins/common/align-layers.c | 2 +- plug-ins/common/colormap-remap.c | 2 +- plug-ins/common/crop-zealous.c | 2 +- plug-ins/common/guillotine.c | 2 +- plug-ins/common/hot.c | 2 +- plug-ins/common/mail.c | 2 +- plug-ins/common/plugin-browser.c | 2 +- plug-ins/common/procedure-browser.c | 2 +- plug-ins/common/sparkle.c | 2 +- plug-ins/common/unit-editor.c | 2 +- plug-ins/gradient-flare/gradient-flare.c | 2 +- plug-ins/lighting/lighting-main.c | 2 +- plug-ins/print/print.c | 4 +- .../script-fu/libscriptfu/script-fu-scripts.c | 2 +- .../script-fu/scripts/distress-selection.scm | 2 +- plug-ins/script-fu/scripts/drop-shadow.scm | 2 +- .../script-fu/scripts/perspective-shadow.scm | 2 +- .../script-fu/scripts/script-fu-set-cmap.scm | 2 +- .../script-fu/scripts/selection-round.scm | 2 +- plug-ins/script-fu/scripts/xach-effect.scm | 2 +- 21 files changed, 67 insertions(+), 73 deletions(-) diff --git a/menus/image-menu.ui.in.in b/menus/image-menu.ui.in.in index 4e01f46ec2..1922cc1be5 100644 --- a/menus/image-menu.ui.in.in +++ b/menus/image-menu.ui.in.in @@ -10,7 +10,6 @@ Crea_te app.edit-paste-as-new-image - app.file-open app.file-open-as-layers @@ -52,7 +51,9 @@ app.file-export-as app.file-create-template - +
+ Send +
app.file-copy-location app.file-show-in-file-manager @@ -106,12 +107,12 @@ app.vectors-stroke
+ Preferences app.dialogs-preferences app.dialogs-extensions app.dialogs-input-devices app.dialogs-keyboard-shortcuts app.dialogs-module-dialog -
@@ -127,13 +128,15 @@ app.tools-by-color-select-short app.vectors-selection-from-vectors app.dialogs-selection-editor + +
+ Modify app.select-feather app.select-sharpen app.select-shrink app.select-grow app.select-border app.select-flood -
app.quick-mask-toggle @@ -150,7 +153,6 @@ app.view-show-all app.view-dot-for-dot - _Zoom
app.view-zoom-revert @@ -176,7 +178,6 @@
- _Flip & Rotate
app.view-reset @@ -347,25 +348,27 @@ app.image-scale
+ Crop app.image-crop-to-selection app.image-crop-to-content
-
+ Arrange app.image-merge-layers app.image-flatten -
_Guides - app.image-configure-grid
+ Properties app.image-properties - + + Meta_data +
@@ -403,7 +406,6 @@ app.layers-raise-to-top app.layers-lower-to-bottom
- _Mask @@ -499,7 +501,6 @@ app.filters-channel-mixer app.filters-component-extract app.filters-mono-mixer - D_esaturate @@ -510,13 +511,14 @@ _Map - +
+ Colormap +
app.filters-alien-map app.filters-color-exchange app.filters-color-rotate
- _Tone Mapping @@ -524,22 +526,20 @@ app.filters-mantiuk-2006 app.filters-reinhard-2005 app.filters-stress - I_nfo app.dialogs-histogram -
+ Modify app.filters-threshold app.filters-colorize app.filters-posterize app.filters-color-to-alpha app.filters-dither app.filters-rgb-clip -
@@ -643,7 +643,6 @@ app.filters-motion-blur-circular app.filters-motion-blur-linear app.filters-motion-blur-zoom - En_hance @@ -654,7 +653,6 @@ app.filters-red-eye-removal app.filters-snn-mean app.filters-unsharp-mask - _Distorts @@ -674,21 +672,20 @@ app.filters-waves app.filters-whirl-pinch app.filters-wind - _Light and Shadow
+ Light app.filters-bloom app.filters-supernova app.filters-lens-flare -
+ Shadow app.filters-dropshadow app.filters-long-shadow app.filters-vignette -
@@ -723,7 +720,6 @@ C_ombine - _Artistic @@ -736,11 +732,9 @@ app.filters-slic app.filters-softglow app.filters-waterpixels - _Decor - _Map @@ -753,40 +747,38 @@ app.filters-recursive-transform app.filters-tile-paper app.filters-tile-seamless - _Render - - - N_oise - app.filters-noise-cell - app.filters-noise-perlin - app.filters-plasma - app.filters-noise-simplex - app.filters-noise-solid - - - - _Pattern - app.filters-bayer-matrix - app.filters-checkerboard - app.filters-diffraction-patterns - app.filters-grid - app.filters-linear-sinusoid - app.filters-maze - app.filters-sinus - app.filters-spiral - - - +
+ + _Fractals + + + N_oise + app.filters-noise-cell + app.filters-noise-perlin + app.filters-plasma + app.filters-noise-simplex + app.filters-noise-solid + + + _Pattern + app.filters-bayer-matrix + app.filters-checkerboard + app.filters-diffraction-patterns + app.filters-grid + app.filters-linear-sinusoid + app.filters-maze + app.filters-sinus + app.filters-spiral + +
_Web app.filters-semi-flatten - - @@ -837,7 +829,9 @@
app.dialogs-action-search
- +
+ Programming +
diff --git a/plug-ins/common/align-layers.c b/plug-ins/common/align-layers.c index 8201a4d36e..7134b95522 100644 --- a/plug-ins/common/align-layers.c +++ b/plug-ins/common/align-layers.c @@ -177,7 +177,7 @@ align_layers_create_procedure (GimpPlugIn *plug_in, GIMP_PROCEDURE_SENSITIVE_NO_DRAWABLES); gimp_procedure_set_menu_label (procedure, _("Align Visi_ble Layers...")); - gimp_procedure_add_menu_path (procedure, "/Image/Arrange"); + gimp_procedure_add_menu_path (procedure, "/Image/[Arrange]"); gimp_procedure_set_documentation (procedure, _("Align all visible layers of the image"), diff --git a/plug-ins/common/colormap-remap.c b/plug-ins/common/colormap-remap.c index 71b6fe180e..ccf96cf784 100644 --- a/plug-ins/common/colormap-remap.c +++ b/plug-ins/common/colormap-remap.c @@ -185,7 +185,7 @@ remap_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("R_earrange Colormap...")); gimp_procedure_set_icon_name (procedure, GIMP_ICON_COLORMAP); - gimp_procedure_add_menu_path (procedure, "/Colors/Map/Colormap"); + gimp_procedure_add_menu_path (procedure, "/Colors/Map/[Colormap]"); gimp_procedure_add_menu_path (procedure, ""); gimp_procedure_set_documentation (procedure, diff --git a/plug-ins/common/crop-zealous.c b/plug-ins/common/crop-zealous.c index 2b42eac64e..a854365182 100644 --- a/plug-ins/common/crop-zealous.c +++ b/plug-ins/common/crop-zealous.c @@ -112,7 +112,7 @@ crop_create_procedure (GimpPlugIn *plug_in, GIMP_PROCEDURE_SENSITIVE_DRAWABLE); gimp_procedure_set_menu_label (procedure, _("_Zealous Crop")); - gimp_procedure_add_menu_path (procedure, "/Image"); + gimp_procedure_add_menu_path (procedure, "/Image/[Crop]"); gimp_procedure_set_documentation (procedure, _("Autocrop unused space from " diff --git a/plug-ins/common/guillotine.c b/plug-ins/common/guillotine.c index 53d908a95a..ade6cc6db7 100644 --- a/plug-ins/common/guillotine.c +++ b/plug-ins/common/guillotine.c @@ -110,7 +110,7 @@ guillotine_create_procedure (GimpPlugIn *plug_in, GIMP_PROCEDURE_SENSITIVE_NO_DRAWABLES); gimp_procedure_set_menu_label (procedure, _("Slice Using G_uides")); - gimp_procedure_add_menu_path (procedure, "/Image"); + gimp_procedure_add_menu_path (procedure, "/Image/[Crop]"); gimp_procedure_set_documentation (procedure, _("Slice the image into subimages " diff --git a/plug-ins/common/hot.c b/plug-ins/common/hot.c index badd3506f4..89c1ebc3e9 100644 --- a/plug-ins/common/hot.c +++ b/plug-ins/common/hot.c @@ -247,7 +247,7 @@ hot_create_procedure (GimpPlugIn *plug_in, GIMP_PROCEDURE_SENSITIVE_DRAWABLE); gimp_procedure_set_menu_label (procedure, _("_Hot...")); - gimp_procedure_add_menu_path (procedure, "/Colors"); + gimp_procedure_add_menu_path (procedure, "/Colors/[Modify]"); gimp_procedure_set_documentation (procedure, _("Find and fix pixels that may " diff --git a/plug-ins/common/mail.c b/plug-ins/common/mail.c index 39ab4864a0..a88bbcced2 100644 --- a/plug-ins/common/mail.c +++ b/plug-ins/common/mail.c @@ -187,7 +187,7 @@ mail_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("Send by E_mail...")); gimp_procedure_set_icon_name (procedure, GIMP_ICON_EDIT); - gimp_procedure_add_menu_path (procedure, "/File"); + gimp_procedure_add_menu_path (procedure, "/File/[Send]"); gimp_procedure_set_documentation (procedure, _("Send the image by email"), diff --git a/plug-ins/common/plugin-browser.c b/plug-ins/common/plugin-browser.c index b952738794..6322d3945d 100644 --- a/plug-ins/common/plugin-browser.c +++ b/plug-ins/common/plugin-browser.c @@ -168,7 +168,7 @@ browser_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("_Plug-In Browser")); gimp_procedure_set_icon_name (procedure, GIMP_ICON_PLUGIN); - gimp_procedure_add_menu_path (procedure, "/Help"); + gimp_procedure_add_menu_path (procedure, "/Help/[Programming]"); gimp_procedure_set_documentation (procedure, _("Display information about plug-ins"), diff --git a/plug-ins/common/procedure-browser.c b/plug-ins/common/procedure-browser.c index 71dd93bbe0..a0bff17c2a 100644 --- a/plug-ins/common/procedure-browser.c +++ b/plug-ins/common/procedure-browser.c @@ -124,7 +124,7 @@ browser_create_procedure (GimpPlugIn *plug_in, browser_run, NULL, NULL); gimp_procedure_set_menu_label (procedure, _("Procedure _Browser")); - gimp_procedure_add_menu_path (procedure, "/Help"); + gimp_procedure_add_menu_path (procedure, "/Help/[Programming]"); gimp_procedure_set_documentation (procedure, _("List available procedures in the PDB"), diff --git a/plug-ins/common/sparkle.c b/plug-ins/common/sparkle.c index 3b62310ea9..cf50f0ca54 100644 --- a/plug-ins/common/sparkle.c +++ b/plug-ins/common/sparkle.c @@ -176,7 +176,7 @@ sparkle_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("_Sparkle...")); gimp_procedure_add_menu_path (procedure, - "/Filters/Light and Shadow/Light"); + "/Filters/Light and Shadow/[Light]"); gimp_procedure_set_documentation (procedure, _("Turn bright spots into " diff --git a/plug-ins/common/unit-editor.c b/plug-ins/common/unit-editor.c index bd06d90075..8515cba3e1 100644 --- a/plug-ins/common/unit-editor.c +++ b/plug-ins/common/unit-editor.c @@ -174,7 +174,7 @@ editor_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("U_nits")); gimp_procedure_set_icon_name (procedure, GIMP_ICON_TOOL_MEASURE); - gimp_procedure_add_menu_path (procedure, "/Edit"); + gimp_procedure_add_menu_path (procedure, "/Edit/[Preferences]"); gimp_procedure_set_documentation (procedure, _("Create or alter units used in GIMP"), diff --git a/plug-ins/gradient-flare/gradient-flare.c b/plug-ins/gradient-flare/gradient-flare.c index bb4c3d4974..e3e7ed028c 100644 --- a/plug-ins/gradient-flare/gradient-flare.c +++ b/plug-ins/gradient-flare/gradient-flare.c @@ -818,7 +818,7 @@ gflare_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("_Gradient Flare...")); gimp_procedure_add_menu_path (procedure, - "/Filters/Light and Shadow/Light"); + "/Filters/Light and Shadow/[Light]"); gimp_procedure_set_documentation (procedure, _("Produce a lense flare effect " diff --git a/plug-ins/lighting/lighting-main.c b/plug-ins/lighting/lighting-main.c index 45ea7f648e..5af5e1ac9b 100644 --- a/plug-ins/lighting/lighting-main.c +++ b/plug-ins/lighting/lighting-main.c @@ -120,7 +120,7 @@ lighting_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("_Lighting Effects...")); gimp_procedure_add_menu_path (procedure, - "/Filters/Light and Shadow/Light"); + "/Filters/Light and Shadow/[Light]"); gimp_procedure_set_documentation (procedure, _("Apply various lighting effects " diff --git a/plug-ins/print/print.c b/plug-ins/print/print.c index 0116adda13..47f5890892 100644 --- a/plug-ins/print/print.c +++ b/plug-ins/print/print.c @@ -166,7 +166,7 @@ print_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("_Print...")); gimp_procedure_set_icon_name (procedure, GIMP_ICON_DOCUMENT_PRINT); - gimp_procedure_add_menu_path (procedure, "/File"); + gimp_procedure_add_menu_path (procedure, "/File/[Send]"); gimp_procedure_set_documentation (procedure, _("Print the image"), @@ -190,7 +190,7 @@ print_create_procedure (GimpPlugIn *plug_in, gimp_procedure_set_menu_label (procedure, _("Page Set_up...")); gimp_procedure_set_icon_name (procedure, GIMP_ICON_DOCUMENT_PAGE_SETUP); - gimp_procedure_add_menu_path (procedure, "/File"); + gimp_procedure_add_menu_path (procedure, "/File/[Send]"); gimp_procedure_set_documentation (procedure, _("Adjust page size and orientation " diff --git a/plug-ins/script-fu/libscriptfu/script-fu-scripts.c b/plug-ins/script-fu/libscriptfu/script-fu-scripts.c index 0c2d23bffd..c3f10daee6 100644 --- a/plug-ins/script-fu/libscriptfu/script-fu-scripts.c +++ b/plug-ins/script-fu/libscriptfu/script-fu-scripts.c @@ -497,7 +497,7 @@ script_fu_menu_map (const gchar *menu_path) { "/Script-Fu/Decor", "/Filters/Decor" }, { "/Script-Fu/Render", "/Filters/Render" }, { "/Script-Fu/Selection", "/Select/Modify" }, - { "/Script-Fu/Shadow", "/Filters/Light and Shadow/Shadow" }, + { "/Script-Fu/Shadow", "/Filters/Light and Shadow/[Shadow]" }, { "/Script-Fu/Stencil Ops", "/Filters/Decor" } }; diff --git a/plug-ins/script-fu/scripts/distress-selection.scm b/plug-ins/script-fu/scripts/distress-selection.scm index 20e88ad693..668db28603 100644 --- a/plug-ins/script-fu/scripts/distress-selection.scm +++ b/plug-ins/script-fu/scripts/distress-selection.scm @@ -119,4 +119,4 @@ ) (script-fu-menu-register "script-fu-distress-selection" - "/Select/Modify") + "/Select/[Modify]") diff --git a/plug-ins/script-fu/scripts/drop-shadow.scm b/plug-ins/script-fu/scripts/drop-shadow.scm index 5d0acecb5b..0c8392e76e 100644 --- a/plug-ins/script-fu/scripts/drop-shadow.scm +++ b/plug-ins/script-fu/scripts/drop-shadow.scm @@ -184,4 +184,4 @@ ) (script-fu-menu-register "script-fu-drop-shadow" - "/Filters/Light and Shadow/Shadow") + "/Filters/Light and Shadow/[Shadow]") diff --git a/plug-ins/script-fu/scripts/perspective-shadow.scm b/plug-ins/script-fu/scripts/perspective-shadow.scm index 05cafaa5f2..3cccc4216c 100644 --- a/plug-ins/script-fu/scripts/perspective-shadow.scm +++ b/plug-ins/script-fu/scripts/perspective-shadow.scm @@ -213,4 +213,4 @@ ) (script-fu-menu-register "script-fu-perspective-shadow" - "/Filters/Light and Shadow/Shadow") + "/Filters/Light and Shadow/[Shadow]") diff --git a/plug-ins/script-fu/scripts/script-fu-set-cmap.scm b/plug-ins/script-fu/scripts/script-fu-set-cmap.scm index 26d9d8ded7..dfd52f208e 100644 --- a/plug-ins/script-fu/scripts/script-fu-set-cmap.scm +++ b/plug-ins/script-fu/scripts/script-fu-set-cmap.scm @@ -61,4 +61,4 @@ SF-PALETTE _"Palette" "Default" ) -(script-fu-menu-register "script-fu-set-cmap" "/Colors/Map/Colormap") +(script-fu-menu-register "script-fu-set-cmap" "/Colors/Map/[Colormap]") diff --git a/plug-ins/script-fu/scripts/selection-round.scm b/plug-ins/script-fu/scripts/selection-round.scm index afbc91c517..e3d95d2cb3 100644 --- a/plug-ins/script-fu/scripts/selection-round.scm +++ b/plug-ins/script-fu/scripts/selection-round.scm @@ -161,4 +161,4 @@ ) (script-fu-menu-register "script-fu-selection-rounded-rectangle" - "/Select/Modify") + "/Select/[Modify]") diff --git a/plug-ins/script-fu/scripts/xach-effect.scm b/plug-ins/script-fu/scripts/xach-effect.scm index e9b59fd407..610d230fa7 100644 --- a/plug-ins/script-fu/scripts/xach-effect.scm +++ b/plug-ins/script-fu/scripts/xach-effect.scm @@ -139,4 +139,4 @@ ) (script-fu-menu-register "script-fu-xach-effect" - "/Filters/Light and Shadow/Shadow") + "/Filters/Light and Shadow/[Shadow]")