From 4776b092bda355da27ccfc6cf3740cbf7d084d1b Mon Sep 17 00:00:00 2001 From: Jehan Date: Sun, 26 Feb 2023 19:53:24 +0100 Subject: [PATCH] app: action names set in GimpToolControl don't need the group name appended. Not with the new GAction-based actions. --- app/tools/gimpbrushtool.c | 16 ++++++++-------- app/tools/gimpbucketfilltool.c | 4 ++-- app/tools/gimpclonetool.c | 2 +- app/tools/gimpcolortool.c | 2 +- app/tools/gimpforegroundselecttool.c | 2 +- app/tools/gimpgradienttool.c | 4 ++-- app/tools/gimpinktool.c | 8 ++++---- app/tools/gimpmybrushtool.c | 6 +++--- app/tools/gimppaintselecttool.c | 4 ++-- app/tools/gimppainttool.c | 2 +- app/tools/gimpperspectiveclonetool.c | 2 +- app/tools/gimptexttool.c | 2 +- app/tools/gimptransformgridtool.c | 2 +- app/tools/gimpwarptool.c | 6 +++--- 14 files changed, 31 insertions(+), 31 deletions(-) diff --git a/app/tools/gimpbrushtool.c b/app/tools/gimpbrushtool.c index c5493fbdce..b6502afeef 100644 --- a/app/tools/gimpbrushtool.c +++ b/app/tools/gimpbrushtool.c @@ -114,21 +114,21 @@ gimp_brush_tool_init (GimpBrushTool *brush_tool) GimpTool *tool = GIMP_TOOL (brush_tool); gimp_tool_control_set_action_pixel_size (tool->control, - "tools/tools-paintbrush-pixel-size-set"); + "tools-paintbrush-pixel-size-set"); gimp_tool_control_set_action_size (tool->control, - "tools/tools-paintbrush-size-set"); + "tools-paintbrush-size-set"); gimp_tool_control_set_action_aspect (tool->control, - "tools/tools-paintbrush-aspect-ratio-set"); + "tools-paintbrush-aspect-ratio-set"); gimp_tool_control_set_action_angle (tool->control, - "tools/tools-paintbrush-angle-set"); + "tools-paintbrush-angle-set"); gimp_tool_control_set_action_spacing (tool->control, - "tools/tools-paintbrush-spacing-set"); + "tools-paintbrush-spacing-set"); gimp_tool_control_set_action_hardness (tool->control, - "tools/tools-paintbrush-hardness-set"); + "tools-paintbrush-hardness-set"); gimp_tool_control_set_action_force (tool->control, - "tools/tools-paintbrush-force-set"); + "tools-paintbrush-force-set"); gimp_tool_control_set_action_object_1 (tool->control, - "context/context-brush-select-set"); + "context-brush-select-set"); } static void diff --git a/app/tools/gimpbucketfilltool.c b/app/tools/gimpbucketfilltool.c index e44206c617..764978e3b3 100644 --- a/app/tools/gimpbucketfilltool.c +++ b/app/tools/gimpbucketfilltool.c @@ -200,9 +200,9 @@ gimp_bucket_fill_tool_init (GimpBucketFillTool *bucket_fill_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_BUCKET_FILL); gimp_tool_control_set_action_opacity (tool->control, - "context/context-opacity-set"); + "context-opacity-set"); gimp_tool_control_set_action_object_1 (tool->control, - "context/context-pattern-select-set"); + "context-pattern-select-set"); bucket_fill_tool->priv = gimp_bucket_fill_tool_get_instance_private (bucket_fill_tool); diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c index 32f8612899..0bc1dfa60a 100644 --- a/app/tools/gimpclonetool.c +++ b/app/tools/gimpclonetool.c @@ -85,7 +85,7 @@ gimp_clone_tool_init (GimpCloneTool *clone) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_CLONE); gimp_tool_control_set_action_object_2 (tool->control, - "context/context-pattern-select-set"); + "context-pattern-select-set"); paint_tool->status = _("Click to clone"); paint_tool->status_ctrl = _("%s to set a new clone source"); diff --git a/app/tools/gimpcolortool.c b/app/tools/gimpcolortool.c index 9a4ff97ada..37f72212bd 100644 --- a/app/tools/gimpcolortool.c +++ b/app/tools/gimpcolortool.c @@ -174,7 +174,7 @@ gimp_color_tool_init (GimpColorTool *color_tool) GimpTool *tool = GIMP_TOOL (color_tool); gimp_tool_control_set_action_size (tool->control, - "tools/tools-color-average-radius-set"); + "tools-color-average-radius-set"); } static void diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c index 852a6e1c90..1d9bfd5fc3 100644 --- a/app/tools/gimpforegroundselecttool.c +++ b/app/tools/gimpforegroundselecttool.c @@ -248,7 +248,7 @@ gimp_foreground_select_tool_init (GimpForegroundSelectTool *fg_select) GIMP_TOOL_CURSOR_FREE_SELECT); gimp_tool_control_set_action_size (tool->control, - "tools/tools-foreground-select-brush-size-set"); + "tools-foreground-select-brush-size-set"); fg_select->state = MATTING_STATE_FREE_SELECT; fg_select->grayscale_preview = NULL; diff --git a/app/tools/gimpgradienttool.c b/app/tools/gimpgradienttool.c index a459e4adbd..5f3a96bce0 100644 --- a/app/tools/gimpgradienttool.c +++ b/app/tools/gimpgradienttool.c @@ -215,9 +215,9 @@ gimp_gradient_tool_init (GimpGradientTool *gradient_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_GRADIENT); gimp_tool_control_set_action_opacity (tool->control, - "context/context-opacity-set"); + "context-opacity-set"); gimp_tool_control_set_action_object_1 (tool->control, - "context/context-gradient-select-set"); + "context-gradient-select-set"); gimp_draw_tool_set_default_status (GIMP_DRAW_TOOL (tool), _("Click-Drag to draw a gradient")); diff --git a/app/tools/gimpinktool.c b/app/tools/gimpinktool.c index d94311dcec..94cf10996d 100644 --- a/app/tools/gimpinktool.c +++ b/app/tools/gimpinktool.c @@ -93,13 +93,13 @@ gimp_ink_tool_init (GimpInkTool *ink_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_INK); gimp_tool_control_set_action_pixel_size (tool->control, - "tools/tools-ink-blob-pixel-size-set"); + "tools-ink-blob-pixel-size-set"); gimp_tool_control_set_action_size (tool->control, - "tools/tools-ink-blob-size-set"); + "tools-ink-blob-size-set"); gimp_tool_control_set_action_aspect (tool->control, - "tools/tools-ink-blob-aspect-set"); + "tools-ink-blob-aspect-set"); gimp_tool_control_set_action_angle (tool->control, - "tools/tools-ink-blob-angle-set"); + "tools-ink-blob-angle-set"); gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (ink_tool), GIMP_COLOR_PICK_TARGET_FOREGROUND); diff --git a/app/tools/gimpmybrushtool.c b/app/tools/gimpmybrushtool.c index 2a7378802f..f8175ef845 100644 --- a/app/tools/gimpmybrushtool.c +++ b/app/tools/gimpmybrushtool.c @@ -96,11 +96,11 @@ gimp_mybrush_tool_init (GimpMybrushTool *mybrush_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_INK); gimp_tool_control_set_action_size (tool->control, - "tools/tools-mypaint-brush-radius-set"); + "tools-mypaint-brush-radius-set"); gimp_tool_control_set_action_pixel_size (tool->control, - "tools/tools-mypaint-brush-pixel-size-set"); + "tools-mypaint-brush-pixel-size-set"); gimp_tool_control_set_action_hardness (tool->control, - "tools/tools-mypaint-brush-hardness-set"); + "tools-mypaint-brush-hardness-set"); gimp_paint_tool_enable_color_picker (GIMP_PAINT_TOOL (mybrush_tool), GIMP_COLOR_PICK_TARGET_FOREGROUND); diff --git a/app/tools/gimppaintselecttool.c b/app/tools/gimppaintselecttool.c index bc680b9d0a..353cc39426 100644 --- a/app/tools/gimppaintselecttool.c +++ b/app/tools/gimppaintselecttool.c @@ -211,10 +211,10 @@ gimp_paint_select_tool_init (GimpPaintSelectTool *ps_tool) gimp_tool_control_set_cursor_modifier (tool->control, GIMP_CURSOR_MODIFIER_PLUS); gimp_tool_control_set_action_pixel_size (tool->control, - "tools/tools-paint-select-pixel-size-set"); + "tools-paint-select-pixel-size-set"); /* TODO: the size-set action is not implemented. */ gimp_tool_control_set_action_size (tool->control, - "tools/tools-paint-select-size-set"); + "tools-paint-select-size-set"); ps_tool->image_mask = NULL; ps_tool->trimap = NULL; ps_tool->drawable = NULL; diff --git a/app/tools/gimppainttool.c b/app/tools/gimppainttool.c index 07db2fda85..49121e5813 100644 --- a/app/tools/gimppainttool.c +++ b/app/tools/gimppainttool.c @@ -158,7 +158,7 @@ gimp_paint_tool_init (GimpPaintTool *paint_tool) gimp_tool_control_set_motion_mode (tool->control, GIMP_MOTION_MODE_EXACT); gimp_tool_control_set_scroll_lock (tool->control, TRUE); gimp_tool_control_set_action_opacity (tool->control, - "context/context-opacity-set"); + "context-opacity-set"); paint_tool->active = TRUE; paint_tool->pick_colors = FALSE; diff --git a/app/tools/gimpperspectiveclonetool.c b/app/tools/gimpperspectiveclonetool.c index 48eec83ef9..f746d9aea0 100644 --- a/app/tools/gimpperspectiveclonetool.c +++ b/app/tools/gimpperspectiveclonetool.c @@ -185,7 +185,7 @@ gimp_perspective_clone_tool_init (GimpPerspectiveCloneTool *clone_tool) GimpTool *tool = GIMP_TOOL (clone_tool); gimp_tool_control_set_action_object_2 (tool->control, - "context/context-pattern-select-set"); + "context-pattern-select-set"); gimp_matrix3_identity (&clone_tool->transform); gimp_paint_tool_enable_multi_paint (GIMP_PAINT_TOOL (clone_tool)); diff --git a/app/tools/gimptexttool.c b/app/tools/gimptexttool.c index 0202d4cfa0..cc8a77f5e2 100644 --- a/app/tools/gimptexttool.c +++ b/app/tools/gimptexttool.c @@ -275,7 +275,7 @@ gimp_text_tool_init (GimpTextTool *text_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_TEXT); gimp_tool_control_set_action_object_1 (tool->control, - "context/context-font-select-set"); + "context-font-select-set"); } static void diff --git a/app/tools/gimptransformgridtool.c b/app/tools/gimptransformgridtool.c index afceba34ac..51b1c1cc80 100644 --- a/app/tools/gimptransformgridtool.c +++ b/app/tools/gimptransformgridtool.c @@ -310,7 +310,7 @@ gimp_transform_grid_tool_init (GimpTransformGridTool *tg_tool) gimp_tool_control_set_cursor (tool->control, GIMP_CURSOR_CROSSHAIR_SMALL); gimp_tool_control_set_action_opacity (tool->control, - "tools/tools-transform-preview-opacity-set"); + "tools-transform-preview-opacity-set"); tg_tool->strokes = g_ptr_array_new (); } diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c index d02974439b..8696ca9735 100644 --- a/app/tools/gimpwarptool.c +++ b/app/tools/gimpwarptool.c @@ -227,11 +227,11 @@ gimp_warp_tool_init (GimpWarpTool *self) GIMP_TOOL_CURSOR_WARP); gimp_tool_control_set_action_pixel_size (tool->control, - "tools/tools-warp-effect-pixel-size-set"); + "tools-warp-effect-pixel-size-set"); gimp_tool_control_set_action_size (tool->control, - "tools/tools-warp-effect-size-set"); + "tools-warp-effect-size-set"); gimp_tool_control_set_action_hardness (tool->control, - "tools/tools-warp-effect-hardness-set"); + "tools-warp-effect-hardness-set"); self->show_cursor = TRUE; self->draw_brush = TRUE;