dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

menus: move menus to submenus of tab menu 

Fixes #9883

    There were menus that put their entries
    directly in the tab menu rather than in a submenu.

    This moves them to submenus to bring back GIMP 2.10 behavior.

    Stray entries added by scripts are also moved to the right
    submenu.
This commit is contained in:
Anders Jonsson 2024-02-25 00:13:01 +01:00 committed by Jacob Boerema
parent 08c1fdc719
commit 0d512085f3
19 changed files with 126 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
menus/buffers-menu.ui
View File

@ -2,15 +2,19 @@
<interface> <interface>
<menu id="/buffers-popup"> <menu id="/buffers-popup">
<section> <submenu>
<item><attribute name="action">buffers.buffers-paste</attribute></item> <attribute name="label" translatable="yes" context="buffers-action">Buffers Menu</attribute>
<item><attribute name="action">buffers.buffers-paste-in-place</attribute></item>
<item><attribute name="action">buffers.buffers-paste-into</attribute></item> <section>
<item><attribute name="action">buffers.buffers-paste-into-in-place</attribute></item> <item><attribute name="action">buffers.buffers-paste</attribute></item>
<item><attribute name="action">buffers.buffers-paste-as-new-layer</attribute></item> <item><attribute name="action">buffers.buffers-paste-in-place</attribute></item>
<item><attribute name="action">buffers.buffers-paste-as-new-layer-in-place</attribute></item> <item><attribute name="action">buffers.buffers-paste-into</attribute></item>
<item><attribute name="action">buffers.buffers-paste-as-new-image</attribute></item> <item><attribute name="action">buffers.buffers-paste-into-in-place</attribute></item>
<item><attribute name="action">buffers.buffers-delete</attribute></item> <item><attribute name="action">buffers.buffers-paste-as-new-layer</attribute></item>
</section> <item><attribute name="action">buffers.buffers-paste-as-new-layer-in-place</attribute></item>
<item><attribute name="action">buffers.buffers-paste-as-new-image</attribute></item>
<item><attribute name="action">buffers.buffers-delete</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

24
menus/colormap-menu.ui
View File

@ -2,15 +2,19 @@
<interface> <interface>
<menu id="/colormap-popup"> <menu id="/colormap-popup">
<item><attribute name="action">colormap.colormap-edit-color</attribute></item> <submenu>
<item><attribute name="action">colormap.colormap-delete-color</attribute></item> <attribute name="label" translatable="yes" context="colormap-action">Colormap Menu</attribute>
<item><attribute name="action">colormap.colormap-add-color-from-fg</attribute></item>
<item><attribute name="action">colormap.colormap-add-color-from-bg</attribute></item> <item><attribute name="action">colormap.colormap-edit-color</attribute></item>
<section> <item><attribute name="action">colormap.colormap-delete-color</attribute></item>
<item><attribute name="action">colormap.colormap-selection-replace</attribute></item> <item><attribute name="action">colormap.colormap-add-color-from-fg</attribute></item>
<item><attribute name="action">colormap.colormap-selection-add</attribute></item> <item><attribute name="action">colormap.colormap-add-color-from-bg</attribute></item>
<item><attribute name="action">colormap.colormap-selection-subtract</attribute></item> <section>
<item><attribute name="action">colormap.colormap-selection-intersect</attribute></item> <item><attribute name="action">colormap.colormap-selection-replace</attribute></item>
</section> <item><attribute name="action">colormap.colormap-selection-add</attribute></item>
<item><attribute name="action">colormap.colormap-selection-subtract</attribute></item>
<item><attribute name="action">colormap.colormap-selection-intersect</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

28
menus/documents-menu.ui
View File

@ -2,17 +2,21 @@
<interface> <interface>
<menu id="/documents-popup"> <menu id="/documents-popup">
<item><attribute name="action">documents.documents-open</attribute></item> <submenu>
<item><attribute name="action">documents.documents-raise-or-open</attribute></item> <attribute name="label" translatable="yes" context="documents-action">Documents Menu</attribute>
<item><attribute name="action">documents.documents-file-open-dialog</attribute></item>
<item><attribute name="action">documents.documents-copy-location</attribute></item> <item><attribute name="action">documents.documents-open</attribute></item>
<item><attribute name="action">documents.documents-show-in-file-manager</attribute></item> <item><attribute name="action">documents.documents-raise-or-open</attribute></item>
<item><attribute name="action">documents.documents-remove</attribute></item> <item><attribute name="action">documents.documents-file-open-dialog</attribute></item>
<item><attribute name="action">documents.documents-clear</attribute></item> <item><attribute name="action">documents.documents-copy-location</attribute></item>
<section> <item><attribute name="action">documents.documents-show-in-file-manager</attribute></item>
<item><attribute name="action">documents.documents-recreate-preview</attribute></item> <item><attribute name="action">documents.documents-remove</attribute></item>
<item><attribute name="action">documents.documents-reload-previews</attribute></item> <item><attribute name="action">documents.documents-clear</attribute></item>
<item><attribute name="action">documents.documents-remove-dangling</attribute></item> <section>
</section> <item><attribute name="action">documents.documents-recreate-preview</attribute></item>
<item><attribute name="action">documents.documents-reload-previews</attribute></item>
<item><attribute name="action">documents.documents-remove-dangling</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

