diff --git a/ChangeLog b/ChangeLog index e1259f07be..15f5915a80 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,13 +1,28 @@ +2005-01-23 Sven Neumann + + * app/core/core-enums.h + * libgimpbase/gimpbaseenums.h: moved enums to libgimpbase (from + app/core and libgimp). The remaining enums in app/core/core-enums.h + need special treatment. + + * app/core/core-enums.c: + * libgimp/gimpenums.h + * libgimpbase/gimpbaseenums.c + * tools/pdbgen/enums.pl: regenerated. + + * libgimpbase/gimpbase.def + * libgimp/gimp.def: updated. + 2005-01-23 Sven Neumann * app/base/base-enums.h * libgimpbase/gimpbaseenums.h: moved GimpInterpolationType and - GimpTransferMode to libgimpbase (from core and libgimp). The + GimpTransferMode to libgimpbase (from app/base and libgimp). The remaining enums in app/base/base-enums.h need special treatment. * app/base/base-enums.c * libgimp/gimpenums.h - * libgimpbase/gimpbaseenums.[ch] + * libgimpbase/gimpbaseenums.c * tools/pdbgen/enums.pl: regenerated. * libgimpbase/gimpbase.def diff --git a/app/core/core-enums.c b/app/core/core-enums.c index 54a0043e1c..6f0794a4b5 100644 --- a/app/core/core-enums.c +++ b/app/core/core-enums.c @@ -8,172 +8,6 @@ #include "gimp-intl.h" /* enumerations from "./core-enums.h" */ -GType -gimp_add_mask_type_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_ADD_WHITE_MASK, "GIMP_ADD_WHITE_MASK", "white-mask" }, - { GIMP_ADD_BLACK_MASK, "GIMP_ADD_BLACK_MASK", "black-mask" }, - { GIMP_ADD_ALPHA_MASK, "GIMP_ADD_ALPHA_MASK", "alpha-mask" }, - { GIMP_ADD_ALPHA_TRANSFER_MASK, "GIMP_ADD_ALPHA_TRANSFER_MASK", "alpha-transfer-mask" }, - { GIMP_ADD_SELECTION_MASK, "GIMP_ADD_SELECTION_MASK", "selection-mask" }, - { GIMP_ADD_COPY_MASK, "GIMP_ADD_COPY_MASK", "copy-mask" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_ADD_WHITE_MASK, N_("_White (full opacity)"), NULL }, - { GIMP_ADD_BLACK_MASK, N_("_Black (full transparency)"), NULL }, - { GIMP_ADD_ALPHA_MASK, N_("Layer's _alpha channel"), NULL }, - { GIMP_ADD_ALPHA_TRANSFER_MASK, N_("_Transfer layer's alpha channel"), NULL }, - { GIMP_ADD_SELECTION_MASK, N_("_Selection"), NULL }, - { GIMP_ADD_COPY_MASK, N_("_Grayscale copy of layer"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpAddMaskType", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_blend_mode_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_FG_BG_RGB_MODE, "GIMP_FG_BG_RGB_MODE", "fg-bg-rgb-mode" }, - { GIMP_FG_BG_HSV_MODE, "GIMP_FG_BG_HSV_MODE", "fg-bg-hsv-mode" }, - { GIMP_FG_TRANSPARENT_MODE, "GIMP_FG_TRANSPARENT_MODE", "fg-transparent-mode" }, - { GIMP_CUSTOM_MODE, "GIMP_CUSTOM_MODE", "custom-mode" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_FG_BG_RGB_MODE, N_("FG to BG (RGB)"), NULL }, - { GIMP_FG_BG_HSV_MODE, N_("FG to BG (HSV)"), NULL }, - { GIMP_FG_TRANSPARENT_MODE, N_("FG to transparent"), NULL }, - { GIMP_CUSTOM_MODE, N_("Custom gradient"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpBlendMode", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_bucket_fill_mode_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_FG_BUCKET_FILL, "GIMP_FG_BUCKET_FILL", "fg-bucket-fill" }, - { GIMP_BG_BUCKET_FILL, "GIMP_BG_BUCKET_FILL", "bg-bucket-fill" }, - { GIMP_PATTERN_BUCKET_FILL, "GIMP_PATTERN_BUCKET_FILL", "pattern-bucket-fill" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_FG_BUCKET_FILL, N_("FG color fill"), NULL }, - { GIMP_BG_BUCKET_FILL, N_("BG color fill"), NULL }, - { GIMP_PATTERN_BUCKET_FILL, N_("Pattern fill"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpBucketFillMode", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_channel_ops_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_CHANNEL_OP_ADD, "GIMP_CHANNEL_OP_ADD", "add" }, - { GIMP_CHANNEL_OP_SUBTRACT, "GIMP_CHANNEL_OP_SUBTRACT", "subtract" }, - { GIMP_CHANNEL_OP_REPLACE, "GIMP_CHANNEL_OP_REPLACE", "replace" }, - { GIMP_CHANNEL_OP_INTERSECT, "GIMP_CHANNEL_OP_INTERSECT", "intersect" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_CHANNEL_OP_ADD, N_("Add to the current selection"), NULL }, - { GIMP_CHANNEL_OP_SUBTRACT, N_("Subtract from the current selection"), NULL }, - { GIMP_CHANNEL_OP_REPLACE, N_("Replace the current selection"), NULL }, - { GIMP_CHANNEL_OP_INTERSECT, N_("Intersect with the current selection"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpChannelOps", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_channel_type_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_RED_CHANNEL, "GIMP_RED_CHANNEL", "red-channel" }, - { GIMP_GREEN_CHANNEL, "GIMP_GREEN_CHANNEL", "green-channel" }, - { GIMP_BLUE_CHANNEL, "GIMP_BLUE_CHANNEL", "blue-channel" }, - { GIMP_GRAY_CHANNEL, "GIMP_GRAY_CHANNEL", "gray-channel" }, - { GIMP_INDEXED_CHANNEL, "GIMP_INDEXED_CHANNEL", "indexed-channel" }, - { GIMP_ALPHA_CHANNEL, "GIMP_ALPHA_CHANNEL", "alpha-channel" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_RED_CHANNEL, N_("Red"), NULL }, - { GIMP_GREEN_CHANNEL, N_("Green"), NULL }, - { GIMP_BLUE_CHANNEL, N_("Blue"), NULL }, - { GIMP_GRAY_CHANNEL, N_("Gray"), NULL }, - { GIMP_INDEXED_CHANNEL, N_("Indexed"), NULL }, - { GIMP_ALPHA_CHANNEL, N_("Alpha"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpChannelType", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_container_policy_get_type (void) { @@ -346,52 +180,6 @@ gimp_fill_type_get_type (void) return type; } -GType -gimp_gradient_type_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_GRADIENT_LINEAR, "GIMP_GRADIENT_LINEAR", "linear" }, - { GIMP_GRADIENT_BILINEAR, "GIMP_GRADIENT_BILINEAR", "bilinear" }, - { GIMP_GRADIENT_RADIAL, "GIMP_GRADIENT_RADIAL", "radial" }, - { GIMP_GRADIENT_SQUARE, "GIMP_GRADIENT_SQUARE", "square" }, - { GIMP_GRADIENT_CONICAL_SYMMETRIC, "GIMP_GRADIENT_CONICAL_SYMMETRIC", "conical-symmetric" }, - { GIMP_GRADIENT_CONICAL_ASYMMETRIC, "GIMP_GRADIENT_CONICAL_ASYMMETRIC", "conical-asymmetric" }, - { GIMP_GRADIENT_SHAPEBURST_ANGULAR, "GIMP_GRADIENT_SHAPEBURST_ANGULAR", "shapeburst-angular" }, - { GIMP_GRADIENT_SHAPEBURST_SPHERICAL, "GIMP_GRADIENT_SHAPEBURST_SPHERICAL", "shapeburst-spherical" }, - { GIMP_GRADIENT_SHAPEBURST_DIMPLED, "GIMP_GRADIENT_SHAPEBURST_DIMPLED", "shapeburst-dimpled" }, - { GIMP_GRADIENT_SPIRAL_CLOCKWISE, "GIMP_GRADIENT_SPIRAL_CLOCKWISE", "spiral-clockwise" }, - { GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE, "GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE", "spiral-anticlockwise" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_GRADIENT_LINEAR, N_("Linear"), NULL }, - { GIMP_GRADIENT_BILINEAR, N_("Bi-linear"), NULL }, - { GIMP_GRADIENT_RADIAL, N_("Radial"), NULL }, - { GIMP_GRADIENT_SQUARE, N_("Square"), NULL }, - { GIMP_GRADIENT_CONICAL_SYMMETRIC, N_("Conical (sym)"), NULL }, - { GIMP_GRADIENT_CONICAL_ASYMMETRIC, N_("Conical (asym)"), NULL }, - { GIMP_GRADIENT_SHAPEBURST_ANGULAR, N_("Shaped (angular)"), NULL }, - { GIMP_GRADIENT_SHAPEBURST_SPHERICAL, N_("Shaped (spherical)"), NULL }, - { GIMP_GRADIENT_SHAPEBURST_DIMPLED, N_("Shaped (dimpled)"), NULL }, - { GIMP_GRADIENT_SPIRAL_CLOCKWISE, N_("Spiral (cw)"), NULL }, - { GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE, N_("Spiral (ccw)"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpGradientType", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_grid_style_get_type (void) { @@ -588,36 +376,6 @@ gimp_dash_preset_get_type (void) return type; } -GType -gimp_icon_type_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_ICON_TYPE_STOCK_ID, "GIMP_ICON_TYPE_STOCK_ID", "stock-id" }, - { GIMP_ICON_TYPE_INLINE_PIXBUF, "GIMP_ICON_TYPE_INLINE_PIXBUF", "inline-pixbuf" }, - { GIMP_ICON_TYPE_IMAGE_FILE, "GIMP_ICON_TYPE_IMAGE_FILE", "image-file" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_ICON_TYPE_STOCK_ID, N_("Stock ID"), NULL }, - { GIMP_ICON_TYPE_INLINE_PIXBUF, N_("Inline pixbuf"), NULL }, - { GIMP_ICON_TYPE_IMAGE_FILE, N_("Image file"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpIconType", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_brush_generated_shape_get_type (void) { @@ -750,36 +508,6 @@ gimp_view_size_get_type (void) return type; } -GType -gimp_repeat_mode_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_REPEAT_NONE, "GIMP_REPEAT_NONE", "none" }, - { GIMP_REPEAT_SAWTOOTH, "GIMP_REPEAT_SAWTOOTH", "sawtooth" }, - { GIMP_REPEAT_TRIANGULAR, "GIMP_REPEAT_TRIANGULAR", "triangular" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_REPEAT_NONE, N_("None"), NULL }, - { GIMP_REPEAT_SAWTOOTH, N_("Sawtooth wave"), NULL }, - { GIMP_REPEAT_TRIANGULAR, N_("Triangular wave"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpRepeatMode", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_selection_control_get_type (void) { @@ -844,34 +572,6 @@ gimp_thumbnail_size_get_type (void) return type; } -GType -gimp_transform_direction_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_TRANSFORM_FORWARD, "GIMP_TRANSFORM_FORWARD", "forward" }, - { GIMP_TRANSFORM_BACKWARD, "GIMP_TRANSFORM_BACKWARD", "backward" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_TRANSFORM_FORWARD, N_("Forward (traditional)"), NULL }, - { GIMP_TRANSFORM_BACKWARD, N_("Backward (corrective)"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (! type) - { - type = g_enum_register_static ("GimpTransformDirection", values); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_undo_mode_get_type (void) { diff --git a/app/core/core-enums.h b/app/core/core-enums.h index 45df84ca2e..ef5fcf2e45 100644 --- a/app/core/core-enums.h +++ b/app/core/core-enums.h @@ -36,73 +36,6 @@ * these enums that are registered with the type system */ -#define GIMP_TYPE_ADD_MASK_TYPE (gimp_add_mask_type_get_type ()) - -GType gimp_add_mask_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_ADD_WHITE_MASK, /*< desc="_White (full opacity)" >*/ - GIMP_ADD_BLACK_MASK, /*< desc="_Black (full transparency)" >*/ - GIMP_ADD_ALPHA_MASK, /*< desc="Layer's _alpha channel" >*/ - GIMP_ADD_ALPHA_TRANSFER_MASK, /*< desc="_Transfer layer's alpha channel" >*/ - GIMP_ADD_SELECTION_MASK, /*< desc="_Selection" >*/ - GIMP_ADD_COPY_MASK /*< desc="_Grayscale copy of layer" >*/ -} GimpAddMaskType; - - -#define GIMP_TYPE_BLEND_MODE (gimp_blend_mode_get_type ()) - -GType gimp_blend_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_FG_BG_RGB_MODE, /*< desc="FG to BG (RGB)" >*/ - GIMP_FG_BG_HSV_MODE, /*< desc="FG to BG (HSV)" >*/ - GIMP_FG_TRANSPARENT_MODE, /*< desc="FG to transparent" >*/ - GIMP_CUSTOM_MODE /*< desc="Custom gradient" >*/ -} GimpBlendMode; - - -#define GIMP_TYPE_BUCKET_FILL_MODE (gimp_bucket_fill_mode_get_type ()) - -GType gimp_bucket_fill_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_FG_BUCKET_FILL, /*< desc="FG color fill" >*/ - GIMP_BG_BUCKET_FILL, /*< desc="BG color fill" >*/ - GIMP_PATTERN_BUCKET_FILL /*< desc="Pattern fill" >*/ -} GimpBucketFillMode; - - -#define GIMP_TYPE_CHANNEL_OPS (gimp_channel_ops_get_type ()) - -GType gimp_channel_ops_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_CHANNEL_OP_ADD, /*< desc="Add to the current selection" >*/ - GIMP_CHANNEL_OP_SUBTRACT, /*< desc="Subtract from the current selection" >*/ - GIMP_CHANNEL_OP_REPLACE, /*< desc="Replace the current selection" >*/ - GIMP_CHANNEL_OP_INTERSECT /*< desc="Intersect with the current selection" >*/ -} GimpChannelOps; - - -#define GIMP_TYPE_CHANNEL_TYPE (gimp_channel_type_get_type ()) - -GType gimp_channel_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RED_CHANNEL, /*< desc="Red" >*/ - GIMP_GREEN_CHANNEL, /*< desc="Green" >*/ - GIMP_BLUE_CHANNEL, /*< desc="Blue" >*/ - GIMP_GRAY_CHANNEL, /*< desc="Gray" >*/ - GIMP_INDEXED_CHANNEL, /*< desc="Indexed" >*/ - GIMP_ALPHA_CHANNEL /*< desc="Alpha" >*/ -} GimpChannelType; - #define GIMP_TYPE_CONTAINER_POLICY (gimp_container_policy_get_type ()) @@ -177,26 +110,6 @@ typedef enum } GimpFillType; -#define GIMP_TYPE_GRADIENT_TYPE (gimp_gradient_type_get_type ()) - -GType gimp_gradient_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_GRADIENT_LINEAR, /*< desc="Linear" >*/ - GIMP_GRADIENT_BILINEAR, /*< desc="Bi-linear" >*/ - GIMP_GRADIENT_RADIAL, /*< desc="Radial" >*/ - GIMP_GRADIENT_SQUARE, /*< desc="Square" >*/ - GIMP_GRADIENT_CONICAL_SYMMETRIC, /*< desc="Conical (sym)" >*/ - GIMP_GRADIENT_CONICAL_ASYMMETRIC, /*< desc="Conical (asym)" >*/ - GIMP_GRADIENT_SHAPEBURST_ANGULAR, /*< desc="Shaped (angular)" >*/ - GIMP_GRADIENT_SHAPEBURST_SPHERICAL, /*< desc="Shaped (spherical)">*/ - GIMP_GRADIENT_SHAPEBURST_DIMPLED, /*< desc="Shaped (dimpled)" >*/ - GIMP_GRADIENT_SPIRAL_CLOCKWISE, /*< desc="Spiral (cw)" >*/ - GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE /*< desc="Spiral (ccw)" >*/ -} GimpGradientType; - - #define GIMP_TYPE_GRID_STYLE (gimp_grid_style_get_type ()) GType gimp_grid_style_get_type (void) G_GNUC_CONST; @@ -277,18 +190,6 @@ typedef enum /*< pdb-skip >*/ } GimpDashPreset; -#define GIMP_TYPE_ICON_TYPE (gimp_icon_type_get_type ()) - -GType gimp_icon_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_ICON_TYPE_STOCK_ID, /*< desc="Stock ID" >*/ - GIMP_ICON_TYPE_INLINE_PIXBUF, /*< desc="Inline pixbuf" >*/ - GIMP_ICON_TYPE_IMAGE_FILE /*< desc="Image file" >*/ -} GimpIconType; - - #define GIMP_TYPE_BRUSH_GENERATED_SHAPE (gimp_brush_generated_shape_get_type ()) GType gimp_brush_generated_shape_get_type (void) G_GNUC_CONST; @@ -343,18 +244,6 @@ typedef enum /*< pdb-skip >*/ } GimpViewSize; -#define GIMP_TYPE_REPEAT_MODE (gimp_repeat_mode_get_type ()) - -GType gimp_repeat_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_REPEAT_NONE, /*< desc="None" >*/ - GIMP_REPEAT_SAWTOOTH, /*< desc="Sawtooth wave" >*/ - GIMP_REPEAT_TRIANGULAR /*< desc="Triangular wave" >*/ -} GimpRepeatMode; - - #define GIMP_TYPE_SELECTION_CONTROL (gimp_selection_control_get_type ()) GType gimp_selection_control_get_type (void) G_GNUC_CONST; @@ -381,17 +270,6 @@ typedef enum /*< pdb-skip >*/ } GimpThumbnailSize; -#define GIMP_TYPE_TRANSFORM_DIRECTION (gimp_transform_direction_get_type ()) - -GType gimp_transform_direction_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_TRANSFORM_FORWARD, /*< desc="Forward (traditional)" >*/ - GIMP_TRANSFORM_BACKWARD /*< desc="Backward (corrective)" >*/ -} GimpTransformDirection; - - #define GIMP_TYPE_UNDO_MODE (gimp_undo_mode_get_type ()) GType gimp_undo_mode_get_type (void) G_GNUC_CONST; diff --git a/libgimp/gimp.def b/libgimp/gimp.def index 8cbf8e7db9..f61eb3007a 100644 --- a/libgimp/gimp.def +++ b/libgimp/gimp.def @@ -1,9 +1,7 @@ EXPORTS - gimp_add_mask_type_get_type gimp_airbrush gimp_airbrush_default gimp_attach_new_parasite - gimp_blend_mode_get_type gimp_brightness_contrast gimp_brush_application_mode_get_type gimp_brush_delete @@ -44,7 +42,6 @@ EXPORTS gimp_brushes_set_paint_mode gimp_brushes_set_popup gimp_brushes_set_spacing - gimp_bucket_fill_mode_get_type gimp_by_color_select gimp_channel_combine_masks gimp_channel_copy @@ -52,11 +49,9 @@ EXPORTS gimp_channel_get_opacity gimp_channel_get_show_masked gimp_channel_new - gimp_channel_ops_get_type gimp_channel_set_color gimp_channel_set_opacity gimp_channel_set_show_masked - gimp_channel_type_get_type gimp_check_size gimp_check_type gimp_clone @@ -246,7 +241,6 @@ EXPORTS gimp_gradient_segment_type_get_type gimp_gradient_select_destroy gimp_gradient_select_new - gimp_gradient_type_get_type gimp_gradients_close_popup gimp_gradients_get_gradient gimp_gradients_get_gradient_data @@ -262,7 +256,6 @@ EXPORTS gimp_histogram_channel_get_type gimp_hue_range_get_type gimp_hue_saturation - gimp_icon_type_get_type gimp_image_add_channel gimp_image_add_hguide gimp_image_add_layer @@ -500,7 +493,6 @@ EXPORTS gimp_register_magic_load_handler gimp_register_save_handler gimp_register_thumbnail_loader - gimp_repeat_mode_get_type gimp_rgn_iterate1 gimp_rgn_iterate2 gimp_rgn_iterator_dest @@ -555,7 +547,6 @@ EXPORTS gimp_tile_unref gimp_tile_width gimp_transform_2d - gimp_transform_direction_get_type gimp_uninstall_temp_proc gimp_version gimp_wm_class diff --git a/libgimp/gimpenums.h b/libgimp/gimpenums.h index c3f81954b3..7a04bec78b 100644 --- a/libgimp/gimpenums.h +++ b/libgimp/gimpenums.h @@ -25,34 +25,6 @@ G_BEGIN_DECLS -#define GIMP_TYPE_ADD_MASK_TYPE (gimp_add_mask_type_get_type ()) - -GType gimp_add_mask_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_ADD_WHITE_MASK, - GIMP_ADD_BLACK_MASK, - GIMP_ADD_ALPHA_MASK, - GIMP_ADD_ALPHA_TRANSFER_MASK, - GIMP_ADD_SELECTION_MASK, - GIMP_ADD_COPY_MASK -} GimpAddMaskType; - - -#define GIMP_TYPE_BLEND_MODE (gimp_blend_mode_get_type ()) - -GType gimp_blend_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_FG_BG_RGB_MODE, - GIMP_FG_BG_HSV_MODE, - GIMP_FG_TRANSPARENT_MODE, - GIMP_CUSTOM_MODE -} GimpBlendMode; - - #define GIMP_TYPE_BRUSH_APPLICATION_MODE (gimp_brush_application_mode_get_type ()) GType gimp_brush_application_mode_get_type (void) G_GNUC_CONST; @@ -64,46 +36,6 @@ typedef enum } GimpBrushApplicationMode; -#define GIMP_TYPE_BUCKET_FILL_MODE (gimp_bucket_fill_mode_get_type ()) - -GType gimp_bucket_fill_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_FG_BUCKET_FILL, - GIMP_BG_BUCKET_FILL, - GIMP_PATTERN_BUCKET_FILL -} GimpBucketFillMode; - - -#define GIMP_TYPE_CHANNEL_OPS (gimp_channel_ops_get_type ()) - -GType gimp_channel_ops_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_CHANNEL_OP_ADD, - GIMP_CHANNEL_OP_SUBTRACT, - GIMP_CHANNEL_OP_REPLACE, - GIMP_CHANNEL_OP_INTERSECT -} GimpChannelOps; - - -#define GIMP_TYPE_CHANNEL_TYPE (gimp_channel_type_get_type ()) - -GType gimp_channel_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RED_CHANNEL, - GIMP_GREEN_CHANNEL, - GIMP_BLUE_CHANNEL, - GIMP_GRAY_CHANNEL, - GIMP_INDEXED_CHANNEL, - GIMP_ALPHA_CHANNEL -} GimpChannelType; - - #define GIMP_TYPE_CLONE_TYPE (gimp_clone_type_get_type ()) GType gimp_clone_type_get_type (void) G_GNUC_CONST; @@ -216,26 +148,6 @@ typedef enum } GimpGradientSegmentType; -#define GIMP_TYPE_GRADIENT_TYPE (gimp_gradient_type_get_type ()) - -GType gimp_gradient_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_GRADIENT_LINEAR, - GIMP_GRADIENT_BILINEAR, - GIMP_GRADIENT_RADIAL, - GIMP_GRADIENT_SQUARE, - GIMP_GRADIENT_CONICAL_SYMMETRIC, - GIMP_GRADIENT_CONICAL_ASYMMETRIC, - GIMP_GRADIENT_SHAPEBURST_ANGULAR, - GIMP_GRADIENT_SHAPEBURST_SPHERICAL, - GIMP_GRADIENT_SHAPEBURST_DIMPLED, - GIMP_GRADIENT_SPIRAL_CLOCKWISE, - GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE -} GimpGradientType; - - #define GIMP_TYPE_HISTOGRAM_CHANNEL (gimp_histogram_channel_get_type ()) GType gimp_histogram_channel_get_type (void) G_GNUC_CONST; @@ -266,18 +178,6 @@ typedef enum } GimpHueRange; -#define GIMP_TYPE_ICON_TYPE (gimp_icon_type_get_type ()) - -GType gimp_icon_type_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_ICON_TYPE_STOCK_ID, - GIMP_ICON_TYPE_INLINE_PIXBUF, - GIMP_ICON_TYPE_IMAGE_FILE -} GimpIconType; - - #define GIMP_TYPE_LAYER_MODE_EFFECTS (gimp_layer_mode_effects_get_type ()) GType gimp_layer_mode_effects_get_type (void) G_GNUC_CONST; @@ -368,18 +268,6 @@ typedef enum } GimpPaintApplicationMode; -#define GIMP_TYPE_REPEAT_MODE (gimp_repeat_mode_get_type ()) - -GType gimp_repeat_mode_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_REPEAT_NONE, - GIMP_REPEAT_SAWTOOTH, - GIMP_REPEAT_TRIANGULAR -} GimpRepeatMode; - - #define GIMP_TYPE_ROTATION_TYPE (gimp_rotation_type_get_type ()) GType gimp_rotation_type_get_type (void) G_GNUC_CONST; @@ -415,17 +303,6 @@ typedef enum } GimpSizeType; -#define GIMP_TYPE_TRANSFORM_DIRECTION (gimp_transform_direction_get_type ()) - -GType gimp_transform_direction_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_TRANSFORM_FORWARD, - GIMP_TRANSFORM_BACKWARD -} GimpTransformDirection; - - void _gimp_enums_init (void); const gchar ** gimp_enums_get_type_names (gint *n_type_names); diff --git a/libgimpbase/gimpbase.def b/libgimpbase/gimpbase.def index dde6f187d8..b74790b9a6 100644 --- a/libgimpbase/gimpbase.def +++ b/libgimpbase/gimpbase.def @@ -1,7 +1,12 @@ EXPORTS _gp_params_destroy + gimp_add_mask_type_get_type gimp_any_to_utf8 gimp_base_init + gimp_blend_mode_get_type + gimp_bucket_fill_mode_get_type + gimp_channel_ops_get_type + gimp_channel_type_get_type gimp_check_size_get_type gimp_check_type_get_type gimp_checks_get_shades @@ -23,7 +28,9 @@ EXPORTS gimp_flags_set_value_descriptions gimp_flags_value_get_desc gimp_flags_value_get_help + gimp_gradient_type_get_type gimp_gtkrc + gimp_icon_type_get_type gimp_image_base_type_get_type gimp_image_type_get_type gimp_interpolation_type_get_type @@ -66,11 +73,13 @@ EXPORTS gimp_pixpipe_params_parse gimp_plug_in_directory gimp_progress_command_get_type + gimp_repeat_mode_get_type gimp_signal_private gimp_stack_trace_mode_get_type gimp_strip_uline gimp_sysconf_directory gimp_transfer_mode_get_type + gimp_transform_direction_get_type gimp_type_get_translation_domain gimp_type_set_translation_domain gimp_unit_get_abbreviation diff --git a/libgimpbase/gimpbaseenums.c b/libgimpbase/gimpbaseenums.c index 97bf8b4be0..4f019b81c5 100644 --- a/libgimpbase/gimpbaseenums.c +++ b/libgimpbase/gimpbaseenums.c @@ -7,6 +7,177 @@ #include "libgimp/libgimp-intl.h" /* enumerations from "./gimpbaseenums.h" */ +GType +gimp_add_mask_type_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_ADD_WHITE_MASK, "GIMP_ADD_WHITE_MASK", "white-mask" }, + { GIMP_ADD_BLACK_MASK, "GIMP_ADD_BLACK_MASK", "black-mask" }, + { GIMP_ADD_ALPHA_MASK, "GIMP_ADD_ALPHA_MASK", "alpha-mask" }, + { GIMP_ADD_ALPHA_TRANSFER_MASK, "GIMP_ADD_ALPHA_TRANSFER_MASK", "alpha-transfer-mask" }, + { GIMP_ADD_SELECTION_MASK, "GIMP_ADD_SELECTION_MASK", "selection-mask" }, + { GIMP_ADD_COPY_MASK, "GIMP_ADD_COPY_MASK", "copy-mask" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_ADD_WHITE_MASK, N_("_White (full opacity)"), NULL }, + { GIMP_ADD_BLACK_MASK, N_("_Black (full transparency)"), NULL }, + { GIMP_ADD_ALPHA_MASK, N_("Layer's _alpha channel"), NULL }, + { GIMP_ADD_ALPHA_TRANSFER_MASK, N_("_Transfer layer's alpha channel"), NULL }, + { GIMP_ADD_SELECTION_MASK, N_("_Selection"), NULL }, + { GIMP_ADD_COPY_MASK, N_("_Grayscale copy of layer"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpAddMaskType", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_blend_mode_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_FG_BG_RGB_MODE, "GIMP_FG_BG_RGB_MODE", "fg-bg-rgb-mode" }, + { GIMP_FG_BG_HSV_MODE, "GIMP_FG_BG_HSV_MODE", "fg-bg-hsv-mode" }, + { GIMP_FG_TRANSPARENT_MODE, "GIMP_FG_TRANSPARENT_MODE", "fg-transparent-mode" }, + { GIMP_CUSTOM_MODE, "GIMP_CUSTOM_MODE", "custom-mode" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_FG_BG_RGB_MODE, N_("FG to BG (RGB)"), NULL }, + { GIMP_FG_BG_HSV_MODE, N_("FG to BG (HSV)"), NULL }, + { GIMP_FG_TRANSPARENT_MODE, N_("FG to transparent"), NULL }, + { GIMP_CUSTOM_MODE, N_("Custom gradient"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpBlendMode", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_bucket_fill_mode_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_FG_BUCKET_FILL, "GIMP_FG_BUCKET_FILL", "fg-bucket-fill" }, + { GIMP_BG_BUCKET_FILL, "GIMP_BG_BUCKET_FILL", "bg-bucket-fill" }, + { GIMP_PATTERN_BUCKET_FILL, "GIMP_PATTERN_BUCKET_FILL", "pattern-bucket-fill" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_FG_BUCKET_FILL, N_("FG color fill"), NULL }, + { GIMP_BG_BUCKET_FILL, N_("BG color fill"), NULL }, + { GIMP_PATTERN_BUCKET_FILL, N_("Pattern fill"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpBucketFillMode", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_channel_ops_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_CHANNEL_OP_ADD, "GIMP_CHANNEL_OP_ADD", "add" }, + { GIMP_CHANNEL_OP_SUBTRACT, "GIMP_CHANNEL_OP_SUBTRACT", "subtract" }, + { GIMP_CHANNEL_OP_REPLACE, "GIMP_CHANNEL_OP_REPLACE", "replace" }, + { GIMP_CHANNEL_OP_INTERSECT, "GIMP_CHANNEL_OP_INTERSECT", "intersect" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_CHANNEL_OP_ADD, N_("Add to the current selection"), NULL }, + { GIMP_CHANNEL_OP_SUBTRACT, N_("Subtract from the current selection"), NULL }, + { GIMP_CHANNEL_OP_REPLACE, N_("Replace the current selection"), NULL }, + { GIMP_CHANNEL_OP_INTERSECT, N_("Intersect with the current selection"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpChannelOps", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_channel_type_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_RED_CHANNEL, "GIMP_RED_CHANNEL", "red-channel" }, + { GIMP_GREEN_CHANNEL, "GIMP_GREEN_CHANNEL", "green-channel" }, + { GIMP_BLUE_CHANNEL, "GIMP_BLUE_CHANNEL", "blue-channel" }, + { GIMP_GRAY_CHANNEL, "GIMP_GRAY_CHANNEL", "gray-channel" }, + { GIMP_INDEXED_CHANNEL, "GIMP_INDEXED_CHANNEL", "indexed-channel" }, + { GIMP_ALPHA_CHANNEL, "GIMP_ALPHA_CHANNEL", "alpha-channel" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_RED_CHANNEL, N_("Red"), NULL }, + { GIMP_GREEN_CHANNEL, N_("Green"), NULL }, + { GIMP_BLUE_CHANNEL, N_("Blue"), NULL }, + { GIMP_GRAY_CHANNEL, N_("Gray"), NULL }, + { GIMP_INDEXED_CHANNEL, N_("Indexed"), NULL }, + { GIMP_ALPHA_CHANNEL, N_("Alpha"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpChannelType", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_check_size_get_type (void) { @@ -75,6 +246,84 @@ gimp_check_type_get_type (void) return type; } +GType +gimp_gradient_type_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_GRADIENT_LINEAR, "GIMP_GRADIENT_LINEAR", "linear" }, + { GIMP_GRADIENT_BILINEAR, "GIMP_GRADIENT_BILINEAR", "bilinear" }, + { GIMP_GRADIENT_RADIAL, "GIMP_GRADIENT_RADIAL", "radial" }, + { GIMP_GRADIENT_SQUARE, "GIMP_GRADIENT_SQUARE", "square" }, + { GIMP_GRADIENT_CONICAL_SYMMETRIC, "GIMP_GRADIENT_CONICAL_SYMMETRIC", "conical-symmetric" }, + { GIMP_GRADIENT_CONICAL_ASYMMETRIC, "GIMP_GRADIENT_CONICAL_ASYMMETRIC", "conical-asymmetric" }, + { GIMP_GRADIENT_SHAPEBURST_ANGULAR, "GIMP_GRADIENT_SHAPEBURST_ANGULAR", "shapeburst-angular" }, + { GIMP_GRADIENT_SHAPEBURST_SPHERICAL, "GIMP_GRADIENT_SHAPEBURST_SPHERICAL", "shapeburst-spherical" }, + { GIMP_GRADIENT_SHAPEBURST_DIMPLED, "GIMP_GRADIENT_SHAPEBURST_DIMPLED", "shapeburst-dimpled" }, + { GIMP_GRADIENT_SPIRAL_CLOCKWISE, "GIMP_GRADIENT_SPIRAL_CLOCKWISE", "spiral-clockwise" }, + { GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE, "GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE", "spiral-anticlockwise" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_GRADIENT_LINEAR, N_("Linear"), NULL }, + { GIMP_GRADIENT_BILINEAR, N_("Bi-linear"), NULL }, + { GIMP_GRADIENT_RADIAL, N_("Radial"), NULL }, + { GIMP_GRADIENT_SQUARE, N_("Square"), NULL }, + { GIMP_GRADIENT_CONICAL_SYMMETRIC, N_("Conical (sym)"), NULL }, + { GIMP_GRADIENT_CONICAL_ASYMMETRIC, N_("Conical (asym)"), NULL }, + { GIMP_GRADIENT_SHAPEBURST_ANGULAR, N_("Shaped (angular)"), NULL }, + { GIMP_GRADIENT_SHAPEBURST_SPHERICAL, N_("Shaped (spherical)"), NULL }, + { GIMP_GRADIENT_SHAPEBURST_DIMPLED, N_("Shaped (dimpled)"), NULL }, + { GIMP_GRADIENT_SPIRAL_CLOCKWISE, N_("Spiral (cw)"), NULL }, + { GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE, N_("Spiral (ccw)"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpGradientType", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_icon_type_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_ICON_TYPE_STOCK_ID, "GIMP_ICON_TYPE_STOCK_ID", "stock-id" }, + { GIMP_ICON_TYPE_INLINE_PIXBUF, "GIMP_ICON_TYPE_INLINE_PIXBUF", "inline-pixbuf" }, + { GIMP_ICON_TYPE_IMAGE_FILE, "GIMP_ICON_TYPE_IMAGE_FILE", "image-file" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_ICON_TYPE_STOCK_ID, N_("Stock ID"), NULL }, + { GIMP_ICON_TYPE_INLINE_PIXBUF, N_("Inline pixbuf"), NULL }, + { GIMP_ICON_TYPE_IMAGE_FILE, N_("Image file"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpIconType", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_image_base_type_get_type (void) { @@ -176,6 +425,37 @@ gimp_interpolation_type_get_type (void) return type; } +GType +gimp_repeat_mode_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_REPEAT_NONE, "GIMP_REPEAT_NONE", "none" }, + { GIMP_REPEAT_SAWTOOTH, "GIMP_REPEAT_SAWTOOTH", "sawtooth" }, + { GIMP_REPEAT_TRIANGULAR, "GIMP_REPEAT_TRIANGULAR", "triangular" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_REPEAT_NONE, N_("None"), NULL }, + { GIMP_REPEAT_SAWTOOTH, N_("Sawtooth wave"), NULL }, + { GIMP_REPEAT_TRIANGULAR, N_("Triangular wave"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpRepeatMode", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_transfer_mode_get_type (void) { @@ -207,6 +487,35 @@ gimp_transfer_mode_get_type (void) return type; } +GType +gimp_transform_direction_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_TRANSFORM_FORWARD, "GIMP_TRANSFORM_FORWARD", "forward" }, + { GIMP_TRANSFORM_BACKWARD, "GIMP_TRANSFORM_BACKWARD", "backward" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_TRANSFORM_FORWARD, N_("Forward (traditional)"), NULL }, + { GIMP_TRANSFORM_BACKWARD, N_("Backward (corrective)"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (! type) + { + type = g_enum_register_static ("GimpTransformDirection", values); + gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_pdb_arg_type_get_type (void) { diff --git a/libgimpbase/gimpbaseenums.h b/libgimpbase/gimpbaseenums.h index 63eb5f5d8c..b793a79881 100644 --- a/libgimpbase/gimpbaseenums.h +++ b/libgimpbase/gimpbaseenums.h @@ -26,6 +26,74 @@ G_BEGIN_DECLS /* For information look into the C source or the html documentation */ +#define GIMP_TYPE_ADD_MASK_TYPE (gimp_add_mask_type_get_type ()) + +GType gimp_add_mask_type_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_ADD_WHITE_MASK, /*< desc="_White (full opacity)" >*/ + GIMP_ADD_BLACK_MASK, /*< desc="_Black (full transparency)" >*/ + GIMP_ADD_ALPHA_MASK, /*< desc="Layer's _alpha channel" >*/ + GIMP_ADD_ALPHA_TRANSFER_MASK, /*< desc="_Transfer layer's alpha channel" >*/ + GIMP_ADD_SELECTION_MASK, /*< desc="_Selection" >*/ + GIMP_ADD_COPY_MASK /*< desc="_Grayscale copy of layer" >*/ +} GimpAddMaskType; + + +#define GIMP_TYPE_BLEND_MODE (gimp_blend_mode_get_type ()) + +GType gimp_blend_mode_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_FG_BG_RGB_MODE, /*< desc="FG to BG (RGB)" >*/ + GIMP_FG_BG_HSV_MODE, /*< desc="FG to BG (HSV)" >*/ + GIMP_FG_TRANSPARENT_MODE, /*< desc="FG to transparent" >*/ + GIMP_CUSTOM_MODE /*< desc="Custom gradient" >*/ +} GimpBlendMode; + + +#define GIMP_TYPE_BUCKET_FILL_MODE (gimp_bucket_fill_mode_get_type ()) + +GType gimp_bucket_fill_mode_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_FG_BUCKET_FILL, /*< desc="FG color fill" >*/ + GIMP_BG_BUCKET_FILL, /*< desc="BG color fill" >*/ + GIMP_PATTERN_BUCKET_FILL /*< desc="Pattern fill" >*/ +} GimpBucketFillMode; + + +#define GIMP_TYPE_CHANNEL_OPS (gimp_channel_ops_get_type ()) + +GType gimp_channel_ops_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_CHANNEL_OP_ADD, /*< desc="Add to the current selection" >*/ + GIMP_CHANNEL_OP_SUBTRACT, /*< desc="Subtract from the current selection" >*/ + GIMP_CHANNEL_OP_REPLACE, /*< desc="Replace the current selection" >*/ + GIMP_CHANNEL_OP_INTERSECT /*< desc="Intersect with the current selection" >*/ +} GimpChannelOps; + + +#define GIMP_TYPE_CHANNEL_TYPE (gimp_channel_type_get_type ()) + +GType gimp_channel_type_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_RED_CHANNEL, /*< desc="Red" >*/ + GIMP_GREEN_CHANNEL, /*< desc="Green" >*/ + GIMP_BLUE_CHANNEL, /*< desc="Blue" >*/ + GIMP_GRAY_CHANNEL, /*< desc="Gray" >*/ + GIMP_INDEXED_CHANNEL, /*< desc="Indexed" >*/ + GIMP_ALPHA_CHANNEL /*< desc="Alpha" >*/ +} GimpChannelType; + + #define GIMP_TYPE_CHECK_SIZE (gimp_check_size_get_type ()) GType gimp_check_size_get_type (void) G_GNUC_CONST; @@ -53,6 +121,38 @@ typedef enum /*< pdb-skip >*/ } GimpCheckType; +#define GIMP_TYPE_GRADIENT_TYPE (gimp_gradient_type_get_type ()) + +GType gimp_gradient_type_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_GRADIENT_LINEAR, /*< desc="Linear" >*/ + GIMP_GRADIENT_BILINEAR, /*< desc="Bi-linear" >*/ + GIMP_GRADIENT_RADIAL, /*< desc="Radial" >*/ + GIMP_GRADIENT_SQUARE, /*< desc="Square" >*/ + GIMP_GRADIENT_CONICAL_SYMMETRIC, /*< desc="Conical (sym)" >*/ + GIMP_GRADIENT_CONICAL_ASYMMETRIC, /*< desc="Conical (asym)" >*/ + GIMP_GRADIENT_SHAPEBURST_ANGULAR, /*< desc="Shaped (angular)" >*/ + GIMP_GRADIENT_SHAPEBURST_SPHERICAL, /*< desc="Shaped (spherical)">*/ + GIMP_GRADIENT_SHAPEBURST_DIMPLED, /*< desc="Shaped (dimpled)" >*/ + GIMP_GRADIENT_SPIRAL_CLOCKWISE, /*< desc="Spiral (cw)" >*/ + GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE /*< desc="Spiral (ccw)" >*/ +} GimpGradientType; + + +#define GIMP_TYPE_ICON_TYPE (gimp_icon_type_get_type ()) + +GType gimp_icon_type_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_ICON_TYPE_STOCK_ID, /*< desc="Stock ID" >*/ + GIMP_ICON_TYPE_INLINE_PIXBUF, /*< desc="Inline pixbuf" >*/ + GIMP_ICON_TYPE_IMAGE_FILE /*< desc="Image file" >*/ +} GimpIconType; + + #define GIMP_TYPE_IMAGE_BASE_TYPE (gimp_image_base_type_get_type ()) GType gimp_image_base_type_get_type (void) G_GNUC_CONST; @@ -93,6 +193,18 @@ typedef enum } GimpInterpolationType; +#define GIMP_TYPE_REPEAT_MODE (gimp_repeat_mode_get_type ()) + +GType gimp_repeat_mode_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_REPEAT_NONE, /*< desc="None" >*/ + GIMP_REPEAT_SAWTOOTH, /*< desc="Sawtooth wave" >*/ + GIMP_REPEAT_TRIANGULAR /*< desc="Triangular wave" >*/ +} GimpRepeatMode; + + #define GIMP_TYPE_TRANSFER_MODE (gimp_transfer_mode_get_type ()) GType gimp_transfer_mode_get_type (void) G_GNUC_CONST; @@ -105,6 +217,17 @@ typedef enum } GimpTransferMode; +#define GIMP_TYPE_TRANSFORM_DIRECTION (gimp_transform_direction_get_type ()) + +GType gimp_transform_direction_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_TRANSFORM_FORWARD, /*< desc="Forward (traditional)" >*/ + GIMP_TRANSFORM_BACKWARD /*< desc="Backward (corrective)" >*/ +} GimpTransformDirection; + + typedef enum /*< skip >*/ { GIMP_UNIT_PIXEL = 0, diff --git a/tools/pdbgen/enums.pl b/tools/pdbgen/enums.pl index dd265c3e24..a8789d8863 100644 --- a/tools/pdbgen/enums.pl +++ b/tools/pdbgen/enums.pl @@ -20,6 +20,95 @@ package Gimp::CodeGen::enums; %enums = ( + GimpAddMaskType => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_ADD_WHITE_MASK GIMP_ADD_BLACK_MASK + GIMP_ADD_ALPHA_MASK GIMP_ADD_ALPHA_TRANSFER_MASK + GIMP_ADD_SELECTION_MASK GIMP_ADD_COPY_MASK) ], + mapping => { GIMP_ADD_WHITE_MASK => '0', + GIMP_ADD_BLACK_MASK => '1', + GIMP_ADD_ALPHA_MASK => '2', + GIMP_ADD_ALPHA_TRANSFER_MASK => '3', + GIMP_ADD_SELECTION_MASK => '4', + GIMP_ADD_COPY_MASK => '5' } + }, + GimpBlendMode => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_FG_BG_RGB_MODE GIMP_FG_BG_HSV_MODE + GIMP_FG_TRANSPARENT_MODE GIMP_CUSTOM_MODE) ], + mapping => { GIMP_FG_BG_RGB_MODE => '0', + GIMP_FG_BG_HSV_MODE => '1', + GIMP_FG_TRANSPARENT_MODE => '2', + GIMP_CUSTOM_MODE => '3' } + }, + GimpBucketFillMode => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_FG_BUCKET_FILL GIMP_BG_BUCKET_FILL + GIMP_PATTERN_BUCKET_FILL) ], + mapping => { GIMP_FG_BUCKET_FILL => '0', + GIMP_BG_BUCKET_FILL => '1', + GIMP_PATTERN_BUCKET_FILL => '2' } + }, + GimpChannelOps => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_CHANNEL_OP_ADD GIMP_CHANNEL_OP_SUBTRACT + GIMP_CHANNEL_OP_REPLACE GIMP_CHANNEL_OP_INTERSECT) ], + mapping => { GIMP_CHANNEL_OP_ADD => '0', + GIMP_CHANNEL_OP_SUBTRACT => '1', + GIMP_CHANNEL_OP_REPLACE => '2', + GIMP_CHANNEL_OP_INTERSECT => '3' } + }, + GimpChannelType => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_RED_CHANNEL GIMP_GREEN_CHANNEL + GIMP_BLUE_CHANNEL GIMP_GRAY_CHANNEL + GIMP_INDEXED_CHANNEL GIMP_ALPHA_CHANNEL) ], + mapping => { GIMP_RED_CHANNEL => '0', + GIMP_GREEN_CHANNEL => '1', + GIMP_BLUE_CHANNEL => '2', + GIMP_GRAY_CHANNEL => '3', + GIMP_INDEXED_CHANNEL => '4', + GIMP_ALPHA_CHANNEL => '5' } + }, + GimpGradientType => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_GRADIENT_LINEAR GIMP_GRADIENT_BILINEAR + GIMP_GRADIENT_RADIAL GIMP_GRADIENT_SQUARE + GIMP_GRADIENT_CONICAL_SYMMETRIC + GIMP_GRADIENT_CONICAL_ASYMMETRIC + GIMP_GRADIENT_SHAPEBURST_ANGULAR + GIMP_GRADIENT_SHAPEBURST_SPHERICAL + GIMP_GRADIENT_SHAPEBURST_DIMPLED + GIMP_GRADIENT_SPIRAL_CLOCKWISE + GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE) ], + mapping => { GIMP_GRADIENT_LINEAR => '0', + GIMP_GRADIENT_BILINEAR => '1', + GIMP_GRADIENT_RADIAL => '2', + GIMP_GRADIENT_SQUARE => '3', + GIMP_GRADIENT_CONICAL_SYMMETRIC => '4', + GIMP_GRADIENT_CONICAL_ASYMMETRIC => '5', + GIMP_GRADIENT_SHAPEBURST_ANGULAR => '6', + GIMP_GRADIENT_SHAPEBURST_SPHERICAL => '7', + GIMP_GRADIENT_SHAPEBURST_DIMPLED => '8', + GIMP_GRADIENT_SPIRAL_CLOCKWISE => '9', + GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE => '10' } + }, + GimpIconType => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_ICON_TYPE_STOCK_ID + GIMP_ICON_TYPE_INLINE_PIXBUF + GIMP_ICON_TYPE_IMAGE_FILE) ], + mapping => { GIMP_ICON_TYPE_STOCK_ID => '0', + GIMP_ICON_TYPE_INLINE_PIXBUF => '1', + GIMP_ICON_TYPE_IMAGE_FILE => '2' } + }, GimpImageBaseType => { contig => 1, header => 'libgimpbase/gimpbaseenums.h', @@ -52,6 +141,15 @@ package Gimp::CodeGen::enums; GIMP_INTERPOLATION_CUBIC => '2', GIMP_INTERPOLATION_LANCZOS => '3' } }, + GimpRepeatMode => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_REPEAT_NONE GIMP_REPEAT_SAWTOOTH + GIMP_REPEAT_TRIANGULAR) ], + mapping => { GIMP_REPEAT_NONE => '0', + GIMP_REPEAT_SAWTOOTH => '1', + GIMP_REPEAT_TRIANGULAR => '2' } + }, GimpTransferMode => { contig => 1, header => 'libgimpbase/gimpbaseenums.h', @@ -60,6 +158,13 @@ package Gimp::CodeGen::enums; GIMP_MIDTONES => '1', GIMP_HIGHLIGHTS => '2' } }, + GimpTransformDirection => + { contig => 1, + header => 'libgimpbase/gimpbaseenums.h', + symbols => [ qw(GIMP_TRANSFORM_FORWARD GIMP_TRANSFORM_BACKWARD) ], + mapping => { GIMP_TRANSFORM_FORWARD => '0', + GIMP_TRANSFORM_BACKWARD => '1' } + }, GimpUnit => { contig => 1, header => 'libgimpbase/gimpbaseenums.h', @@ -232,61 +337,6 @@ package Gimp::CodeGen::enums; GIMP_BLUE_HUES => '5', GIMP_MAGENTA_HUES => '6' } }, - GimpAddMaskType => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_ADD_WHITE_MASK GIMP_ADD_BLACK_MASK - GIMP_ADD_ALPHA_MASK GIMP_ADD_ALPHA_TRANSFER_MASK - GIMP_ADD_SELECTION_MASK GIMP_ADD_COPY_MASK) ], - mapping => { GIMP_ADD_WHITE_MASK => '0', - GIMP_ADD_BLACK_MASK => '1', - GIMP_ADD_ALPHA_MASK => '2', - GIMP_ADD_ALPHA_TRANSFER_MASK => '3', - GIMP_ADD_SELECTION_MASK => '4', - GIMP_ADD_COPY_MASK => '5' } - }, - GimpBlendMode => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_FG_BG_RGB_MODE GIMP_FG_BG_HSV_MODE - GIMP_FG_TRANSPARENT_MODE GIMP_CUSTOM_MODE) ], - mapping => { GIMP_FG_BG_RGB_MODE => '0', - GIMP_FG_BG_HSV_MODE => '1', - GIMP_FG_TRANSPARENT_MODE => '2', - GIMP_CUSTOM_MODE => '3' } - }, - GimpBucketFillMode => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_FG_BUCKET_FILL GIMP_BG_BUCKET_FILL - GIMP_PATTERN_BUCKET_FILL) ], - mapping => { GIMP_FG_BUCKET_FILL => '0', - GIMP_BG_BUCKET_FILL => '1', - GIMP_PATTERN_BUCKET_FILL => '2' } - }, - GimpChannelOps => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_CHANNEL_OP_ADD GIMP_CHANNEL_OP_SUBTRACT - GIMP_CHANNEL_OP_REPLACE GIMP_CHANNEL_OP_INTERSECT) ], - mapping => { GIMP_CHANNEL_OP_ADD => '0', - GIMP_CHANNEL_OP_SUBTRACT => '1', - GIMP_CHANNEL_OP_REPLACE => '2', - GIMP_CHANNEL_OP_INTERSECT => '3' } - }, - GimpChannelType => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_RED_CHANNEL GIMP_GREEN_CHANNEL - GIMP_BLUE_CHANNEL GIMP_GRAY_CHANNEL - GIMP_INDEXED_CHANNEL GIMP_ALPHA_CHANNEL) ], - mapping => { GIMP_RED_CHANNEL => '0', - GIMP_GREEN_CHANNEL => '1', - GIMP_BLUE_CHANNEL => '2', - GIMP_GRAY_CHANNEL => '3', - GIMP_INDEXED_CHANNEL => '4', - GIMP_ALPHA_CHANNEL => '5' } - }, GimpConvertDitherType => { contig => 1, header => 'core/core-enums.h', @@ -321,40 +371,6 @@ package Gimp::CodeGen::enums; GIMP_TRANSPARENT_FILL => '3', GIMP_PATTERN_FILL => '4' } }, - GimpGradientType => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_GRADIENT_LINEAR GIMP_GRADIENT_BILINEAR - GIMP_GRADIENT_RADIAL GIMP_GRADIENT_SQUARE - GIMP_GRADIENT_CONICAL_SYMMETRIC - GIMP_GRADIENT_CONICAL_ASYMMETRIC - GIMP_GRADIENT_SHAPEBURST_ANGULAR - GIMP_GRADIENT_SHAPEBURST_SPHERICAL - GIMP_GRADIENT_SHAPEBURST_DIMPLED - GIMP_GRADIENT_SPIRAL_CLOCKWISE - GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE) ], - mapping => { GIMP_GRADIENT_LINEAR => '0', - GIMP_GRADIENT_BILINEAR => '1', - GIMP_GRADIENT_RADIAL => '2', - GIMP_GRADIENT_SQUARE => '3', - GIMP_GRADIENT_CONICAL_SYMMETRIC => '4', - GIMP_GRADIENT_CONICAL_ASYMMETRIC => '5', - GIMP_GRADIENT_SHAPEBURST_ANGULAR => '6', - GIMP_GRADIENT_SHAPEBURST_SPHERICAL => '7', - GIMP_GRADIENT_SHAPEBURST_DIMPLED => '8', - GIMP_GRADIENT_SPIRAL_CLOCKWISE => '9', - GIMP_GRADIENT_SPIRAL_ANTICLOCKWISE => '10' } - }, - GimpIconType => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_ICON_TYPE_STOCK_ID - GIMP_ICON_TYPE_INLINE_PIXBUF - GIMP_ICON_TYPE_IMAGE_FILE) ], - mapping => { GIMP_ICON_TYPE_STOCK_ID => '0', - GIMP_ICON_TYPE_INLINE_PIXBUF => '1', - GIMP_ICON_TYPE_IMAGE_FILE => '2' } - }, GimpOrientationType => { contig => 1, header => 'core/core-enums.h', @@ -372,22 +388,6 @@ package Gimp::CodeGen::enums; GIMP_ROTATE_180 => '1', GIMP_ROTATE_270 => '2' } }, - GimpRepeatMode => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_REPEAT_NONE GIMP_REPEAT_SAWTOOTH - GIMP_REPEAT_TRIANGULAR) ], - mapping => { GIMP_REPEAT_NONE => '0', - GIMP_REPEAT_SAWTOOTH => '1', - GIMP_REPEAT_TRIANGULAR => '2' } - }, - GimpTransformDirection => - { contig => 1, - header => 'core/core-enums.h', - symbols => [ qw(GIMP_TRANSFORM_FORWARD GIMP_TRANSFORM_BACKWARD) ], - mapping => { GIMP_TRANSFORM_FORWARD => '0', - GIMP_TRANSFORM_BACKWARD => '1' } - }, GimpGradientSegmentType => { contig => 1, header => 'core/core-enums.h',