From 9282180296624050e65dd68f05f4de471079e8c1 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 27 Jun 2006 20:05:56 +0000 Subject: [PATCH] Applied patch from Zbigniew Chyla (bug 345982): 2006-06-27 Sven Neumann Applied patch from Zbigniew Chyla (bug 345982): * app/tools/gimptransformtool.[ch]: added undo_desc field for storing undo string and use that, not tool_info->blurb. * app/tools/gimpfliptool.c * app/tools/gimpperspectivetool.c * app/tools/gimprotatetool.c * app/tools/gimpscaletool.c * app/tools/gimpsheartool.c: set undo_desc. --- ChangeLog | 15 ++++++++++++++- app/tools/gimpfliptool.c | 2 ++ app/tools/gimpperspectivetool.c | 1 + app/tools/gimprotatetool.c | 1 + app/tools/gimpscaletool.c | 1 + app/tools/gimpsheartool.c | 1 + app/tools/gimptransformtool.c | 4 +++- app/tools/gimptransformtool.h | 2 ++ 8 files changed, 25 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index da958d1084..52f1fc7421 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2006-06-27 Sven Neumann + + Applied patch from Zbigniew Chyla (bug 345982): + + * app/tools/gimptransformtool.[ch]: added undo_desc field for + storing undo string and use that, not tool_info->blurb. + + * app/tools/gimpfliptool.c + * app/tools/gimpperspectivetool.c + * app/tools/gimprotatetool.c + * app/tools/gimpscaletool.c + * app/tools/gimpsheartool.c: set undo_desc. + 2006-06-27 Sven Neumann * modules/cdisplay_proof.c: use the GimpColorRenderingIntent enum @@ -133,7 +146,7 @@ 2006-06-27 Sven Neumann - Applied patch from Zbigniew Chyla: + Applied patch from Zbigniew Chyla (bug 345982): * app/gimp-intl.h * libgimp/stdplugins-intl.h: removed most content and include diff --git a/app/tools/gimpfliptool.c b/app/tools/gimpfliptool.c index 658f61d45d..d75c412bb1 100644 --- a/app/tools/gimpfliptool.c +++ b/app/tools/gimpfliptool.c @@ -99,6 +99,7 @@ static void gimp_flip_tool_init (GimpFlipTool *flip_tool) { GimpTool *tool = GIMP_TOOL (flip_tool); + GimpTransformTool *tr_tool = GIMP_TRANSFORM_TOOL (flip_tool); gimp_tool_control_set_snap_to (tool->control, FALSE); gimp_tool_control_set_cursor (tool->control, GIMP_CURSOR_MOUSE); @@ -107,6 +108,7 @@ gimp_flip_tool_init (GimpFlipTool *flip_tool) GIMP_TOOL_CURSOR_FLIP_HORIZONTAL); gimp_tool_control_set_toggle_tool_cursor (tool->control, GIMP_TOOL_CURSOR_FLIP_VERTICAL); + tr_tool->undo_desc = Q_("command|Flip"); } static void diff --git a/app/tools/gimpperspectivetool.c b/app/tools/gimpperspectivetool.c index 798fb9b3cf..a21f759835 100644 --- a/app/tools/gimpperspectivetool.c +++ b/app/tools/gimpperspectivetool.c @@ -95,6 +95,7 @@ gimp_perspective_tool_init (GimpPerspectiveTool *perspective_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_PERSPECTIVE); + tr_tool->undo_desc = Q_("command|Perspective"); tr_tool->shell_desc = _("Perspective Transform Information"); tr_tool->progress_text = _("Perspective"); diff --git a/app/tools/gimprotatetool.c b/app/tools/gimprotatetool.c index d6816d65c4..1f64c12f84 100644 --- a/app/tools/gimprotatetool.c +++ b/app/tools/gimprotatetool.c @@ -112,6 +112,7 @@ gimp_rotate_tool_init (GimpRotateTool *rotate_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_ROTATE); + tr_tool->undo_desc = Q_("command|Rotate"); tr_tool->shell_desc = _("Rotation Information"); tr_tool->progress_text = _("Rotating"); diff --git a/app/tools/gimpscaletool.c b/app/tools/gimpscaletool.c index b1dd07e167..9b1e44666c 100644 --- a/app/tools/gimpscaletool.c +++ b/app/tools/gimpscaletool.c @@ -105,6 +105,7 @@ gimp_scale_tool_init (GimpScaleTool *scale_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_RESIZE); + tr_tool->undo_desc = Q_("command|Scale"); tr_tool->shell_desc = _("Scaling Information"); tr_tool->progress_text = _("Scaling"); diff --git a/app/tools/gimpsheartool.c b/app/tools/gimpsheartool.c index 96d434ee44..d6430faefc 100644 --- a/app/tools/gimpsheartool.c +++ b/app/tools/gimpsheartool.c @@ -112,6 +112,7 @@ gimp_shear_tool_init (GimpShearTool *shear_tool) gimp_tool_control_set_tool_cursor (tool->control, GIMP_TOOL_CURSOR_SHEAR); + tr_tool->undo_desc = Q_("command|Shear"); tr_tool->shell_desc = _("Shearing Information"); tr_tool->progress_text = _("Shearing"); diff --git a/app/tools/gimptransformtool.c b/app/tools/gimptransformtool.c index 5da8c63b80..d7520e0da5 100644 --- a/app/tools/gimptransformtool.c +++ b/app/tools/gimptransformtool.c @@ -220,6 +220,8 @@ gimp_transform_tool_init (GimpTransformTool *tr_tool) tr_tool->type = GIMP_TRANSFORM_TYPE_LAYER; tr_tool->direction = GIMP_TRANSFORM_FORWARD; + tr_tool->undo_desc = NULL; + tr_tool->shell_desc = NULL; tr_tool->progress_text = _("Transforming"); tr_tool->dialog = NULL; @@ -983,7 +985,7 @@ gimp_transform_tool_doit (GimpTransformTool *tr_tool, /* Start a transform undo group */ gimp_image_undo_group_start (display->image, GIMP_UNDO_GROUP_TRANSFORM, - tool->tool_info->blurb); + tr_tool->undo_desc); /* With the old UI, if original is NULL, then this is the * first transformation. In the new UI, it is always so, right? diff --git a/app/tools/gimptransformtool.h b/app/tools/gimptransformtool.h index ab55c25c96..8ef9ff1f4a 100644 --- a/app/tools/gimptransformtool.h +++ b/app/tools/gimptransformtool.h @@ -91,6 +91,8 @@ struct _GimpTransformTool GimpTransformType type; GimpTransformDirection direction; + const gchar *undo_desc; + const gchar *shell_desc; const gchar *progress_text;