Index: gimp/app/tools/gimptransformoptions.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimptransformoptions.c,v
retrieving revision 1.44
diff -u -p -r1.44 gimptransformoptions.c
--- gimp/app/tools/gimptransformoptions.c	28 Jun 2004 23:42:21 -0000	1.44
+++ gimp/app/tools/gimptransformoptions.c	29 Jun 2004 22:32:34 -0000
@@ -51,8 +51,7 @@ enum
   PROP_SUPERSAMPLE,
   PROP_RECURSION_LEVEL,
   PROP_CLIP,
-  PROP_SHOW_PREVIEW,
-  PROP_GRID_TYPE,
+  PROP_PREVIEW_TYPE,
   PROP_GRID_SIZE,
   PROP_CONSTRAIN_1,
   PROP_CONSTRAIN_2
@@ -62,20 +61,21 @@ enum
 static void   gimp_transform_options_init       (GimpTransformOptions      *options);
 static void   gimp_transform_options_class_init (GimpTransformOptionsClass *options_class);
 
-static void   gimp_transform_options_set_property (GObject         *object,
-                                                   guint            property_id,
-                                                   const GValue    *value,
-                                                   GParamSpec      *pspec);
-static void   gimp_transform_options_get_property (GObject         *object,
-                                                   guint            property_id,
-                                                   GValue          *value,
-                                                   GParamSpec      *pspec);
-
-static void   gimp_transform_options_reset        (GimpToolOptions *tool_options);static void   gimp_transform_options_set_defaults (GimpToolOptions *tool_options);
-
-static void   gimp_transform_options_grid_notify  (GimpTransformOptions *options,
-                                                   GParamSpec           *pspec,
-                                                   GtkWidget            *density_box);
+static void   gimp_transform_options_set_property   (GObject         *object,
+                                                     guint            property_id,
+                                                     const GValue    *value,
+                                                     GParamSpec      *pspec);
+static void   gimp_transform_options_get_property   (GObject         *object,
+                                                     guint            property_id,
+                                                     GValue          *value,
+                                                     GParamSpec      *pspec);
+
+static void   gimp_transform_options_reset          (GimpToolOptions *tool_options);
+static void   gimp_transform_options_set_defaults   (GimpToolOptions *tool_options);
+
+static void   gimp_transform_options_preview_notify (GimpTransformOptions *options,
+                                                     GParamSpec           *pspec,
+                                                     GtkWidget            *density_box);
 
 
 static GimpToolOptionsClass *parent_class = NULL;
@@ -163,14 +163,10 @@ gimp_transform_options_class_init (GimpT
                                     "clip", NULL,
                                     FALSE,
                                     0);
-  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_SHOW_PREVIEW,
-                                    "show-preview", NULL,
-                                    FALSE,
-                                    0);
-  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_GRID_TYPE,
-                                 "grid-type", NULL,
-                                 GIMP_TYPE_TRANSFORM_GRID_TYPE,
-                                 GIMP_TRANSFORM_GRID_TYPE_N_LINES,
+  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_PREVIEW_TYPE,
+                                 "preview-type", NULL,
+                                 GIMP_TYPE_TRANSFORM_PREVIEW_TYPE,
+                                 GIMP_TRANSFORM_PREVIEW_TYPE_TEXTURE,
                                  0);
   GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_GRID_SIZE,
                                 "grid-size", NULL,
