From 4ce5181cc5535a448b038094cdc2355b075e847f Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 7 Jul 2025 16:16:48 +0200 Subject: [PATCH] app, menus: vectors -> path in dialog and action identifiers --- app/actions/dialogs-actions.c | 4 ++-- app/actions/layers-actions.c | 10 +++++----- app/actions/view-actions.c | 6 +++--- app/dialogs/dialogs.c | 2 +- app/display/gimptoolpath.c | 2 +- app/tools/gimpalignoptions.c | 4 ++-- app/tools/gimptools-utils.c | 2 +- app/widgets/gimphelp-ids.h | 2 +- menus/dialogs-menuitems.ui.in | 2 +- menus/image-menu.ui.in.in | 6 +++--- menus/layers-menu.ui | 4 ++-- 11 files changed, 22 insertions(+), 22 deletions(-) diff --git a/app/actions/dialogs-actions.c b/app/actions/dialogs-actions.c index f3875c5609..765e3194e0 100644 --- a/app/actions/dialogs-actions.c +++ b/app/actions/dialogs-actions.c @@ -89,12 +89,12 @@ const GimpStringActionEntry dialogs_dockable_actions[] = "gimp-channel-list", GIMP_HELP_CHANNEL_DIALOG }, - { "dialogs-vectors", GIMP_ICON_DIALOG_PATHS, + { "dialogs-paths", GIMP_ICON_DIALOG_PATHS, NC_("dialogs-action", "_Paths Dialog"), NC_("dialogs-action", "_Paths"), { NULL }, NC_("dialogs-action", "Open the paths dialog"), - "gimp-vectors-list", + "gimp-path-list", GIMP_HELP_PATH_DIALOG }, { "dialogs-indexed-palette", GIMP_ICON_COLORMAP, diff --git a/app/actions/layers-actions.c b/app/actions/layers-actions.c index f661f53bca..997bf0917a 100644 --- a/app/actions/layers-actions.c +++ b/app/actions/layers-actions.c @@ -179,13 +179,13 @@ static const GimpActionEntry layers_actions[] = layers_text_discard_cmd_callback, GIMP_HELP_LAYER_TEXT_DISCARD }, - { "layers-text-to-vectors", GIMP_ICON_TOOL_TEXT, + { "layers-text-to-path", GIMP_ICON_TOOL_TEXT, NC_("layers-action", "Text to _Path"), NULL, { NULL }, NC_("layers-action", "Create paths from text layers"), layers_text_to_path_cmd_callback, GIMP_HELP_LAYER_TEXT_TO_PATH }, - { "layers-text-along-vectors", GIMP_ICON_TOOL_TEXT, + { "layers-text-along-path", GIMP_ICON_TOOL_TEXT, NC_("layers-action", "Text alon_g Path"), NULL, { NULL }, NC_("layers-action", "Warp this layer's text along the current path"), layers_text_along_path_cmd_callback, @@ -1038,9 +1038,9 @@ layers_actions_update (GimpActionGroup *group, SET_SENSITIVE ("layers-merge-layers", n_selected_layers > 0 && !fs && !ac); SET_SENSITIVE ("layers-flatten-image", !fs && !ac); - SET_VISIBLE ("layers-text-discard", n_text_layers > 0 && !ac); - SET_VISIBLE ("layers-text-to-vectors", n_text_layers > 0 && !ac); - SET_VISIBLE ("layers-text-along-vectors", text_layer && !ac); + SET_VISIBLE ("layers-text-discard", n_text_layers > 0 && !ac); + SET_VISIBLE ("layers-text-to-path", n_text_layers > 0 && !ac); + SET_VISIBLE ("layers-text-along-path", text_layer && !ac); SET_SENSITIVE ("layers-resize", n_selected_layers == 1 && all_writable && all_movable && !ac); SET_SENSITIVE ("layers-resize-to-image", all_writable && all_movable && !ac); diff --git a/app/actions/view-actions.c b/app/actions/view-actions.c index e5a905d849..60ff89afc6 100644 --- a/app/actions/view-actions.c +++ b/app/actions/view-actions.c @@ -270,7 +270,7 @@ static const GimpToggleActionEntry view_toggle_actions[] = FALSE, GIMP_HELP_VIEW_SNAP_TO_CANVAS }, - { "view-snap-to-vectors", NULL, + { "view-snap-to-path", NULL, NC_("view-action", "Snap t_o Active Path"), NULL, { NULL }, NC_("view-action", "Tool operations snap to the active path"), view_snap_to_path_cmd_callback, @@ -938,8 +938,8 @@ view_actions_update (GimpActionGroup *group, SET_ACTIVE ("view-snap-to-grid", display && options->snap_to_grid); SET_SENSITIVE ("view-snap-to-canvas", image); SET_ACTIVE ("view-snap-to-canvas", display && options->snap_to_canvas); - SET_SENSITIVE ("view-snap-to-vectors", image); - SET_ACTIVE ("view-snap-to-vectors", display && options->snap_to_path); + SET_SENSITIVE ("view-snap-to-path", image); + SET_ACTIVE ("view-snap-to-path", display && options->snap_to_path); SET_SENSITIVE ("view-snap-to-bbox", image); SET_ACTIVE ("view-snap-to-bbox", display && options->snap_to_bbox); SET_SENSITIVE ("view-snap-to-equidistance", image); diff --git a/app/dialogs/dialogs.c b/app/dialogs/dialogs.c index 2fd3e80f15..7c15ce47ff 100644 --- a/app/dialogs/dialogs.c +++ b/app/dialogs/dialogs.c @@ -380,7 +380,7 @@ static const GimpDialogFactoryEntry entries[] = N_("Channels"), NULL, GIMP_ICON_DIALOG_CHANNELS, GIMP_HELP_CHANNEL_DIALOG, dialogs_channel_list_view_new, 0, FALSE), - DOCKABLE ("gimp-vectors-list", + DOCKABLE ("gimp-path-list", N_("Paths"), NULL, GIMP_ICON_DIALOG_PATHS, GIMP_HELP_PATH_DIALOG, dialogs_path_list_view_new, 0, FALSE), diff --git a/app/display/gimptoolpath.c b/app/display/gimptoolpath.c index 96fadb2157..12a1629a4d 100644 --- a/app/display/gimptoolpath.c +++ b/app/display/gimptoolpath.c @@ -1195,7 +1195,7 @@ gimp_tool_path_key_press (GimpToolWidget *widget, case GDK_KEY_Escape: if (private->edit_mode != GIMP_PATH_MODE_DESIGN) g_object_set (private, - "vectors-edit-mode", GIMP_PATH_MODE_DESIGN, + "path-edit-mode", GIMP_PATH_MODE_DESIGN, NULL); break; diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c index 82ce3fa59c..775f9c733c 100644 --- a/app/tools/gimpalignoptions.c +++ b/app/tools/gimpalignoptions.c @@ -160,7 +160,7 @@ gimp_align_options_class_init (GimpAlignOptionsClass *klass) TRUE, GIMP_PARAM_STATIC_STRINGS); GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_ALIGN_PATHS, - "align-vectors", + "align-paths", _("Selected paths"), _("Selected paths will be aligned or distributed by the tool"), FALSE, @@ -401,7 +401,7 @@ gimp_align_options_gui (GimpToolOptions *tool_options) NULL, widget, NULL); gtk_grid_attach (GTK_GRID (items_grid), widget, 0, 0, 1, 1); - widget = gimp_prop_check_button_new (config, "align-vectors", NULL); + widget = gimp_prop_check_button_new (config, "align-paths", NULL); gtk_grid_attach (GTK_GRID (items_grid), widget, 0, 1, 1, 1); options->priv->pivot_selector = gimp_pivot_selector_new (0.0, 0.0, 1.0, 1.0); diff --git a/app/tools/gimptools-utils.c b/app/tools/gimptools-utils.c index 26f7f14982..9c337c5ebb 100644 --- a/app/tools/gimptools-utils.c +++ b/app/tools/gimptools-utils.c @@ -59,7 +59,7 @@ gimp_tools_blink_lock_box (Gimp *gimp, else if (GIMP_IS_CHANNEL (item)) identifier = "gimp-channel-list"; else if (GIMP_IS_PATH (item)) - identifier = "gimp-vectors-list"; + identifier = "gimp-path-list"; else return; diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h index 166d6e6f87..3d13392b22 100644 --- a/app/widgets/gimphelp-ids.h +++ b/app/widgets/gimphelp-ids.h @@ -121,7 +121,7 @@ #define GIMP_HELP_VIEW_SNAP_TO_GUIDES "gimp-view-snap-to-guides" #define GIMP_HELP_VIEW_SNAP_TO_GRID "gimp-view-snap-to-grid" #define GIMP_HELP_VIEW_SNAP_TO_CANVAS "gimp-view-snap-to-canvas" -#define GIMP_HELP_VIEW_SNAP_TO_PATH "gimp-view-snap-to-vectors" +#define GIMP_HELP_VIEW_SNAP_TO_PATH "gimp-view-snap-to-path" #define GIMP_HELP_VIEW_SNAP_TO_BBOX "gimp-view-snap-to-bbox" #define GIMP_HELP_VIEW_SNAP_TO_EQUIDISTANCE "gimp-view-snap-to-equidistance" #define GIMP_HELP_VIEW_SHOW_MENUBAR "gimp-view-show-menubar" diff --git a/menus/dialogs-menuitems.ui.in b/menus/dialogs-menuitems.ui.in index 9a0df3ccf8..d9e6131d7f 100644 --- a/menus/dialogs-menuitems.ui.in +++ b/menus/dialogs-menuitems.ui.in @@ -6,7 +6,7 @@
@GROUP@.dialogs-layers @GROUP@.dialogs-channels - @GROUP@.dialogs-vectors + @GROUP@.dialogs-paths @GROUP@.dialogs-indexed-palette @GROUP@.dialogs-histogram @GROUP@.dialogs-selection-editor diff --git a/menus/image-menu.ui.in.in b/menus/image-menu.ui.in.in index f77fe104dd..8241cf1163 100644 --- a/menus/image-menu.ui.in.in +++ b/menus/image-menu.ui.in.in @@ -275,7 +275,7 @@ app.view-snap-to-guides app.view-snap-to-grid app.view-snap-to-canvas - app.view-snap-to-vectors + app.view-snap-to-path app.view-snap-to-bbox app.view-snap-to-equidistance
@@ -430,8 +430,8 @@
Text app.layers-text-discard - app.layers-text-to-vectors - app.layers-text-along-vectors + app.layers-text-to-path + app.layers-text-along-path
diff --git a/menus/layers-menu.ui b/menus/layers-menu.ui index e780d64387..34b78229a1 100644 --- a/menus/layers-menu.ui +++ b/menus/layers-menu.ui @@ -60,8 +60,8 @@
app.layers-text-discard - app.layers-text-to-vectors - app.layers-text-along-vectors + app.layers-text-to-path + app.layers-text-along-path
app.layers-resize