[gimp] app, pdb: change a lot of GIMP_LAYER_MODE_NORMAL_LEGACY to just NORMAL
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp] app, pdb: change a lot of GIMP_LAYER_MODE_NORMAL_LEGACY to just NORMAL
- Date: Sat, 19 Aug 2017 18:36:08 +0000 (UTC)
commit 0cfe5506398d17d95f03d9a95af3a17cec62a2c5
Author: Michael Natterer <mitch gimp org>
Date: Sat Aug 19 20:33:47 2017 +0200
app, pdb: change a lot of GIMP_LAYER_MODE_NORMAL_LEGACY to just NORMAL
this commit changes just those which make no difference to
functionality: property and object member defaults that get overridden
anyway, return values of g_return_val_if_fail(), some other stuff.
app/core/gimp-utils.c | 2 +-
app/core/gimplayer.c | 6 +++---
app/gegl/gimpapplicator.c | 2 +-
.../layer-modes/gimpoperationlayermode.c | 2 +-
app/pdb/brush-select-cmds.c | 4 ++--
app/pdb/brushes-cmds.c | 2 +-
app/pdb/context-cmds.c | 4 ++--
app/pdb/edit-cmds.c | 6 +++---
app/pdb/layer-cmds.c | 6 +++---
app/widgets/gimpbrushselect.c | 2 +-
app/widgets/gimplayermodebox.c | 4 ++--
app/widgets/gimplayermodecombobox.c | 4 ++--
app/xcf/xcf-load.c | 2 +-
libgimp/gimpimagemetadata.c | 2 +-
tools/pdbgen/pdb/brush_select.pdb | 2 ++
tools/pdbgen/pdb/brushes.pdb | 1 +
tools/pdbgen/pdb/context.pdb | 2 ++
tools/pdbgen/pdb/edit.pdb | 3 +++
tools/pdbgen/pdb/layer.pdb | 3 +++
19 files changed, 35 insertions(+), 24 deletions(-)
---
diff --git a/app/core/gimp-utils.c b/app/core/gimp-utils.c
index e5bbd9a..ba2f9c0 100644
--- a/app/core/gimp-utils.c
+++ b/app/core/gimp-utils.c
@@ -868,7 +868,7 @@ gimp_create_image_from_buffer (Gimp *gimp,
layer = gimp_layer_new_from_gegl_buffer (buffer, image, format,
image_name,
GIMP_OPACITY_OPAQUE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
NULL /* same image */);
gimp_image_add_layer (image, layer, NULL, -1, FALSE);
diff --git a/app/core/gimplayer.c b/app/core/gimplayer.c
index a9b97b9..4a55036 100644
--- a/app/core/gimplayer.c
+++ b/app/core/gimplayer.c
@@ -468,7 +468,7 @@ gimp_layer_class_init (GimpLayerClass *klass)
g_object_class_install_property (object_class, PROP_MODE,
g_param_spec_enum ("mode", NULL, NULL,
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READABLE));
g_object_class_install_property (object_class, PROP_BLEND_SPACE,
@@ -521,7 +521,7 @@ static void
gimp_layer_init (GimpLayer *layer)
{
layer->opacity = GIMP_OPACITY_OPAQUE;
- layer->mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
+ layer->mode = GIMP_LAYER_MODE_NORMAL;
layer->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
layer->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
layer->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
@@ -2381,7 +2381,7 @@ gimp_layer_set_mode (GimpLayer *layer,
GimpLayerMode
gimp_layer_get_mode (GimpLayer *layer)
{
- g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_MODE_NORMAL_LEGACY);
+ g_return_val_if_fail (GIMP_IS_LAYER (layer), GIMP_LAYER_MODE_NORMAL);
return layer->mode;
}
diff --git a/app/gegl/gimpapplicator.c b/app/gegl/gimpapplicator.c
index 2eec05a..bc0e218 100644
--- a/app/gegl/gimpapplicator.c
+++ b/app/gegl/gimpapplicator.c
@@ -58,7 +58,7 @@ static void
gimp_applicator_init (GimpApplicator *applicator)
{
applicator->opacity = 1.0;
- applicator->paint_mode = GIMP_LAYER_MODE_NORMAL_LEGACY;
+ applicator->paint_mode = GIMP_LAYER_MODE_NORMAL;
applicator->blend_space = GIMP_LAYER_COLOR_SPACE_AUTO;
applicator->composite_space = GIMP_LAYER_COLOR_SPACE_AUTO;
applicator->composite_mode = GIMP_LAYER_COMPOSITE_AUTO;
diff --git a/app/operations/layer-modes/gimpoperationlayermode.c
b/app/operations/layer-modes/gimpoperationlayermode.c
index 68d4eb6..f2998ff 100644
--- a/app/operations/layer-modes/gimpoperationlayermode.c
+++ b/app/operations/layer-modes/gimpoperationlayermode.c
@@ -156,7 +156,7 @@ gimp_operation_layer_mode_class_init (GimpOperationLayerModeClass *klass)
g_param_spec_enum ("layer-mode",
NULL, NULL,
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
diff --git a/app/pdb/brush-select-cmds.c b/app/pdb/brush-select-cmds.c
index 7ad5317..86bd7ae 100644
--- a/app/pdb/brush-select-cmds.c
+++ b/app/pdb/brush-select-cmds.c
@@ -204,7 +204,7 @@ register_brush_select_procs (GimpPDB *pdb)
"paint mode",
"The initial paint mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
@@ -278,7 +278,7 @@ register_brush_select_procs (GimpPDB *pdb)
"paint mode",
"The initial paint mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
diff --git a/app/pdb/brushes-cmds.c b/app/pdb/brushes-cmds.c
index 281b29e..e03c898 100644
--- a/app/pdb/brushes-cmds.c
+++ b/app/pdb/brushes-cmds.c
@@ -440,7 +440,7 @@ register_brushes_procs (GimpPDB *pdb)
"paint mode",
"The paint mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_int32 ("width",
diff --git a/app/pdb/context-cmds.c b/app/pdb/context-cmds.c
index 0482d0f..89b25dd 100644
--- a/app/pdb/context-cmds.c
+++ b/app/pdb/context-cmds.c
@@ -3139,7 +3139,7 @@ register_context_procs (GimpPDB *pdb)
"paint mode",
"The paint mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
@@ -3163,7 +3163,7 @@ register_context_procs (GimpPDB *pdb)
"paint mode",
"The paint mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
diff --git a/app/pdb/edit-cmds.c b/app/pdb/edit-cmds.c
index 44282fe..97e5c9a 100644
--- a/app/pdb/edit-cmds.c
+++ b/app/pdb/edit-cmds.c
@@ -1345,7 +1345,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode",
"The paint application mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity",
@@ -1412,7 +1412,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode",
"The paint application mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_double ("opacity",
@@ -1492,7 +1492,7 @@ register_edit_procs (GimpPDB *pdb)
"paint mode",
"The paint application mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_argument (procedure,
g_param_spec_enum ("gradient-type",
diff --git a/app/pdb/layer-cmds.c b/app/pdb/layer-cmds.c
index 3d095e8..cc50805 100644
--- a/app/pdb/layer-cmds.c
+++ b/app/pdb/layer-cmds.c
@@ -1384,7 +1384,7 @@ register_layer_procs (GimpPDB *pdb)
"mode",
"The layer combination mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_procedure_add_return_value (procedure,
gimp_param_spec_layer_id ("layer",
@@ -2320,7 +2320,7 @@ register_layer_procs (GimpPDB *pdb)
"mode",
"The layer combination mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
@@ -2350,7 +2350,7 @@ register_layer_procs (GimpPDB *pdb)
"mode",
"The new layer combination mode",
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE));
gimp_pdb_register_procedure (pdb, procedure);
g_object_unref (procedure);
diff --git a/app/widgets/gimpbrushselect.c b/app/widgets/gimpbrushselect.c
index 71c2718..e15168f 100644
--- a/app/widgets/gimpbrushselect.c
+++ b/app/widgets/gimpbrushselect.c
@@ -105,7 +105,7 @@ gimp_brush_select_class_init (GimpBrushSelectClass *klass)
g_object_class_install_property (object_class, PROP_PAINT_MODE,
g_param_spec_enum ("paint-mode", NULL, NULL,
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_WRITABLE |
G_PARAM_CONSTRUCT));
diff --git a/app/widgets/gimplayermodebox.c b/app/widgets/gimplayermodebox.c
index bea5d15..a467632 100644
--- a/app/widgets/gimplayermodebox.c
+++ b/app/widgets/gimplayermodebox.c
@@ -101,7 +101,7 @@ gimp_layer_mode_box_class_init (GimpLayerModeBoxClass *klass)
g_param_spec_enum ("layer-mode",
NULL, NULL,
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
@@ -290,7 +290,7 @@ GimpLayerMode
gimp_layer_mode_box_get_mode (GimpLayerModeBox *box)
{
g_return_val_if_fail (GIMP_IS_LAYER_MODE_BOX (box),
- GIMP_LAYER_MODE_NORMAL_LEGACY);
+ GIMP_LAYER_MODE_NORMAL);
return box->priv->layer_mode;
}
diff --git a/app/widgets/gimplayermodecombobox.c b/app/widgets/gimplayermodecombobox.c
index d2dc279..2a829f7 100644
--- a/app/widgets/gimplayermodecombobox.c
+++ b/app/widgets/gimplayermodecombobox.c
@@ -108,7 +108,7 @@ gimp_layer_mode_combo_box_class_init (GimpLayerModeComboBoxClass *klass)
g_param_spec_enum ("layer-mode",
NULL, NULL,
GIMP_TYPE_LAYER_MODE,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
GIMP_PARAM_READWRITE |
G_PARAM_CONSTRUCT));
@@ -297,7 +297,7 @@ GimpLayerMode
gimp_layer_mode_combo_box_get_mode (GimpLayerModeComboBox *combo)
{
g_return_val_if_fail (GIMP_IS_LAYER_MODE_COMBO_BOX (combo),
- GIMP_LAYER_MODE_NORMAL_LEGACY);
+ GIMP_LAYER_MODE_NORMAL);
return combo->priv->layer_mode;
}
diff --git a/app/xcf/xcf-load.c b/app/xcf/xcf-load.c
index fc0b4e0..846648e 100644
--- a/app/xcf/xcf-load.c
+++ b/app/xcf/xcf-load.c
@@ -1628,7 +1628,7 @@ xcf_load_layer (XcfInfo *info,
/* create a new layer */
layer = gimp_layer_new (image, width, height,
- format, name, 255, GIMP_LAYER_MODE_NORMAL_LEGACY);
+ format, name, 255, GIMP_LAYER_MODE_NORMAL);
g_free (name);
if (! layer)
return NULL;
diff --git a/libgimp/gimpimagemetadata.c b/libgimp/gimpimagemetadata.c
index e487eec..858ce51 100644
--- a/libgimp/gimpimagemetadata.c
+++ b/libgimp/gimpimagemetadata.c
@@ -661,7 +661,7 @@ gimp_image_metadata_load_thumbnail (GFile *file,
layer_ID = gimp_layer_new_from_pixbuf (image_ID, _("Background"),
pixbuf,
100.0,
- GIMP_LAYER_MODE_NORMAL_LEGACY,
+ GIMP_LAYER_MODE_NORMAL,
0.0, 0.0);
g_object_unref (pixbuf);
diff --git a/tools/pdbgen/pdb/brush_select.pdb b/tools/pdbgen/pdb/brush_select.pdb
index 0f14220..a3acedb 100644
--- a/tools/pdbgen/pdb/brush_select.pdb
+++ b/tools/pdbgen/pdb/brush_select.pdb
@@ -36,6 +36,7 @@ sub brushes_popup {
desc => 'The initial spacing of the brush (if < 0 then use brush
default spacing)' },
{ name => 'paint_mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The initial paint mode' }
);
@@ -101,6 +102,7 @@ sub brushes_set_popup {
desc => 'The initial spacing of the brush (if < 0 then use brush
default spacing)' },
{ name => 'paint_mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The initial paint mode' }
);
diff --git a/tools/pdbgen/pdb/brushes.pdb b/tools/pdbgen/pdb/brushes.pdb
index e3553c4..4c5231c 100644
--- a/tools/pdbgen/pdb/brushes.pdb
+++ b/tools/pdbgen/pdb/brushes.pdb
@@ -157,6 +157,7 @@ sub brushes_get_brush_data {
{ name => 'spacing', type => '0 <= int32 <= 1000',
desc => 'The brush spacing' },
{ name => 'paint_mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The paint mode' },
{ name => 'width', type => 'int32',
desc => 'The brush width' },
diff --git a/tools/pdbgen/pdb/context.pdb b/tools/pdbgen/pdb/context.pdb
index 60c2492..290e591 100644
--- a/tools/pdbgen/pdb/context.pdb
+++ b/tools/pdbgen/pdb/context.pdb
@@ -447,6 +447,7 @@ HELP
@outargs = (
{ name => 'paint_mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The paint mode' }
);
@@ -470,6 +471,7 @@ HELP
@inargs = (
{ name => 'paint_mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The paint mode' }
);
diff --git a/tools/pdbgen/pdb/edit.pdb b/tools/pdbgen/pdb/edit.pdb
index 9999399..06ac9ad 100644
--- a/tools/pdbgen/pdb/edit.pdb
+++ b/tools/pdbgen/pdb/edit.pdb
@@ -622,6 +622,7 @@ HELP
{ name => 'fill_mode', type => 'enum GimpBucketFillMode',
desc => 'The type of fill' },
{ name => paint_mode, type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The paint application mode' },
{ name => 'opacity', type => '0 <= float <= 100',
desc => 'The opacity of the final bucket fill' },
@@ -719,6 +720,7 @@ HELP
{ name => 'fill_mode', type => 'enum GimpBucketFillMode',
desc => 'The type of fill' },
{ name => paint_mode, type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The paint application mode' },
{ name => 'opacity', type => '0 <= float <= 100',
desc => 'The opacity of the final bucket fill' },
@@ -816,6 +818,7 @@ HELP
{ name => 'blend_mode', type => 'enum GimpBlendMode',
desc => 'The type of blend' },
{ name => 'paint_mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The paint application mode' },
{ name => 'gradient_type', type => 'enum GimpGradientType',
desc => 'The type of gradient' },
diff --git a/tools/pdbgen/pdb/layer.pdb b/tools/pdbgen/pdb/layer.pdb
index 78a1355..a32c6b4 100644
--- a/tools/pdbgen/pdb/layer.pdb
+++ b/tools/pdbgen/pdb/layer.pdb
@@ -44,6 +44,7 @@ HELP
{ name => 'opacity', type => '0 <= float <= 100',
desc => 'The layer opacity' },
{ name => 'mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The layer combination mode' }
);
@@ -1161,6 +1162,7 @@ sub layer_get_mode {
@outargs = (
{ name => 'mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The layer combination mode' }
);
@@ -1183,6 +1185,7 @@ sub layer_set_mode {
{ name => 'layer', type => 'layer',
desc => 'The layer' },
{ name => 'mode', type => 'enum GimpLayerMode',
+ default => 'GIMP_LAYER_MODE_NORMAL',
desc => 'The new layer combination mode' }
);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
