callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: rename "Fade" section of GimpFilterTool to "Blending Options"

Browse Source 
... and GIMP_LAYER_MODE_CONTEXT_FADE to
GIMP_LAYER_MODE_CONTEXT_FILTER.

(cherry picked from commit 38059dc5fd)
This commit is contained in:
Ell
2020-04-08 15:58:11 +03:00
parent 8d08f4a672
commit ba7d2f4f87
6 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/operations/layer-modes/gimp-layer-modes.c
View File

@ -87,7 +87,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE | GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE, GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE,
.context = GIMP_LAYER_MODE_CONTEXT_PAINT | .context = GIMP_LAYER_MODE_CONTEXT_PAINT |
GIMP_LAYER_MODE_CONTEXT_FADE, GIMP_LAYER_MODE_CONTEXT_FILTER,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION, .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION, .composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL .composite_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL
@ -369,7 +369,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE | GIMP_LAYER_MODE_FLAG_COMPOSITE_MODE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_SUBTRACTIVE, GIMP_LAYER_MODE_FLAG_SUBTRACTIVE,
.context = GIMP_LAYER_MODE_CONTEXT_PAINT | .context = GIMP_LAYER_MODE_CONTEXT_PAINT |
GIMP_LAYER_MODE_CONTEXT_FADE, GIMP_LAYER_MODE_CONTEXT_FILTER,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP, .paint_composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
.composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP, .composite_mode = GIMP_LAYER_COMPOSITE_CLIP_TO_BACKDROP,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL, .composite_space = GIMP_LAYER_COLOR_SPACE_RGB_PERCEPTUAL,
@ -451,7 +451,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.op_name = "gimp:behind", .op_name = "gimp:behind",
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE, .flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE,
.context = GIMP_LAYER_MODE_CONTEXT_PAINT | .context = GIMP_LAYER_MODE_CONTEXT_PAINT |
GIMP_LAYER_MODE_CONTEXT_FADE, GIMP_LAYER_MODE_CONTEXT_FILTER,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION, .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION, .composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR .composite_space = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
@ -826,7 +826,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.op_name = "gimp:replace", .op_name = "gimp:replace",
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE | .flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_TRIVIAL, GIMP_LAYER_MODE_FLAG_TRIVIAL,
.context = GIMP_LAYER_MODE_CONTEXT_FADE, .context = GIMP_LAYER_MODE_CONTEXT_FILTER,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION, .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION, .composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_space = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR .composite_space = GIMP_LAYER_COLOR_SPACE_RGB_LINEAR
@ -838,7 +838,7 @@ static const GimpLayerModeInfo layer_mode_infos[] =
.flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE | .flags = GIMP_LAYER_MODE_FLAG_BLEND_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE | GIMP_LAYER_MODE_FLAG_COMPOSITE_SPACE_IMMUTABLE |
GIMP_LAYER_MODE_FLAG_ALPHA_ONLY, GIMP_LAYER_MODE_FLAG_ALPHA_ONLY,
.context = GIMP_LAYER_MODE_CONTEXT_FADE, .context = GIMP_LAYER_MODE_CONTEXT_FILTER,
.paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION, .paint_composite_mode = GIMP_LAYER_COMPOSITE_UNION,
.composite_mode = GIMP_LAYER_COMPOSITE_UNION .composite_mode = GIMP_LAYER_COMPOSITE_UNION
} }

4
app/operations/operations-enums.c
View File

@ -338,7 +338,7 @@ gimp_layer_mode_context_get_type (void)
{ GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", "layer" }, { 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_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", "group" },
{ GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", "paint" }, { 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_FILTER, "GIMP_LAYER_MODE_CONTEXT_FILTER", "filter" },
{ GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", "all" }, { GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", "all" },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };
@ -348,7 +348,7 @@ gimp_layer_mode_context_get_type (void)
{ GIMP_LAYER_MODE_CONTEXT_LAYER, "GIMP_LAYER_MODE_CONTEXT_LAYER", NULL }, { 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_GROUP, "GIMP_LAYER_MODE_CONTEXT_GROUP", NULL },
{ GIMP_LAYER_MODE_CONTEXT_PAINT, "GIMP_LAYER_MODE_CONTEXT_PAINT", 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_FILTER, "GIMP_LAYER_MODE_CONTEXT_FILTER", NULL },
{ GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", NULL }, { GIMP_LAYER_MODE_CONTEXT_ALL, "GIMP_LAYER_MODE_CONTEXT_ALL", NULL },
{ 0, NULL, NULL } { 0, NULL, NULL }
}; };

4
app/operations/operations-enums.h
View File