24
menus/error-console-menu.ui
View File

@ -2,17 +2,21 @@
<interface> <interface>
<menu id="/error-console-popup"> <menu id="/error-console-popup">
<item><attribute name="action">error-console.error-console-clear</attribute></item>
<item><attribute name="action">error-console.error-console-select-all</attribute></item>
<section>
<item><attribute name="action">error-console.error-console-save-all</attribute></item>
<item><attribute name="action">error-console.error-console-save-selection</attribute></item>
</section>
<submenu> <submenu>
<attribute name="label" translatable="yes" context="error-console-action">_Highlight</attribute> <attribute name="label" translatable="yes" context="error-console-action">Error Console Menu</attribute>
<item><attribute name="action">error-console.error-console-highlight-error</attribute></item>
<item><attribute name="action">error-console.error-console-highlight-warning</attribute></item> <item><attribute name="action">error-console.error-console-clear</attribute></item>
<item><attribute name="action">error-console.error-console-highlight-info</attribute></item> <item><attribute name="action">error-console.error-console-select-all</attribute></item>
<section>
<item><attribute name="action">error-console.error-console-save-all</attribute></item>
<item><attribute name="action">error-console.error-console-save-selection</attribute></item>
</section>
<submenu>
<attribute name="label" translatable="yes" context="error-console-action">_Highlight</attribute>
<item><attribute name="action">error-console.error-console-highlight-error</attribute></item>
<item><attribute name="action">error-console.error-console-highlight-warning</attribute></item>
<item><attribute name="action">error-console.error-console-highlight-info</attribute></item>
</submenu>
</submenu> </submenu>
</menu> </menu>
</interface> </interface>

10
menus/fonts-menu.ui
View File

@ -2,8 +2,12 @@
<interface> <interface>
<menu id="/fonts-popup"> <menu id="/fonts-popup">
<section> <submenu>
<item><attribute name="action">fonts.fonts-refresh</attribute></item> <attribute name="label" translatable="yes" context="fonts-action">Fonts Menu</attribute>
</section>
<section>
<item><attribute name="action">fonts.fonts-refresh</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

10
menus/images-menu.ui
View File

@ -2,8 +2,12 @@
<interface> <interface>
<menu id="/images-popup"> <menu id="/images-popup">
<item><attribute name="action">images.images-raise-views</attribute></item> <submenu>
<item><attribute name="action">images.images-new-view</attribute></item> <attribute name="label" translatable="yes" context="images-action">Images Menu</attribute>
<item><attribute name="action">images.images-delete</attribute></item>
<item><attribute name="action">images.images-raise-views</attribute></item>
<item><attribute name="action">images.images-new-view</attribute></item>
<item><attribute name="action">images.images-delete</attribute></item>
</submenu>
</menu> </menu>
</interface> </interface>

16
menus/mypaint-brushes-menu.ui
View File

@ -2,11 +2,15 @@
<interface> <interface>
<menu id="/mypaint-brushes-popup"> <menu id="/mypaint-brushes-popup">
<item><attribute name="action">mypaint-brushes.mypaint-brushes-copy-location</attribute></item> <submenu>
<item><attribute name="action">mypaint-brushes.mypaint-brushes-show-in-file-manager</attribute></item> <attribute name="label" translatable="yes" context="mypaint-brushes-action">MyPaint Brushes Menu</attribute>
<item><attribute name="action">mypaint-brushes.mypaint-brushes-delete</attribute></item>
<section> <item><attribute name="action">mypaint-brushes.mypaint-brushes-copy-location</attribute></item>
<item><attribute name="action">mypaint-brushes.mypaint-brushes-refresh</attribute></item> <item><attribute name="action">mypaint-brushes.mypaint-brushes-show-in-file-manager</attribute></item>
</section> <item><attribute name="action">mypaint-brushes.mypaint-brushes-delete</attribute></item>
<section>
<item><attribute name="action">mypaint-brushes.mypaint-brushes-refresh</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