@@ -221,11 +217,8 @@ gimp_transform_options_set_property (GOb
     case PROP_CLIP:
       options->clip = g_value_get_boolean (value);
       break;
-    case PROP_SHOW_PREVIEW:
-      options->show_preview = g_value_get_boolean (value);
-      break;
-    case PROP_GRID_TYPE:
-      options->grid_type = g_value_get_enum (value);
+    case PROP_PREVIEW_TYPE:
+      options->preview_type = g_value_get_enum (value);
       break;
     case PROP_GRID_SIZE:
       options->grid_size = g_value_get_int (value);
@@ -272,11 +265,8 @@ gimp_transform_options_get_property (GOb
     case PROP_CLIP:
       g_value_set_boolean (value, options->clip);
       break;
-    case PROP_SHOW_PREVIEW:
-      g_value_set_boolean (value, options->show_preview);
-      break;
-    case PROP_GRID_TYPE:
-      g_value_set_enum (value, options->grid_type);
+    case PROP_PREVIEW_TYPE:
+      g_value_set_enum (value, options->preview_type);
       break;
     case PROP_GRID_SIZE:
       g_value_set_int (value, options->grid_size);
@@ -394,19 +384,22 @@ gimp_transform_options_gui (GimpToolOpti
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
   gtk_widget_show (button);
 
-  /* the preview toggle button */
-  button = gimp_prop_check_button_new (config, "show-preview", _("Preview"));
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
-  gtk_widget_show (button);
-
-  /*  the grid frame  */
+  /*  the preview frame  */
   frame = gimp_frame_new (NULL);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
   gtk_widget_show (frame);
 
-  /*  the grid type menu  */
-  combo = gimp_prop_enum_combo_box_new (config, "grid-type", 0, 0);
-  gtk_frame_set_label_widget (GTK_FRAME (frame), combo);
+  /*  the preview type menu  */
+  hbox = gtk_hbox_new (FALSE, 4);
+  gtk_frame_set_label_widget (GTK_FRAME (frame), hbox);
+  gtk_widget_show (hbox);
+
+  label = gtk_label_new (_("Preview Type:"));
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
+  gtk_widget_show (label);
+
+  combo = gimp_prop_enum_combo_box_new (config, "preview-type", 0, 0);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE, 0);
   gtk_widget_show (combo);
 
   /*  the grid density scale  */
@@ -416,13 +409,16 @@ gimp_transform_options_gui (GimpToolOpti
   gtk_container_add (GTK_CONTAINER (frame), table);
   gtk_widget_show (table);
 
-  g_signal_connect (config, "notify::grid-type",
-                    G_CALLBACK (gimp_transform_options_grid_notify),
+  gtk_widget_set_sensitive (table,
+                            options->preview_type ==
+                            GIMP_TRANSFORM_PREVIEW_TYPE_GRID);
+  g_signal_connect (config, "notify::preview-type",
+                    G_CALLBACK (gimp_transform_options_preview_notify),
                     table);
 
   gimp_prop_scale_entry_new (config, "grid-size",
                              GTK_TABLE (table), 0, 0,
-                             _("Density:"),
+                             _("Grid Lines:"),
                              1.0, 8.0, 0,
                              FALSE, 0.0, 0.0);
 
@@ -503,11 +499,11 @@ gimp_transform_options_gui (GimpToolOpti
 /*  private functions  */
 
 static void
-gimp_transform_options_grid_notify (GimpTransformOptions *options,
-                                    GParamSpec           *pspec,
-                                    GtkWidget            *density_box)
+gimp_transform_options_preview_notify (GimpTransformOptions *options,
+                                       GParamSpec           *pspec,
+                                       GtkWidget            *density_box)
 {
   gtk_widget_set_sensitive (density_box,
-                            options->grid_type !=
-                            GIMP_TRANSFORM_GRID_TYPE_NONE);
+                            options->preview_type ==
+                            GIMP_TRANSFORM_PREVIEW_TYPE_GRID);
 }
Index: gimp/app/tools/gimptransformoptions.h
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimptransformoptions.h,v
retrieving revision 1.18
diff -u -p -r1.18 gimptransformoptions.h
--- gimp/app/tools/gimptransformoptions.h	13 Jun 2004 01:37:29 -0000	1.18
+++ gimp/app/tools/gimptransformoptions.h	29 Jun 2004 22:32:34 -0000
@@ -36,19 +36,18 @@ typedef struct _GimpToolOptionsClass Gim
 
 struct _GimpTransformOptions
 {
-  GimpToolOptions         parent_instance;
+  GimpToolOptions           parent_instance;
 
-  GimpTransformType       type;
-  GimpTransformDirection  direction;
-  GimpInterpolationType   interpolation;
-  gboolean                supersample;
-  gint                    recursion_level;
-  gboolean                clip;
-  gboolean                show_preview;
-  GimpTransformGridType   grid_type;
-  gint                    grid_size;
-  gboolean                constrain_1;
-  gboolean                constrain_2;
+  GimpTransformType         type;
+  GimpTransformDirection    direction;
+  GimpInterpolationType     interpolation;
+  gboolean                  supersample;
+  gint                      recursion_level;
+  gboolean                  clip;
+  GimpTransformPreviewType  preview_type;
+  gint                      grid_size;
+  gboolean                  constrain_1;
+  gboolean                  constrain_2;
 };
 
 
Index: gimp/app/tools/gimptransformtool.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/gimptransformtool.c,v
retrieving revision 1.132
diff -u -p -r1.132 gimptransformtool.c
--- gimp/app/tools/gimptransformtool.c	24 Jun 2004 10:16:08 -0000	1.132
+++ gimp/app/tools/gimptransformtool.c	29 Jun 2004 22:32:35 -0000
@@ -136,6 +136,8 @@ static void     gimp_transform_tool_doit
                                                     GimpDisplay       *gdisp);
 static void     gimp_transform_tool_grid_recalc    (GimpTransformTool *tr_tool);
 
+static void     gimp_transform_tool_force_expose_preview (GimpTransformTool *tr_tool);
+
 static void     gimp_transform_tool_response       (GtkWidget         *widget,
                                                     gint               response_id,
                                                     GimpTransformTool *tr_tool);
@@ -143,9 +145,6 @@ static void     gimp_transform_tool_resp
 static void     gimp_transform_tool_notify_type    (GimpTransformOptions *options,
                                                     GParamSpec           *pspec,
                                                     GimpTransformTool    *tr_tool);
-static void     gimp_transform_tool_notify_grid    (GimpTransformOptions *options,
-                                                    GParamSpec           *pspec,
-                                                    GimpTransformTool    *tr_tool);
 static void     gimp_transform_tool_notify_preview (GimpTransformOptions *options,
                                                     GParamSpec           *pspec,
                                                     GimpTransformTool    *tr_tool);
@@ -289,15 +288,11 @@ gimp_transform_tool_constructor (GType  
                                G_CALLBACK (gimp_transform_tool_notify_preview),
                                tr_tool, 0);
       g_signal_connect_object (tool->tool_info->tool_options,
-                               "notify::grid-type",
-                               G_CALLBACK (gimp_transform_tool_notify_grid),
+                               "notify::preview-type",
+                               G_CALLBACK (gimp_transform_tool_notify_preview),
                                tr_tool, 0);
       g_signal_connect_object (tool->tool_info->tool_options,
                                "notify::grid-size",
-                               G_CALLBACK (gimp_transform_tool_notify_grid),
-                               tr_tool, 0);
-      g_signal_connect_object (tool->tool_info->tool_options,
-                               "notify::show-preview",
                                G_CALLBACK (gimp_transform_tool_notify_preview),
                                tr_tool, 0);
     }
@@ -1131,23 +1126,33 @@ gimp_transform_tool_transform_bounding_b
 void
 gimp_transform_tool_expose_preview (GimpTransformTool *tr_tool)
 {
-  static gint           last_x = 0;
-  static gint           last_y = 0;
-  static gint           last_w = 0;
-  static gint           last_h = 0;
-
-  GimpDisplayShell     *shell;
   GimpTransformOptions *options;
-  gdouble               dx [4], dy [4];
-  gint                  area_x, area_y, area_w, area_h;
-  gint                  i;
-
-  g_return_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool));
 
   options =
     GIMP_TRANSFORM_OPTIONS (GIMP_TOOL (tr_tool)->tool_info->tool_options);
 
-  if (! (tr_tool->use_grid && options->show_preview))
+  if (options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_TEXTURE &&
+      options->type         == GIMP_TRANSFORM_TYPE_LAYER &&
+      options->direction    == GIMP_TRANSFORM_FORWARD)
+    gimp_transform_tool_force_expose_preview (tr_tool);
+}
+
+void
+gimp_transform_tool_force_expose_preview (GimpTransformTool *tr_tool)
+{
+  static gint       last_x = 0;
+  static gint       last_y = 0;
+  static gint       last_w = 0;
+  static gint       last_h = 0;
+
+  GimpDisplayShell *shell;
+  gdouble           dx [4], dy [4];
+  gint              area_x, area_y, area_w, area_h;
+  gint              i;
+
+  g_return_if_fail (GIMP_IS_TRANSFORM_TOOL (tr_tool));
+
+  if (! tr_tool->use_grid)
     return;
 
   g_return_if_fail (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tr_tool)));
