From ce776c947d36538e80226bf09004d1f86c89c3d9 Mon Sep 17 00:00:00 2001
From: Jehan <jehan@girinstud.io>
Date: Tue, 4 Apr 2023 01:35:00 +0200
Subject: [PATCH] app, menus: progressively move to action group logics.

---
 app/widgets/gimpactionfactory.c  |   2 +-
 app/widgets/gimpmenu.c           |  48 ++++-----
 app/widgets/gimpmenumodel.c      |  57 +++++++----
 app/widgets/gimpuimanager.c      |  38 +++++--
 menus/brush-editor-menu.ui       |   2 +-
 menus/brushes-menu.ui            |  16 +--
 menus/buffers-menu.ui            |  16 +--
 menus/colormap-menu.ui           |  14 +--
 menus/cursor-info-menu.ui        |   2 +-
 menus/dashboard-menu.ui          |  30 +++---
 menus/dockable-menu.ui.in        |  44 ++++----
 menus/documents-menu.ui          |  20 ++--
 menus/dynamics-editor-menu.ui    |   2 +-
 menus/dynamics-menu.ui           |  14 +--
 menus/error-console-menu.ui      |  14 +--
 menus/fonts-menu.ui              |   2 +-
 menus/gradient-editor-menu.ui    | 166 +++++++++++++++----------------
 menus/gradients-menu.ui          |  16 +--
 menus/images-menu.ui             |   6 +-
 menus/mypaint-brushes-menu.ui    |   8 +-
 menus/palette-editor-menu.ui     |  16 +--
 menus/palettes-menu.ui           |  18 ++--
 menus/patterns-menu.ui           |  16 +--
 menus/sample-points-menu.ui      |   2 +-
 menus/templates-menu.ui          |  10 +-
 menus/text-editor-toolbar.ui     |  16 +--
 menus/text-tool-menu.ui          |  28 +++---
 menus/tool-options-menu.ui       |   6 +-
 menus/tool-preset-editor-menu.ui |   6 +-
 menus/tool-presets-menu.ui       |  18 ++--
 menus/vector-toolpath-menu.ui    |  10 +-
 31 files changed, 344 insertions(+), 319 deletions(-)

diff --git a/app/widgets/gimpactionfactory.c b/app/widgets/gimpactionfactory.c
index 0fe71e9d99..4b04a6080a 100644
--- a/app/widgets/gimpactionfactory.c
+++ b/app/widgets/gimpactionfactory.c
@@ -188,7 +188,7 @@ gimp_action_factory_get_group (GimpActionFactory *factory,
 
               g_signal_connect_object (group, "action-removed",
                                        G_CALLBACK (gimp_action_factory_action_removed),
-                                       factory, 0);
+                                       factory, G_CONNECT_AFTER);
             }
 
           return entry->group;
diff --git a/app/widgets/gimpmenu.c b/app/widgets/gimpmenu.c
index ad85968a49..38cdc2d7bc 100644
--- a/app/widgets/gimpmenu.c
+++ b/app/widgets/gimpmenu.c
@@ -232,18 +232,16 @@ gimp_menu_append (GimpMenuShell *shell,
         }
       else if (submenu != NULL && label == NULL)
         {
-          GApplication *app;
-          GAction      *action;
-          const gchar  *group_label;
-          GtkWidget    *subcontainer;
-          GtkWidget    *item;
+          GimpAction  *action;
+          const gchar *group_label;
+          GtkWidget   *subcontainer;
+          GtkWidget   *item;
 
           group = NULL;
 
           g_return_if_fail (action_name != NULL);
 
-          app    = manager->gimp->app;
-          action = g_action_map_lookup_action (G_ACTION_MAP (app), action_name + 4);
+          action = gimp_ui_manager_find_action (manager, NULL, action_name);
 
           /* As a special case, when a submenu has no label, we expect it to
            * have an action attribute, which must be for a radio action. In such
@@ -466,8 +464,7 @@ gimp_menu_add_action (GimpMenu          *menu,
                       GtkRadioMenuItem **group)
 {
   GimpUIManager *manager;
-  GApplication  *app;
-  GAction       *action;
+  GimpAction    *action;
   const gchar   *action_label;
   GtkWidget     *item;
   gboolean       visible;
@@ -475,16 +472,11 @@ gimp_menu_add_action (GimpMenu          *menu,
   g_return_if_fail (GIMP_IS_MENU (menu));
 
   manager = gimp_menu_shell_get_manager (GIMP_MENU_SHELL (menu));
-  app     = manager->gimp->app;
-
-  if (g_str_has_prefix (action_name, "app."))
-    action = g_action_map_lookup_action (G_ACTION_MAP (app), action_name + 4);
-  else
-    action = g_action_map_lookup_action (G_ACTION_MAP (app), action_name);
+  action  = gimp_ui_manager_find_action (manager, NULL, action_name);
 
   g_return_if_fail (GIMP_IS_ACTION (action));
 
-  action_label = gimp_action_get_label (GIMP_ACTION (action));
+  action_label = gimp_action_get_label (action);
   g_return_if_fail (action_label != NULL);
 
   if (GIMP_IS_TOGGLE_ACTION (action))
@@ -532,14 +524,16 @@ gimp_menu_add_action (GimpMenu          *menu,
       if (group)
         *group = NULL;
 
-      gtk_actionable_set_action_name (GTK_ACTIONABLE (item), action_name);
+      g_signal_connect_swapped (item, "activate",
+                                G_CALLBACK (gimp_action_activate),
+                                action);
     }
 
-  gimp_action_set_proxy (GIMP_ACTION (action), item);
+  gimp_action_set_proxy (action, item);
   g_object_set_data (G_OBJECT (item), GIMP_MENU_ACTION_KEY, action);
 
   gtk_widget_set_sensitive (GTK_WIDGET (item),
-                            gimp_action_is_sensitive (GIMP_ACTION (action), NULL));
+                            gimp_action_is_sensitive (action, NULL));
   g_signal_connect_object (action, "notify::sensitive",
                            G_CALLBACK (gimp_menu_action_notify_sensitive),
                            item, 0);
@@ -577,7 +571,7 @@ gimp_menu_add_action (GimpMenu          *menu,
         gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
     }
 
-  visible = gimp_action_is_visible (GIMP_ACTION (action));
+  visible = gimp_action_is_visible (action);
   gtk_widget_set_visible (item, visible);
   if (visible && GTK_IS_MENU (menu))
     {
@@ -610,19 +604,13 @@ gimp_menu_remove_action (GimpMenu    *menu,
                          const gchar *action_name)
 {
   GimpUIManager *manager;
-  GApplication  *app;
   GList         *children;
-  GAction       *action;
+  GimpAction    *action;
 
   g_return_if_fail (GIMP_IS_MENU (menu));
 
   manager = gimp_menu_shell_get_manager (GIMP_MENU_SHELL (menu));
-  app     = manager->gimp->app;
-
-  if (g_str_has_prefix (action_name, "app."))
-    action = g_action_map_lookup_action (G_ACTION_MAP (app), action_name + 4);
-  else
-    action = g_action_map_lookup_action (G_ACTION_MAP (app), action_name);
+  action  = gimp_ui_manager_find_action (manager, NULL, action_name);
 
   g_return_if_fail (GIMP_IS_ACTION (action));
 
@@ -630,8 +618,8 @@ gimp_menu_remove_action (GimpMenu    *menu,
 
   for (GList *iter = children; iter; iter = iter->next)
     {
-      GtkWidget *child = iter->data;
-      GAction   *item_action;
+      GtkWidget  *child = iter->data;
+      GimpAction *item_action;
 
       item_action = g_object_get_data (G_OBJECT (child), GIMP_MENU_ACTION_KEY);
       if (item_action == action)
diff --git a/app/widgets/gimpmenumodel.c b/app/widgets/gimpmenumodel.c
index 329f57b209..a252befaca 100644
--- a/app/widgets/gimpmenumodel.c
+++ b/app/widgets/gimpmenumodel.c
@@ -31,6 +31,7 @@
 #include "core/gimp.h"
 
 #include "gimpaction.h"
+#include "gimpactiongroup.h"
 #include "gimpmenumodel.h"
 #include "gimpmenushell.h"
 #include "gimpuimanager.h"
@@ -358,9 +359,8 @@ gimp_menu_model_get_position (GimpMenuModel *model,
                               const gchar   *action_name,
                               gboolean      *visible)
 {
-  GApplication  *app = model->priv->manager->gimp->app;
-  GList         *iter;
-  gint           len = 0;
+  GList *iter;
+  gint   len = 0;
 
   for (iter = model->priv->items; iter; iter = iter->next)
     {
@@ -382,19 +382,37 @@ gimp_menu_model_get_position (GimpMenuModel *model,
                                           G_MENU_ATTRIBUTE_ACTION,
                                           "&s", &cur_action_name))
         {
-          GAction *cur_action;
+          GimpAction  *cur_action       = NULL;
+          const gchar *real_action_name = NULL;
 
-          cur_action = g_action_map_lookup_action (G_ACTION_MAP (app),
-                                                   cur_action_name + 4);
-          if (action_name != NULL &&
-              g_strcmp0 (action_name, cur_action_name + 4) == 0)
+          if (cur_action_name != NULL)
+            {
+              real_action_name = strstr (cur_action_name, ".");
+              if (real_action_name != NULL)
+                real_action_name++;
+              else
+                real_action_name = cur_action_name;
+
+              cur_action = gimp_ui_manager_find_action (model->priv->manager, NULL, cur_action_name);
+            }
+
+          if (cur_action_name != NULL &&
+              g_strcmp0 (action_name, real_action_name) == 0)
             {
               if (visible)
-                *visible = gimp_action_is_visible (GIMP_ACTION (cur_action));
+                {
+                  if (cur_action != NULL)
+                    *visible = gimp_action_is_visible (cur_action);
+                  else
+                    /* This may happen when editing a menu item for an action
+                     * which got removed.
+                     */
+                    *visible = FALSE;
+                }
 
               break;
             }
