diff --git a/app/text/text-enums.c b/app/text/text-enums.c index 698176cb25..f3eeb021f0 100644 --- a/app/text/text-enums.c +++ b/app/text/text-enums.c @@ -38,68 +38,6 @@ gimp_text_box_mode_get_type (void) return type; } -GType -gimp_text_outline_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_TEXT_OUTLINE_NONE, "GIMP_TEXT_OUTLINE_NONE", "none" }, - { GIMP_TEXT_OUTLINE_STROKE_ONLY, "GIMP_TEXT_OUTLINE_STROKE_ONLY", "stroke-only" }, - { GIMP_TEXT_OUTLINE_STROKE_FILL, "GIMP_TEXT_OUTLINE_STROKE_FILL", "stroke-fill" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_TEXT_OUTLINE_NONE, NC_("text-outline", "Filled"), NULL }, - { GIMP_TEXT_OUTLINE_STROKE_ONLY, NC_("text-outline", "Outlined"), NULL }, - { GIMP_TEXT_OUTLINE_STROKE_FILL, NC_("text-outline", "Outlined and filled"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (G_UNLIKELY (! type)) - { - type = g_enum_register_static ("GimpTextOutline", values); - gimp_type_set_translation_context (type, "text-outline"); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_text_outline_direction_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_TEXT_OUTLINE_DIRECTION_OUTER, "GIMP_TEXT_OUTLINE_DIRECTION_OUTER", "outer" }, - { GIMP_TEXT_OUTLINE_DIRECTION_INNER, "GIMP_TEXT_OUTLINE_DIRECTION_INNER", "inner" }, - { GIMP_TEXT_OUTLINE_DIRECTION_CENTERED, "GIMP_TEXT_OUTLINE_DIRECTION_CENTERED", "centered" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_TEXT_OUTLINE_DIRECTION_OUTER, NC_("text-outline-direction", "Outer"), NULL }, - { GIMP_TEXT_OUTLINE_DIRECTION_INNER, NC_("text-outline-direction", "Inner"), NULL }, - { GIMP_TEXT_OUTLINE_DIRECTION_CENTERED, NC_("text-outline-direction", "Centered"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (G_UNLIKELY (! type)) - { - type = g_enum_register_static ("GimpTextOutlineDirection", values); - gimp_type_set_translation_context (type, "text-outline-direction"); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - /* Generated data ends here */ diff --git a/app/text/text-enums.h b/app/text/text-enums.h index 8cb431753d..2cfa9e97ff 100644 --- a/app/text/text-enums.h +++ b/app/text/text-enums.h @@ -27,27 +27,3 @@ typedef enum GIMP_TEXT_BOX_DYNAMIC, /*< desc="Dynamic" >*/ GIMP_TEXT_BOX_FIXED /*< desc="Fixed" >*/ } GimpTextBoxMode; - - -#define GIMP_TYPE_TEXT_OUTLINE (gimp_text_outline_get_type ()) - -GType gimp_text_outline_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_TEXT_OUTLINE_NONE, /*< desc="Filled" >*/ - GIMP_TEXT_OUTLINE_STROKE_ONLY, /*< desc="Outlined" >*/ - GIMP_TEXT_OUTLINE_STROKE_FILL /*< desc="Outlined and filled" >*/ -} GimpTextOutline; - - -#define GIMP_TYPE_TEXT_OUTLINE_DIRECTION (gimp_text_outline_direction_get_type ()) - -GType gimp_text_outline_direction_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_TEXT_OUTLINE_DIRECTION_OUTER, /*< desc="Outer" >*/ - GIMP_TEXT_OUTLINE_DIRECTION_INNER, /*< desc="Inner" >*/ - GIMP_TEXT_OUTLINE_DIRECTION_CENTERED /*< desc="Centered" >*/ -} GimpTextOutlineDirection; diff --git a/libgimp/gimpenums.c.tail b/libgimp/gimpenums.c.tail index b1c0aa0e0a..39cf0a3185 100644 --- a/libgimp/gimpenums.c.tail +++ b/libgimp/gimpenums.c.tail @@ -62,6 +62,8 @@ static const GimpGetTypeFunc get_type_funcs[] = gimp_text_direction_get_type, gimp_text_hint_style_get_type, gimp_text_justification_get_type, + gimp_text_outline_get_type, + gimp_text_outline_direction_get_type, gimp_transfer_mode_get_type, gimp_transform_direction_get_type, gimp_transform_resize_get_type, @@ -129,6 +131,8 @@ static const gchar * const type_names[] = "GimpTextDirection", "GimpTextHintStyle", "GimpTextJustification", + "GimpTextOutline", + "GimpTextOutlineDirection", "GimpTransferMode", "GimpTransformDirection", "GimpTransformResize", diff --git a/libgimpbase/gimpbase.def b/libgimpbase/gimpbase.def index ceddf33dd6..454de44291 100644 --- a/libgimpbase/gimpbase.def +++ b/libgimpbase/gimpbase.def @@ -215,6 +215,8 @@ EXPORTS gimp_text_direction_get_type gimp_text_hint_style_get_type gimp_text_justification_get_type + gimp_text_outline_direction_get_type + gimp_text_outline_get_type gimp_transfer_mode_get_type gimp_transform_direction_get_type gimp_transform_resize_get_type diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c index 47d4b4fa3e..520fa74a47 100644 --- a/libgimpbase/gimpbaseenums.c +++ b/libgimpbase/gimpbaseenums.c @@ -1788,6 +1788,70 @@ gimp_text_justification_get_type (void) return type; } +GType +gimp_text_outline_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_TEXT_OUTLINE_NONE, "GIMP_TEXT_OUTLINE_NONE", "none" }, + { GIMP_TEXT_OUTLINE_STROKE_ONLY, "GIMP_TEXT_OUTLINE_STROKE_ONLY", "stroke-only" }, + { GIMP_TEXT_OUTLINE_STROKE_FILL, "GIMP_TEXT_OUTLINE_STROKE_FILL", "stroke-fill" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_TEXT_OUTLINE_NONE, NC_("text-outline", "Filled"), NULL }, + { GIMP_TEXT_OUTLINE_STROKE_ONLY, NC_("text-outline", "Outlined"), NULL }, + { GIMP_TEXT_OUTLINE_STROKE_FILL, NC_("text-outline", "Outlined and filled"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpTextOutline", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_type_set_translation_context (type, "text-outline"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_text_outline_direction_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_TEXT_OUTLINE_DIRECTION_OUTER, "GIMP_TEXT_OUTLINE_DIRECTION_OUTER", "outer" }, + { GIMP_TEXT_OUTLINE_DIRECTION_INNER, "GIMP_TEXT_OUTLINE_DIRECTION_INNER", "inner" }, + { GIMP_TEXT_OUTLINE_DIRECTION_CENTERED, "GIMP_TEXT_OUTLINE_DIRECTION_CENTERED", "centered" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_TEXT_OUTLINE_DIRECTION_OUTER, NC_("text-outline-direction", "Outer"), NULL }, + { GIMP_TEXT_OUTLINE_DIRECTION_INNER, NC_("text-outline-direction", "Inner"), NULL }, + { GIMP_TEXT_OUTLINE_DIRECTION_CENTERED, NC_("text-outline-direction", "Centered"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpTextOutlineDirection", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_type_set_translation_context (type, "text-outline-direction"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_transfer_mode_get_type (void) { diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h index 9b2f0c9921..a3f65b4343 100644 --- a/libgimpbase/gimpbaseenums.h +++ b/libgimpbase/gimpbaseenums.h @@ -1196,6 +1196,43 @@ typedef enum GIMP_TEXT_JUSTIFY_FILL /*< desc="Filled" >*/ } GimpTextJustification; +/** + * GimpTextOutline: + * @GIMP_TEXT_OUTLINE_NONE: Filled + * @GIMP_TEXT_OUTLINE_STROKE_ONLY: Outlined + * @GIMP_TEXT_OUTLINE_STROKE_FILL: Outlined and filled + * + * Settings for text stroke and fill. + **/ +#define GIMP_TYPE_TEXT_OUTLINE (gimp_text_outline_get_type ()) + +GType gimp_text_outline_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_TEXT_OUTLINE_NONE, /*< desc="Filled" >*/ + GIMP_TEXT_OUTLINE_STROKE_ONLY, /*< desc="Outlined" >*/ + GIMP_TEXT_OUTLINE_STROKE_FILL /*< desc="Outlined and filled" >*/ +} GimpTextOutline; + +/** + * GimpTextOutlineDirection: + * @GIMP_TEXT_OUTLINE_DIRECTION_OUTER: Outer + * @GIMP_TEXT_OUTLINE_DIRECTION_INNER: Inner + * @GIMP_TEXT_OUTLINE_DIRECTION_CENTERED: Centered + * + * Options for how the text outline's stroke is drawn. + **/ +#define GIMP_TYPE_TEXT_OUTLINE_DIRECTION (gimp_text_outline_direction_get_type ()) + +GType gimp_text_outline_direction_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_TEXT_OUTLINE_DIRECTION_OUTER, /*< desc="Outer" >*/ + GIMP_TEXT_OUTLINE_DIRECTION_INNER, /*< desc="Inner" >*/ + GIMP_TEXT_OUTLINE_DIRECTION_CENTERED /*< desc="Centered" >*/ +} GimpTextOutlineDirection; /** * GimpTransferMode: diff --git a/pdb/enums.pl b/pdb/enums.pl index fc0c5ceefb..74d0e52324 100644 --- a/pdb/enums.pl +++ b/pdb/enums.pl @@ -581,6 +581,26 @@ package Gimp::CodeGen::enums; GIMP_TEXT_JUSTIFY_CENTER => '2', GIMP_TEXT_JUSTIFY_FILL => '3' } }, + GimpTextOutline => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_TEXT_OUTLINE_NONE + GIMP_TEXT_OUTLINE_STROKE_ONLY + GIMP_TEXT_OUTLINE_STROKE_FILL) ], + mapping => { GIMP_TEXT_OUTLINE_NONE => '0', + GIMP_TEXT_OUTLINE_STROKE_ONLY => '1', + GIMP_TEXT_OUTLINE_STROKE_FILL => '2' } + }, + GimpTextOutlineDirection => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_TEXT_OUTLINE_DIRECTION_OUTER + GIMP_TEXT_OUTLINE_DIRECTION_INNER + GIMP_TEXT_OUTLINE_DIRECTION_CENTERED) ], + mapping => { GIMP_TEXT_OUTLINE_DIRECTION_OUTER => '0', + GIMP_TEXT_OUTLINE_DIRECTION_INNER => '1', + GIMP_TEXT_OUTLINE_DIRECTION_CENTERED => '2' } + }, GimpTransferMode => { contig => 1, header => 'libgimpbase/gimpbaseenums.h',