From a30db14bb7daf43569476b7381b18b6ebf3d4071 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Thu, 15 Apr 2004 15:07:30 +0000 Subject: [PATCH] set translate_desc to "Move Layer Mask". 2004-04-15 Michael Natterer * app/core/gimplayermask.c (gimp_layer_mask_class_init): set translate_desc to "Move Layer Mask". * app/tools/gimpeditselectiontool.c: take the undo desc from the moved item's class instead of duplicating all strings here. --- ChangeLog | 9 +++++++ app/core/gimplayermask.c | 7 +++--- app/tools/gimpeditselectiontool.c | 40 ++++++++++++++----------------- 3 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7c8a17eb4e..539b7d4839 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2004-04-15 Michael Natterer + + * app/core/gimplayermask.c (gimp_layer_mask_class_init): set + translate_desc to "Move Layer Mask". + + * app/tools/gimpeditselectiontool.c: take the undo desc + from the moved item's class instead of duplicating all + strings here. + 2004-04-15 Sven Neumann * app/core/gimppalette-import.[ch] diff --git a/app/core/gimplayermask.c b/app/core/gimplayermask.c index 9718f3e977..d4e3f6e923 100644 --- a/app/core/gimplayermask.c +++ b/app/core/gimplayermask.c @@ -131,9 +131,10 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass) viewable_class->default_stock_id = "gimp-layer-mask"; - item_class->is_attached = gimp_layer_mask_is_attached; - item_class->duplicate = gimp_layer_mask_duplicate; - item_class->rename = gimp_layer_mask_rename; + item_class->is_attached = gimp_layer_mask_is_attached; + item_class->duplicate = gimp_layer_mask_duplicate; + item_class->rename = gimp_layer_mask_rename; + item_class->translate_desc = _("Move Layer Mask"); } static void diff --git a/app/tools/gimpeditselectiontool.c b/app/tools/gimpeditselectiontool.c index dd847378cc..c753ad2f27 100644 --- a/app/tools/gimpeditselectiontool.c +++ b/app/tools/gimpeditselectiontool.c @@ -242,28 +242,24 @@ init_edit_selection (GimpTool *tool, edit_select->edit_type = edit_type; + if (edit_select->edit_type == EDIT_VECTORS_TRANSLATE) + active_item = GIMP_ITEM (gimp_image_get_active_vectors (gdisp->gimage)); + else + active_item = GIMP_ITEM (gimp_image_active_drawable (gdisp->gimage)); + switch (edit_select->edit_type) { case EDIT_VECTORS_TRANSLATE: - undo_desc = _("Move Path"); - break; - case EDIT_CHANNEL_TRANSLATE: - undo_desc = _("Move Channel"); - break; - case EDIT_LAYER_MASK_TRANSLATE: - undo_desc = _("Move Layer Mask"); + case EDIT_LAYER_TRANSLATE: + undo_desc = GIMP_ITEM_GET_CLASS (active_item)->translate_desc; break; case EDIT_MASK_TRANSLATE: undo_desc = _("Move Selection"); break; - case EDIT_LAYER_TRANSLATE: - undo_desc = _("Move Layer"); - break; - default: undo_desc = _("Move Floating Layer"); break; @@ -275,11 +271,6 @@ init_edit_selection (GimpTool *tool, GIMP_UNDO_GROUP_ITEM_DISPLACE, undo_desc); - if (edit_select->edit_type == EDIT_VECTORS_TRANSLATE) - active_item = GIMP_ITEM (gimp_image_get_active_vectors (gdisp->gimage)); - else - active_item = GIMP_ITEM (gimp_image_active_drawable (gdisp->gimage)); - gimp_item_offsets (active_item, &off_x, &off_y); edit_select->x = edit_select->origx = coords->x - off_x; @@ -1115,7 +1106,6 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool, edit_type = EDIT_MASK_TRANSLATE; undo_type = GIMP_UNDO_GROUP_MASK; - undo_desc = _("Move Selection"); } else { @@ -1155,7 +1145,6 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool, edit_type = EDIT_VECTORS_TRANSLATE; undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE; - undo_desc = _("Move Path"); } else { @@ -1198,22 +1187,18 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool, if (GIMP_IS_LAYER_MASK (item)) { edit_type = EDIT_LAYER_MASK_TRANSLATE; - undo_desc = _("Move Layer Mask"); } else if (GIMP_IS_CHANNEL (item)) { edit_type = EDIT_CHANNEL_TRANSLATE; - undo_desc = _("Move Channel"); } else if (gimp_layer_is_floating_sel (GIMP_LAYER (item))) { edit_type = EDIT_FLOATING_SEL_TRANSLATE; - undo_desc = _("Move Floating Layer"); } else { edit_type = EDIT_LAYER_TRANSLATE; - undo_desc = _("Move Layer"); } undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE; @@ -1225,6 +1210,17 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool, if (! item) return; + switch (edit_type) + { + case EDIT_FLOATING_SEL_TRANSLATE: + undo_desc = _("Move Floating Layer"); + break; + + default: + undo_desc = GIMP_ITEM_GET_CLASS (item)->translate_desc; + break; + } + undo = gimp_undo_stack_peek (gdisp->gimage->undo_stack); /* compress undo */