-          else if (gimp_action_is_visible (GIMP_ACTION (cur_action)))
+          else if (cur_action != NULL && gimp_action_is_visible (cur_action))
             {
               len++;
             }
@@ -537,8 +555,7 @@ static void
 gimp_menu_model_initialize (GimpMenuModel *model,
                             GMenuModel    *gmodel)
 {
-  GApplication *app = model->priv->manager->gimp->app;
-  gint          n_items;
+  gint n_items;
 
   g_return_if_fail (GIMP_IS_MENU_MODEL (model));
   g_return_if_fail (gmodel == NULL || G_IS_MENU_MODEL (gmodel));
@@ -593,16 +610,16 @@ gimp_menu_model_initialize (GimpMenuModel *model,
 
           if (action_name)
             {
-              GAction *action;
+              GimpAction *action;
+
+              action = gimp_ui_manager_find_action (model->priv->manager, NULL, action_name);
 
-              action = g_action_map_lookup_action (G_ACTION_MAP (app),
-                                                   action_name + 4);
               g_signal_connect_object (action,
                                        "notify::visible",
                                        G_CALLBACK (gimp_menu_model_action_notify_visible),
                                        model, 0);
 
-              g_menu_item_set_label (item, gimp_action_get_label (GIMP_ACTION (action)));
+              g_menu_item_set_label (item, gimp_action_get_label (action));
               g_signal_connect_object (action,
                                        "notify::label",
                                        G_CALLBACK (gimp_menu_model_action_notify_label),
@@ -690,7 +707,6 @@ gimp_menu_model_get_item (GimpMenuModel *model,
                           gint           idx)
 {
   GimpMenuModel *m   = GIMP_MENU_MODEL (model);
-  GApplication  *app = m->priv->manager->gimp->app;
   gint           cur = -1;
 
   for (GList *iter = m->priv->items; iter; iter = iter->next)
@@ -713,11 +729,10 @@ gimp_menu_model_get_item (GimpMenuModel *model,
                                           G_MENU_ATTRIBUTE_ACTION,
                                           "&s", &action_name))
         {
-          GAction *action;
+          GimpAction *action;
 
-          action = g_action_map_lookup_action (G_ACTION_MAP (app),
-                                               action_name + 4);
-          if (gimp_action_is_visible (GIMP_ACTION (action)))
+          action = gimp_ui_manager_find_action (model->priv->manager, NULL, action_name);
+          if (gimp_action_is_visible (action))
             cur++;
         }
 
diff --git a/app/widgets/gimpuimanager.c b/app/widgets/gimpuimanager.c
index 75aeb4a067..d5a6720155 100644
--- a/app/widgets/gimpuimanager.c
+++ b/app/widgets/gimpuimanager.c
@@ -630,7 +630,13 @@ gimp_ui_manager_find_action (GimpUIManager *manager,
   g_return_val_if_fail (GIMP_IS_UI_MANAGER (manager), NULL);
   g_return_val_if_fail (action_name != NULL, NULL);
 
-  if (group_name)
+  if (g_strcmp0 (group_name, "app") == 0)
+    {
+      GApplication *app = manager->gimp->app;
+
+      action = (GimpAction *) g_action_map_lookup_action (G_ACTION_MAP (app), action_name);
+    }
+  else if (group_name)
     {
       group = gimp_ui_manager_get_action_group (manager, group_name);
 
@@ -640,17 +646,33 @@ gimp_ui_manager_find_action (GimpUIManager *manager,
   else
     {
       GList *list;
+      gchar *dot;
 
-      for (list = gimp_ui_manager_get_action_groups (manager);
-           list;
-           list = g_list_next (list))
+      dot = strstr (action_name, ".");
+
+      if (dot == NULL)
         {
-          group = list->data;
+          /* No group specified. */
+          for (list = gimp_ui_manager_get_action_groups (manager);
+               list;
+               list = g_list_next (list))
+            {
+              group = list->data;
 
-          action = gimp_action_group_get_action (group, action_name);
+              action = gimp_action_group_get_action (group, action_name);
 
-          if (action)
-            break;
+              if (action)
+                break;
+            }
+        }
+      else
+        {
+          gchar *gname;
+
+          gname = g_strndup (action_name, dot - action_name);
+
+          action = gimp_ui_manager_find_action (manager, gname, dot + 1);
+          g_free (gname);
         }
     }
 
diff --git a/menus/brush-editor-menu.ui b/menus/brush-editor-menu.ui
index 792663d429..4576ca09f6 100644
--- a/menus/brush-editor-menu.ui
+++ b/menus/brush-editor-menu.ui
@@ -5,7 +5,7 @@
     <submenu>
       <attribute name="label" translatable="yes" context="brush-editor-action">Brush Editor Menu</attribute>
       <attribute name="icon">gimp-tool-paintbrush</attribute>
-      <item><attribute name="action">app.brush-editor-edit-active</attribute></item>
+      <item><attribute name="action">brush-editor.brush-editor-edit-active</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/brushes-menu.ui b/menus/brushes-menu.ui
index f36bf5ba0e..408214fcc5 100644
--- a/menus/brushes-menu.ui
+++ b/menus/brushes-menu.ui
@@ -6,17 +6,17 @@
       <attribute name="label" translatable="yes" context="brushes-action">Brushes Menu</attribute>
       <attribute name="icon">gimp-tool-paintbrush</attribute>
 
-      <item><attribute name="action">app.brushes-edit</attribute></item>
-      <item><attribute name="action">app.brushes-open-as-image</attribute></item>
+      <item><attribute name="action">brushes.brushes-edit</attribute></item>
+      <item><attribute name="action">brushes.brushes-open-as-image</attribute></item>
       <section>
-        <item><attribute name="action">app.brushes-new</attribute></item>
-        <item><attribute name="action">app.brushes-duplicate</attribute></item>
-        <item><attribute name="action">app.brushes-copy-location</attribute></item>
-        <item><attribute name="action">app.brushes-show-in-file-manager</attribute></item>
-        <item><attribute name="action">app.brushes-delete</attribute></item>
+        <item><attribute name="action">brushes.brushes-new</attribute></item>
+        <item><attribute name="action">brushes.brushes-duplicate</attribute></item>
+        <item><attribute name="action">brushes.brushes-copy-location</attribute></item>
+        <item><attribute name="action">brushes.brushes-show-in-file-manager</attribute></item>
+        <item><attribute name="action">brushes.brushes-delete</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.brushes-refresh</attribute></item>
+        <item><attribute name="action">brushes.brushes-refresh</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/buffers-menu.ui b/menus/buffers-menu.ui
index 00492743cb..344087f4a2 100644
--- a/menus/buffers-menu.ui
+++ b/menus/buffers-menu.ui
@@ -3,14 +3,14 @@
 <interface>
   <menu id="/buffers-popup">
     <section>
-      <item><attribute name="action">app.buffers-paste</attribute></item>
-      <item><attribute name="action">app.buffers-paste-in-place</attribute></item>
-      <item><attribute name="action">app.buffers-paste-into</attribute></item>
-      <item><attribute name="action">app.buffers-paste-into-in-place</attribute></item>
-      <item><attribute name="action">app.buffers-paste-as-new-layer</attribute></item>
-      <item><attribute name="action">app.buffers-paste-as-new-layer-in-place</attribute></item>
-      <item><attribute name="action">app.buffers-paste-as-new-image</attribute></item>
-      <item><attribute name="action">app.buffers-delete</attribute></item>
+      <item><attribute name="action">buffers.buffers-paste</attribute></item>
+      <item><attribute name="action">buffers.buffers-paste-in-place</attribute></item>
+      <item><attribute name="action">buffers.buffers-paste-into</attribute></item>
+      <item><attribute name="action">buffers.buffers-paste-into-in-place</attribute></item>
+      <item><attribute name="action">buffers.buffers-paste-as-new-layer</attribute></item>
+      <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>
   </menu>
 </interface>
diff --git a/menus/colormap-menu.ui b/menus/colormap-menu.ui
index 02e3a6c924..5376c1dc07 100644
--- a/menus/colormap-menu.ui
+++ b/menus/colormap-menu.ui
@@ -2,14 +2,14 @@
 
 <interface>
   <menu id="/colormap-popup">
-    <item><attribute name="action">app.colormap-edit-color</attribute></item>
-    <item><attribute name="action">app.colormap-add-color-from-fg</attribute></item>
-    <item><attribute name="action">app.colormap-add-color-from-bg</attribute></item>
+    <item><attribute name="action">colormap.colormap-edit-color</attribute></item>
+    <item><attribute name="action">colormap.colormap-add-color-from-fg</attribute></item>
+    <item><attribute name="action">colormap.colormap-add-color-from-bg</attribute></item>
     <section>
-      <item><attribute name="action">app.colormap-selection-replace</attribute></item>
-      <item><attribute name="action">app.colormap-selection-add</attribute></item>
-      <item><attribute name="action">app.colormap-selection-subtract</attribute></item>
-      <item><attribute name="action">app.colormap-selection-intersect</attribute></item>
+      <item><attribute name="action">colormap.colormap-selection-replace</attribute></item>
+      <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>
   </menu>
 </interface>
diff --git a/menus/cursor-info-menu.ui b/menus/cursor-info-menu.ui
index 2ab6a66950..98c45c32ad 100644
--- a/menus/cursor-info-menu.ui
+++ b/menus/cursor-info-menu.ui
@@ -5,7 +5,7 @@
     <submenu>
       <attribute name="label" translatable="yes" context="cursor-info-action">Pointer Information Menu</attribute>
       <attribute name="icon">gimp-cursor</attribute>
-      <item><attribute name="action">app.cursor-info-sample-merged</attribute></item>
+      <item><attribute name="action">cursor-info.cursor-info-sample-merged</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/dashboard-menu.ui b/menus/dashboard-menu.ui
index 3153b6e9fd..76be1e529f 100644
--- a/menus/dashboard-menu.ui
+++ b/menus/dashboard-menu.ui
@@ -12,29 +12,29 @@
       </submenu>
       <submenu>
         <attribute name="label" translatable="yes" context="dashboard-action">_Update Interval</attribute>
-        <item><attribute name="action">app.dashboard-update-interval-0-25-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-update-interval-0-5-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-update-interval-1-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-update-interval-2-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-update-interval-4-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-update-interval-0-25-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-update-interval-0-5-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-update-interval-1-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-update-interval-2-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-update-interval-4-sec</attribute></item>
       </submenu>
       <submenu>
         <attribute name="label" translatable="yes" context="dashboard-action">_History Duration</attribute>
-        <item><attribute name="action">app.dashboard-history-duration-15-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-history-duration-30-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-history-duration-60-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-history-duration-120-sec</attribute></item>
-        <item><attribute name="action">app.dashboard-history-duration-240-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-history-duration-15-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-history-duration-30-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-history-duration-60-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-history-duration-120-sec</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-history-duration-240-sec</attribute></item>
       </submenu>
       <section>
-        <item><attribute name="action">app.dashboard-log-record</attribute></item>
-        <item><attribute name="action">app.dashboard-log-add-marker</attribute></item>
-        <item><attribute name="action">app.dashboard-log-add-empty-marker</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-log-record</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-log-add-marker</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-log-add-empty-marker</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.dashboard-reset</attribute></item>
+        <item><attribute name="action">dashboard.dashboard-reset</attribute></item>
       </section>
-      <item><attribute name="action">app.dashboard-low-swap-space-warning</attribute></item>
+      <item><attribute name="action">dashboard.dashboard-low-swap-space-warning</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/dockable-menu.ui.in b/menus/dockable-menu.ui.in
index 3911836a60..b9b2cff945 100644
--- a/menus/dockable-menu.ui.in
+++ b/menus/dockable-menu.ui.in
@@ -6,41 +6,41 @@
       <attribute name="label" translatable="yes" context="file-action">_Add Tab</attribute>
       <xi:include href="dialogs-menuitems.ui" />
     </submenu>
-    <item><attribute name="action">app.dockable-close-tab</attribute></item>
-    <item><attribute name="action">app.dockable-detach-tab</attribute></item>
-    <item><attribute name="action">app.dockable-lock-tab</attribute></item>
+    <item><attribute name="action">dockable.dockable-close-tab</attribute></item>
+    <item><attribute name="action">dockable.dockable-detach-tab</attribute></item>
+    <item><attribute name="action">dockable.dockable-lock-tab</attribute></item>
     <section>
       <submenu>
         <attribute name="label" translatable="yes" context="file-action">_Preview Size</attribute>
-        <item><attribute name="action">app.dockable-preview-size-tiny</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-extra-small</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-small</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-medium</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-large</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-extra-large</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-enormous</attribute></item>
-        <item><attribute name="action">app.dockable-preview-size-gigantic</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-tiny</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-extra-small</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-small</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-medium</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-large</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-extra-large</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-enormous</attribute></item>
+        <item><attribute name="action">dockable.dockable-preview-size-gigantic</attribute></item>
       </submenu>
       <submenu>
         <attribute name="label" translatable="yes" context="file-action">_Tab Style</attribute>
-        <item><attribute name="action">app.dockable-tab-style-icon</attribute></item>
-        <item><attribute name="action">app.dockable-tab-style-preview</attribute></item>
-        <item><attribute name="action">app.dockable-tab-style-name</attribute></item>
-        <item><attribute name="action">app.dockable-tab-style-icon-name</attribute></item>
-        <item><attribute name="action">app.dockable-tab-style-preview-name</attribute></item>
+        <item><attribute name="action">dockable.dockable-tab-style-icon</attribute></item>
+        <item><attribute name="action">dockable.dockable-tab-style-preview</attribute></item>
+        <item><attribute name="action">dockable.dockable-tab-style-name</attribute></item>
+        <item><attribute name="action">dockable.dockable-tab-style-icon-name</attribute></item>
+        <item><attribute name="action">dockable.dockable-tab-style-preview-name</attribute></item>
       </submenu>
-      <item><attribute name="action">app.dockable-view-type-list</attribute></item>
-      <item><attribute name="action">app.dockable-view-type-grid</attribute></item>
-      <item><attribute name="action">app.dockable-show-button-bar</attribute></item>
+      <item><attribute name="action">dockable.dockable-view-type-list</attribute></item>
+      <item><attribute name="action">dockable.dockable-view-type-grid</attribute></item>
+      <item><attribute name="action">dockable.dockable-show-button-bar</attribute></item>
     </section>
     <section>
-      <item><attribute name="action">app.dock-show-image-menu</attribute></item>
-      <item><attribute name="action">app.dock-auto-follow-active</attribute></item>
+      <item><attribute name="action">dock.dock-show-image-menu</attribute></item>
+      <item><attribute name="action">dock.dock-auto-follow-active</attribute></item>
     </section>
     <submenu>
       <attribute name="label" translatable="yes" context="file-action">Move to Screen</attribute>
       <section>
-        <item><attribute name="action">app.dock-open-display</attribute></item>
+        <item><attribute name="action">dock.dock-open-display</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/documents-menu.ui b/menus/documents-menu.ui
index dfdf89a2b3..9108d9d3f3 100644
--- a/menus/documents-menu.ui
+++ b/menus/documents-menu.ui
@@ -2,17 +2,17 @@
 
 <interface>
   <menu id="/documents-popup">
-    <item><attribute name="action">app.documents-open</attribute></item>
-    <item><attribute name="action">app.documents-raise-or-open</attribute></item>
-    <item><attribute name="action">app.documents-file-open-dialog</attribute></item>
-    <item><attribute name="action">app.documents-copy-location</attribute></item>
-    <item><attribute name="action">app.documents-show-in-file-manager</attribute></item>
-    <item><attribute name="action">app.documents-remove</attribute></item>
-    <item><attribute name="action">app.documents-clear</attribute></item>
+    <item><attribute name="action">documents.documents-open</attribute></item>
+    <item><attribute name="action">documents.documents-raise-or-open</attribute></item>
+    <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-show-in-file-manager</attribute></item>
+    <item><attribute name="action">documents.documents-remove</attribute></item>
+    <item><attribute name="action">documents.documents-clear</attribute></item>
     <section>
-      <item><attribute name="action">app.documents-recreate-preview</attribute></item>
-      <item><attribute name="action">app.documents-reload-previews</attribute></item>
-      <item><attribute name="action">app.documents-remove-dangling</attribute></item>
+      <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>
   </menu>
 </interface>
diff --git a/menus/dynamics-editor-menu.ui b/menus/dynamics-editor-menu.ui
index c9ffc31eb8..66a6be9417 100644
--- a/menus/dynamics-editor-menu.ui
+++ b/menus/dynamics-editor-menu.ui
@@ -5,7 +5,7 @@
     <submenu>
       <attribute name="label" translatable="yes" context="dynamics-editor-action">Paint Dynamics Editor Menu</attribute>
       <attribute name="icon">gimp-dynamics</attribute>
-      <item><attribute name="action">app.dynamics-editor-edit-active</attribute></item>
+      <item><attribute name="action">dynamics-editor.dynamics-editor-edit-active</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/dynamics-menu.ui b/menus/dynamics-menu.ui
index 8cbca48d88..ee53c76705 100644
--- a/menus/dynamics-menu.ui
+++ b/menus/dynamics-menu.ui
@@ -6,16 +6,16 @@
       <attribute name="label" translatable="yes" context="dynamics-action">Paint Dynamics Menu</attribute>
       <attribute name="icon">gimp-dynamics</attribute>
 
-      <item><attribute name="action">app.dynamics-edit</attribute></item>
+      <item><attribute name="action">dynamics.dynamics-edit</attribute></item>
       <section>
-        <item><attribute name="action">app.dynamics-new</attribute></item>
-        <item><attribute name="action">app.dynamics-duplicate</attribute></item>
-        <item><attribute name="action">app.dynamics-copy-location</attribute></item>
-        <item><attribute name="action">app.dynamics-show-in-file-manager</attribute></item>
-        <item><attribute name="action">app.dynamics-delete</attribute></item>
+        <item><attribute name="action">dynamics.dynamics-new</attribute></item>
+        <item><attribute name="action">dynamics.dynamics-duplicate</attribute></item>
+        <item><attribute name="action">dynamics.dynamics-copy-location</attribute></item>
+        <item><attribute name="action">dynamics.dynamics-show-in-file-manager</attribute></item>
+        <item><attribute name="action">dynamics.dynamics-delete</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.dynamics-refresh</attribute></item>
+        <item><attribute name="action">dynamics.dynamics-refresh</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/error-console-menu.ui b/menus/error-console-menu.ui
index 2f7710b4bc..2621bb154b 100644
--- a/menus/error-console-menu.ui
+++ b/menus/error-console-menu.ui
@@ -2,17 +2,17 @@
 
 <interface>
   <menu id="/error-console-popup">
-    <item><attribute name="action">app.error-console-clear</attribute></item>
-    <item><attribute name="action">app.error-console-select-all</attribute></item>
+    <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">app.error-console-save-all</attribute></item>
-      <item><attribute name="action">app.error-console-save-selection</attribute></item>
+      <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">_Highlight</attribute>
-      <item><attribute name="action">app.error-console-highlight-error</attribute></item>
-      <item><attribute name="action">app.error-console-highlight-warning</attribute></item>
-      <item><attribute name="action">app.error-console-highlight-info</attribute></item>
+      <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>
   </menu>
 </interface>
diff --git a/menus/fonts-menu.ui b/menus/fonts-menu.ui
index a1de917600..3b58ccbc1f 100644
--- a/menus/fonts-menu.ui
+++ b/menus/fonts-menu.ui
@@ -3,7 +3,7 @@
 <interface>
   <menu id="/fonts-popup">
     <section>
-      <item><attribute name="action">app.fonts-refresh</attribute></item>
+      <item><attribute name="action">fonts.fonts-refresh</attribute></item>
     </section>
   </menu>
 </interface>
diff --git a/menus/gradient-editor-menu.ui b/menus/gradient-editor-menu.ui
index bf733117d9..aa1764d076 100644
--- a/menus/gradient-editor-menu.ui
+++ b/menus/gradient-editor-menu.ui
@@ -7,123 +7,123 @@
       <attribute name="icon">gimp-tool-gradient</attribute>
       <submenu>
         <attribute name="label" translatable="yes" context="gradient-editor-action">Left Color Type</attribute>
-        <item><attribute name="action">app.gradient-editor-left-color-fixed</attribute></item>
-        <item><attribute name="action">app.gradient-editor-left-color-foreground</attribute></item>
-        <item><attribute name="action">app.gradient-editor-left-color-foreground-transparent</attribute></item>
-        <item><attribute name="action">app.gradient-editor-left-color-background</attribute></item>
-        <item><attribute name="action">app.gradient-editor-left-color-background-transparent</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-left-color-fixed</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-left-color-foreground</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-left-color-foreground-transparent</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-left-color-background</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-left-color-background-transparent</attribute></item>
       </submenu>
-      <item><attribute name="action">app.gradient-editor-left-color</attribute></item>
+      <item><attribute name="action">gradient-editor.gradient-editor-left-color</attribute></item>
       <submenu>
         <attribute name="label" translatable="yes" context="gradient-editor-action">_Load Left Color From</attribute>
-        <item><attribute name="action">app.gradient-editor-load-left-left-neighbor</attribute></item>
-        <item><attribute name="action">app.gradient-editor-load-left-right-endpoint</attribute></item>
-        <item><attribute name="action">app.gradient-editor-load-left-fg</attribute></item>
-        <item><attribute name="action">app.gradient-editor-load-left-bg</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-load-left-left-neighbor</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-load-left-right-endpoint</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-load-left-fg</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-load-left-bg</attribute></item>
         <section>
-          <item><attribute name="action">app.gradient-editor-load-left-01</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-02</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-03</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-04</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-05</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-06</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-07</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-08</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-09</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-left-10</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-01</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-02</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-03</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-04</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-05</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-06</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-07</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-08</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-09</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-left-10</attribute></item>
         </section>
       </submenu>
       <submenu>
         <attribute name="label" translatable="yes" context="gradient-editor-action">_Save Left Color To</attribute>
-        <item><attribute name="action">app.gradient-editor-save-left-01</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-02</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-03</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-04</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-05</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-06</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-07</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-08</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-09</attribute></item>
-        <item><attribute name="action">app.gradient-editor-save-left-10</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-01</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-02</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-03</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-04</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-05</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-06</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-07</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-08</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-09</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-save-left-10</attribute></item>
       </submenu>
       <section>
         <submenu>
           <attribute name="label" translatable="yes" context="gradient-editor-action">Right Color Type</attribute>
-          <item><attribute name="action">app.gradient-editor-right-color-fixed</attribute></item>
-          <item><attribute name="action">app.gradient-editor-right-color-foreground</attribute></item>
-          <item><attribute name="action">app.gradient-editor-right-color-foreground-transparent</attribute></item>
-          <item><attribute name="action">app.gradient-editor-right-color-background</attribute></item>
-          <item><attribute name="action">app.gradient-editor-right-color-background-transparent</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-right-color-fixed</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-right-color-foreground</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-right-color-foreground-transparent</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-right-color-background</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-right-color-background-transparent</attribute></item>
         </submenu>
-        <item><attribute name="action">app.gradient-editor-right-color</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-right-color</attribute></item>
         <submenu>
           <attribute name="label" translatable="yes" context="gradient-editor-action">Load Right Color Fr_om</attribute>
-          <item><attribute name="action">app.gradient-editor-load-right-right-neighbor</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-left-endpoint</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-fg</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-bg</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-right-neighbor</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-left-endpoint</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-fg</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-bg</attribute></item>
           <section>
-          <item><attribute name="action">app.gradient-editor-load-right-01</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-02</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-03</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-04</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-05</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-06</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-07</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-08</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-09</attribute></item>
-          <item><attribute name="action">app.gradient-editor-load-right-10</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-01</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-02</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-03</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-04</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-05</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-06</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-07</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-08</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-09</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-load-right-10</attribute></item>
           </section>
         </submenu>
         <submenu>
           <attribute name="label" translatable="yes" context="gradient-editor-action">Sa_ve Right Color To</attribute>
-          <item><attribute name="action">app.gradient-editor-save-right-01</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-02</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-03</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-04</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-05</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-06</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-07</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-08</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-09</attribute></item>
-          <item><attribute name="action">app.gradient-editor-save-right-10</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-01</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-02</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-03</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-04</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-05</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-06</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-07</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-08</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-09</attribute></item>
+          <item><attribute name="action">gradient-editor.gradient-editor-save-right-10</attribute></item>
         </submenu>
       </section>
       <section>
       <submenu>
         <!-- Special trick: when a submenu has a radio action attribute, its label will be the group label. -->
-        <attribute name="action">app.gradient-editor-blending-linear</attribute>
-        <item><attribute name="action">app.gradient-editor-blending-linear</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blending-curved</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blending-sine</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blending-sphere-increasing</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blending-sphere-decreasing</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blending-step</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blending-varies</attribute></item>
+        <attribute name="action">gradient-editor.gradient-editor-blending-linear</attribute>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-linear</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-curved</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-sine</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-sphere-increasing</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-sphere-decreasing</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-step</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blending-varies</attribute></item>
       </submenu>
       <submenu>
         <!-- Special trick: when a submenu has a radio action attribute, its label will be the group label. -->
-        <attribute name="action">app.gradient-editor-coloring-rgb</attribute>
-        <item><attribute name="action">app.gradient-editor-coloring-rgb</attribute></item>
-        <item><attribute name="action">app.gradient-editor-coloring-hsv-ccw</attribute></item>
-        <item><attribute name="action">app.gradient-editor-coloring-hsv-cw</attribute></item>
-        <item><attribute name="action">app.gradient-editor-coloring-varies</attribute></item>
+        <attribute name="action">gradient-editor.gradient-editor-coloring-rgb</attribute>
+        <item><attribute name="action">gradient-editor.gradient-editor-coloring-rgb</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-coloring-hsv-ccw</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-coloring-hsv-cw</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-coloring-varies</attribute></item>
       </submenu>
       </section>
       <section>
-        <item><attribute name="action">app.gradient-editor-flip</attribute></item>
-        <item><attribute name="action">app.gradient-editor-replicate</attribute></item>
-        <item><attribute name="action">app.gradient-editor-split-midpoint</attribute></item>
-        <item><attribute name="action">app.gradient-editor-split-uniform</attribute></item>
-        <item><attribute name="action">app.gradient-editor-delete</attribute></item>
-        <item><attribute name="action">app.gradient-editor-recenter</attribute></item>
-        <item><attribute name="action">app.gradient-editor-redistribute</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-flip</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-replicate</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-split-midpoint</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-split-uniform</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-delete</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-recenter</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-redistribute</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.gradient-editor-blend-color</attribute></item>
-        <item><attribute name="action">app.gradient-editor-blend-opacity</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blend-color</attribute></item>
+        <item><attribute name="action">gradient-editor.gradient-editor-blend-opacity</attribute></item>
       </section>
-      <item><attribute name="action">app.gradient-editor-edit-active</attribute></item>
+      <item><attribute name="action">gradient-editor.gradient-editor-edit-active</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/gradients-menu.ui b/menus/gradients-menu.ui
index 17cf26f343..c415844b2a 100644
--- a/menus/gradients-menu.ui
+++ b/menus/gradients-menu.ui
@@ -7,17 +7,17 @@
       <attribute name="label" translatable="yes" context="gradients-action">Gradients Menu</attribute>
       <attribute name="icon">gimp-tool-gradient</attribute>
 
-      <item><attribute name="action">app.gradients-edit</attribute></item>
+      <item><attribute name="action">gradients.gradients-edit</attribute></item>
       <section>
-        <item><attribute name="action">app.gradients-new</attribute></item>
-        <item><attribute name="action">app.gradients-duplicate</attribute></item>
-        <item><attribute name="action">app.gradients-save-as-pov</attribute></item>
-        <item><attribute name="action">app.gradients-copy-location</attribute></item>
-        <item><attribute name="action">app.gradients-show-in-file-manager</attribute></item>
-        <item><attribute name="action">app.gradients-delete</attribute></item>
+        <item><attribute name="action">gradients.gradients-new</attribute></item>
+        <item><attribute name="action">gradients.gradients-duplicate</attribute></item>
+        <item><attribute name="action">gradients.gradients-save-as-pov</attribute></item>
+        <item><attribute name="action">gradients.gradients-copy-location</attribute></item>
+        <item><attribute name="action">gradients.gradients-show-in-file-manager</attribute></item>
+        <item><attribute name="action">gradients.gradients-delete</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.gradients-refresh</attribute></item>
+        <item><attribute name="action">gradients.gradients-refresh</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/images-menu.ui b/menus/images-menu.ui
index 07ebec12c4..8206d8eff8 100644
--- a/menus/images-menu.ui
+++ b/menus/images-menu.ui
@@ -2,8 +2,8 @@
 
 <interface>
   <menu id="/images-popup">
-    <item><attribute name="action">app.images-raise-views</attribute></item>
-    <item><attribute name="action">app.images-new-view</attribute></item>
-    <item><attribute name="action">app.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>
   </menu>
 </interface>
diff --git a/menus/mypaint-brushes-menu.ui b/menus/mypaint-brushes-menu.ui
index 88138208d8..f8397176ef 100644
--- a/menus/mypaint-brushes-menu.ui
+++ b/menus/mypaint-brushes-menu.ui
@@ -2,11 +2,11 @@
 
 <interface>
   <menu id="/mypaint-brushes-popup">
-    <item><attribute name="action">app.mypaint-brushes-copy-location</attribute></item>
-    <item><attribute name="action">app.mypaint-brushes-show-in-file-manager</attribute></item>
-    <item><attribute name="action">app.mypaint-brushes-delete</attribute></item>
+    <item><attribute name="action">mypaint-brushes.mypaint-brushes-copy-location</attribute></item>
+    <item><attribute name="action">mypaint-brushes.mypaint-brushes-show-in-file-manager</attribute></item>
+    <item><attribute name="action">mypaint-brushes.mypaint-brushes-delete</attribute></item>
     <section>
-      <item><attribute name="action">app.mypaint-brushes-refresh</attribute></item>
+      <item><attribute name="action">mypaint-brushes.mypaint-brushes-refresh</attribute></item>
     </section>
   </menu>
 </interface>
diff --git a/menus/palette-editor-menu.ui b/menus/palette-editor-menu.ui
index 138bae6394..62546e38aa 100644
--- a/menus/palette-editor-menu.ui
+++ b/menus/palette-editor-menu.ui
@@ -6,16 +6,16 @@
       <attribute name="label" translatable="yes" context="palette-editor-action">Palette Editor Menu</attribute>
       <attribute name="icon">gtk-select-color</attribute>
 
-      <item><attribute name="action">app.palette-editor-edit-color</attribute></item>
-      <item><attribute name="action">app.palette-editor-new-color-fg</attribute></item>
-      <item><attribute name="action">app.palette-editor-new-color-bg</attribute></item>
-      <item><attribute name="action">app.palette-editor-delete-color</attribute></item>
+      <item><attribute name="action">palette-editor.palette-editor-edit-color</attribute></item>
+      <item><attribute name="action">palette-editor.palette-editor-new-color-fg</attribute></item>
+      <item><attribute name="action">palette-editor.palette-editor-new-color-bg</attribute></item>
+      <item><attribute name="action">palette-editor.palette-editor-delete-color</attribute></item>
       <section>
-        <item><attribute name="action">app.palette-editor-zoom-out</attribute></item>
-        <item><attribute name="action">app.palette-editor-zoom-in</attribute></item>
-        <item><attribute name="action">app.palette-editor-zoom-all</attribute></item>
+        <item><attribute name="action">palette-editor.palette-editor-zoom-out</attribute></item>
+        <item><attribute name="action">palette-editor.palette-editor-zoom-in</attribute></item>
+        <item><attribute name="action">palette-editor.palette-editor-zoom-all</attribute></item>
       </section>
-      <item><attribute name="action">app.palette-editor-edit-active</attribute></item>
+      <item><attribute name="action">palette-editor.palette-editor-edit-active</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/palettes-menu.ui b/menus/palettes-menu.ui
index 1435bd6801..1f259a1511 100644
--- a/menus/palettes-menu.ui
+++ b/menus/palettes-menu.ui
@@ -6,18 +6,18 @@
       <attribute name="label" translatable="yes" context="palettes-action">Palettes Menu</attribute>
       <attribute name="icon">gtk-select-color</attribute>
 
-      <item><attribute name="action">app.palettes-edit</attribute></item>
+      <item><attribute name="action">palettes.palettes-edit</attribute></item>
       <section>
-        <item><attribute name="action">app.palettes-new</attribute></item>
-        <item><attribute name="action">app.palettes-import</attribute></item>
-        <item><attribute name="action">app.palettes-duplicate</attribute></item>
-        <item><attribute name="action">app.palettes-merge</attribute></item>
-        <item><attribute name="action">app.palettes-copy-location</attribute></item>
-        <item><attribute name="action">app.palettes-show-in-file-manager</attribute></item>
-        <item><attribute name="action">app.palettes-delete</attribute></item>
+        <item><attribute name="action">palettes.palettes-new</attribute></item>
+        <item><attribute name="action">palettes.palettes-import</attribute></item>
+        <item><attribute name="action">palettes.palettes-duplicate</attribute></item>
+        <item><attribute name="action">palettes.palettes-merge</attribute></item>
+        <item><attribute name="action">palettes.palettes-copy-location</attribute></item>
+        <item><attribute name="action">palettes.palettes-show-in-file-manager</attribute></item>
+        <item><attribute name="action">palettes.palettes-delete</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.palettes-refresh</attribute></item>
+        <item><attribute name="action">palettes.palettes-refresh</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/patterns-menu.ui b/menus/patterns-menu.ui
index 452f2b7ed2..dce4e9f8e3 100644
--- a/menus/patterns-menu.ui
+++ b/menus/patterns-menu.ui
@@ -2,21 +2,21 @@
 
 <interface>
   <menu id="/patterns-popup">
-    <item><attribute name="action">app.patterns-open-as-image</attribute></item>
+    <item><attribute name="action">patterns.patterns-open-as-image</attribute></item>
 
     <!-- disabled because they are useless now
-    <item><attribute name="action">app.patterns-edit</attribute></item>
+    <item><attribute name="action">patterns.patterns-edit</attribute></item>
     <section>
-      <item><attribute name="action">app.patterns-new</attribute></item>
-      <item><attribute name="action">app.patterns-duplicate</attribute></item>
+      <item><attribute name="action">patterns.patterns-new</attribute></item>
+      <item><attribute name="action">patterns.patterns-duplicate</attribute></item>
     </section>
     -->
 
-    <item><attribute name="action">app.patterns-copy-location</attribute></item>
-    <item><attribute name="action">app.patterns-show-in-file-manager</attribute></item>
-    <item><attribute name="action">app.patterns-delete</attribute></item>
+    <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">app.patterns-refresh</attribute></item>
+      <item><attribute name="action">patterns.patterns-refresh</attribute></item>
     </section>
   </menu>
 </interface>
diff --git a/menus/sample-points-menu.ui b/menus/sample-points-menu.ui
index 2851d1801b..5eb0e012e1 100644
--- a/menus/sample-points-menu.ui
+++ b/menus/sample-points-menu.ui
@@ -6,7 +6,7 @@
       <attribute name="label" translatable="yes" context="sample-points-action">Sample Point Menu</attribute>
       <attribute name="icon">gimp-sample-point</attribute>
 
-      <item><attribute name="action">app.sample-points-sample-merged</attribute></item>
+      <item><attribute name="action">sample-points.sample-points-sample-merged</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/templates-menu.ui b/menus/templates-menu.ui
index 0fc8ccc9d8..8910f63bd0 100644
--- a/menus/templates-menu.ui
+++ b/menus/templates-menu.ui
@@ -2,12 +2,12 @@
 
 <interface>
   <menu id="/templates-popup">
-    <item><attribute name="action">app.templates-create-image</attribute></item>
+    <item><attribute name="action">templates.templates-create-image</attribute></item>
     <section>
-      <item><attribute name="action">app.templates-new</attribute></item>
-      <item><attribute name="action">app.templates-duplicate</attribute></item>
-      <item><attribute name="action">app.templates-edit</attribute></item>
-      <item><attribute name="action">app.templates-delete</attribute></item>
+      <item><attribute name="action">templates.templates-new</attribute></item>
+      <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>
   </menu>
 </interface>
diff --git a/menus/text-editor-toolbar.ui b/menus/text-editor-toolbar.ui
index 59f9c1ab37..8f7ec544c3 100644
--- a/menus/text-editor-toolbar.ui
+++ b/menus/text-editor-toolbar.ui
@@ -3,14 +3,14 @@
 <interface>
   <menu id="/text-editor-toolbar">
     <section>
-      <item><attribute name="action">app.text-editor-load</attribute></item>
-      <item><attribute name="action">app.text-editor-clear</attribute></item>
+      <item><attribute name="action">text-editor.text-editor-load</attribute></item>
+      <item><attribute name="action">text-editor.text-editor-clear</attribute></item>
     </section>
-    <item><attribute name="action">app.text-editor-direction-ltr</attribute></item>
-    <item><attribute name="action">app.text-editor-direction-rtl</attribute></item>
-    <item><attribute name="action">app.text-editor-direction-ttb-rtl</attribute></item>
-    <item><attribute name="action">app.text-editor-direction-ttb-rtl-upright</attribute></item>
-    <item><attribute name="action">app.text-editor-direction-ttb-ltr</attribute></item>
-    <item><attribute name="action">app.text-editor-direction-ttb-ltr-upright</attribute></item>
+    <item><attribute name="action">text-editor.text-editor-direction-ltr</attribute></item>
+    <item><attribute name="action">text-editor.text-editor-direction-rtl</attribute></item>
+    <item><attribute name="action">text-editor.text-editor-direction-ttb-rtl</attribute></item>
+    <item><attribute name="action">text-editor.text-editor-direction-ttb-rtl-upright</attribute></item>
+    <item><attribute name="action">text-editor.text-editor-direction-ttb-ltr</attribute></item>
+    <item><attribute name="action">text-editor.text-editor-direction-ttb-ltr-upright</attribute></item>
   </menu>
 </interface>
diff --git a/menus/text-tool-menu.ui b/menus/text-tool-menu.ui
index 18fef6bef0..1881c5ac9c 100644
--- a/menus/text-tool-menu.ui
+++ b/menus/text-tool-menu.ui
@@ -5,24 +5,24 @@
     <submenu>
       <attribute name="label" translatable="yes" context="text-tool-action">Text Tool Menu</attribute>
 
-      <item><attribute name="action">app.text-tool-cut</attribute></item>
-      <item><attribute name="action">app.text-tool-copy</attribute></item>
-      <item><attribute name="action">app.text-tool-paste</attribute></item>
-      <item><attribute name="action">app.text-tool-delete</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-cut</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-copy</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-paste</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-delete</attribute></item>
       <section>
-        <item><attribute name="action">app.text-tool-load</attribute></item>
-        <item><attribute name="action">app.text-tool-clear</attribute></item>
+        <item><attribute name="action">text-tool.text-tool-load</attribute></item>
+        <item><attribute name="action">text-tool.text-tool-clear</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.text-tool-text-to-path</attribute></item>
-        <item><attribute name="action">app.text-tool-text-along-path</attribute></item>
+        <item><attribute name="action">text-tool.text-tool-text-to-path</attribute></item>
+        <item><attribute name="action">text-tool.text-tool-text-along-path</attribute></item>
       </section>
-      <item><attribute name="action">app.text-tool-direction-ltr</attribute></item>
-      <item><attribute name="action">app.text-tool-direction-rtl</attribute></item>
-      <item><attribute name="action">app.text-tool-direction-ttb-rtl</attribute></item>
-      <item><attribute name="action">app.text-tool-direction-ttb-rtl-upright</attribute></item>
-      <item><attribute name="action">app.text-tool-direction-ttb-ltr</attribute></item>
-      <item><attribute name="action">app.text-tool-direction-ttb-ltr-upright</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-direction-ltr</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-direction-rtl</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-direction-ttb-rtl</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-direction-ttb-rtl-upright</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-direction-ttb-ltr</attribute></item>
+      <item><attribute name="action">text-tool.text-tool-direction-ttb-ltr-upright</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/tool-options-menu.ui b/menus/tool-options-menu.ui
index 61d59cbb23..3c9d376aa9 100644
--- a/menus/tool-options-menu.ui
+++ b/menus/tool-options-menu.ui
@@ -9,7 +9,7 @@
         <attribute name="label" translatable="yes" context="tool-options-action">_Save Tool Preset</attribute>
         <attribute name="icon">document-save</attribute>
         <section>
-          <item><attribute name="action">app.tool-options-save-new-preset</attribute></item>
+          <item><attribute name="action">tool-options.tool-options-save-new-preset</attribute></item>
         </section>
       </submenu>
       <submenu>
@@ -25,8 +25,8 @@
         <attribute name="icon">edit-delete</attribute>
       </submenu>
       <section>
-        <item><attribute name="action">app.tool-options-reset</attribute></item>
-        <item><attribute name="action">app.tool-options-reset-all</attribute></item>
+        <item><attribute name="action">tool-options.tool-options-reset</attribute></item>
+        <item><attribute name="action">tool-options.tool-options-reset-all</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/tool-preset-editor-menu.ui b/menus/tool-preset-editor-menu.ui
index 8faf0ae72b..d65bd65fe0 100644
--- a/menus/tool-preset-editor-menu.ui
+++ b/menus/tool-preset-editor-menu.ui
@@ -7,10 +7,10 @@
       <attribute name="icon">gimp-tool-preset</attribute>
 
       <section>
-        <item><attribute name="action">app.tool-preset-editor-save</attribute></item>
-        <item><attribute name="action">app.tool-preset-editor-restore</attribute></item>
+        <item><attribute name="action">tool-preset-editor.tool-preset-editor-save</attribute></item>
+        <item><attribute name="action">tool-preset-editor.tool-preset-editor-restore</attribute></item>
       </section>
-      <item><attribute name="action">app.tool-preset-editor-edit-active</attribute></item>
+      <item><attribute name="action">tool-preset-editor.tool-preset-editor-edit-active</attribute></item>
     </submenu>
   </menu>
 </interface>
diff --git a/menus/tool-presets-menu.ui b/menus/tool-presets-menu.ui
index 372169da01..f37bc8ab7a 100644
--- a/menus/tool-presets-menu.ui
+++ b/menus/tool-presets-menu.ui
@@ -6,18 +6,18 @@
       <attribute name="label" translatable="yes" context="tool-presets-action">Tool Presets Menu</attribute>
       <attribute name="icon">gimp-tool-preset</attribute>
 
-      <item><attribute name="action">app.tool-presets-edit</attribute></item>
+      <item><attribute name="action">tool-presets.tool-presets-edit</attribute></item>
       <section>
-        <item><attribute name="action">app.tool-presets-new</attribute></item>
-        <item><attribute name="action">app.tool-presets-duplicate</attribute></item>
-        <item><attribute name="action">app.tool-presets-copy-location</attribute></item>
-        <item><attribute name="action">app.tool-presets-show-in-file-manager</attribute></item>
-        <item><attribute name="action">app.tool-presets-save</attribute></item>
-        <item><attribute name="action">app.tool-presets-restore</attribute></item>
-        <item><attribute name="action">app.tool-presets-delete</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-new</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-duplicate</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-copy-location</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-show-in-file-manager</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-save</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-restore</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-delete</attribute></item>
       </section>
       <section>
-        <item><attribute name="action">app.tool-presets-refresh</attribute></item>
+        <item><attribute name="action">tool-presets.tool-presets-refresh</attribute></item>
       </section>
     </submenu>
   </menu>
diff --git a/menus/vector-toolpath-menu.ui b/menus/vector-toolpath-menu.ui
index aaf4942b15..27cc82bae3 100644
--- a/menus/vector-toolpath-menu.ui
+++ b/menus/vector-toolpath-menu.ui
@@ -3,11 +3,11 @@
 <interface>
   <menu id="/vector-toolpath-popup">
     <section>
-      <item><attribute name="action">app.vector-toolpath-delete-anchor</attribute></item>
-      <item><attribute name="action">app.vector-toolpath-shift-start</attribute></item>
+      <item><attribute name="action">vector-toolpath.vector-toolpath-delete-anchor</attribute></item>
+      <item><attribute name="action">vector-toolpath.vector-toolpath-shift-start</attribute></item>
     </section>
-    <item><attribute name="action">app.vector-toolpath-insert-anchor</attribute></item>
-    <item><attribute name="action">app.vector-toolpath-delete-segment</attribute></item>
-    <item><attribute name="action">app.vector-toolpath-reverse-stroke</attribute></item>
+    <item><attribute name="action">vector-toolpath.vector-toolpath-insert-anchor</attribute></item>
+    <item><attribute name="action">vector-toolpath.vector-toolpath-delete-segment</attribute></item>
+    <item><attribute name="action">vector-toolpath.vector-toolpath-reverse-stroke</attribute></item>
   </menu>
 </interface>