From fc050914ab7ec4473821468ed404503d577df3e5 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Sat, 12 Nov 2022 19:42:05 +0100
Subject: [PATCH] app, menus, plug-ins: move some advanced paste actions into
 submenu.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

There are so many paste options and I feel that the "Paste into Selection*"
actions are advanved enough that they can go into submenus. So I move them into
"Paste as". The other reason is that I'm going to add 2 more options!

I hesitated to rename the "Paste as" submenu but we couldn't find a good naming
(except just "Paste" but it's redundant with the default action and "Paste…" but
this usually implies a dialog, not a submenu).

Last but not least, I renamed the various paste actions to contain the word
"Paste" in it. E.g. s/New Image/Paste as New Image/. The old naming made sense
when action labels were only displayed in menus. But nowadays they can be shown
in other more independant context, such as the action search (and just
displaying "New Image" in there is very misleading).
---
 app/actions/edit-actions.c                      | 2 +-
 menus/image-menu.xml.in                         | 4 ++--
 plug-ins/script-fu/scripts/paste-as-brush.scm   | 2 +-
 plug-ins/script-fu/scripts/paste-as-pattern.scm | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index 4fb56ba859..0cb8a07417 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -126,7 +126,7 @@ static const GimpActionEntry edit_actions[] =
     GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
 
   { "edit-paste-as-new-image-short", GIMP_ICON_EDIT_PASTE_AS_NEW,
-    NC_("edit-action", "_New Image"), NULL,
+    NC_("edit-action", "Paste as _New Image"), NULL,
     NC_("edit-action", "Create a new image from the content of the clipboard"),
     edit_paste_as_new_image_cmd_callback,
     GIMP_HELP_EDIT_PASTE_AS_NEW_IMAGE },
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index a138451d64..b6043974ed 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -195,10 +195,10 @@
       <placeholder name="Paste">
         <menuitem action="edit-paste" />
         <menuitem action="edit-paste-in-place" />
-        <menuitem action="edit-paste-into" />
-        <menuitem action="edit-paste-into-in-place" />
       </placeholder>
       <menu action="edit-paste-as-menu" name="Paste as">
+        <menuitem action="edit-paste-into" />
+        <menuitem action="edit-paste-into-in-place" />
         <menuitem action="edit-paste-as-new-image-short" />
       </menu>
       <menu action="edit-buffer-menu" name="Buffer">
diff --git a/plug-ins/script-fu/scripts/paste-as-brush.scm b/plug-ins/script-fu/scripts/paste-as-brush.scm
index cef3f7893b..e9ec164f8e 100644
--- a/plug-ins/script-fu/scripts/paste-as-brush.scm
+++ b/plug-ins/script-fu/scripts/paste-as-brush.scm
@@ -61,7 +61,7 @@
 )
 
 (script-fu-register "script-fu-paste-as-brush"
-  _"New _Brush..."
+  _"Paste as New _Brush..."
   _"Paste the clipboard contents into a new brush"
   "Michael Natterer <mitch@gimp.org>"
   "Michael Natterer"
diff --git a/plug-ins/script-fu/scripts/paste-as-pattern.scm b/plug-ins/script-fu/scripts/paste-as-pattern.scm
index e070bbf6aa..fa97c70ba1 100644
--- a/plug-ins/script-fu/scripts/paste-as-pattern.scm
+++ b/plug-ins/script-fu/scripts/paste-as-pattern.scm
@@ -49,7 +49,7 @@
 )
 
 (script-fu-register "script-fu-paste-as-pattern"
-  _"New _Pattern..."
+  _"Paste as New _Pattern..."
   _"Paste the clipboard contents into a new pattern"
   "Michael Natterer <mitch@gimp.org>"
   "Michael Natterer"