@ -153,12 +153,12 @@ typedef enum /*< pdb-skip >*/
GIMP_LAYER_MODE_CONTEXT_LAYER = 1 << 0, GIMP_LAYER_MODE_CONTEXT_LAYER = 1 << 0,
GIMP_LAYER_MODE_CONTEXT_GROUP = 1 << 1, GIMP_LAYER_MODE_CONTEXT_GROUP = 1 << 1,
GIMP_LAYER_MODE_CONTEXT_PAINT = 1 << 2, GIMP_LAYER_MODE_CONTEXT_PAINT = 1 << 2,
GIMP_LAYER_MODE_CONTEXT_FADE = 1 << 3, GIMP_LAYER_MODE_CONTEXT_FILTER = 1 << 3,
GIMP_LAYER_MODE_CONTEXT_ALL = (GIMP_LAYER_MODE_CONTEXT_LAYER | GIMP_LAYER_MODE_CONTEXT_ALL = (GIMP_LAYER_MODE_CONTEXT_LAYER |
GIMP_LAYER_MODE_CONTEXT_GROUP | GIMP_LAYER_MODE_CONTEXT_GROUP |
GIMP_LAYER_MODE_CONTEXT_PAINT | GIMP_LAYER_MODE_CONTEXT_PAINT |
GIMP_LAYER_MODE_CONTEXT_FADE) GIMP_LAYER_MODE_CONTEXT_FILTER)
} GimpLayerModeContext; } GimpLayerModeContext;

14
app/tools/gimpfilteroptions.c
View File

@ -37,7 +37,7 @@ enum
PROP_PREVIEW_SPLIT_ALIGNMENT, PROP_PREVIEW_SPLIT_ALIGNMENT,
PROP_PREVIEW_SPLIT_POSITION, PROP_PREVIEW_SPLIT_POSITION,
PROP_CONTROLLER, PROP_CONTROLLER,
PROP_FADE_EXPANDED, PROP_BLENDING_OPTIONS_EXPANDED,
PROP_COLOR_OPTIONS_EXPANDED PROP_COLOR_OPTIONS_EXPANDED
}; };
@ -103,8 +103,8 @@ gimp_filter_options_class_init (GimpFilterOptionsClass *klass)
TRUE, TRUE,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_FADE_EXPANDED, GIMP_CONFIG_PROP_BOOLEAN (object_class, PROP_BLENDING_OPTIONS_EXPANDED,
"fade-expanded", "blending-options-expanded",
NULL, NULL, NULL, NULL,
FALSE, FALSE,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
@ -151,8 +151,8 @@ gimp_filter_options_set_property (GObject *object,
options->controller = g_value_get_boolean (value); options->controller = g_value_get_boolean (value);
break; break;
case PROP_FADE_EXPANDED: case PROP_BLENDING_OPTIONS_EXPANDED:
options->fade_expanded = g_value_get_boolean (value); options->blending_options_expanded = g_value_get_boolean (value);
break; break;
case PROP_COLOR_OPTIONS_EXPANDED: case PROP_COLOR_OPTIONS_EXPANDED:
@ -195,8 +195,8 @@ gimp_filter_options_get_property (GObject *object,
g_value_set_boolean (value, options->controller); g_value_set_boolean (value, options->controller);
break; break;
case PROP_FADE_EXPANDED: case PROP_BLENDING_OPTIONS_EXPANDED:
g_value_set_boolean (value, options->fade_expanded); g_value_set_boolean (value, options->blending_options_expanded);
break; break;
case PROP_COLOR_OPTIONS_EXPANDED: case PROP_COLOR_OPTIONS_EXPANDED:

2
app/tools/gimpfilteroptions.h
View File

@ -42,7 +42,7 @@ struct _GimpFilterOptions
gdouble preview_split_position; gdouble preview_split_position;
gboolean controller; gboolean controller;
gboolean fade_expanded; gboolean blending_options_expanded;
gboolean color_options_expanded; gboolean color_options_expanded;
}; };

8
app/tools/gimpfiltertool.c
View File

@ -1095,13 +1095,13 @@ gimp_filter_tool_update_dialog_operation_settings (GimpFilterTool *filter_tool)
gtk_box_pack_start (GTK_BOX (vbox), filter_tool->region_combo, gtk_box_pack_start (GTK_BOX (vbox), filter_tool->region_combo,
FALSE, FALSE, 0); FALSE, FALSE, 0);
/* The Fade expander */ /* The blending-options expander */
expander = gtk_expander_new (_("Fade")); expander = gtk_expander_new (_("Blending Options"));
gtk_box_pack_start (GTK_BOX (vbox), expander, gtk_box_pack_start (GTK_BOX (vbox), expander,
FALSE, FALSE, 0); FALSE, FALSE, 0);
gtk_widget_show (expander); gtk_widget_show (expander);
g_object_bind_property (options, "fade-expanded", g_object_bind_property (options, "blending-options-expanded",
expander, "expanded", expander, "expanded",
G_BINDING_SYNC_CREATE | G_BINDING_SYNC_CREATE |
G_BINDING_BIDIRECTIONAL); G_BINDING_BIDIRECTIONAL);
@ -1117,7 +1117,7 @@ gimp_filter_tool_update_dialog_operation_settings (GimpFilterTool *filter_tool)
/* The mode box */ /* The mode box */
mode_box = gimp_prop_layer_mode_box_new ( mode_box = gimp_prop_layer_mode_box_new (
filter_tool->config, "gimp-mode", filter_tool->config, "gimp-mode",
GIMP_LAYER_MODE_CONTEXT_FADE); GIMP_LAYER_MODE_CONTEXT_FILTER);
gimp_layer_mode_box_set_label (GIMP_LAYER_MODE_BOX (mode_box), gimp_layer_mode_box_set_label (GIMP_LAYER_MODE_BOX (mode_box),
_("Mode")); _("Mode"));
gtk_box_pack_start (GTK_BOX (vbox2), mode_box, gtk_box_pack_start (GTK_BOX (vbox2), mode_box,