@@ -1311,75 +1316,58 @@ gimp_transform_tool_grid_recalc (GimpTra
       tr_tool->tgrid_coords = NULL;
     }
 
-  switch (options->grid_type)
+  if (options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_GRID)
     {
-    case GIMP_TRANSFORM_GRID_TYPE_N_LINES:
-    case GIMP_TRANSFORM_GRID_TYPE_SPACING:
-      {
-        GimpTool *tool;
-        gint      i, gci;
-        gdouble  *coords;
-        gint      width, height;
+      GimpTool             *tool;
+      gint                  i, gci;
+      gdouble              *coords;
+      gint                  width, height;
 
-        width  = MAX (1, tr_tool->x2 - tr_tool->x1);
-        height = MAX (1, tr_tool->y2 - tr_tool->y1);
+      width  = MAX (1, tr_tool->x2 - tr_tool->x1);
+      height = MAX (1, tr_tool->y2 - tr_tool->y1);
 
-        tool = GIMP_TOOL (tr_tool);
+      tool = GIMP_TOOL (tr_tool);
 
-        if (options->grid_type == GIMP_TRANSFORM_GRID_TYPE_N_LINES)
-          {
-            if (width <= height)
-              {
-                tr_tool->ngx = options->grid_size;
-                tr_tool->ngy = tr_tool->ngx * MAX (1, height / width);
-              }
-            else
-              {
-                tr_tool->ngy = options->grid_size;
-                tr_tool->ngx = tr_tool->ngy * MAX (1, width / height);
-              }
-          }
-        else /* GIMP_TRANSFORM_GRID_TYPE_SPACING */
-          {
-            gint grid_size = MAX (2, options->grid_size);
-
-            tr_tool->ngx = width  / grid_size;
-            tr_tool->ngy = height / grid_size;
-          }
-
-        tr_tool->grid_coords = coords =
-          g_new (gdouble, (tr_tool->ngx + tr_tool->ngy) * 4);
+      if (width <= height)
+        {
+          tr_tool->ngx = options->grid_size;
+          tr_tool->ngy = tr_tool->ngx * MAX (1, height / width);
+        }
+      else
+        {
+          tr_tool->ngy = options->grid_size;
+          tr_tool->ngx = tr_tool->ngy * MAX (1, width / height);
+        }
 
-        tr_tool->tgrid_coords =
-          g_new (gdouble, (tr_tool->ngx + tr_tool->ngy) * 4);
+      tr_tool->grid_coords = coords =
+        g_new (gdouble, (tr_tool->ngx + tr_tool->ngy) * 4);
 
-        gci = 0;
+      tr_tool->tgrid_coords =
+        g_new (gdouble, (tr_tool->ngx + tr_tool->ngy) * 4);
 
-        for (i = 1; i <= tr_tool->ngx; i++)
-          {
-            coords[gci]     = tr_tool->x1 + (((gdouble) i) / (tr_tool->ngx + 1) *
-                                             (tr_tool->x2 - tr_tool->x1));
-            coords[gci + 1] = tr_tool->y1;
-            coords[gci + 2] = coords[gci];
-            coords[gci + 3] = tr_tool->y2;
+      gci = 0;
 
-            gci += 4;
-          }
+      for (i = 1; i <= tr_tool->ngx; i++)
+        {
+          coords[gci]     = tr_tool->x1 + (((gdouble) i) / (tr_tool->ngx + 1) *
+                                            (tr_tool->x2 - tr_tool->x1));
+          coords[gci + 1] = tr_tool->y1;
+          coords[gci + 2] = coords[gci];
+          coords[gci + 3] = tr_tool->y2;
 
-        for (i = 1; i <= tr_tool->ngy; i++)
-          {
-            coords[gci]     = tr_tool->x1;
-            coords[gci + 1] = tr_tool->y1 + (((gdouble) i) / (tr_tool->ngy + 1) *
-                                             (tr_tool->y2 - tr_tool->y1));
-            coords[gci + 2] = tr_tool->x2;
-            coords[gci + 3] = coords[gci + 1];
+          gci += 4;
+        }
 
-            gci += 4;
-          }
-      }
+      for (i = 1; i <= tr_tool->ngy; i++)
+        {
+          coords[gci]     = tr_tool->x1;
+          coords[gci + 1] = tr_tool->y1 + (((gdouble) i) / (tr_tool->ngy + 1) *
+                                            (tr_tool->y2 - tr_tool->y1));
+          coords[gci + 2] = tr_tool->x2;
+          coords[gci + 3] = coords[gci + 1];
 
-    default:
-      break;
+          gci += 4;
+        }
     }
 }
 
