Commit dcee3d60 authored by Michael Natterer's avatar Michael Natterer 😴 Committed by Michael Natterer
Browse files

app/core/core-enums.[ch] drop the "image" from GIMP_UNDO_IMAGE_GUIDE,

2007-01-30  Michael Natterer  <mitch@gimp.org>

	* app/core/core-enums.[ch]
	* app/core/gimpimage-undo-push.[ch]: drop the "image" from
	GIMP_UNDO_IMAGE_GUIDE, GIMP_UNDO_IMAGE_SAMPLE_POINT,
	gimp_imge_undo_push_image_guide() and
	gimp_imge_undo_push_image_sample_point()

	* app/core/gimpimage-undo.c
	* app/core/gimpimage-guides.c
	* app/core/gimpimage-scale.c
	* app/core/gimpimage-sample-points.c
	* app/core/gimpimage-rotate.c
	* app/tools/gimpmeasuretool.c: changed accordingly.


svn path=/trunk/; revision=21804
parent e3886a21
2007-01-30 Michael Natterer <mitch@gimp.org>
* app/core/core-enums.[ch]
* app/core/gimpimage-undo-push.[ch]: drop the "image" from
GIMP_UNDO_IMAGE_GUIDE, GIMP_UNDO_IMAGE_SAMPLE_POINT,
gimp_imge_undo_push_image_guide() and
gimp_imge_undo_push_image_sample_point()
* app/core/gimpimage-undo.c
* app/core/gimpimage-guides.c
* app/core/gimpimage-scale.c
* app/core/gimpimage-sample-points.c
* app/core/gimpimage-rotate.c
* app/tools/gimpmeasuretool.c: changed accordingly.
2007-01-29 Michael Natterer <mitch@gimp.org>
 