6
menus/palettes-menu.ui
View File

@ -19,9 +19,9 @@
<section> <section>
<item><attribute name="action">palettes.palettes-refresh</attribute></item> <item><attribute name="action">palettes.palettes-refresh</attribute></item>
</section> </section>
</submenu> <submenu>
<submenu> <attribute name="label" translatable="yes" context="palettes-action">Export as</attribute>
<attribute name="label" translatable="yes" context="palettes-action">Export as</attribute> </submenu>
</submenu> </submenu>
</menu> </menu>
</interface> </interface>

32
menus/patterns-menu.ui
View File

@ -2,21 +2,25 @@
<interface> <interface>
<menu id="/patterns-popup"> <menu id="/patterns-popup">
<item><attribute name="action">patterns.patterns-open-as-image</attribute></item> <submenu>
<attribute name="label" translatable="yes" context="patterns-action">Patterns Menu</attribute>
<!-- disabled because they are useless now <item><attribute name="action">patterns.patterns-open-as-image</attribute></item>
<item><attribute name="action">patterns.patterns-edit</attribute></item>
<section>
<item><attribute name="action">patterns.patterns-new</attribute></item>
<item><attribute name="action">patterns.patterns-duplicate</attribute></item>
</section>
-->
<item><attribute name="action">patterns.patterns-copy-location</attribute></item> <!-- disabled because they are useless now
<item><attribute name="action">patterns.patterns-show-in-file-manager</attribute></item> <item><attribute name="action">patterns.patterns-edit</attribute></item>
<item><attribute name="action">patterns.patterns-delete</attribute></item> <section>
<section> <item><attribute name="action">patterns.patterns-new</attribute></item>
<item><attribute name="action">patterns.patterns-refresh</attribute></item> <item><attribute name="action">patterns.patterns-duplicate</attribute></item>
</section> </section>
-->
<item><attribute name="action">patterns.patterns-copy-location</attribute></item>
<item><attribute name="action">patterns.patterns-show-in-file-manager</attribute></item>
<item><attribute name="action">patterns.patterns-delete</attribute></item>
<section>
<item><attribute name="action">patterns.patterns-refresh</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

18
menus/templates-menu.ui
View File

@ -2,12 +2,16 @@
<interface> <interface>
<menu id="/templates-popup"> <menu id="/templates-popup">
<item><attribute name="action">templates.templates-create-image</attribute></item> <submenu>
<section> <attribute name="label" translatable="yes" context="templates-action">Templates Menu</attribute>
<item><attribute name="action">templates.templates-new</attribute></item>
<item><attribute name="action">templates.templates-duplicate</attribute></item> <item><attribute name="action">templates.templates-create-image</attribute></item>
<item><attribute name="action">templates.templates-edit</attribute></item> <section>
<item><attribute name="action">templates.templates-delete</attribute></item> <item><attribute name="action">templates.templates-new</attribute></item>
</section> <item><attribute name="action">templates.templates-duplicate</attribute></item>
<item><attribute name="action">templates.templates-edit</attribute></item>
<item><attribute name="action">templates.templates-delete</attribute></item>
</section>
</submenu>
</menu> </menu>
</interface> </interface>

2
plug-ins/common/colormap-remap.c
View File