@@ -1439,10 +1427,11 @@ gimp_transform_tool_prepare (GimpTransfo
   options =
     GIMP_TRANSFORM_OPTIONS (GIMP_TOOL (tr_tool)->tool_info->tool_options);
 
-  if (options->type      == GIMP_TRANSFORM_TYPE_LAYER &&
-      options->direction == GIMP_TRANSFORM_FORWARD)
+  if (options->preview_type == GIMP_TRANSFORM_PREVIEW_TYPE_TEXTURE &&
+      options->type         == GIMP_TRANSFORM_TYPE_LAYER &&
+      options->direction    == GIMP_TRANSFORM_FORWARD)
     gimp_display_shell_set_show_transform (GIMP_DISPLAY_SHELL (gdisp->shell),
-                                           options->show_preview);
+                                           TRUE);
   else
     gimp_display_shell_set_show_transform (GIMP_DISPLAY_SHELL (gdisp->shell),
                                            FALSE);
@@ -1530,51 +1519,55 @@ gimp_transform_tool_notify_type (GimpTra
 }
 
 static void
-gimp_transform_tool_notify_grid (GimpTransformOptions *options,
-                                 GParamSpec           *pspec,
-                                 GimpTransformTool    *tr_tool)
-{
-  if (tr_tool->function == TRANSFORM_CREATING)
-    return;
-
-  gimp_draw_tool_pause (GIMP_DRAW_TOOL (tr_tool));
-
-  gimp_transform_tool_grid_recalc (tr_tool);
-  gimp_transform_tool_transform_bounding_box (tr_tool);
-
-  gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
-}
-
-static void
 gimp_transform_tool_notify_preview (GimpTransformOptions *options,
                                     GParamSpec           *pspec,
                                     GimpTransformTool    *tr_tool)
 {
-  GimpDisplayShell *shell;
-  gboolean          show_preview;
+  GimpDisplayShell *shell = NULL;
 
-  if (! gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tr_tool)))
-    return;
-
-  shell = GIMP_DISPLAY_SHELL (GIMP_DRAW_TOOL (tr_tool)->gdisp->shell);
+  if (gimp_draw_tool_is_active (GIMP_DRAW_TOOL (tr_tool)))
+    shell = GIMP_DISPLAY_SHELL (GIMP_DRAW_TOOL (tr_tool)->gdisp->shell);
 