* app/core/core-enums.[ch]
......@@ -769,8 +769,8 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, "GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE", "group-image-vectors-merge" },
{ GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, "GIMP_UNDO_GROUP_IMAGE_QUICK_MASK", "group-image-quick-mask" },
{ GIMP_UNDO_GROUP_IMAGE_GRID, "GIMP_UNDO_GROUP_IMAGE_GRID", "group-image-grid" },
{ GIMP_UNDO_GROUP_IMAGE_GUIDE, "GIMP_UNDO_GROUP_IMAGE_GUIDE", "group-image-guide" },
{ GIMP_UNDO_GROUP_IMAGE_SAMPLE_POINT, "GIMP_UNDO_GROUP_IMAGE_SAMPLE_POINT", "group-image-sample-point" },
{ GIMP_UNDO_GROUP_GUIDE, "GIMP_UNDO_GROUP_GUIDE", "group-guide" },
{ GIMP_UNDO_GROUP_SAMPLE_POINT, "GIMP_UNDO_GROUP_SAMPLE_POINT", "group-sample-point" },
{ GIMP_UNDO_GROUP_DRAWABLE, "GIMP_UNDO_GROUP_DRAWABLE", "group-drawable" },
{ GIMP_UNDO_GROUP_DRAWABLE_MOD, "GIMP_UNDO_GROUP_DRAWABLE_MOD", "group-drawable-mod" },
{ GIMP_UNDO_GROUP_MASK, "GIMP_UNDO_GROUP_MASK", "group-mask" },
......@@ -801,8 +801,8 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_IMAGE_RESOLUTION, "GIMP_UNDO_IMAGE_RESOLUTION", "image-resolution" },
{ GIMP_UNDO_IMAGE_GRID, "GIMP_UNDO_IMAGE_GRID", "image-grid" },
{ GIMP_UNDO_IMAGE_COLORMAP, "GIMP_UNDO_IMAGE_COLORMAP", "image-colormap" },
{ GIMP_UNDO_IMAGE_GUIDE, "GIMP_UNDO_IMAGE_GUIDE", "image-guide" },
{ GIMP_UNDO_IMAGE_SAMPLE_POINT, "GIMP_UNDO_IMAGE_SAMPLE_POINT", "image-sample-point" },
{ GIMP_UNDO_GUIDE, "GIMP_UNDO_GUIDE", "guide" },
{ GIMP_UNDO_SAMPLE_POINT, "GIMP_UNDO_SAMPLE_POINT", "sample-point" },
{ GIMP_UNDO_DRAWABLE, "GIMP_UNDO_DRAWABLE", "drawable" },
{ GIMP_UNDO_DRAWABLE_MOD, "GIMP_UNDO_DRAWABLE_MOD", "drawable-mod" },
{ GIMP_UNDO_MASK, "GIMP_UNDO_MASK", "mask" },
......@@ -857,8 +857,8 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, N_("Merge paths"), NULL },
{ GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, N_("Quick Mask"), NULL },
{ GIMP_UNDO_GROUP_IMAGE_GRID, N_("Grid"), NULL },
{ GIMP_UNDO_GROUP_IMAGE_GUIDE, N_("Guide"), NULL },
{ GIMP_UNDO_GROUP_IMAGE_SAMPLE_POINT, N_("Sample Point"), NULL },
{ GIMP_UNDO_GROUP_GUIDE, N_("Guide"), NULL },
{ GIMP_UNDO_GROUP_SAMPLE_POINT, N_("Sample Point"), NULL },
{ GIMP_UNDO_GROUP_DRAWABLE, N_("Layer/Channel"), NULL },
{ GIMP_UNDO_GROUP_DRAWABLE_MOD, N_("Layer/Channel modification"), NULL },
{ GIMP_UNDO_GROUP_MASK, N_("Selection mask"), NULL },
......@@ -889,8 +889,8 @@ gimp_undo_type_get_type (void)
{ GIMP_UNDO_IMAGE_RESOLUTION, N_("Image resolution change"), NULL },
{ GIMP_UNDO_IMAGE_GRID, N_("Grid"), NULL },
{ GIMP_UNDO_IMAGE_COLORMAP, N_("Change indexed palette"), NULL },
{ GIMP_UNDO_IMAGE_GUIDE, N_("Guide"), NULL },
{ GIMP_UNDO_IMAGE_SAMPLE_POINT, N_("Sample Point"), NULL },
{ GIMP_UNDO_GUIDE, N_("Guide"), NULL },
{ GIMP_UNDO_SAMPLE_POINT, N_("Sample Point"), NULL },
{ GIMP_UNDO_DRAWABLE, N_("Layer/Channel"), NULL },
{ GIMP_UNDO_DRAWABLE_MOD, N_("Layer/Channel modification"), NULL },
{ GIMP_UNDO_MASK, N_("Selection mask"), NULL },
......
......@@ -369,8 +369,8 @@ typedef enum /*< pdb-skip >*/
GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE,/*< desc="Merge paths" >*/
GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, /*< desc="Quick Mask" >*/
GIMP_UNDO_GROUP_IMAGE_GRID, /*< desc="Grid" >*/
GIMP_UNDO_GROUP_IMAGE_GUIDE, /*< desc="Guide" >*/
GIMP_UNDO_GROUP_IMAGE_SAMPLE_POINT, /*< desc="Sample Point" >*/
GIMP_UNDO_GROUP_GUIDE, /*< desc="Guide" >*/
GIMP_UNDO_GROUP_SAMPLE_POINT, /*< desc="Sample Point" >*/
GIMP_UNDO_GROUP_DRAWABLE, /*< desc="Layer/Channel" >*/
GIMP_UNDO_GROUP_DRAWABLE_MOD, /*< desc="Layer/Channel modification" >*/
GIMP_UNDO_GROUP_MASK, /*< desc="Selection mask" >*/
......@@ -406,8 +406,8 @@ typedef enum /*< pdb-skip >*/
GIMP_UNDO_IMAGE_RESOLUTION, /*< desc="Image resolution change" >*/
GIMP_UNDO_IMAGE_GRID, /*< desc="Grid" >*/
GIMP_UNDO_IMAGE_COLORMAP, /*< desc="Change indexed palette" >*/
GIMP_UNDO_IMAGE_GUIDE, /*< desc="Guide" >*/
GIMP_UNDO_IMAGE_SAMPLE_POINT, /*< desc="Sample Point" >*/
GIMP_UNDO_GUIDE, /*< desc="Guide" >*/
GIMP_UNDO_SAMPLE_POINT, /*< desc="Sample Point" >*/
GIMP_UNDO_DRAWABLE, /*< desc="Layer/Channel" >*/
GIMP_UNDO_DRAWABLE_MOD, /*< desc="Layer/Channel modification" >*/
GIMP_UNDO_MASK, /*< desc="Selection mask" >*/
......
......@@ -47,7 +47,7 @@ gimp_image_add_hguide (GimpImage *image,
image->gimp->next_guide_ID++);
if (push_undo)
gimp_image_undo_push_image_guide (image, _("Add Horizontal Guide"), guide);
gimp_image_undo_push_guide (image, _("Add Horizontal Guide"), guide);
gimp_image_add_guide (image, guide, position);
g_object_unref (G_OBJECT (guide));
......@@ -69,7 +69,7 @@ gimp_image_add_vguide (GimpImage *image,
image->gimp->next_guide_ID++);
if (push_undo)
gimp_image_undo_push_image_guide (image, _("Add Vertical Guide"), guide);
gimp_image_undo_push_guide (image, _("Add Vertical Guide"), guide);
gimp_image_add_guide (image, guide, position);
g_object_unref (G_OBJECT (guide));
......@@ -110,7 +110,7 @@ gimp_image_remove_guide (GimpImage *image,
gimp_image_update_guide (image, guide);
if (push_undo)
gimp_image_undo_push_image_guide (image, _("Remove Guide"), guide);
gimp_image_undo_push_guide (image, _("Remove Guide"), guide);
image->guides = g_list_remove (image->guides, guide);
gimp_guide_removed (guide);
......@@ -135,7 +135,7 @@ gimp_image_move_guide (GimpImage *image,
g_return_if_fail (position <= image->width);
if (push_undo)
gimp_image_undo_push_image_guide (image, _("Move Guide"), guide);
gimp_image_undo_push_guide (image, _("Move Guide"), guide);
gimp_image_update_guide (image, guide);
gimp_guide_set_position (guide, position);
......
......@@ -263,13 +263,13 @@ gimp_image_rotate_guides (GimpImage *image,
switch (orientation)
{
case GIMP_ORIENTATION_HORIZONTAL:
gimp_image_undo_push_image_guide (image, NULL, guide);
gimp_image_undo_push_guide (image, NULL, guide);
gimp_guide_set_orientation (guide, GIMP_ORIENTATION_VERTICAL);
gimp_guide_set_position (guide, image->height - position);
break;
case GIMP_ORIENTATION_VERTICAL:
gimp_image_undo_push_image_guide (image, NULL, guide);
gimp_image_undo_push_guide (image, NULL, guide);
gimp_guide_set_orientation (guide, GIMP_ORIENTATION_HORIZONTAL);
break;
......@@ -300,12 +300,12 @@ gimp_image_rotate_guides (GimpImage *image,
switch (orientation)
{
case GIMP_ORIENTATION_HORIZONTAL:
gimp_image_undo_push_image_guide (image, NULL, guide);
gimp_image_undo_push_guide (image, NULL, guide);
gimp_guide_set_orientation (guide, GIMP_ORIENTATION_VERTICAL);
break;
case GIMP_ORIENTATION_VERTICAL:
gimp_image_undo_push_image_guide (image, NULL, guide);
gimp_image_undo_push_guide (image, NULL, guide);
gimp_guide_set_orientation (guide, GIMP_ORIENTATION_HORIZONTAL);
gimp_guide_set_position (guide, image->width - position);
break;
......
......@@ -52,8 +52,8 @@ gimp_image_add_sample_point_at_pos (GimpImage *image,
sample_point->sample_point_ID = image->gimp->next_sample_point_ID++;
if (push_undo)
gimp_image_undo_push_image_sample_point (image, _("Add Sample_Point"),
sample_point);
gimp_image_undo_push_sample_point (image, _("Add Sample_Point"),
sample_point);
gimp_image_add_sample_point (image, sample_point, x, y);
gimp_image_sample_point_unref (sample_point);
......@@ -118,8 +118,8 @@ gimp_image_remove_sample_point (GimpImage *image,
gimp_image_update_sample_point (image, sample_point);
if (push_undo)
gimp_image_undo_push_image_sample_point (image, _("Remove Sample Point"),
sample_point);
gimp_image_undo_push_sample_point (image, _("Remove Sample Point"),
sample_point);
list = g_list_find (image->sample_points, sample_point);
if (list)
......@@ -155,8 +155,8 @@ gimp_image_move_sample_point (GimpImage *image,
g_return_if_fail (y < image->height);
if (push_undo)
gimp_image_undo_push_image_sample_point (image, _("Move Sample Point"),
sample_point);
gimp_image_undo_push_sample_point (image, _("Move Sample Point"),
sample_point);
gimp_image_update_sample_point (image, sample_point);
sample_point->x = x;
......
......@@ -170,12 +170,12 @@ gimp_image_scale (GimpImage *image,
switch (gimp_guide_get_orientation (guide))
{
case GIMP_ORIENTATION_HORIZONTAL:
gimp_image_undo_push_image_guide (image, NULL, guide);
gimp_image_undo_push_guide (image, NULL, guide);
gimp_guide_set_position (guide, (position * new_height) / old_height);
break;
case GIMP_ORIENTATION_VERTICAL:
gimp_image_undo_push_image_guide (image, NULL, guide);
gimp_image_undo_push_guide (image, NULL, guide);
gimp_guide_set_position (guide, (position * new_width) / old_width);
break;
......@@ -189,7 +189,7 @@ gimp_image_scale (GimpImage *image,
{
GimpSamplePoint *sample_point = list->data;
gimp_image_undo_push_image_sample_point (image, NULL, sample_point);
gimp_image_undo_push_sample_point (image, NULL, sample_point);
sample_point->x = sample_point->x * new_width / old_width;
sample_point->y = sample_point->y * new_height / old_height;
}
......
......@@ -57,9 +57,9 @@
#include "gimp-intl.h"
/*********************/
/* Image Type Undo */
/*********************/
/*****************/
/* Image Undos */
/*****************/
GimpUndo *
gimp_image_undo_push_image_type (GimpImage *image,
......@@ -75,11 +75,6 @@ gimp_image_undo_push_image_type (GimpImage *image,
NULL);
}
/*********************/
/* Image Size Undo */
/*********************/
GimpUndo *
gimp_image_undo_push_image_size (GimpImage *image,
const gchar *undo_desc)
......@@ -94,11 +89,6 @@ gimp_image_undo_push_image_size (GimpImage *image,
NULL);
}
/***************************/
/* Image Resolution Undo */
/***************************/
GimpUndo *
gimp_image_undo_push_image_resolution (GimpImage *image,
const gchar *undo_desc)
......@@ -113,11 +103,6 @@ gimp_image_undo_push_image_resolution (GimpImage *image,
NULL);
}
/****************/
/* Grid Undo */
/****************/
GimpUndo *
gimp_image_undo_push_image_grid (GimpImage *image,
const gchar *undo_desc,
......@@ -135,11 +120,6 @@ gimp_image_undo_push_image_grid (GimpImage *image,
NULL);
}
/*******************/
/* Colormap Undo */
/*******************/
GimpUndo *
gimp_image_undo_push_image_colormap (GimpImage *image,
const gchar *undo_desc)
......@@ -168,16 +148,16 @@ struct _GuideUndo
gint position;
};
static gboolean undo_pop_image_guide (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void undo_free_image_guide (GimpUndo *undo,
GimpUndoMode undo_mode);
static gboolean undo_pop_guide (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void undo_free_guide (GimpUndo *undo,
GimpUndoMode undo_mode);
GimpUndo *
gimp_image_undo_push_image_guide (GimpImage *image,
const gchar *undo_desc,
GimpGuide *guide)
gimp_image_undo_push_guide (GimpImage *image,
const gchar *undo_desc,
GimpGuide *guide)
{
GimpUndo *new;
......@@ -187,10 +167,10 @@ gimp_image_undo_push_image_guide (GimpImage *image,
if ((new = gimp_image_undo_push (image, GIMP_TYPE_UNDO,
sizeof (GuideUndo),
sizeof (GuideUndo),
GIMP_UNDO_IMAGE_GUIDE, undo_desc,
GIMP_UNDO_GUIDE, undo_desc,
GIMP_DIRTY_IMAGE_META,
undo_pop_image_guide,
undo_free_image_guide,
undo_pop_guide,
undo_free_guide,
NULL)))
{
GuideUndo *gu = new->data;
......@@ -206,9 +186,9 @@ gimp_image_undo_push_image_guide (GimpImage *image,
}
static gboolean
undo_pop_image_guide (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
undo_pop_guide (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
{
GuideUndo *gu = undo->data;
GimpOrientationType old_orientation;
......@@ -250,8 +230,8 @@ undo_pop_image_guide (GimpUndo *undo,
}
static void
undo_free_image_guide (GimpUndo *undo,
GimpUndoMode undo_mode)
undo_free_guide (GimpUndo *undo,
GimpUndoMode undo_mode)
{
GuideUndo *gu = undo->data;
......@@ -273,16 +253,16 @@ struct _SamplePointUndo
gint y;
};
static gboolean undo_pop_image_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void undo_free_image_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode);
static gboolean undo_pop_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum);
static void undo_free_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode);
GimpUndo *
gimp_image_undo_push_image_sample_point (GimpImage *image,
const gchar *undo_desc,
GimpSamplePoint *sample_point)
gimp_image_undo_push_sample_point (GimpImage *image,
const gchar *undo_desc,
GimpSamplePoint *sample_point)
{
GimpUndo *new;
......@@ -292,10 +272,10 @@ gimp_image_undo_push_image_sample_point (GimpImage *image,
if ((new = gimp_image_undo_push (image, GIMP_TYPE_UNDO,
sizeof (SamplePointUndo),
sizeof (SamplePointUndo),
GIMP_UNDO_IMAGE_SAMPLE_POINT, undo_desc,
GIMP_UNDO_SAMPLE_POINT, undo_desc,
GIMP_DIRTY_IMAGE_META,
undo_pop_image_sample_point,
undo_free_image_sample_point,
undo_pop_sample_point,
undo_free_sample_point,
NULL)))
{
SamplePointUndo *spu = new->data;
......@@ -311,9 +291,9 @@ gimp_image_undo_push_image_sample_point (GimpImage *image,
}
static gboolean
undo_pop_image_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
undo_pop_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode,
GimpUndoAccumulator *accum)
{
SamplePointUndo *spu = undo->data;
gint old_x;
......@@ -359,8 +339,8 @@ undo_pop_image_sample_point (GimpUndo *undo,
}
static void
undo_free_image_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode)
undo_free_sample_point (GimpUndo *undo,
GimpUndoMode undo_mode)
{
SamplePointUndo *gu = undo->data;
......
......@@ -33,10 +33,14 @@ GimpUndo * gimp_image_undo_push_image_grid (GimpImage *image,
GimpGrid *grid);
GimpUndo * gimp_image_undo_push_image_colormap (GimpImage *image,
const gchar *undo_desc);
GimpUndo * gimp_image_undo_push_image_guide (GimpImage *image,
/* guide & sample point undos */
GimpUndo * gimp_image_undo_push_guide (GimpImage *image,
const gchar *undo_desc,
GimpGuide *guide);
GimpUndo * gimp_image_undo_push_image_sample_point (GimpImage *image,
GimpUndo * gimp_image_undo_push_sample_point (GimpImage *image,
const gchar *undo_desc,
GimpSamplePoint *sample_point);
......
......@@ -538,7 +538,7 @@ gimp_image_undo_dirty_from_type (GimpUndoType undo_type)
return GIMP_DIRTY_IMAGE_STRUCTURE | GIMP_DIRTY_SELECTION;
case GIMP_UNDO_GROUP_IMAGE_GRID:
case GIMP_UNDO_GROUP_IMAGE_GUIDE:
case GIMP_UNDO_GROUP_GUIDE:
return GIMP_DIRTY_IMAGE_META;
case GIMP_UNDO_GROUP_DRAWABLE:
......
......@@ -233,7 +233,7 @@ gimp_measure_tool_button_press (GimpTool *tool,
if (create_hguide && create_vguide)
gimp_image_undo_group_start (display->image,
GIMP_UNDO_GROUP_IMAGE_GUIDE,
GIMP_UNDO_GROUP_GUIDE,
_("Add Guides"));
if (create_hguide)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment