Commit 152adbb1 authored by Michael Natterer's avatar Michael Natterer 😴

Rename GIMP_LAYER_MODE_FOO_BROKEN to GIMP_LAYER_MODE_FOO_LEGACY

"Broken" sounds like it needs fixing, but it's legacy compat stuff
that will have to stay for all eternity.
parent e53b269f
......@@ -54,25 +54,25 @@ static const GimpLayerMode paint_modes[] =
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_COLOR_ERASE,
GIMP_LAYER_MODE_MULTIPLY_BROKEN,
GIMP_LAYER_MODE_DIVIDE_BROKEN,
GIMP_LAYER_MODE_SCREEN_BROKEN,
GIMP_LAYER_MODE_MULTIPLY_LEGACY,
GIMP_LAYER_MODE_DIVIDE_LEGACY,
GIMP_LAYER_MODE_SCREEN_LEGACY,
GIMP_LAYER_MODE_OVERLAY,
GIMP_LAYER_MODE_DODGE_BROKEN,
GIMP_LAYER_MODE_BURN_BROKEN,
GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
GIMP_LAYER_MODE_ADDITION_BROKEN,
GIMP_LAYER_MODE_SUBTRACT_BROKEN,
GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
GIMP_LAYER_MODE_HSV_HUE_BROKEN,
GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
GIMP_LAYER_MODE_DODGE_LEGACY,
GIMP_LAYER_MODE_BURN_LEGACY,
GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
GIMP_LAYER_MODE_ADDITION_LEGACY,
GIMP_LAYER_MODE_SUBTRACT_LEGACY,
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
GIMP_LAYER_MODE_HSV_HUE_LEGACY,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_LCH_HUE,
GIMP_LAYER_MODE_LCH_CHROMA,
GIMP_LAYER_MODE_LCH_COLOR,
......
......@@ -85,25 +85,25 @@ static const GimpLayerMode layer_modes[] =
{
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_MULTIPLY_BROKEN,
GIMP_LAYER_MODE_DIVIDE_BROKEN,
GIMP_LAYER_MODE_SCREEN_BROKEN,
GIMP_LAYER_MODE_MULTIPLY_LEGACY,
GIMP_LAYER_MODE_DIVIDE_LEGACY,
GIMP_LAYER_MODE_SCREEN_LEGACY,
GIMP_LAYER_MODE_OVERLAY,
GIMP_LAYER_MODE_DODGE_BROKEN,
GIMP_LAYER_MODE_BURN_BROKEN,
GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
GIMP_LAYER_MODE_ADDITION_BROKEN,
GIMP_LAYER_MODE_SUBTRACT_BROKEN,
GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
GIMP_LAYER_MODE_HSV_HUE_BROKEN,
GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
GIMP_LAYER_MODE_DODGE_LEGACY,
GIMP_LAYER_MODE_BURN_LEGACY,
GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
GIMP_LAYER_MODE_ADDITION_LEGACY,
GIMP_LAYER_MODE_SUBTRACT_LEGACY,
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
GIMP_LAYER_MODE_HSV_HUE_LEGACY,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_LCH_HUE,
GIMP_LAYER_MODE_LCH_CHROMA,
GIMP_LAYER_MODE_LCH_COLOR,
......
......@@ -292,25 +292,25 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_NORMAL, "GIMP_LAYER_MODE_NORMAL", "normal" },
{ GIMP_LAYER_MODE_DISSOLVE, "GIMP_LAYER_MODE_DISSOLVE", "dissolve" },
{ GIMP_LAYER_MODE_BEHIND, "GIMP_LAYER_MODE_BEHIND", "behind" },
{ GIMP_LAYER_MODE_MULTIPLY_BROKEN, "GIMP_LAYER_MODE_MULTIPLY_BROKEN", "multiply-broken" },
{ GIMP_LAYER_MODE_SCREEN_BROKEN, "GIMP_LAYER_MODE_SCREEN_BROKEN", "screen-broken" },
{ GIMP_LAYER_MODE_OVERLAY_BROKEN, "GIMP_LAYER_MODE_OVERLAY_BROKEN", "overlay-broken" },
{ GIMP_LAYER_MODE_DIFFERENCE_BROKEN, "GIMP_LAYER_MODE_DIFFERENCE_BROKEN", "difference-broken" },
{ GIMP_LAYER_MODE_ADDITION_BROKEN, "GIMP_LAYER_MODE_ADDITION_BROKEN", "addition-broken" },
{ GIMP_LAYER_MODE_SUBTRACT_BROKEN, "GIMP_LAYER_MODE_SUBTRACT_BROKEN", "subtract-broken" },
{ GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN, "GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN", "darken-only-broken" },
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN, "GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN", "lighten-only-broken" },
{ GIMP_LAYER_MODE_HSV_HUE_BROKEN, "GIMP_LAYER_MODE_HSV_HUE_BROKEN", "hsv-hue-broken" },
{ GIMP_LAYER_MODE_HSV_SATURATION_BROKEN, "GIMP_LAYER_MODE_HSV_SATURATION_BROKEN", "hsv-saturation-broken" },
{ GIMP_LAYER_MODE_HSV_COLOR_BROKEN, "GIMP_LAYER_MODE_HSV_COLOR_BROKEN", "hsv-color-broken" },
{ GIMP_LAYER_MODE_HSV_VALUE_BROKEN, "GIMP_LAYER_MODE_HSV_VALUE_BROKEN", "hsv-value-broken" },
{ GIMP_LAYER_MODE_DIVIDE_BROKEN, "GIMP_LAYER_MODE_DIVIDE_BROKEN", "divide-broken" },
{ GIMP_LAYER_MODE_DODGE_BROKEN, "GIMP_LAYER_MODE_DODGE_BROKEN", "dodge-broken" },
{ GIMP_LAYER_MODE_BURN_BROKEN, "GIMP_LAYER_MODE_BURN_BROKEN", "burn-broken" },
{ GIMP_LAYER_MODE_HARDLIGHT_BROKEN, "GIMP_LAYER_MODE_HARDLIGHT_BROKEN", "hardlight-broken" },
{ GIMP_LAYER_MODE_SOFTLIGHT_BROKEN, "GIMP_LAYER_MODE_SOFTLIGHT_BROKEN", "softlight-broken" },
{ GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN, "GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN", "grain-extract-broken" },
{ GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN, "GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN", "grain-merge-broken" },
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, "GIMP_LAYER_MODE_MULTIPLY_LEGACY", "multiply-legacy" },
{ GIMP_LAYER_MODE_SCREEN_LEGACY, "GIMP_LAYER_MODE_SCREEN_LEGACY", "screen-legacy" },
{ GIMP_LAYER_MODE_OVERLAY_LEGACY, "GIMP_LAYER_MODE_OVERLAY_LEGACY", "overlay-legacy" },
{ GIMP_LAYER_MODE_DIFFERENCE_LEGACY, "GIMP_LAYER_MODE_DIFFERENCE_LEGACY", "difference-legacy" },
{ GIMP_LAYER_MODE_ADDITION_LEGACY, "GIMP_LAYER_MODE_ADDITION_LEGACY", "addition-legacy" },
{ GIMP_LAYER_MODE_SUBTRACT_LEGACY, "GIMP_LAYER_MODE_SUBTRACT_LEGACY", "subtract-legacy" },
{ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, "GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY", "darken-only-legacy" },
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, "GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY", "lighten-only-legacy" },
{ GIMP_LAYER_MODE_HSV_HUE_LEGACY, "GIMP_LAYER_MODE_HSV_HUE_LEGACY", "hsv-hue-legacy" },
{ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, "GIMP_LAYER_MODE_HSV_SATURATION_LEGACY", "hsv-saturation-legacy" },
{ GIMP_LAYER_MODE_HSV_COLOR_LEGACY, "GIMP_LAYER_MODE_HSV_COLOR_LEGACY", "hsv-color-legacy" },
{ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, "GIMP_LAYER_MODE_HSV_VALUE_LEGACY", "hsv-value-legacy" },
{ GIMP_LAYER_MODE_DIVIDE_LEGACY, "GIMP_LAYER_MODE_DIVIDE_LEGACY", "divide-legacy" },
{ GIMP_LAYER_MODE_DODGE_LEGACY, "GIMP_LAYER_MODE_DODGE_LEGACY", "dodge-legacy" },
{ GIMP_LAYER_MODE_BURN_LEGACY, "GIMP_LAYER_MODE_BURN_LEGACY", "burn-legacy" },
{ GIMP_LAYER_MODE_HARDLIGHT_LEGACY, "GIMP_LAYER_MODE_HARDLIGHT_LEGACY", "hardlight-legacy" },
{ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, "GIMP_LAYER_MODE_SOFTLIGHT_LEGACY", "softlight-legacy" },
{ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, "GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY", "grain-extract-legacy" },
{ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, "GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY", "grain-merge-legacy" },
{ GIMP_LAYER_MODE_COLOR_ERASE, "GIMP_LAYER_MODE_COLOR_ERASE", "color-erase" },
{ GIMP_LAYER_MODE_OVERLAY, "GIMP_LAYER_MODE_OVERLAY", "overlay" },
{ GIMP_LAYER_MODE_LCH_HUE, "GIMP_LAYER_MODE_LCH_HUE", "lch-hue" },
......@@ -328,25 +328,25 @@ gimp_layer_mode_get_type (void)
{ GIMP_LAYER_MODE_NORMAL, NC_("layer-mode", "Normal"), NULL },
{ GIMP_LAYER_MODE_DISSOLVE, NC_("layer-mode", "Dissolve"), NULL },
{ GIMP_LAYER_MODE_BEHIND, NC_("layer-mode", "Behind"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY_BROKEN, NC_("layer-mode", "Multiply"), NULL },
{ GIMP_LAYER_MODE_SCREEN_BROKEN, NC_("layer-mode", "Screen"), NULL },
{ GIMP_LAYER_MODE_OVERLAY_BROKEN, NC_("layer-mode", "Old broken Overlay"), NULL },
{ GIMP_LAYER_MODE_DIFFERENCE_BROKEN, NC_("layer-mode", "Difference"), NULL },
{ GIMP_LAYER_MODE_ADDITION_BROKEN, NC_("layer-mode", "Addition"), NULL },
{ GIMP_LAYER_MODE_SUBTRACT_BROKEN, NC_("layer-mode", "Subtract"), NULL },
{ GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN, NC_("layer-mode", "Darken only"), NULL },
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN, NC_("layer-mode", "Lighten only"), NULL },
{ GIMP_LAYER_MODE_HSV_HUE_BROKEN, NC_("layer-mode", "Hue (HSV)"), NULL },
{ GIMP_LAYER_MODE_HSV_SATURATION_BROKEN, NC_("layer-mode", "Saturation (HSV)"), NULL },
{ GIMP_LAYER_MODE_HSV_COLOR_BROKEN, NC_("layer-mode", "Color (HSV)"), NULL },
{ GIMP_LAYER_MODE_HSV_VALUE_BROKEN, NC_("layer-mode", "Value (HSV)"), NULL },
{ GIMP_LAYER_MODE_DIVIDE_BROKEN, NC_("layer-mode", "Divide"), NULL },
{ GIMP_LAYER_MODE_DODGE_BROKEN, NC_("layer-mode", "Dodge"), NULL },
{ GIMP_LAYER_MODE_BURN_BROKEN, NC_("layer-mode", "Burn"), NULL },
{ GIMP_LAYER_MODE_HARDLIGHT_BROKEN, NC_("layer-mode", "Hard light"), NULL },
{ GIMP_LAYER_MODE_SOFTLIGHT_BROKEN, NC_("layer-mode", "Soft light"), NULL },
{ GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN, NC_("layer-mode", "Grain extract"), NULL },
{ GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN, NC_("layer-mode", "Grain merge"), NULL },
{ GIMP_LAYER_MODE_MULTIPLY_LEGACY, NC_("layer-mode", "Multiply"), NULL },
{ GIMP_LAYER_MODE_SCREEN_LEGACY, NC_("layer-mode", "Screen"), NULL },
{ GIMP_LAYER_MODE_OVERLAY_LEGACY, NC_("layer-mode", "Old broken Overlay"), NULL },
{ GIMP_LAYER_MODE_DIFFERENCE_LEGACY, NC_("layer-mode", "Difference"), NULL },
{ GIMP_LAYER_MODE_ADDITION_LEGACY, NC_("layer-mode", "Addition"), NULL },
{ GIMP_LAYER_MODE_SUBTRACT_LEGACY, NC_("layer-mode", "Subtract"), NULL },
{ GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, NC_("layer-mode", "Darken only"), NULL },
{ GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, NC_("layer-mode", "Lighten only"), NULL },
{ GIMP_LAYER_MODE_HSV_HUE_LEGACY, NC_("layer-mode", "Hue (HSV)"), NULL },
{ GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, NC_("layer-mode", "Saturation (HSV)"), NULL },
{ GIMP_LAYER_MODE_HSV_COLOR_LEGACY, NC_("layer-mode", "Color (HSV)"), NULL },
{ GIMP_LAYER_MODE_HSV_VALUE_LEGACY, NC_("layer-mode", "Value (HSV)"), NULL },
{ GIMP_LAYER_MODE_DIVIDE_LEGACY, NC_("layer-mode", "Divide"), NULL },
{ GIMP_LAYER_MODE_DODGE_LEGACY, NC_("layer-mode", "Dodge"), NULL },
{ GIMP_LAYER_MODE_BURN_LEGACY, NC_("layer-mode", "Burn"), NULL },
{ GIMP_LAYER_MODE_HARDLIGHT_LEGACY, NC_("layer-mode", "Hard light"), NULL },
{ GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, NC_("layer-mode", "Soft light"), NULL },
{ GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, NC_("layer-mode", "Grain extract"), NULL },
{ GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, NC_("layer-mode", "Grain merge"), NULL },
{ GIMP_LAYER_MODE_COLOR_ERASE, NC_("layer-mode", "Color erase"), NULL },
{ GIMP_LAYER_MODE_OVERLAY, NC_("layer-mode", "Overlay"), NULL },
{ GIMP_LAYER_MODE_LCH_HUE, NC_("layer-mode", "Hue (LCH)"), NULL },
......
......@@ -157,25 +157,25 @@ typedef enum
GIMP_LAYER_MODE_NORMAL, /*< desc="Normal" >*/
GIMP_LAYER_MODE_DISSOLVE, /*< desc="Dissolve" >*/
GIMP_LAYER_MODE_BEHIND, /*< desc="Behind" >*/
GIMP_LAYER_MODE_MULTIPLY_BROKEN, /*< desc="Multiply" >*/
GIMP_LAYER_MODE_SCREEN_BROKEN, /*< desc="Screen" >*/
GIMP_LAYER_MODE_OVERLAY_BROKEN, /*< desc="Old broken Overlay" >*/
GIMP_LAYER_MODE_DIFFERENCE_BROKEN, /*< desc="Difference" >*/
GIMP_LAYER_MODE_ADDITION_BROKEN, /*< desc="Addition" >*/
GIMP_LAYER_MODE_SUBTRACT_BROKEN, /*< desc="Subtract" >*/
GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN, /*< desc="Darken only" >*/
GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN, /*< desc="Lighten only" >*/
GIMP_LAYER_MODE_HSV_HUE_BROKEN, /*< desc="Hue (HSV)" >*/
GIMP_LAYER_MODE_HSV_SATURATION_BROKEN, /*< desc="Saturation (HSV)" >*/
GIMP_LAYER_MODE_HSV_COLOR_BROKEN, /*< desc="Color (HSV)" >*/
GIMP_LAYER_MODE_HSV_VALUE_BROKEN, /*< desc="Value (HSV)" >*/
GIMP_LAYER_MODE_DIVIDE_BROKEN, /*< desc="Divide" >*/
GIMP_LAYER_MODE_DODGE_BROKEN, /*< desc="Dodge" >*/
GIMP_LAYER_MODE_BURN_BROKEN, /*< desc="Burn" >*/
GIMP_LAYER_MODE_HARDLIGHT_BROKEN, /*< desc="Hard light" >*/
GIMP_LAYER_MODE_SOFTLIGHT_BROKEN, /*< desc="Soft light" >*/
GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN, /*< desc="Grain extract" >*/
GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN, /*< desc="Grain merge" >*/
GIMP_LAYER_MODE_MULTIPLY_LEGACY, /*< desc="Multiply" >*/
GIMP_LAYER_MODE_SCREEN_LEGACY, /*< desc="Screen" >*/
GIMP_LAYER_MODE_OVERLAY_LEGACY, /*< desc="Old broken Overlay" >*/
GIMP_LAYER_MODE_DIFFERENCE_LEGACY, /*< desc="Difference" >*/
GIMP_LAYER_MODE_ADDITION_LEGACY, /*< desc="Addition" >*/
GIMP_LAYER_MODE_SUBTRACT_LEGACY, /*< desc="Subtract" >*/
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY, /*< desc="Darken only" >*/
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY, /*< desc="Lighten only" >*/
GIMP_LAYER_MODE_HSV_HUE_LEGACY, /*< desc="Hue (HSV)" >*/
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY, /*< desc="Saturation (HSV)" >*/
GIMP_LAYER_MODE_HSV_COLOR_LEGACY, /*< desc="Color (HSV)" >*/
GIMP_LAYER_MODE_HSV_VALUE_LEGACY, /*< desc="Value (HSV)" >*/
GIMP_LAYER_MODE_DIVIDE_LEGACY, /*< desc="Divide" >*/
GIMP_LAYER_MODE_DODGE_LEGACY, /*< desc="Dodge" >*/
GIMP_LAYER_MODE_BURN_LEGACY, /*< desc="Burn" >*/
GIMP_LAYER_MODE_HARDLIGHT_LEGACY, /*< desc="Hard light" >*/
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY, /*< desc="Soft light" >*/
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY, /*< desc="Grain extract" >*/
GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY, /*< desc="Grain merge" >*/
GIMP_LAYER_MODE_COLOR_ERASE, /*< desc="Color erase" >*/
GIMP_LAYER_MODE_OVERLAY, /*< desc="Overlay" >*/
GIMP_LAYER_MODE_LCH_HUE, /*< desc="Hue (LCH)" >*/
......
......@@ -1347,9 +1347,9 @@ gimp_context_deserialize (GimpConfig *config,
if (context->paint_mode != old_paint_mode)
{
if (context->paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
if (context->paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
g_object_set (context,
"paint-mode", GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
"paint-mode", GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
NULL);
}
......
......@@ -2394,9 +2394,9 @@ gimp_image_get_xcf_version (GimpImage *image,
switch (gimp_layer_get_mode (layer))
{
/* new layer modes not supported by gimp-1.2 */
case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
case GIMP_LAYER_MODE_COLOR_ERASE:
version = MAX (2, version);
break;
......
......@@ -162,79 +162,79 @@ gimp_gegl_mode_node_set_mode (GeglNode *node,
operation = "gimp:behind-mode";
break;
case GIMP_LAYER_MODE_MULTIPLY_BROKEN:
case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
operation = "gimp:multiply-mode";
break;
case GIMP_LAYER_MODE_SCREEN_BROKEN:
case GIMP_LAYER_MODE_SCREEN_LEGACY:
operation = "gimp:screen-mode";
break;
case GIMP_LAYER_MODE_OVERLAY_BROKEN:
case GIMP_LAYER_MODE_OVERLAY_LEGACY:
operation = "gimp:softlight-mode";
break;
case GIMP_LAYER_MODE_DIFFERENCE_BROKEN:
case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
operation = "gimp:difference-mode";
break;
case GIMP_LAYER_MODE_ADDITION_BROKEN:
case GIMP_LAYER_MODE_ADDITION_LEGACY:
operation = "gimp:addition-mode";
break;
case GIMP_LAYER_MODE_SUBTRACT_BROKEN:
case GIMP_LAYER_MODE_SUBTRACT_LEGACY:
operation = "gimp:subtract-mode";
break;
case GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN:
case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
operation = "gimp:darken-only-mode";
break;
case GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN:
case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
operation = "gimp:lighten-only-mode";
break;
case GIMP_LAYER_MODE_HSV_HUE_BROKEN:
case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
operation = "gimp:hue-mode";
break;
case GIMP_LAYER_MODE_HSV_SATURATION_BROKEN:
case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
operation = "gimp:saturation-mode";
break;
case GIMP_LAYER_MODE_HSV_COLOR_BROKEN:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
operation = "gimp:color-mode";
break;
case GIMP_LAYER_MODE_HSV_VALUE_BROKEN:
case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
operation = "gimp:value-mode";
break;
case GIMP_LAYER_MODE_DIVIDE_BROKEN:
case GIMP_LAYER_MODE_DIVIDE_LEGACY:
operation = "gimp:divide-mode";
break;
case GIMP_LAYER_MODE_DODGE_BROKEN:
case GIMP_LAYER_MODE_DODGE_LEGACY:
operation = "gimp:dodge-mode";
break;
case GIMP_LAYER_MODE_BURN_BROKEN:
case GIMP_LAYER_MODE_BURN_LEGACY:
operation = "gimp:burn-mode";
break;
case GIMP_LAYER_MODE_HARDLIGHT_BROKEN:
case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
operation = "gimp:hardlight-mode";
break;
case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
operation = "gimp:softlight-mode";
break;
case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
operation = "gimp:grain-extract-mode";
break;
case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
operation = "gimp:grain-merge-mode";
break;
......
......@@ -78,79 +78,79 @@ get_layer_mode_function (GimpLayerMode paint_mode,
func = gimp_operation_behind_mode_process_pixels;
break;
case GIMP_LAYER_MODE_MULTIPLY_BROKEN:
case GIMP_LAYER_MODE_MULTIPLY_LEGACY:
func = gimp_operation_multiply_mode_process_pixels;
break;
case GIMP_LAYER_MODE_SCREEN_BROKEN:
case GIMP_LAYER_MODE_SCREEN_LEGACY:
func = gimp_operation_screen_mode_process_pixels;
break;
case GIMP_LAYER_MODE_OVERLAY_BROKEN:
case GIMP_LAYER_MODE_OVERLAY_LEGACY:
func = gimp_operation_softlight_mode_process_pixels;
break;
case GIMP_LAYER_MODE_DIFFERENCE_BROKEN:
case GIMP_LAYER_MODE_DIFFERENCE_LEGACY:
func = gimp_operation_difference_mode_process_pixels;
break;
case GIMP_LAYER_MODE_ADDITION_BROKEN:
case GIMP_LAYER_MODE_ADDITION_LEGACY:
func = gimp_operation_addition_mode_process_pixels;
break;
case GIMP_LAYER_MODE_SUBTRACT_BROKEN:
case GIMP_LAYER_MODE_SUBTRACT_LEGACY:
func = gimp_operation_subtract_mode_process_pixels;
break;
case GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN:
case GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY:
func = gimp_operation_darken_only_mode_process_pixels;
break;
case GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN:
case GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY:
func = gimp_operation_lighten_only_mode_process_pixels;
break;
case GIMP_LAYER_MODE_HSV_HUE_BROKEN:
case GIMP_LAYER_MODE_HSV_HUE_LEGACY:
func = gimp_operation_hue_mode_process_pixels;
break;
case GIMP_LAYER_MODE_HSV_SATURATION_BROKEN:
case GIMP_LAYER_MODE_HSV_SATURATION_LEGACY:
func = gimp_operation_saturation_mode_process_pixels;
break;
case GIMP_LAYER_MODE_HSV_COLOR_BROKEN:
case GIMP_LAYER_MODE_HSV_COLOR_LEGACY:
func = gimp_operation_color_mode_process_pixels;
break;
case GIMP_LAYER_MODE_HSV_VALUE_BROKEN:
case GIMP_LAYER_MODE_HSV_VALUE_LEGACY:
func = gimp_operation_value_mode_process_pixels;
break;
case GIMP_LAYER_MODE_DIVIDE_BROKEN:
case GIMP_LAYER_MODE_DIVIDE_LEGACY:
func = gimp_operation_divide_mode_process_pixels;
break;
case GIMP_LAYER_MODE_DODGE_BROKEN:
case GIMP_LAYER_MODE_DODGE_LEGACY:
func = gimp_operation_dodge_mode_process_pixels;
break;
case GIMP_LAYER_MODE_BURN_BROKEN:
case GIMP_LAYER_MODE_BURN_LEGACY:
func = gimp_operation_burn_mode_process_pixels;
break;
case GIMP_LAYER_MODE_HARDLIGHT_BROKEN:
case GIMP_LAYER_MODE_HARDLIGHT_LEGACY:
func = gimp_operation_hardlight_mode_process_pixels;
break;
case GIMP_LAYER_MODE_SOFTLIGHT_BROKEN:
case GIMP_LAYER_MODE_SOFTLIGHT_LEGACY:
func = gimp_operation_softlight_mode_process_pixels;
break;
case GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN:
case GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY:
func = gimp_operation_grain_extract_mode_process_pixels;
break;
case GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN:
case GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY:
func = gimp_operation_grain_merge_mode_process_pixels;
break;
......
......@@ -61,8 +61,8 @@ brushes_popup_invoker (GimpProcedure *procedure,
if (success)
{
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (gimp->no_interface ||
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
......@@ -129,8 +129,8 @@ brushes_set_popup_invoker (GimpProcedure *procedure,
if (success)
{
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (gimp->no_interface ||
! gimp_pdb_lookup_procedure (gimp->pdb, brush_callback) ||
......
......@@ -207,8 +207,8 @@ brushes_get_brush_data_invoker (GimpProcedure *procedure,
{
GimpBrush *brush;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (name && strlen (name))
brush = gimp_pdb_get_brush (gimp, name, FALSE, error);
......
......@@ -419,8 +419,8 @@ context_set_paint_mode_invoker (GimpProcedure *procedure,
if (success)
{
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_paint_mode (context, paint_mode);
}
......
......@@ -621,8 +621,8 @@ edit_bucket_fill_invoker (GimpProcedure *procedure,
if (gimp_fill_options_set_by_fill_mode (options, context,
fill_mode, error))
{
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
......@@ -698,8 +698,8 @@ edit_bucket_fill_full_invoker (GimpProcedure *procedure,
if (gimp_fill_options_set_by_fill_mode (options, context,
fill_mode, error))
{
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_context_set_opacity (GIMP_CONTEXT (options), opacity / 100.0);
gimp_context_set_paint_mode (GIMP_CONTEXT (options), paint_mode);
......@@ -794,8 +794,8 @@ edit_blend_invoker (GimpProcedure *procedure,
{
GimpGradient *gradient;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (paint_mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
paint_mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
if (progress)
gimp_progress_start (progress, FALSE, _("Blending"));
......
......@@ -88,8 +88,8 @@ layer_new_invoker (GimpProcedure *procedure,
gboolean has_alpha = FALSE;
const Babl *format;
if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
switch (type)
{
......@@ -1140,8 +1140,8 @@ layer_set_mode_invoker (GimpProcedure *procedure,
if (success)
{
if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_layer_set_mode (layer, mode, TRUE);
}
......
......@@ -75,7 +75,7 @@
#define GIMP_MAINIMAGE_LAYER2_HEIGHT 251
#define GIMP_MAINIMAGE_LAYER2_FORMAT babl_format ("R'G'B' u8")
#define GIMP_MAINIMAGE_LAYER2_OPACITY GIMP_OPACITY_TRANSPARENT
#define GIMP_MAINIMAGE_LAYER2_MODE GIMP_LAYER_MODE_MULTIPLY_BROKEN
#define GIMP_MAINIMAGE_LAYER2_MODE GIMP_LAYER_MODE_MULTIPLY_LEGACY
#define GIMP_MAINIMAGE_GROUP1_NAME "group1"
......
......@@ -108,29 +108,29 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
GIMP_LAYER_MODE_SCREEN_BROKEN,
GIMP_LAYER_MODE_DODGE_BROKEN,
GIMP_LAYER_MODE_ADDITION_BROKEN,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
GIMP_LAYER_MODE_SCREEN_LEGACY,
GIMP_LAYER_MODE_DODGE_LEGACY,
GIMP_LAYER_MODE_ADDITION_LEGACY,
GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
GIMP_LAYER_MODE_MULTIPLY_BROKEN,
GIMP_LAYER_MODE_BURN_BROKEN,
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
GIMP_LAYER_MODE_MULTIPLY_LEGACY,
GIMP_LAYER_MODE_BURN_LEGACY,
GIMP_LAYER_MODE_OVERLAY,
GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
GIMP_LAYER_MODE_SUBTRACT_BROKEN,
GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
GIMP_LAYER_MODE_DIVIDE_BROKEN,
GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
GIMP_LAYER_MODE_SUBTRACT_LEGACY,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
GIMP_LAYER_MODE_DIVIDE_LEGACY,
GIMP_LAYER_MODE_HSV_HUE_BROKEN,
GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
GIMP_LAYER_MODE_HSV_HUE_LEGACY,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_LCH_HUE,
GIMP_LAYER_MODE_LCH_CHROMA,
......@@ -141,19 +141,19 @@ gimp_paint_mode_menu_new (gboolean with_behind_mode,
GIMP_LAYER_MODE_DISSOLVE, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
GIMP_LAYER_MODE_ADDITION_BROKEN, -1);
GIMP_LAYER_MODE_ADDITION_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
GIMP_LAYER_MODE_BURN_BROKEN, -1);
GIMP_LAYER_MODE_BURN_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
GIMP_LAYER_MODE_HARDLIGHT_BROKEN, -1);
GIMP_LAYER_MODE_HARDLIGHT_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
GIMP_LAYER_MODE_DIVIDE_BROKEN, -1);
GIMP_LAYER_MODE_DIVIDE_LEGACY, -1);
gimp_int_store_insert_separator_after (GIMP_INT_STORE (store),
GIMP_LAYER_MODE_HSV_VALUE_BROKEN, -1);
GIMP_LAYER_MODE_HSV_VALUE_LEGACY, -1);
if (with_behind_mode)
{
......
......@@ -1093,8 +1093,8 @@ xcf_load_layer_props (XcfInfo *info,
info->cp += xcf_read_int32 (info->input, &mode, 1);
if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
gimp_layer_set_mode (*layer, (GimpLayerMode) mode, FALSE);
}
......
......@@ -726,8 +726,8 @@ xcf_save_prop (XcfInfo *info,
mode = va_arg (args, gint32);
size = 4;
if (mode == GIMP_LAYER_MODE_OVERLAY_BROKEN)
mode = GIMP_LAYER_MODE_SOFTLIGHT_BROKEN;
if (mode == GIMP_LAYER_MODE_OVERLAY_LEGACY)
mode = GIMP_LAYER_MODE_SOFTLIGHT_LEGACY;
xcf_write_prop_type_check_error (info, prop_type);
xcf_write_int32_check_error (info, &size, 1);
......
......@@ -72,25 +72,25 @@ typedef enum
GIMP_LAYER_MODE_NORMAL,
GIMP_LAYER_MODE_DISSOLVE,
GIMP_LAYER_MODE_BEHIND,
GIMP_LAYER_MODE_MULTIPLY_BROKEN,
GIMP_LAYER_MODE_SCREEN_BROKEN,
GIMP_LAYER_MODE_OVERLAY_BROKEN,
GIMP_LAYER_MODE_DIFFERENCE_BROKEN,
GIMP_LAYER_MODE_ADDITION_BROKEN,
GIMP_LAYER_MODE_SUBTRACT_BROKEN,
GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN,
GIMP_LAYER_MODE_LIGHTEN_ONLY_BROKEN,
GIMP_LAYER_MODE_HSV_HUE_BROKEN,
GIMP_LAYER_MODE_HSV_SATURATION_BROKEN,
GIMP_LAYER_MODE_HSV_COLOR_BROKEN,
GIMP_LAYER_MODE_HSV_VALUE_BROKEN,
GIMP_LAYER_MODE_DIVIDE_BROKEN,
GIMP_LAYER_MODE_DODGE_BROKEN,
GIMP_LAYER_MODE_BURN_BROKEN,
GIMP_LAYER_MODE_HARDLIGHT_BROKEN,
GIMP_LAYER_MODE_SOFTLIGHT_BROKEN,
GIMP_LAYER_MODE_GRAIN_EXTRACT_BROKEN,
GIMP_LAYER_MODE_GRAIN_MERGE_BROKEN,
GIMP_LAYER_MODE_MULTIPLY_LEGACY,
GIMP_LAYER_MODE_SCREEN_LEGACY,
GIMP_LAYER_MODE_OVERLAY_LEGACY,
GIMP_LAYER_MODE_DIFFERENCE_LEGACY,
GIMP_LAYER_MODE_ADDITION_LEGACY,
GIMP_LAYER_MODE_SUBTRACT_LEGACY,
GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY,
GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY,
GIMP_LAYER_MODE_HSV_HUE_LEGACY,
GIMP_LAYER_MODE_HSV_SATURATION_LEGACY,
GIMP_LAYER_MODE_HSV_COLOR_LEGACY,
GIMP_LAYER_MODE_HSV_VALUE_LEGACY,
GIMP_LAYER_MODE_DIVIDE_LEGACY,
GIMP_LAYER_MODE_DODGE_LEGACY,
GIMP_LAYER_MODE_BURN_LEGACY,
GIMP_LAYER_MODE_HARDLIGHT_LEGACY,
GIMP_LAYER_MODE_SOFTLIGHT_LEGACY,
GIMP_LAYER_MODE_GRAIN_EXTRACT_LEGACY,
GIMP_LAYER_MODE_GRAIN_MERGE_LEGACY,
GIMP_LAYER_MODE_COLOR_ERASE,
GIMP_LAYER_MODE_OVERLAY,
GIMP_LAYER_MODE_LCH_HUE,
......
......@@ -995,28 +995,28 @@ gimp_layer_mode_from_psp_blend_mode (PSPBlendModes mode)
return GIMP_LAYER_MODE_NORMAL;
case PSP_BLEND_DARKEN:
return GIMP_LAYER_MODE_DARKEN_ONLY_BROKEN;
return GIMP_LAYER_MODE_DARKEN_ONLY_LEGACY;