-  if (options->type      == GIMP_TRANSFORM_TYPE_LAYER &&
-      options->direction == GIMP_TRANSFORM_FORWARD)
+  switch (options->preview_type)
     {
-      gimp_display_shell_set_show_transform (shell, options->show_preview);
+    default:
+    case GIMP_TRANSFORM_PREVIEW_TYPE_OUTLINE:
+      if (shell)
+        {
+          gimp_display_shell_set_show_transform (shell, FALSE);
+          gimp_transform_tool_force_expose_preview (tr_tool);
+        }
+      break;
 
-      /* expose area to clean up if preview is being turned off */
-      show_preview = options->show_preview;
-      options->show_preview = TRUE;
+    case GIMP_TRANSFORM_PREVIEW_TYPE_GRID:
+      if (shell)
+        {
+          gimp_display_shell_set_show_transform (shell, FALSE);
+          gimp_transform_tool_force_expose_preview (tr_tool);
+        }
 
-      gimp_transform_tool_expose_preview (tr_tool);
+      if (tr_tool->function == TRANSFORM_CREATING)
+        return;
 
-      options->show_preview = show_preview;
-    }
-  else
-    {
-      gimp_display_shell_set_show_transform (shell, FALSE);
+      gimp_draw_tool_pause (GIMP_DRAW_TOOL (tr_tool));
 
-      gimp_transform_tool_expose_preview (tr_tool);
+      gimp_transform_tool_grid_recalc (tr_tool);
+      gimp_transform_tool_transform_bounding_box (tr_tool);
+
+      gimp_draw_tool_resume (GIMP_DRAW_TOOL (tr_tool));
+      break;
+
+    case GIMP_TRANSFORM_PREVIEW_TYPE_TEXTURE:
+      if (shell)
+        {
+          if (options->type      == GIMP_TRANSFORM_TYPE_LAYER &&
+              options->direction == GIMP_TRANSFORM_FORWARD)
+            gimp_display_shell_set_show_transform (shell, TRUE);
+          else
+            gimp_display_shell_set_show_transform (shell, FALSE);
+
+          gimp_transform_tool_force_expose_preview (tr_tool);
+        }
+      break;
     }
 }
