From c52a43101a799ed6e8d0f9b5af03d661e836c1a8 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 29 Jan 2007 22:37:18 +0000 Subject: [PATCH] app/core/core-enums.[ch] reordered IMAGE_GRID and IMAGE_COLORMAP to be 2007-01-29 Michael Natterer * app/core/core-enums.[ch] * app/core/gimpimage-undo-push.[ch]: reordered IMAGE_GRID and IMAGE_COLORMAP to be before IMAGE_GUIDE and IMAGE_SAMPLE_POINT. svn path=/trunk/; revision=21802 --- ChangeLog | 6 +++ app/core/core-enums.c | 12 ++--- app/core/core-enums.h | 6 +-- app/core/gimpimage-undo-push.c | 82 +++++++++++++++++----------------- app/core/gimpimage-undo-push.h | 10 ++--- 5 files changed, 61 insertions(+), 55 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2b0267c9f..78d5c5ba5a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-29 Michael Natterer + + * app/core/core-enums.[ch] + * app/core/gimpimage-undo-push.[ch]: reordered IMAGE_GRID and + IMAGE_COLORMAP to be before IMAGE_GUIDE and IMAGE_SAMPLE_POINT. + 2007-01-28 Michael Natterer * app/core/gimpimageundo.[ch]: add support for IMAGE_GRID and diff --git a/app/core/core-enums.c b/app/core/core-enums.c index 3cd741abcb..75aa2ed057 100644 --- a/app/core/core-enums.c +++ b/app/core/core-enums.c @@ -768,8 +768,8 @@ gimp_undo_type_get_type (void) { GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, "GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE", "group-image-layers-merge" }, { 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_GUIDE, "GIMP_UNDO_GROUP_IMAGE_GUIDE", "group-image-guide" }, { 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_DRAWABLE, "GIMP_UNDO_GROUP_DRAWABLE", "group-drawable" }, { GIMP_UNDO_GROUP_DRAWABLE_MOD, "GIMP_UNDO_GROUP_DRAWABLE_MOD", "group-drawable-mod" }, @@ -799,10 +799,10 @@ gimp_undo_type_get_type (void) { GIMP_UNDO_IMAGE_TYPE, "GIMP_UNDO_IMAGE_TYPE", "image-type" }, { GIMP_UNDO_IMAGE_SIZE, "GIMP_UNDO_IMAGE_SIZE", "image-size" }, { GIMP_UNDO_IMAGE_RESOLUTION, "GIMP_UNDO_IMAGE_RESOLUTION", "image-resolution" }, - { GIMP_UNDO_IMAGE_GUIDE, "GIMP_UNDO_IMAGE_GUIDE", "image-guide" }, { GIMP_UNDO_IMAGE_GRID, "GIMP_UNDO_IMAGE_GRID", "image-grid" }, - { GIMP_UNDO_IMAGE_SAMPLE_POINT, "GIMP_UNDO_IMAGE_SAMPLE_POINT", "image-sample-point" }, { 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_DRAWABLE, "GIMP_UNDO_DRAWABLE", "drawable" }, { GIMP_UNDO_DRAWABLE_MOD, "GIMP_UNDO_DRAWABLE_MOD", "drawable-mod" }, { GIMP_UNDO_MASK, "GIMP_UNDO_MASK", "mask" }, @@ -856,8 +856,8 @@ gimp_undo_type_get_type (void) { GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, N_("Merge layers"), NULL }, { GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE, N_("Merge paths"), NULL }, { GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, N_("Quick Mask"), NULL }, - { GIMP_UNDO_GROUP_IMAGE_GUIDE, N_("Guide"), 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_DRAWABLE, N_("Layer/Channel"), NULL }, { GIMP_UNDO_GROUP_DRAWABLE_MOD, N_("Layer/Channel modification"), NULL }, @@ -887,10 +887,10 @@ gimp_undo_type_get_type (void) { GIMP_UNDO_IMAGE_TYPE, N_("Image type"), NULL }, { GIMP_UNDO_IMAGE_SIZE, N_("Image size"), NULL }, { GIMP_UNDO_IMAGE_RESOLUTION, N_("Image resolution change"), NULL }, - { GIMP_UNDO_IMAGE_GUIDE, N_("Guide"), NULL }, { GIMP_UNDO_IMAGE_GRID, N_("Grid"), NULL }, - { GIMP_UNDO_IMAGE_SAMPLE_POINT, N_("Sample Point"), 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_DRAWABLE, N_("Layer/Channel"), NULL }, { GIMP_UNDO_DRAWABLE_MOD, N_("Layer/Channel modification"), NULL }, { GIMP_UNDO_MASK, N_("Selection mask"), NULL }, diff --git a/app/core/core-enums.h b/app/core/core-enums.h index 36f9ebc25d..138e237f3d 100644 --- a/app/core/core-enums.h +++ b/app/core/core-enums.h @@ -368,8 +368,8 @@ typedef enum /*< pdb-skip >*/ GIMP_UNDO_GROUP_IMAGE_LAYERS_MERGE, /*< desc="Merge layers" >*/ GIMP_UNDO_GROUP_IMAGE_VECTORS_MERGE,/*< desc="Merge paths" >*/ GIMP_UNDO_GROUP_IMAGE_QUICK_MASK, /*< desc="Quick Mask" >*/ - GIMP_UNDO_GROUP_IMAGE_GUIDE, /*< desc="Guide" >*/ 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_DRAWABLE, /*< desc="Layer/Channel" >*/ GIMP_UNDO_GROUP_DRAWABLE_MOD, /*< desc="Layer/Channel modification" >*/ @@ -404,10 +404,10 @@ typedef enum /*< pdb-skip >*/ GIMP_UNDO_IMAGE_TYPE, /*< desc="Image type" >*/ GIMP_UNDO_IMAGE_SIZE, /*< desc="Image size" >*/ GIMP_UNDO_IMAGE_RESOLUTION, /*< desc="Image resolution change" >*/ - GIMP_UNDO_IMAGE_GUIDE, /*< desc="Guide" >*/ GIMP_UNDO_IMAGE_GRID, /*< desc="Grid" >*/ - GIMP_UNDO_IMAGE_SAMPLE_POINT, /*< desc="Sample Point" >*/ GIMP_UNDO_IMAGE_COLORMAP, /*< desc="Change indexed palette" >*/ + GIMP_UNDO_IMAGE_GUIDE, /*< desc="Guide" >*/ + GIMP_UNDO_IMAGE_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" >*/ diff --git a/app/core/gimpimage-undo-push.c b/app/core/gimpimage-undo-push.c index 9fc4c88245..0c44982566 100644 --- a/app/core/gimpimage-undo-push.c +++ b/app/core/gimpimage-undo-push.c @@ -114,6 +114,47 @@ gimp_image_undo_push_image_resolution (GimpImage *image, } +/****************/ +/* Grid Undo */ +/****************/ + +GimpUndo * +gimp_image_undo_push_image_grid (GimpImage *image, + const gchar *undo_desc, + GimpGrid *grid) +{ + g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); + g_return_val_if_fail (GIMP_IS_GRID (grid), NULL); + + return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO, + 0, 0, + GIMP_UNDO_IMAGE_GRID, undo_desc, + GIMP_DIRTY_IMAGE_META, + NULL, NULL, + "grid", grid, + NULL); +} + + +/*******************/ +/* Colormap Undo */ +/*******************/ + +GimpUndo * +gimp_image_undo_push_image_colormap (GimpImage *image, + const gchar *undo_desc) +{ + g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); + + return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO, + 0, 0, + GIMP_UNDO_IMAGE_COLORMAP, undo_desc, + GIMP_DIRTY_IMAGE, + NULL, NULL, + NULL); +} + + /****************/ /* Guide Undo */ /****************/ @@ -219,28 +260,6 @@ undo_free_image_guide (GimpUndo *undo, } -/****************/ -/* Grid Undo */ -/****************/ - -GimpUndo * -gimp_image_undo_push_image_grid (GimpImage *image, - const gchar *undo_desc, - GimpGrid *grid) -{ - g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); - g_return_val_if_fail (GIMP_IS_GRID (grid), NULL); - - return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO, - 0, 0, - GIMP_UNDO_IMAGE_GRID, undo_desc, - GIMP_DIRTY_IMAGE_META, - NULL, NULL, - "grid", grid, - NULL); -} - - /**********************/ /* Sampe Point Undo */ /**********************/ @@ -350,25 +369,6 @@ undo_free_image_sample_point (GimpUndo *undo, } -/*******************/ -/* Colormap Undo */ -/*******************/ - -GimpUndo * -gimp_image_undo_push_image_colormap (GimpImage *image, - const gchar *undo_desc) -{ - g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL); - - return gimp_image_undo_push (image, GIMP_TYPE_IMAGE_UNDO, - 0, 0, - GIMP_UNDO_IMAGE_COLORMAP, undo_desc, - GIMP_DIRTY_IMAGE, - NULL, NULL, - NULL); -} - - /*******************/ /* Drawable Undo */ /*******************/ diff --git a/app/core/gimpimage-undo-push.h b/app/core/gimpimage-undo-push.h index 25f5e79022..4968f99661 100644 --- a/app/core/gimpimage-undo-push.h +++ b/app/core/gimpimage-undo-push.h @@ -28,17 +28,17 @@ GimpUndo * gimp_image_undo_push_image_size (GimpImage *image, const gchar *undo_desc); GimpUndo * gimp_image_undo_push_image_resolution (GimpImage *image, const gchar *undo_desc); -GimpUndo * gimp_image_undo_push_image_guide (GimpImage *image, - const gchar *undo_desc, - GimpGuide *guide); GimpUndo * gimp_image_undo_push_image_grid (GimpImage *image, const gchar *undo_desc, GimpGrid *grid); +GimpUndo * gimp_image_undo_push_image_colormap (GimpImage *image, + const gchar *undo_desc); +GimpUndo * gimp_image_undo_push_image_guide (GimpImage *image, + const gchar *undo_desc, + GimpGuide *guide); GimpUndo * gimp_image_undo_push_image_sample_point (GimpImage *image, const gchar *undo_desc, GimpSamplePoint *sample_point); -GimpUndo * gimp_image_undo_push_image_colormap (GimpImage *image, - const gchar *undo_desc); /* drawable undo */