@ -186,7 +186,7 @@ remap_create_procedure (GimpPlugIn *plug_in,
gimp_procedure_set_menu_label (procedure, _("R_earrange Colormap...")); gimp_procedure_set_menu_label (procedure, _("R_earrange Colormap..."));
gimp_procedure_set_icon_name (procedure, GIMP_ICON_COLORMAP); gimp_procedure_set_icon_name (procedure, GIMP_ICON_COLORMAP);
gimp_procedure_add_menu_path (procedure, "<Image>/Colors/Map/[Colormap]"); gimp_procedure_add_menu_path (procedure, "<Image>/Colors/Map/[Colormap]");
gimp_procedure_add_menu_path (procedure, "<Colormap>"); gimp_procedure_add_menu_path (procedure, "<Colormap>/Colormap Menu");
gimp_procedure_set_documentation (procedure, gimp_procedure_set_documentation (procedure,
_("Rearrange the colormap"), _("Rearrange the colormap"),

2
plug-ins/python/gradients-save-as-css.py
View File

@ -218,7 +218,7 @@ class GradientsSaveAsCSS (Gimp.PlugIn):
procedure.set_attribution("Joao S. O. Bueno", procedure.set_attribution("Joao S. O. Bueno",
"(c) GPL V3.0 or later", "(c) GPL V3.0 or later",
"2011") "2011")
procedure.add_menu_path('<Gradients>') procedure.add_menu_path('<Gradients>/Gradients Menu')
procedure.add_argument_from_property(self, "run-mode") procedure.add_argument_from_property(self, "run-mode")
procedure.add_argument_from_property(self, "gradient") procedure.add_argument_from_property(self, "gradient")

2
plug-ins/python/palette-offset.py
View File

@ -102,7 +102,7 @@ class PaletteOffset (Gimp.PlugIn):
procedure.add_argument_from_property(self, "palette") procedure.add_argument_from_property(self, "palette")
procedure.add_argument_from_property(self, "amount") procedure.add_argument_from_property(self, "amount")
procedure.add_return_value_from_property(self, "new-palette") procedure.add_return_value_from_property(self, "new-palette")
procedure.add_menu_path ('<Palettes>') procedure.add_menu_path ('<Palettes>/Palettes Menu')
else: else:
procedure = None procedure = None

2
plug-ins/python/palette-sort.py
View File

@ -427,7 +427,7 @@ class PaletteSort (Gimp.PlugIn):
procedure.set_attribution("João S. O. Bueno, Carol Spears, David Gowers", procedure.set_attribution("João S. O. Bueno, Carol Spears, David Gowers",
"João S. O. Bueno, Carol Spears, David Gowers", "João S. O. Bueno, Carol Spears, David Gowers",
"2006-2014") "2006-2014")
procedure.add_menu_path ('<Palettes>') procedure.add_menu_path ('<Palettes>/Palettes Menu')
procedure.add_argument_from_property(self, "run-mode") procedure.add_argument_from_property(self, "run-mode")
procedure.add_argument_from_property(self, "palette") procedure.add_argument_from_property(self, "palette")

2
plug-ins/python/palette-to-gradient.py
View File

@ -183,7 +183,7 @@ class PaletteToGradient (Gimp.PlugIn):
procedure.add_argument_from_property(self, "palette") procedure.add_argument_from_property(self, "palette")
procedure.add_return_value_from_property(self, "new-gradient") procedure.add_return_value_from_property(self, "new-gradient")
procedure.add_menu_path ('<Palettes>') procedure.add_menu_path ('<Palettes>/Palettes Menu')
return procedure return procedure

2
plug-ins/script-fu/scripts/font-map.scm
View File

@ -174,4 +174,4 @@
) )
(script-fu-menu-register "script-fu-font-map" (script-fu-menu-register "script-fu-font-map"
"<Fonts>") "<Fonts>/Fonts Menu")

2
plug-ins/script-fu/scripts/gradient-example.scm
View File

@ -78,4 +78,4 @@
) )
(script-fu-menu-register "script-fu-gradient-example" (script-fu-menu-register "script-fu-gradient-example"
"<Gradients>") "<Gradients>/Gradients Menu")

8
plug-ins/script-fu/scripts/mkbrush.scm
View File

@ -73,7 +73,7 @@
) )
(script-fu-menu-register "script-fu-make-brush-rectangular" (script-fu-menu-register "script-fu-make-brush-rectangular"
"<Brushes>") "<Brushes>/Brushes Menu")
(define (script-fu-make-brush-rectangular-feathered name width height (define (script-fu-make-brush-rectangular-feathered name width height
@ -144,7 +144,7 @@
) )
(script-fu-menu-register "script-fu-make-brush-rectangular-feathered" (script-fu-menu-register "script-fu-make-brush-rectangular-feathered"
"<Brushes>") "<Brushes>/Brushes Menu")
(define (script-fu-make-brush-elliptical name width height spacing) (define (script-fu-make-brush-elliptical name width height spacing)
@ -199,7 +199,7 @@
) )
(script-fu-menu-register "script-fu-make-brush-elliptical" (script-fu-menu-register "script-fu-make-brush-elliptical"
"<Brushes>") "<Brushes>/Brushes Menu")
(define (script-fu-make-brush-elliptical-feathered name (define (script-fu-make-brush-elliptical-feathered name
@ -269,4 +269,4 @@
) )
(script-fu-menu-register "script-fu-make-brush-elliptical-feathered" (script-fu-menu-register "script-fu-make-brush-elliptical-feathered"
"<Brushes>") "<Brushes>/Brushes Menu")

2
plug-ins/script-fu/scripts/palette-export.scm
View File

@ -228,7 +228,7 @@
(string-append "palette." file-type) (string-append "palette." file-type)
) )
(script-fu-menu-register (string-append "gimp-palette-export-" export-type) (script-fu-menu-register (string-append "gimp-palette-export-" export-type)
"<Palettes>/Export as") "<Palettes>/Palettes Menu/Export as")
) )
(define (bad-file-name) (define (bad-file-name)