Index: gimp/app/tools/tools-enums.c
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/tools-enums.c,v
retrieving revision 1.15
diff -u -p -r1.15 tools-enums.c
--- gimp/app/tools/tools-enums.c	23 Jun 2004 20:29:46 -0000	1.15
+++ gimp/app/tools/tools-enums.c	29 Jun 2004 22:32:35 -0000
@@ -11,9 +11,9 @@
 
 static const GEnumValue gimp_color_pick_mode_enum_values[] =
 {
-  { GIMP_COLOR_PICK_MODE_NONE, N_("Pick only"), "none" },
-  { GIMP_COLOR_PICK_MODE_FOREGROUND, N_("Set foreground color"), "foreground" },
-  { GIMP_COLOR_PICK_MODE_BACKGROUND, N_("Set background color"), "background" },
+  { GIMP_COLOR_PICK_MODE_NONE, N_("Pick Only"), "none" },
+  { GIMP_COLOR_PICK_MODE_FOREGROUND, N_("Set Foreground Color"), "foreground" },
+  { GIMP_COLOR_PICK_MODE_BACKGROUND, N_("Set Background Color"), "background" },
   { 0, NULL, NULL }
 };
 
@@ -50,9 +50,9 @@ gimp_crop_mode_get_type (void)
 
 static const GEnumValue gimp_rect_select_mode_enum_values[] =
 {
-  { GIMP_RECT_SELECT_MODE_FREE, N_("Free select"), "free" },
-  { GIMP_RECT_SELECT_MODE_FIXED_SIZE, N_("Fixed size"), "fixed-size" },
-  { GIMP_RECT_SELECT_MODE_FIXED_RATIO, N_("Fixed aspect ratio"), "fixed-ratio" },
+  { GIMP_RECT_SELECT_MODE_FREE, N_("Free Select"), "free" },
+  { GIMP_RECT_SELECT_MODE_FIXED_SIZE, N_("Fixed Size"), "fixed-size" },
+  { GIMP_RECT_SELECT_MODE_FIXED_RATIO, N_("Fixed Aspect Ratio"), "fixed-ratio" },
   { 0, NULL, NULL }
 };
 
