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 @@
Brush Editor Menu
gimp-tool-paintbrush
- - app.brush-editor-edit-active
+ - brush-editor.brush-editor-edit-active
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 @@
Brushes Menu
gimp-tool-paintbrush
- - app.brushes-edit
- - app.brushes-open-as-image
+ - brushes.brushes-edit
+ - brushes.brushes-open-as-image
- - app.brushes-new
- - app.brushes-duplicate
- - app.brushes-copy-location
- - app.brushes-show-in-file-manager
- - app.brushes-delete
+ - brushes.brushes-new
+ - brushes.brushes-duplicate
+ - brushes.brushes-copy-location
+ - brushes.brushes-show-in-file-manager
+ - brushes.brushes-delete
- - app.brushes-refresh
+ - brushes.brushes-refresh
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 @@
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 @@
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 @@
Pointer Information Menu
gimp-cursor
- - app.cursor-info-sample-merged
+ - cursor-info.cursor-info-sample-merged
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 @@
_Update Interval
- - app.dashboard-update-interval-0-25-sec
- - app.dashboard-update-interval-0-5-sec
- - app.dashboard-update-interval-1-sec
- - app.dashboard-update-interval-2-sec
- - app.dashboard-update-interval-4-sec
+ - dashboard.dashboard-update-interval-0-25-sec
+ - dashboard.dashboard-update-interval-0-5-sec
+ - dashboard.dashboard-update-interval-1-sec
+ - dashboard.dashboard-update-interval-2-sec
+ - dashboard.dashboard-update-interval-4-sec
_History Duration
- - app.dashboard-history-duration-15-sec
- - app.dashboard-history-duration-30-sec
- - app.dashboard-history-duration-60-sec
- - app.dashboard-history-duration-120-sec
- - app.dashboard-history-duration-240-sec
+ - dashboard.dashboard-history-duration-15-sec
+ - dashboard.dashboard-history-duration-30-sec
+ - dashboard.dashboard-history-duration-60-sec
+ - dashboard.dashboard-history-duration-120-sec
+ - dashboard.dashboard-history-duration-240-sec
- - app.dashboard-log-record
- - app.dashboard-log-add-marker
- - app.dashboard-log-add-empty-marker
+ - dashboard.dashboard-log-record
+ - dashboard.dashboard-log-add-marker
+ - dashboard.dashboard-log-add-empty-marker
- - app.dashboard-reset
+ - dashboard.dashboard-reset
- - app.dashboard-low-swap-space-warning
+ - dashboard.dashboard-low-swap-space-warning
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 @@
_Add Tab
- - app.dockable-close-tab
- - app.dockable-detach-tab
- - app.dockable-lock-tab
+ - dockable.dockable-close-tab
+ - dockable.dockable-detach-tab
+ - dockable.dockable-lock-tab
_Preview Size
- - app.dockable-preview-size-tiny
- - app.dockable-preview-size-extra-small
- - app.dockable-preview-size-small
- - app.dockable-preview-size-medium
- - app.dockable-preview-size-large
- - app.dockable-preview-size-extra-large
- - app.dockable-preview-size-enormous
- - app.dockable-preview-size-gigantic
+ - dockable.dockable-preview-size-tiny
+ - dockable.dockable-preview-size-extra-small
+ - dockable.dockable-preview-size-small
+ - dockable.dockable-preview-size-medium
+ - dockable.dockable-preview-size-large
+ - dockable.dockable-preview-size-extra-large
+ - dockable.dockable-preview-size-enormous
+ - dockable.dockable-preview-size-gigantic
_Tab Style
- - app.dockable-tab-style-icon
- - app.dockable-tab-style-preview
- - app.dockable-tab-style-name
- - app.dockable-tab-style-icon-name
- - app.dockable-tab-style-preview-name
+ - dockable.dockable-tab-style-icon
+ - dockable.dockable-tab-style-preview
+ - dockable.dockable-tab-style-name
+ - dockable.dockable-tab-style-icon-name
+ - dockable.dockable-tab-style-preview-name
- - app.dockable-view-type-list
- - app.dockable-view-type-grid
- - app.dockable-show-button-bar
+ - dockable.dockable-view-type-list
+ - dockable.dockable-view-type-grid
+ - dockable.dockable-show-button-bar
- - app.dock-show-image-menu
- - app.dock-auto-follow-active
+ - dock.dock-show-image-menu
+ - dock.dock-auto-follow-active
Move to Screen
- - app.dock-open-display
+ - dock.dock-open-display
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 @@
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 @@
Paint Dynamics Editor Menu
gimp-dynamics
- - app.dynamics-editor-edit-active
+ - dynamics-editor.dynamics-editor-edit-active
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 @@
Paint Dynamics Menu
gimp-dynamics
- - app.dynamics-edit
+ - dynamics.dynamics-edit
- - app.dynamics-new
- - app.dynamics-duplicate
- - app.dynamics-copy-location
- - app.dynamics-show-in-file-manager
- - app.dynamics-delete
+ - dynamics.dynamics-new
+ - dynamics.dynamics-duplicate
+ - dynamics.dynamics-copy-location
+ - dynamics.dynamics-show-in-file-manager
+ - dynamics.dynamics-delete
- - app.dynamics-refresh
+ - dynamics.dynamics-refresh
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 @@
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 @@
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 @@
gimp-tool-gradient
Left Color Type
- - app.gradient-editor-left-color-fixed
- - app.gradient-editor-left-color-foreground
- - app.gradient-editor-left-color-foreground-transparent
- - app.gradient-editor-left-color-background
- - app.gradient-editor-left-color-background-transparent
+ - gradient-editor.gradient-editor-left-color-fixed
+ - gradient-editor.gradient-editor-left-color-foreground
+ - gradient-editor.gradient-editor-left-color-foreground-transparent
+ - gradient-editor.gradient-editor-left-color-background
+ - gradient-editor.gradient-editor-left-color-background-transparent
- - app.gradient-editor-left-color
+ - gradient-editor.gradient-editor-left-color
_Load Left Color From
- - app.gradient-editor-load-left-left-neighbor
- - app.gradient-editor-load-left-right-endpoint
- - app.gradient-editor-load-left-fg
- - app.gradient-editor-load-left-bg
+ - gradient-editor.gradient-editor-load-left-left-neighbor
+ - gradient-editor.gradient-editor-load-left-right-endpoint
+ - gradient-editor.gradient-editor-load-left-fg
+ - gradient-editor.gradient-editor-load-left-bg
- - app.gradient-editor-load-left-01
- - app.gradient-editor-load-left-02
- - app.gradient-editor-load-left-03
- - app.gradient-editor-load-left-04
- - app.gradient-editor-load-left-05
- - app.gradient-editor-load-left-06
- - app.gradient-editor-load-left-07
- - app.gradient-editor-load-left-08
- - app.gradient-editor-load-left-09
- - app.gradient-editor-load-left-10
+ - gradient-editor.gradient-editor-load-left-01
+ - gradient-editor.gradient-editor-load-left-02
+ - gradient-editor.gradient-editor-load-left-03
+ - gradient-editor.gradient-editor-load-left-04
+ - gradient-editor.gradient-editor-load-left-05
+ - gradient-editor.gradient-editor-load-left-06
+ - gradient-editor.gradient-editor-load-left-07
+ - gradient-editor.gradient-editor-load-left-08
+ - gradient-editor.gradient-editor-load-left-09
+ - gradient-editor.gradient-editor-load-left-10
_Save Left Color To
- - app.gradient-editor-save-left-01
- - app.gradient-editor-save-left-02
- - app.gradient-editor-save-left-03
- - app.gradient-editor-save-left-04
- - app.gradient-editor-save-left-05
- - app.gradient-editor-save-left-06
- - app.gradient-editor-save-left-07
- - app.gradient-editor-save-left-08
- - app.gradient-editor-save-left-09
- - app.gradient-editor-save-left-10
+ - gradient-editor.gradient-editor-save-left-01
+ - gradient-editor.gradient-editor-save-left-02
+ - gradient-editor.gradient-editor-save-left-03
+ - gradient-editor.gradient-editor-save-left-04
+ - gradient-editor.gradient-editor-save-left-05
+ - gradient-editor.gradient-editor-save-left-06
+ - gradient-editor.gradient-editor-save-left-07
+ - gradient-editor.gradient-editor-save-left-08
+ - gradient-editor.gradient-editor-save-left-09
+ - gradient-editor.gradient-editor-save-left-10
Right Color Type
- - app.gradient-editor-right-color-fixed
- - app.gradient-editor-right-color-foreground
- - app.gradient-editor-right-color-foreground-transparent
- - app.gradient-editor-right-color-background
- - app.gradient-editor-right-color-background-transparent
+ - gradient-editor.gradient-editor-right-color-fixed
+ - gradient-editor.gradient-editor-right-color-foreground
+ - gradient-editor.gradient-editor-right-color-foreground-transparent
+ - gradient-editor.gradient-editor-right-color-background
+ - gradient-editor.gradient-editor-right-color-background-transparent
- - app.gradient-editor-right-color
+ - gradient-editor.gradient-editor-right-color
Load Right Color Fr_om
- - app.gradient-editor-load-right-right-neighbor
- - app.gradient-editor-load-right-left-endpoint
- - app.gradient-editor-load-right-fg
- - app.gradient-editor-load-right-bg
+ - gradient-editor.gradient-editor-load-right-right-neighbor
+ - gradient-editor.gradient-editor-load-right-left-endpoint
+ - gradient-editor.gradient-editor-load-right-fg
+ - gradient-editor.gradient-editor-load-right-bg
- - app.gradient-editor-load-right-01
- - app.gradient-editor-load-right-02
- - app.gradient-editor-load-right-03
- - app.gradient-editor-load-right-04
- - app.gradient-editor-load-right-05
- - app.gradient-editor-load-right-06
- - app.gradient-editor-load-right-07
- - app.gradient-editor-load-right-08
- - app.gradient-editor-load-right-09
- - app.gradient-editor-load-right-10
+ - gradient-editor.gradient-editor-load-right-01
+ - gradient-editor.gradient-editor-load-right-02
+ - gradient-editor.gradient-editor-load-right-03
+ - gradient-editor.gradient-editor-load-right-04
+ - gradient-editor.gradient-editor-load-right-05
+ - gradient-editor.gradient-editor-load-right-06
+ - gradient-editor.gradient-editor-load-right-07
+ - gradient-editor.gradient-editor-load-right-08
+ - gradient-editor.gradient-editor-load-right-09
+ - gradient-editor.gradient-editor-load-right-10
Sa_ve Right Color To
- - app.gradient-editor-save-right-01
- - app.gradient-editor-save-right-02
- - app.gradient-editor-save-right-03
- - app.gradient-editor-save-right-04
- - app.gradient-editor-save-right-05
- - app.gradient-editor-save-right-06
- - app.gradient-editor-save-right-07
- - app.gradient-editor-save-right-08
- - app.gradient-editor-save-right-09
- - app.gradient-editor-save-right-10
+ - gradient-editor.gradient-editor-save-right-01
+ - gradient-editor.gradient-editor-save-right-02
+ - gradient-editor.gradient-editor-save-right-03
+ - gradient-editor.gradient-editor-save-right-04
+ - gradient-editor.gradient-editor-save-right-05
+ - gradient-editor.gradient-editor-save-right-06
+ - gradient-editor.gradient-editor-save-right-07
+ - gradient-editor.gradient-editor-save-right-08
+ - gradient-editor.gradient-editor-save-right-09
+ - gradient-editor.gradient-editor-save-right-10
- app.gradient-editor-blending-linear
- - app.gradient-editor-blending-linear
- - app.gradient-editor-blending-curved
- - app.gradient-editor-blending-sine
- - app.gradient-editor-blending-sphere-increasing
- - app.gradient-editor-blending-sphere-decreasing
- - app.gradient-editor-blending-step
- - app.gradient-editor-blending-varies
+ gradient-editor.gradient-editor-blending-linear
+ - gradient-editor.gradient-editor-blending-linear
+ - gradient-editor.gradient-editor-blending-curved
+ - gradient-editor.gradient-editor-blending-sine
+ - gradient-editor.gradient-editor-blending-sphere-increasing
+ - gradient-editor.gradient-editor-blending-sphere-decreasing
+ - gradient-editor.gradient-editor-blending-step
+ - gradient-editor.gradient-editor-blending-varies
- app.gradient-editor-coloring-rgb
- - app.gradient-editor-coloring-rgb
- - app.gradient-editor-coloring-hsv-ccw
- - app.gradient-editor-coloring-hsv-cw
- - app.gradient-editor-coloring-varies
+ gradient-editor.gradient-editor-coloring-rgb
+ - gradient-editor.gradient-editor-coloring-rgb
+ - gradient-editor.gradient-editor-coloring-hsv-ccw
+ - gradient-editor.gradient-editor-coloring-hsv-cw
+ - gradient-editor.gradient-editor-coloring-varies
- - app.gradient-editor-flip
- - app.gradient-editor-replicate
- - app.gradient-editor-split-midpoint
- - app.gradient-editor-split-uniform
- - app.gradient-editor-delete
- - app.gradient-editor-recenter
- - app.gradient-editor-redistribute
+ - gradient-editor.gradient-editor-flip
+ - gradient-editor.gradient-editor-replicate
+ - gradient-editor.gradient-editor-split-midpoint
+ - gradient-editor.gradient-editor-split-uniform
+ - gradient-editor.gradient-editor-delete
+ - gradient-editor.gradient-editor-recenter
+ - gradient-editor.gradient-editor-redistribute
- - app.gradient-editor-blend-color
- - app.gradient-editor-blend-opacity
+ - gradient-editor.gradient-editor-blend-color
+ - gradient-editor.gradient-editor-blend-opacity
- - app.gradient-editor-edit-active
+ - gradient-editor.gradient-editor-edit-active
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 @@
Gradients Menu
gimp-tool-gradient
- - app.gradients-edit
+ - gradients.gradients-edit
- - app.gradients-new
- - app.gradients-duplicate
- - app.gradients-save-as-pov
- - app.gradients-copy-location
- - app.gradients-show-in-file-manager
- - app.gradients-delete
+ - gradients.gradients-new
+ - gradients.gradients-duplicate
+ - gradients.gradients-save-as-pov
+ - gradients.gradients-copy-location
+ - gradients.gradients-show-in-file-manager
+ - gradients.gradients-delete
- - app.gradients-refresh
+ - gradients.gradients-refresh
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 @@
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 @@
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 @@
Palette Editor Menu
gtk-select-color
- - app.palette-editor-edit-color
- - app.palette-editor-new-color-fg
- - app.palette-editor-new-color-bg
- - app.palette-editor-delete-color
+ - palette-editor.palette-editor-edit-color
+ - palette-editor.palette-editor-new-color-fg
+ - palette-editor.palette-editor-new-color-bg
+ - palette-editor.palette-editor-delete-color
- - app.palette-editor-zoom-out
- - app.palette-editor-zoom-in
- - app.palette-editor-zoom-all
+ - palette-editor.palette-editor-zoom-out
+ - palette-editor.palette-editor-zoom-in
+ - palette-editor.palette-editor-zoom-all
- - app.palette-editor-edit-active
+ - palette-editor.palette-editor-edit-active
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 @@
Palettes Menu
gtk-select-color
- - app.palettes-edit
+ - palettes.palettes-edit
- - app.palettes-new
- - app.palettes-import
- - app.palettes-duplicate
- - app.palettes-merge
- - app.palettes-copy-location
- - app.palettes-show-in-file-manager
- - app.palettes-delete
+ - palettes.palettes-new
+ - palettes.palettes-import
+ - palettes.palettes-duplicate
+ - palettes.palettes-merge
+ - palettes.palettes-copy-location
+ - palettes.palettes-show-in-file-manager
+ - palettes.palettes-delete
- - app.palettes-refresh
+ - palettes.palettes-refresh
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 @@
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 @@
Sample Point Menu
gimp-sample-point
- - app.sample-points-sample-merged
+ - sample-points.sample-points-sample-merged
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 @@
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 @@
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 @@
Text Tool Menu
- - app.text-tool-cut
- - app.text-tool-copy
- - app.text-tool-paste
- - app.text-tool-delete
+ - text-tool.text-tool-cut
+ - text-tool.text-tool-copy
+ - text-tool.text-tool-paste
+ - text-tool.text-tool-delete
- - app.text-tool-load
- - app.text-tool-clear
+ - text-tool.text-tool-load
+ - text-tool.text-tool-clear
- - app.text-tool-text-to-path
- - app.text-tool-text-along-path
+ - text-tool.text-tool-text-to-path
+ - text-tool.text-tool-text-along-path
- - app.text-tool-direction-ltr
- - app.text-tool-direction-rtl
- - app.text-tool-direction-ttb-rtl
- - app.text-tool-direction-ttb-rtl-upright
- - app.text-tool-direction-ttb-ltr
- - app.text-tool-direction-ttb-ltr-upright
+ - text-tool.text-tool-direction-ltr
+ - text-tool.text-tool-direction-rtl
+ - text-tool.text-tool-direction-ttb-rtl
+ - text-tool.text-tool-direction-ttb-rtl-upright
+ - text-tool.text-tool-direction-ttb-ltr
+ - text-tool.text-tool-direction-ttb-ltr-upright
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 @@
_Save Tool Preset
document-save
- - app.tool-options-save-new-preset
+ - tool-options.tool-options-save-new-preset
@@ -25,8 +25,8 @@
edit-delete
- - app.tool-options-reset
- - app.tool-options-reset-all
+ - tool-options.tool-options-reset
+ - tool-options.tool-options-reset-all
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 @@
gimp-tool-preset
- - app.tool-preset-editor-save
- - app.tool-preset-editor-restore
+ - tool-preset-editor.tool-preset-editor-save
+ - tool-preset-editor.tool-preset-editor-restore
- - app.tool-preset-editor-edit-active
+ - tool-preset-editor.tool-preset-editor-edit-active
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 @@
Tool Presets Menu
gimp-tool-preset
- - app.tool-presets-edit
+ - tool-presets.tool-presets-edit
- - app.tool-presets-new
- - app.tool-presets-duplicate
- - app.tool-presets-copy-location
- - app.tool-presets-show-in-file-manager
- - app.tool-presets-save
- - app.tool-presets-restore
- - app.tool-presets-delete
+ - tool-presets.tool-presets-new
+ - tool-presets.tool-presets-duplicate
+ - tool-presets.tool-presets-copy-location
+ - tool-presets.tool-presets-show-in-file-manager
+ - tool-presets.tool-presets-save
+ - tool-presets.tool-presets-restore
+ - tool-presets.tool-presets-delete
- - app.tool-presets-refresh
+ - tool-presets.tool-presets-refresh
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 @@