dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

set translate_desc to "Move Layer Mask". 

2004-04-15  Michael Natterer  <mitch@gimp.org>

	* 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.
This commit is contained in:
Michael Natterer 2004-04-15 15:07:30 +00:00 committed by Michael Natterer
parent 7e84dd9540
commit a30db14bb7
3 changed files with 31 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2004-04-15 Michael Natterer <mitch@gimp.org>
* 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 <sven@gimp.org> 2004-04-15 Sven Neumann <sven@gimp.org>
* app/core/gimppalette-import.[ch] * app/core/gimppalette-import.[ch]

7
app/core/gimplayermask.c
View File

@ -131,9 +131,10 @@ gimp_layer_mask_class_init (GimpLayerMaskClass *klass)
viewable_class->default_stock_id = "gimp-layer-mask"; viewable_class->default_stock_id = "gimp-layer-mask";
item_class->is_attached = gimp_layer_mask_is_attached; item_class->is_attached = gimp_layer_mask_is_attached;
item_class->duplicate = gimp_layer_mask_duplicate; item_class->duplicate = gimp_layer_mask_duplicate;
item_class->rename = gimp_layer_mask_rename; item_class->rename = gimp_layer_mask_rename;
item_class->translate_desc = _("Move Layer Mask");
} }
static void static void

40
app/tools/gimpeditselectiontool.c
View File

@ -242,28 +242,24 @@ init_edit_selection (GimpTool *tool,
edit_select->edit_type = edit_type; 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) switch (edit_select->edit_type)
{ {
case EDIT_VECTORS_TRANSLATE: case EDIT_VECTORS_TRANSLATE:
undo_desc = _("Move Path");
break;
case EDIT_CHANNEL_TRANSLATE: case EDIT_CHANNEL_TRANSLATE:
undo_desc = _("Move Channel");
break;
case EDIT_LAYER_MASK_TRANSLATE: 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; break;
case EDIT_MASK_TRANSLATE: case EDIT_MASK_TRANSLATE:
undo_desc = _("Move Selection"); undo_desc = _("Move Selection");
break; break;
case EDIT_LAYER_TRANSLATE:
undo_desc = _("Move Layer");
break;
default: default:
undo_desc = _("Move Floating Layer"); undo_desc = _("Move Floating Layer");
break; break;
@ -275,11 +271,6 @@ init_edit_selection (GimpTool *tool,
GIMP_UNDO_GROUP_ITEM_DISPLACE, GIMP_UNDO_GROUP_ITEM_DISPLACE,
undo_desc); 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); gimp_item_offsets (active_item, &off_x, &off_y);
edit_select->x = edit_select->origx = coords->x - off_x; 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; edit_type = EDIT_MASK_TRANSLATE;
undo_type = GIMP_UNDO_GROUP_MASK; undo_type = GIMP_UNDO_GROUP_MASK;
undo_desc = _("Move Selection");
} }
else else
{ {
@ -1155,7 +1145,6 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool,
edit_type = EDIT_VECTORS_TRANSLATE; edit_type = EDIT_VECTORS_TRANSLATE;
undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE; undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE;
undo_desc = _("Move Path");
} }
else else
{ {
@ -1198,22 +1187,18 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool,
if (GIMP_IS_LAYER_MASK (item)) if (GIMP_IS_LAYER_MASK (item))
{ {
edit_type = EDIT_LAYER_MASK_TRANSLATE; edit_type = EDIT_LAYER_MASK_TRANSLATE;
undo_desc = _("Move Layer Mask");
} }
else if (GIMP_IS_CHANNEL (item)) else if (GIMP_IS_CHANNEL (item))
{ {
edit_type = EDIT_CHANNEL_TRANSLATE; edit_type = EDIT_CHANNEL_TRANSLATE;
undo_desc = _("Move Channel");
} }
else if (gimp_layer_is_floating_sel (GIMP_LAYER (item))) else if (gimp_layer_is_floating_sel (GIMP_LAYER (item)))
{ {
edit_type = EDIT_FLOATING_SEL_TRANSLATE; edit_type = EDIT_FLOATING_SEL_TRANSLATE;
undo_desc = _("Move Floating Layer");
} }
else else
{ {
edit_type = EDIT_LAYER_TRANSLATE; edit_type = EDIT_LAYER_TRANSLATE;
undo_desc = _("Move Layer");
} }
undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE; undo_type = GIMP_UNDO_GROUP_ITEM_DISPLACE;
@ -1225,6 +1210,17 @@ gimp_edit_selection_tool_arrow_key (GimpTool *tool,
if (! item) if (! item)
return; 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); undo = gimp_undo_stack_peek (gdisp->gimage->undo_stack);
/* compress undo */ /* compress undo */