[gimp] app: remove "Edit -> Fade..."
- From: Ell <ell src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app: remove "Edit -> Fade..."
- Date: Thu, 27 Dec 2018 16:47:16 +0000 (UTC)
commit ed7ea51fb739d1651946fd122a147f5d8415b7ff
Author: Ell <ell_se yahoo com>
Date: Thu Dec 27 11:16:04 2018 -0500
app: remove "Edit -> Fade..."
This commit completely removes the "Edit -> Fade..." feature,
because...
- The main reason is that "fade" requires us to keep two buffers,
instead of one, for each fadeable undo step, doubling (or worse,
since the extra buffer might have higher precision than the
drawable) the space consumed by these steps. This has notable
impact when editing large images. This overhead is incurred even
when not actually using "fade", and since it seems to be very
rarely used, this is too wasteful.
- "Fade" is broken in 2.10: when comitting a filter, we copy the
cached parts of the result into the apply buffer. However, the
result cache sits after the mode node, while the apply buffer
should contain the result of the filter *before* the mode node,
which can lead to wrong results in the general case.
- The same behavior can be trivially achieved "manually", by
duplicating the layer, editing the duplicate, and changing its
opacity/mode.
- If we really want this feature, now that most filters are GEGL
ops, it makes more sense to just add opacity/mode options to the
filter tool, instead of having this be a separate step.
app/actions/edit-actions.c | 28 ----
app/actions/edit-commands.c | 23 ---
app/actions/edit-commands.h | 3 -
app/core/Makefile.am | 2 -
app/core/gimpdrawable-combine.c | 28 ----
app/core/gimpdrawable-edit.c | 52 ++-----
app/core/gimpdrawable-filters.c | 52 -------
app/core/gimpdrawable.c | 15 +-
app/core/gimpdrawableundo.c | 1 -
app/core/gimpdrawableundo.h | 10 --
app/core/gimpimage-fade.c | 79 ----------
app/core/gimpimage-fade.h | 26 ----
app/core/gimpimage-undo.c | 29 ----
app/core/gimpimage-undo.h | 2 -
app/dialogs/Makefile.am | 2 -
app/dialogs/fade-dialog.c | 214 --------------------------
app/dialogs/fade-dialog.h | 26 ----
app/gimpcore.def | 2 -
app/operations/layer-modes/gimp-layer-modes.c | 11 +-
app/operations/operations-enums.c | 2 -
app/operations/operations-enums.h | 4 +-
app/widgets/gimphelp-ids.h | 1 -
devel-docs/app/app-docs.sgml | 1 -
devel-docs/app/app-sections.txt | 8 -
menus/image-menu.xml.in | 1 -
po/POTFILES.in | 1 -
26 files changed, 16 insertions(+), 607 deletions(-)
---
diff --git a/app/actions/edit-actions.c b/app/actions/edit-actions.c
index 757495047f..f401165bc4 100644
--- a/app/actions/edit-actions.c
+++ b/app/actions/edit-actions.c
@@ -27,7 +27,6 @@
#include "core/gimp.h"
#include "core/gimpchannel.h"
#include "core/gimpcontext.h"
-#include "core/gimpdrawableundo.h"
#include "core/gimpimage.h"
#include "core/gimpimage-undo.h"
#include "core/gimplayer.h"
@@ -101,13 +100,6 @@ static const GimpActionEntry edit_actions[] =
G_CALLBACK (edit_undo_clear_cmd_callback),
GIMP_HELP_EDIT_UNDO_CLEAR },
- { "edit-fade", GIMP_ICON_EDIT_UNDO,
- NC_("edit-action", "_Fade..."), NULL,
- NC_("edit-action",
- "Modify paint mode and opacity of the last pixel manipulation"),
- G_CALLBACK (edit_fade_cmd_callback),
- GIMP_HELP_EDIT_FADE },
-
{ "edit-cut", GIMP_ICON_EDIT_CUT,
NC_("edit-action", "Cu_t"), "<primary>X",
NC_("edit-action", "Move the selected pixels to the clipboard"),
@@ -296,11 +288,9 @@ edit_actions_update (GimpActionGroup *group,
GimpDrawable *drawable = NULL;
gchar *undo_name = NULL;
gchar *redo_name = NULL;
- gchar *fade_name = NULL;
gboolean writable = FALSE;
gboolean children = FALSE;
gboolean undo_enabled = FALSE;
- gboolean fade_enabled = FALSE;
if (image)
{
@@ -342,21 +332,6 @@ edit_actions_update (GimpActionGroup *group,
else if (redo)
redo_name = g_strdup_printf (_("_Redo %s"),
gimp_object_get_name (redo));
-
- undo = gimp_image_undo_get_fadeable (image);
-
- if (GIMP_IS_DRAWABLE_UNDO (undo) &&
- GIMP_DRAWABLE_UNDO (undo)->applied_buffer)
- {
- fade_enabled = TRUE;
- }
-
- if (fade_enabled)
- {
- fade_name =
- g_strdup_printf (_("_Fade %s..."),
- gimp_object_get_name (undo));
- }
}
}
@@ -368,18 +343,15 @@ edit_actions_update (GimpActionGroup *group,
SET_LABEL ("edit-undo", undo_name ? undo_name : _("_Undo"));
SET_LABEL ("edit-redo", redo_name ? redo_name : _("_Redo"));
- SET_LABEL ("edit-fade", fade_name ? fade_name : _("_Fade..."));
SET_SENSITIVE ("edit-undo", undo_enabled && undo_name);
SET_SENSITIVE ("edit-redo", undo_enabled && redo_name);
SET_SENSITIVE ("edit-strong-undo", undo_enabled && undo_name);
SET_SENSITIVE ("edit-strong-redo", undo_enabled && redo_name);
SET_SENSITIVE ("edit-undo-clear", undo_enabled && (undo_name || redo_name));
- SET_SENSITIVE ("edit-fade", fade_enabled && fade_name);
g_free (undo_name);
g_free (redo_name);
- g_free (fade_name);
SET_SENSITIVE ("edit-cut", writable && !children);
SET_SENSITIVE ("edit-copy", drawable);
diff --git a/app/actions/edit-commands.c b/app/actions/edit-commands.c
index 2ee80f146c..499dffe8d8 100644
--- a/app/actions/edit-commands.c
+++ b/app/actions/edit-commands.c
@@ -55,8 +55,6 @@
#include "tools/tool_manager.h"
-#include "dialogs/fade-dialog.h"
-
#include "actions.h"
#include "edit-commands.h"
@@ -204,27 +202,6 @@ edit_undo_clear_cmd_callback (GtkAction *action,
gtk_widget_destroy (dialog);
}
-void
-edit_fade_cmd_callback (GtkAction *action,
- gpointer data)
-{
- GimpImage *image;
- GtkWidget *widget;
- GtkWidget *dialog;
- return_if_no_image (image, data);
- return_if_no_widget (widget, data);
-
- dialog = fade_dialog_new (image, widget);
-
- if (dialog)
- {
- g_signal_connect_object (image, "disconnect",
- G_CALLBACK (gtk_widget_destroy),
- dialog, G_CONNECT_SWAPPED);
- gtk_widget_show (dialog);
- }
-}
-
void
edit_cut_cmd_callback (GtkAction *action,
gpointer data)
diff --git a/app/actions/edit-commands.h b/app/actions/edit-commands.h
index e3abac1ffa..b56af6b9d2 100644
--- a/app/actions/edit-commands.h
+++ b/app/actions/edit-commands.h
@@ -30,9 +30,6 @@ void edit_strong_redo_cmd_callback (GtkAction *action,
void edit_undo_clear_cmd_callback (GtkAction *action,
gpointer data);
-void edit_fade_cmd_callback (GtkAction *action,
- gpointer data);
-
void edit_cut_cmd_callback (GtkAction *action,
gpointer data);
void edit_copy_cmd_callback (GtkAction *action,
diff --git a/app/core/Makefile.am b/app/core/Makefile.am
index 1eed23acc2..97354d42b4 100644
--- a/app/core/Makefile.am
+++ b/app/core/Makefile.am
@@ -286,8 +286,6 @@ libappcore_a_sources = \
gimpimage-crop.h \
gimpimage-duplicate.c \
gimpimage-duplicate.h \
- gimpimage-fade.c \
- gimpimage-fade.h \
gimpimage-flip.c \
gimpimage-flip.h \
gimpimage-grid.h \
diff --git a/app/core/gimpdrawable-combine.c b/app/core/gimpdrawable-combine.c
index 9a4dccea1c..f18ec8866b 100644
--- a/app/core/gimpdrawable-combine.c
+++ b/app/core/gimpdrawable-combine.c
@@ -33,9 +33,7 @@
#include "gimp.h"
#include "gimpchannel.h"
#include "gimpdrawable-combine.h"
-#include "gimpdrawableundo.h"
#include "gimpimage.h"
-#include "gimpimage-undo.h"
#include "gimptempbuf.h"
@@ -102,34 +100,8 @@ gimp_drawable_real_apply_buffer (GimpDrawable *drawable,
if (push_undo)
{
- GimpDrawableUndo *undo;
-
gimp_drawable_push_undo (drawable, undo_desc,
NULL, x, y, width, height);
-
- undo = GIMP_DRAWABLE_UNDO (gimp_image_undo_get_fadeable (image));
-
- if (undo)
- {
- undo->paint_mode = mode;
- undo->blend_space = blend_space;
- undo->composite_space = composite_space;
- undo->composite_mode = composite_mode;
- undo->opacity = opacity;
-
- undo->applied_buffer =
- gegl_buffer_new (GEGL_RECTANGLE (0, 0, width, height),
- gegl_buffer_get_format (buffer));
-
- gimp_gegl_buffer_copy (
- buffer,
- GEGL_RECTANGLE (buffer_region->x + (x - base_x),
- buffer_region->y + (y - base_y),
- width, height),
- GEGL_ABYSS_NONE,
- undo->applied_buffer,
- GEGL_RECTANGLE (0, 0, width, height));
- }
}
applicator = gimp_applicator_new (NULL, FALSE, FALSE);
diff --git a/app/core/gimpdrawable-edit.c b/app/core/gimpdrawable-edit.c
index cd9a4071b8..8b7494d0f4 100644
--- a/app/core/gimpdrawable-edit.c
+++ b/app/core/gimpdrawable-edit.c
@@ -29,11 +29,9 @@
#include "gimpchannel.h"
#include "gimpdrawable.h"
#include "gimpdrawable-edit.h"
-#include "gimpdrawableundo.h"
#include "gimpcontext.h"
#include "gimpfilloptions.h"
#include "gimpimage.h"
-#include "gimpimage-undo.h"
#include "gimppattern.h"
#include "gimptempbuf.h"
@@ -106,24 +104,17 @@ gimp_drawable_edit_fill_direct (GimpDrawable *drawable,
GimpFillOptions *options,
const gchar *undo_desc)
{
- GeglBuffer *buffer;
- GimpImage *image;
- GimpContext *context;
- GimpDrawableUndo *undo;
- gdouble opacity;
- GimpLayerMode mode;
- GimpLayerMode composite_mode;
- gint width;
- gint height;
-
- buffer = gimp_drawable_get_buffer (drawable);
- image = gimp_item_get_image (GIMP_ITEM (drawable));
- context = GIMP_CONTEXT (options);
- opacity = gimp_context_get_opacity (context);
- mode = gimp_context_get_paint_mode (context);
- composite_mode = gimp_layer_mode_get_paint_composite_mode (mode);
- width = gimp_item_get_width (GIMP_ITEM (drawable));
- height = gimp_item_get_height (GIMP_ITEM (drawable));
+ GeglBuffer *buffer;
+ GimpContext *context;
+ GimpLayerMode mode;
+ gint width;
+ gint height;
+
+ buffer = gimp_drawable_get_buffer (drawable);
+ context = GIMP_CONTEXT (options);
+ mode = gimp_context_get_paint_mode (context);
+ width = gimp_item_get_width (GIMP_ITEM (drawable));
+ height = gimp_item_get_height (GIMP_ITEM (drawable));
gimp_drawable_push_undo (drawable, undo_desc,
NULL, 0, 0, width, height);
@@ -132,27 +123,6 @@ gimp_drawable_edit_fill_direct (GimpDrawable *drawable,
gimp_fill_options_fill_buffer (options, drawable, buffer, 0, 0);
else
gimp_gegl_clear (buffer, NULL);
-
- undo = GIMP_DRAWABLE_UNDO (gimp_image_undo_get_fadeable (image));
-
- if (undo)
- {
- undo->paint_mode = mode;
- undo->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
- undo->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
- undo->composite_mode = composite_mode;
- undo->opacity = opacity;
-
- if (! gimp_layer_mode_is_subtractive (mode))
- {
- undo->applied_buffer = gegl_buffer_dup (buffer);
- }
- else
- {
- undo->applied_buffer = gimp_fill_options_create_buffer (
- options, drawable, GEGL_RECTANGLE (0, 0, width, height), 0, 0);
- }
- }
}
diff --git a/app/core/gimpdrawable-filters.c b/app/core/gimpdrawable-filters.c
index ce281c2f95..0fbafbc15e 100644
--- a/app/core/gimpdrawable-filters.c
+++ b/app/core/gimpdrawable-filters.c
@@ -33,11 +33,9 @@
#include "gimpdrawable.h"
#include "gimpdrawable-filters.h"
#include "gimpdrawable-private.h"
-#include "gimpdrawableundo.h"
#include "gimpfilter.h"
#include "gimpfilterstack.h"
#include "gimpimage.h"
-#include "gimpimage-undo.h"
#include "gimpprogress.h"
#include "gimpprojection.h"
@@ -126,7 +124,6 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
GimpImage *image = gimp_item_get_image (GIMP_ITEM (drawable));
GeglBuffer *undo_buffer;
GimpApplicator *applicator;
- GeglBuffer *apply_buffer = NULL;
GeglBuffer *cache = NULL;
GeglRectangle *rects = NULL;
gint n_rects = 0;
@@ -153,41 +150,11 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
gimp_applicator_set_preview (applicator, FALSE,
GEGL_RECTANGLE (0, 0, 0, 0));
- /* the apply_buffer will make a copy of the region that is
- * actually processed in gimp_gegl_apply_cached_operation()
- * below.
- */
- apply_buffer = gimp_applicator_dup_apply_buffer (applicator, &rect);
-
/* the cache and its valid rectangles are the region that
* has already been processed by this applicator.
*/
cache = gimp_applicator_get_cache_buffer (applicator,
&rects, &n_rects);
-
- if (cache)
- {
- gint i;
-
- for (i = 0; i < n_rects; i++)
- {
- g_printerr ("valid: %d %d %d %d\n",
- rects[i].x, rects[i].y,
- rects[i].width, rects[i].height);
-
- /* we have to copy the cached region to the apply_buffer,
- * because this region is not going to be processed.
- */
- gimp_gegl_buffer_copy (cache,
- &rects[i],
- GEGL_ABYSS_NONE,
- apply_buffer,
- GEGL_RECTANGLE (rects[i].x - rect.x,
- rects[i].y - rect.y,
- 0, 0));
- }
- }
-
}
gimp_projection_stop_rendering (gimp_image_get_projection (image));
@@ -205,22 +172,6 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
gimp_drawable_push_undo (drawable, undo_desc, undo_buffer,
rect.x, rect.y,
rect.width, rect.height);
-
- if (applicator)
- {
- GimpDrawableUndo *undo;
-
- undo = GIMP_DRAWABLE_UNDO (gimp_image_undo_get_fadeable (image));
-
- if (undo)
- {
- undo->paint_mode = applicator->paint_mode;
- undo->opacity = applicator->opacity;
-
- undo->applied_buffer = apply_buffer;
- apply_buffer = NULL;
- }
- }
}
else
{
@@ -237,9 +188,6 @@ gimp_drawable_merge_filter (GimpDrawable *drawable,
g_object_unref (undo_buffer);
- if (apply_buffer)
- g_object_unref (apply_buffer);
-
if (cache)
{
g_object_unref (cache);
diff --git a/app/core/gimpdrawable.c b/app/core/gimpdrawable.c
index 7249e8605f..2e85d0777f 100644
--- a/app/core/gimpdrawable.c
+++ b/app/core/gimpdrawable.c
@@ -43,11 +43,9 @@
#include "gimpdrawable-private.h"
#include "gimpdrawable-shadow.h"
#include "gimpdrawable-transform.h"
-#include "gimpdrawableundo.h"
#include "gimpfilterstack.h"
#include "gimpimage.h"
#include "gimpimage-colormap.h"
-#include "gimpimage-undo.h"
#include "gimpimage-undo-push.h"
#include "gimpmarshal.h"
#include "gimppickable.h"
@@ -900,10 +898,7 @@ gimp_drawable_real_push_undo (GimpDrawable *drawable,
gint width,
gint height)
{
- GimpImage *image;
- GimpDrawableUndo *undo;
- gint applied_x = x;
- gint applied_y = y;
+ GimpImage *image;
if (! buffer)
{
@@ -940,14 +935,6 @@ gimp_drawable_real_push_undo (GimpDrawable *drawable,
undo_desc, drawable,
buffer, x, y);
- undo = GIMP_DRAWABLE_UNDO (gimp_image_undo_get_fadeable (image));
-
- if (undo)
- {
- undo->applied_x = applied_x;
- undo->applied_y = applied_y;
- }
-
g_object_unref (buffer);
}
diff --git a/app/core/gimpdrawableundo.c b/app/core/gimpdrawableundo.c
index f2bf16da54..78b8f3902a 100644
--- a/app/core/gimpdrawableundo.c
+++ b/app/core/gimpdrawableundo.c
@@ -202,7 +202,6 @@ gimp_drawable_undo_free (GimpUndo *undo,
GimpDrawableUndo *drawable_undo = GIMP_DRAWABLE_UNDO (undo);
g_clear_object (&drawable_undo->buffer);
- g_clear_object (&drawable_undo->applied_buffer);
GIMP_UNDO_CLASS (parent_class)->free (undo, undo_mode);
}
diff --git a/app/core/gimpdrawableundo.h b/app/core/gimpdrawableundo.h
index 9e67327273..5d7269eb7d 100644
--- a/app/core/gimpdrawableundo.h
+++ b/app/core/gimpdrawableundo.h
@@ -40,16 +40,6 @@ struct _GimpDrawableUndo
GeglBuffer *buffer;
gint x;
gint y;
-
- /* stuff for "Fade" */
- GeglBuffer *applied_buffer;
- gint applied_x;
- gint applied_y;
- GimpLayerMode paint_mode;
- GimpLayerColorSpace blend_space;
- GimpLayerColorSpace composite_space;
- GimpLayerCompositeMode composite_mode;
- gdouble opacity;
};
struct _GimpDrawableUndoClass
diff --git a/app/core/gimpimage-undo.c b/app/core/gimpimage-undo.c
index 6d7b87d4e3..8f3ea4b906 100644
--- a/app/core/gimpimage-undo.c
+++ b/app/core/gimpimage-undo.c
@@ -26,7 +26,6 @@
#include "gimp.h"
#include "gimp-utils.h"
-#include "gimpdrawableundo.h"
#include "gimpimage.h"
#include "gimpimage-private.h"
#include "gimpimage-undo.h"
@@ -461,34 +460,6 @@ gimp_image_undo_can_compress (GimpImage *image,
return NULL;
}
-GimpUndo *
-gimp_image_undo_get_fadeable (GimpImage *image)
-{
- GimpImagePrivate *private;
- GimpUndo *undo;
-
- g_return_val_if_fail (GIMP_IS_IMAGE (image), NULL);
-
- private = GIMP_IMAGE_GET_PRIVATE (image);
-
- undo = gimp_undo_stack_peek (private->undo_stack);
-
- if (GIMP_IS_UNDO_STACK (undo) && undo->undo_type == GIMP_UNDO_GROUP_PAINT)
- {
- GimpUndoStack *stack = GIMP_UNDO_STACK (undo);
-
- if (gimp_undo_stack_get_depth (stack) == 2)
- {
- undo = gimp_undo_stack_peek (stack);
- }
- }
-
- if (GIMP_IS_DRAWABLE_UNDO (undo))
- return undo;
-
- return NULL;
-}
-
/* private functions */
diff --git a/app/core/gimpimage-undo.h b/app/core/gimpimage-undo.h
index 51fe3ba075..34bd2f4ce1 100644
--- a/app/core/gimpimage-undo.h
+++ b/app/core/gimpimage-undo.h
@@ -53,7 +53,5 @@ GimpUndo * gimp_image_undo_can_compress (GimpImage *image,
GType object_type,
GimpUndoType undo_type);
-GimpUndo * gimp_image_undo_get_fadeable (GimpImage *image);
-
#endif /* __GIMP_IMAGE__UNDO_H__ */
diff --git a/app/dialogs/Makefile.am b/app/dialogs/Makefile.am
index 7001fa57e9..93045de974 100644
--- a/app/dialogs/Makefile.am
+++ b/app/dialogs/Makefile.am
@@ -37,8 +37,6 @@ libappdialogs_a_sources = \
data-delete-dialog.h \
extensions-dialog.c \
extensions-dialog.h \
- fade-dialog.c \
- fade-dialog.h \
file-open-dialog.c \
file-open-dialog.h \
file-open-location-dialog.c \
diff --git a/app/gimpcore.def b/app/gimpcore.def
index 3383f8a9e3..4459c83d76 100644
--- a/app/gimpcore.def
+++ b/app/gimpcore.def
@@ -854,8 +854,6 @@ gimp_plug_in_procedure_get_locale_domain
gimp_channel_select_round_rect
gimp_drawable_undo_get_type
-gimp_edit_fade
-gimp_image_undo_get_fadeable
gimp_message_severity_get_type
gimp_progress_message
plug_in_icc_profile_info
diff --git a/app/operations/layer-modes/gimp-layer-modes.c b/app/operations/layer-modes/gimp-layer-modes.c
index 60c23b6e6b..2737bed5b8 100644
--- a/app/operations/layer-modes/gimp-layer-modes.c
+++ b/app/operations/layer-modes/gimp-layer-modes.c
@@ -86,8 +86,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
- .context = GIMP_LAYER_MODE_CONTEXT_PAINT |
- GIMP_LAYER_MODE_CONTEXT_FADE,
+ .context = GIMP_LAYER_MODE_CONTEXT_PAINT,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
@@ -368,8 +367,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_SUBTRACTIVE,
- .context = GIMP_LAYER_MODE_CONTEXT_PAINT |
- GIMP_LAYER_MODE_CONTEXT_FADE,
+ .context = GIMP_LAYER_MODE_CONTEXT_PAINT,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
.composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
@@ -450,8 +448,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.op_name = "gimp:behind",
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
- .context = GIMP_LAYER_MODE_CONTEXT_PAINT |
- GIMP_LAYER_MODE_CONTEXT_FADE,
+ .context = GIMP_LAYER_MODE_CONTEXT_PAINT,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
@@ -826,7 +823,6 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.op_name = "gimp:replace",
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_TRIVIAL,
- .context = GIMP_LAYER_MODE_CONTEXT_FADE,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
@@ -838,7 +834,6 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_ALPHA_ONLY,
- .context = GIMP_LAYER_MODE_CONTEXT_FADE,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION
}
diff --git a/app/operations/operations-enums.c b/app/operations/operations-enums.c
index a0d67b88e0..dabf1fca01 100644
--- a/app/operations/operations-enums.c
+++ b/app/operations/operations-enums.c
@@ -338,7 +338,6 @@ gimp_layer_mode_context_get_type (void)
{ GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", "layer" },
{ GIMP_LAYER_MODE_CONTEXT_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", "group" },
{ GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", "paint" },
- { GIMP_LAYER_MODE_CONTEXT_FADE, "GIMP_LAYER_MODE_CONTEXT_FADE", "fade" },
{ GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", "all" },
{ 0, NULL, NULL }
};
@@ -348,7 +347,6 @@ gimp_layer_mode_context_get_type (void)
{ GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", NULL },
{ GIMP_LAYER_MODE_CONTEXT_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", NULL },
{ GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", NULL },
- { GIMP_LAYER_MODE_CONTEXT_FADE, "GIMP_LAYER_MODE_CONTEXT_FADE", NULL },
{ GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", NULL },
{ 0, NULL, NULL }
};
diff --git a/app/operations/operations-enums.h b/app/operations/operations-enums.h
index e9cb41b3b3..8bcfb06e00 100644
--- a/app/operations/operations-enums.h
+++ b/app/operations/operations-enums.h
@@ -153,12 +153,10 @@ typedef enum /*< pdb-skip >*/
GIMP_LAYER_MODE_CONTEXT_LAYER = 1 << 0,
GIMP_LAYER_MODE_CONTEXT_GROUP = 1 << 1,
GIMP_LAYER_MODE_CONTEXT_PAINT = 1 << 2,
- GIMP_LAYER_MODE_CONTEXT_FADE = 1 << 3,
GIMP_LAYER_MODE_CONTEXT_ALL = (GIMP_LAYER_MODE_CONTEXT_LAYER |
GIMP_LAYER_MODE_CONTEXT_GROUP |
- GIMP_LAYER_MODE_CONTEXT_PAINT |
- GIMP_LAYER_MODE_CONTEXT_FADE)
+ GIMP_LAYER_MODE_CONTEXT_PAINT)
} GimpLayerModeContext;
diff --git a/app/widgets/gimphelp-ids.h b/app/widgets/gimphelp-ids.h
index 69478f472d..2702c6df2a 100644
--- a/app/widgets/gimphelp-ids.h
+++ b/app/widgets/gimphelp-ids.h
@@ -51,7 +51,6 @@
#define GIMP_HELP_EDIT_STRONG_UNDO "gimp-edit-strong-undo"
#define GIMP_HELP_EDIT_STRONG_REDO "gimp-edit-strong-redo"
#define GIMP_HELP_EDIT_UNDO_CLEAR "gimp-edit-undo-clear"
-#define GIMP_HELP_EDIT_FADE "gimp-edit-fade"
#define GIMP_HELP_EDIT_CUT "gimp-edit-cut"
#define GIMP_HELP_EDIT_COPY "gimp-edit-copy"
#define GIMP_HELP_EDIT_COPY_VISIBLE "gimp-edit-copy-visible"
diff --git a/devel-docs/app/app-docs.sgml b/devel-docs/app/app-docs.sgml
index 241579f32c..dfe562c514 100644
--- a/devel-docs/app/app-docs.sgml
+++ b/devel-docs/app/app-docs.sgml
@@ -1336,7 +1336,6 @@
<xi:include href="xml/channel-options-dialog.xml" />
<xi:include href="xml/convert-dialog.xml" />
<xi:include href="xml/data-delete-dialog.xml" />
- <xi:include href="xml/fade-dialog.xml" />
<xi:include href="xml/file-open-dialog.xml" />
<xi:include href="xml/file-open-location-dialog.xml" />
<xi:include href="xml/file-save-dialog.xml" />
diff --git a/devel-docs/app/app-sections.txt b/devel-docs/app/app-sections.txt
index 6b737f65fa..72d2b0ee11 100644
--- a/devel-docs/app/app-sections.txt
+++ b/devel-docs/app/app-sections.txt
@@ -1068,7 +1068,6 @@ gimp_edit_named_copy
gimp_edit_named_copy_visible
gimp_edit_clear
gimp_edit_fill
-gimp_edit_fade
</SECTION>
<SECTION>
@@ -11379,7 +11378,6 @@ gimp_image_undo_group_start
gimp_image_undo_group_end
gimp_image_undo_push
gimp_image_undo_can_compress
-gimp_image_undo_get_fadeable
</SECTION>
<SECTION>
@@ -11779,11 +11777,6 @@ dialogs_get_toolbox
about_dialog_create
</SECTION>
-<SECTION>
-<FILE>fade-dialog</FILE>
-fade_dialog_new
-</SECTION>
-
<SECTION>
<FILE>image-new-dialog</FILE>
image_new_dialog_new
@@ -13612,7 +13605,6 @@ edit_redo_cmd_callback
edit_strong_redo_cmd_callback
edit_strong_undo_cmd_callback
edit_undo_clear_cmd_callback
-edit_fade_cmd_callback
</SECTION>
<SECTION>
diff --git a/menus/image-menu.xml.in b/menus/image-menu.xml.in
index 7a3bd08ed0..7c63730a38 100644
--- a/menus/image-menu.xml.in
+++ b/menus/image-menu.xml.in
@@ -182,7 +182,6 @@
<placeholder name="Undo">
<menuitem action="edit-undo" />
<menuitem action="edit-redo" />
- <menuitem action="edit-fade" />
<menuitem action="dialogs-undo-history" />
</placeholder>
<separator />
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2886921972..bcdbb0a254 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -213,7 +213,6 @@ app/dialogs/data-delete-dialog.c
app/dialogs/dialogs-constructors.c
app/dialogs/dialogs.c
app/dialogs/extensions-dialog.c
-app/dialogs/fade-dialog.c
app/dialogs/file-open-dialog.c
app/dialogs/file-open-location-dialog.c
app/dialogs/file-save-dialog.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