@@ -70,9 +70,9 @@ gimp_rect_select_mode_get_type (void)
 
 static const GEnumValue gimp_transform_type_enum_values[] =
 {
-  { GIMP_TRANSFORM_TYPE_LAYER, N_("Transform layer"), "layer" },
-  { GIMP_TRANSFORM_TYPE_SELECTION, N_("Transform selection"), "selection" },
-  { GIMP_TRANSFORM_TYPE_PATH, N_("Transform path"), "path" },
+  { GIMP_TRANSFORM_TYPE_LAYER, N_("Transform Layer"), "layer" },
+  { GIMP_TRANSFORM_TYPE_SELECTION, N_("Transform Selection"), "selection" },
+  { GIMP_TRANSFORM_TYPE_PATH, N_("Transform Path"), "path" },
   { 0, NULL, NULL }
 };
 
@@ -108,21 +108,21 @@ gimp_vector_mode_get_type (void)
 }
 
 
-static const GEnumValue gimp_transform_grid_type_enum_values[] =
+static const GEnumValue gimp_transform_preview_type_enum_values[] =
 {
-  { GIMP_TRANSFORM_GRID_TYPE_NONE, N_("Don't show grid"), "none" },
-  { GIMP_TRANSFORM_GRID_TYPE_N_LINES, N_("Number of grid lines"), "n-lines" },
-  { GIMP_TRANSFORM_GRID_TYPE_SPACING, N_("Grid line spacing"), "spacing" },
+  { GIMP_TRANSFORM_PREVIEW_TYPE_OUTLINE, N_("Outline"), "outline" },
+  { GIMP_TRANSFORM_PREVIEW_TYPE_GRID, N_("Grid"), "grid" },
+  { GIMP_TRANSFORM_PREVIEW_TYPE_TEXTURE, N_("Texture Map"), "texture" },
   { 0, NULL, NULL }
 };
 
 GType
-gimp_transform_grid_type_get_type (void)
+gimp_transform_preview_type_get_type (void)
 {
   static GType enum_type = 0;
 
   if (!enum_type)
-    enum_type = g_enum_register_static ("GimpTransformGridType", gimp_transform_grid_type_enum_values);
+    enum_type = g_enum_register_static ("GimpTransformPreviewType", gimp_transform_preview_type_enum_values);
 
   return enum_type;
 }
Index: gimp/app/tools/tools-enums.h
===================================================================
RCS file: /cvs/gnome/gimp/app/tools/tools-enums.h,v
retrieving revision 1.15
diff -u -p -r1.15 tools-enums.h
--- gimp/app/tools/tools-enums.h	25 Oct 2003 19:00:46 -0000	1.15
+++ gimp/app/tools/tools-enums.h	29 Jun 2004 22:32:35 -0000
@@ -82,16 +82,16 @@ typedef enum
 } GimpVectorMode;
 
 
-#define GIMP_TYPE_TRANSFORM_GRID_TYPE (gimp_transform_grid_type_get_type ())
+#define GIMP_TYPE_TRANSFORM_PREVIEW_TYPE (gimp_transform_preview_type_get_type ())
 
-GType gimp_transform_grid_type_get_type (void) G_GNUC_CONST;
+GType gimp_transform_preview_type_get_type (void) G_GNUC_CONST;
 
 typedef enum
 {
-  GIMP_TRANSFORM_GRID_TYPE_NONE,     /*< desc="Don't Show Grid"      >*/
-  GIMP_TRANSFORM_GRID_TYPE_N_LINES,  /*< desc="Number of Grid Lines" >*/
-  GIMP_TRANSFORM_GRID_TYPE_SPACING   /*< desc="Grid Line Spacing"    >*/
-} GimpTransformGridType;
+  GIMP_TRANSFORM_PREVIEW_TYPE_OUTLINE,     /*< desc="Outline"     >*/
+  GIMP_TRANSFORM_PREVIEW_TYPE_GRID,        /*< desc="Grid"        >*/
+  GIMP_TRANSFORM_PREVIEW_TYPE_TEXTURE      /*< desc="Texture Map" >*/
+} GimpTransformPreviewType;
 
 
 /*
