From 6e2e8a6f086d2d2db1ee43786cdb601f331a3678 Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Sat, 24 Jun 2017 18:54:22 +0200 Subject: [PATCH] app: move the rectangle tool enums from tools-enums to display-enums --- app/display/display-enums.c | 93 +++++++++++++++++++++++++++++++++++++ app/display/display-enums.h | 36 ++++++++++++++ app/tools/tools-enums.c | 93 ------------------------------------- app/tools/tools-enums.h | 36 -------------- 4 files changed, 129 insertions(+), 129 deletions(-) diff --git a/app/display/display-enums.c b/app/display/display-enums.c index f3ffdd312c..b42cd77aa5 100644 --- a/app/display/display-enums.c +++ b/app/display/display-enums.c @@ -259,6 +259,99 @@ gimp_path_style_get_type (void) return type; } +GType +gimp_rectangle_constraint_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_RECTANGLE_CONSTRAIN_NONE, "GIMP_RECTANGLE_CONSTRAIN_NONE", "none" }, + { GIMP_RECTANGLE_CONSTRAIN_IMAGE, "GIMP_RECTANGLE_CONSTRAIN_IMAGE", "image" }, + { GIMP_RECTANGLE_CONSTRAIN_DRAWABLE, "GIMP_RECTANGLE_CONSTRAIN_DRAWABLE", "drawable" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_RECTANGLE_CONSTRAIN_NONE, "GIMP_RECTANGLE_CONSTRAIN_NONE", NULL }, + { GIMP_RECTANGLE_CONSTRAIN_IMAGE, "GIMP_RECTANGLE_CONSTRAIN_IMAGE", NULL }, + { GIMP_RECTANGLE_CONSTRAIN_DRAWABLE, "GIMP_RECTANGLE_CONSTRAIN_DRAWABLE", NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpRectangleConstraint", values); + gimp_type_set_translation_context (type, "rectangle-constraint"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_rectangle_tool_fixed_rule_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_RECTANGLE_TOOL_FIXED_ASPECT, "GIMP_RECTANGLE_TOOL_FIXED_ASPECT", "aspect" }, + { GIMP_RECTANGLE_TOOL_FIXED_WIDTH, "GIMP_RECTANGLE_TOOL_FIXED_WIDTH", "width" }, + { GIMP_RECTANGLE_TOOL_FIXED_HEIGHT, "GIMP_RECTANGLE_TOOL_FIXED_HEIGHT", "height" }, + { GIMP_RECTANGLE_TOOL_FIXED_SIZE, "GIMP_RECTANGLE_TOOL_FIXED_SIZE", "size" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_RECTANGLE_TOOL_FIXED_ASPECT, NC_("rectangle-tool-fixed-rule", "Aspect ratio"), NULL }, + { GIMP_RECTANGLE_TOOL_FIXED_WIDTH, NC_("rectangle-tool-fixed-rule", "Width"), NULL }, + { GIMP_RECTANGLE_TOOL_FIXED_HEIGHT, NC_("rectangle-tool-fixed-rule", "Height"), NULL }, + { GIMP_RECTANGLE_TOOL_FIXED_SIZE, NC_("rectangle-tool-fixed-rule", "Size"), NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpRectangleToolFixedRule", values); + gimp_type_set_translation_context (type, "rectangle-tool-fixed-rule"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + +GType +gimp_rectangle_precision_get_type (void) +{ + static const GEnumValue values[] = + { + { GIMP_RECTANGLE_PRECISION_INT, "GIMP_RECTANGLE_PRECISION_INT", "int" }, + { GIMP_RECTANGLE_PRECISION_DOUBLE, "GIMP_RECTANGLE_PRECISION_DOUBLE", "double" }, + { 0, NULL, NULL } + }; + + static const GimpEnumDesc descs[] = + { + { GIMP_RECTANGLE_PRECISION_INT, "GIMP_RECTANGLE_PRECISION_INT", NULL }, + { GIMP_RECTANGLE_PRECISION_DOUBLE, "GIMP_RECTANGLE_PRECISION_DOUBLE", NULL }, + { 0, NULL, NULL } + }; + + static GType type = 0; + + if (G_UNLIKELY (! type)) + { + type = g_enum_register_static ("GimpRectanglePrecision", values); + gimp_type_set_translation_context (type, "rectangle-precision"); + gimp_enum_set_value_descriptions (type, descs); + } + + return type; +} + GType gimp_transform_function_get_type (void) { diff --git a/app/display/display-enums.h b/app/display/display-enums.h index c042d5fb2d..72d9553ec9 100644 --- a/app/display/display-enums.h +++ b/app/display/display-enums.h @@ -120,6 +120,42 @@ typedef enum } GimpPathStyle; +#define GIMP_TYPE_RECTANGLE_CONSTRAINT (gimp_rectangle_constraint_get_type ()) + +GType gimp_rectangle_constraint_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_RECTANGLE_CONSTRAIN_NONE, + GIMP_RECTANGLE_CONSTRAIN_IMAGE, + GIMP_RECTANGLE_CONSTRAIN_DRAWABLE +} GimpRectangleConstraint; + + +#define GIMP_TYPE_RECTANGLE_TOOL_FIXED_RULE (gimp_rectangle_tool_fixed_rule_get_type ()) + +GType gimp_rectangle_tool_fixed_rule_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_RECTANGLE_TOOL_FIXED_ASPECT, /*< desc="Aspect ratio" >*/ + GIMP_RECTANGLE_TOOL_FIXED_WIDTH, /*< desc="Width" >*/ + GIMP_RECTANGLE_TOOL_FIXED_HEIGHT, /*< desc="Height" >*/ + GIMP_RECTANGLE_TOOL_FIXED_SIZE, /*< desc="Size" >*/ +} GimpRectangleToolFixedRule; + + +#define GIMP_TYPE_RECTANGLE_PRECISION (gimp_rectangle_precision_get_type ()) + +GType gimp_rectangle_precision_get_type (void) G_GNUC_CONST; + +typedef enum +{ + GIMP_RECTANGLE_PRECISION_INT, + GIMP_RECTANGLE_PRECISION_DOUBLE, +} GimpRectanglePrecision; + + #define GIMP_TYPE_TRANSFORM_FUNCTION (gimp_transform_function_get_type ()) GType gimp_transform_function_get_type (void) G_GNUC_CONST; diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c index 497a77562f..ff6b00e350 100644 --- a/app/tools/tools-enums.c +++ b/app/tools/tools-enums.c @@ -9,99 +9,6 @@ #include "gimp-intl.h" /* enumerations from "tools-enums.h" */ -GType -gimp_rectangle_constraint_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_RECTANGLE_CONSTRAIN_NONE, "GIMP_RECTANGLE_CONSTRAIN_NONE", "none" }, - { GIMP_RECTANGLE_CONSTRAIN_IMAGE, "GIMP_RECTANGLE_CONSTRAIN_IMAGE", "image" }, - { GIMP_RECTANGLE_CONSTRAIN_DRAWABLE, "GIMP_RECTANGLE_CONSTRAIN_DRAWABLE", "drawable" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_RECTANGLE_CONSTRAIN_NONE, "GIMP_RECTANGLE_CONSTRAIN_NONE", NULL }, - { GIMP_RECTANGLE_CONSTRAIN_IMAGE, "GIMP_RECTANGLE_CONSTRAIN_IMAGE", NULL }, - { GIMP_RECTANGLE_CONSTRAIN_DRAWABLE, "GIMP_RECTANGLE_CONSTRAIN_DRAWABLE", NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (G_UNLIKELY (! type)) - { - type = g_enum_register_static ("GimpRectangleConstraint", values); - gimp_type_set_translation_context (type, "rectangle-constraint"); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_rectangle_precision_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_RECTANGLE_PRECISION_INT, "GIMP_RECTANGLE_PRECISION_INT", "int" }, - { GIMP_RECTANGLE_PRECISION_DOUBLE, "GIMP_RECTANGLE_PRECISION_DOUBLE", "double" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_RECTANGLE_PRECISION_INT, "GIMP_RECTANGLE_PRECISION_INT", NULL }, - { GIMP_RECTANGLE_PRECISION_DOUBLE, "GIMP_RECTANGLE_PRECISION_DOUBLE", NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (G_UNLIKELY (! type)) - { - type = g_enum_register_static ("GimpRectanglePrecision", values); - gimp_type_set_translation_context (type, "rectangle-precision"); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - -GType -gimp_rectangle_tool_fixed_rule_get_type (void) -{ - static const GEnumValue values[] = - { - { GIMP_RECTANGLE_TOOL_FIXED_ASPECT, "GIMP_RECTANGLE_TOOL_FIXED_ASPECT", "aspect" }, - { GIMP_RECTANGLE_TOOL_FIXED_WIDTH, "GIMP_RECTANGLE_TOOL_FIXED_WIDTH", "width" }, - { GIMP_RECTANGLE_TOOL_FIXED_HEIGHT, "GIMP_RECTANGLE_TOOL_FIXED_HEIGHT", "height" }, - { GIMP_RECTANGLE_TOOL_FIXED_SIZE, "GIMP_RECTANGLE_TOOL_FIXED_SIZE", "size" }, - { 0, NULL, NULL } - }; - - static const GimpEnumDesc descs[] = - { - { GIMP_RECTANGLE_TOOL_FIXED_ASPECT, NC_("rectangle-tool-fixed-rule", "Aspect ratio"), NULL }, - { GIMP_RECTANGLE_TOOL_FIXED_WIDTH, NC_("rectangle-tool-fixed-rule", "Width"), NULL }, - { GIMP_RECTANGLE_TOOL_FIXED_HEIGHT, NC_("rectangle-tool-fixed-rule", "Height"), NULL }, - { GIMP_RECTANGLE_TOOL_FIXED_SIZE, NC_("rectangle-tool-fixed-rule", "Size"), NULL }, - { 0, NULL, NULL } - }; - - static GType type = 0; - - if (G_UNLIKELY (! type)) - { - type = g_enum_register_static ("GimpRectangleToolFixedRule", values); - gimp_type_set_translation_context (type, "rectangle-tool-fixed-rule"); - gimp_enum_set_value_descriptions (type, descs); - } - - return type; -} - GType gimp_rect_select_mode_get_type (void) { diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h index def8967faf..a7f21589dd 100644 --- a/app/tools/tools-enums.h +++ b/app/tools/tools-enums.h @@ -23,42 +23,6 @@ * these enums are registered with the type system */ -#define GIMP_TYPE_RECTANGLE_CONSTRAINT (gimp_rectangle_constraint_get_type ()) - -GType gimp_rectangle_constraint_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RECTANGLE_CONSTRAIN_NONE, - GIMP_RECTANGLE_CONSTRAIN_IMAGE, - GIMP_RECTANGLE_CONSTRAIN_DRAWABLE -} GimpRectangleConstraint; - - -#define GIMP_TYPE_RECTANGLE_PRECISION (gimp_rectangle_precision_get_type ()) - -GType gimp_rectangle_precision_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RECTANGLE_PRECISION_INT, - GIMP_RECTANGLE_PRECISION_DOUBLE, -} GimpRectanglePrecision; - - -#define GIMP_TYPE_RECTANGLE_TOOL_FIXED_RULE (gimp_rectangle_tool_fixed_rule_get_type ()) - -GType gimp_rectangle_tool_fixed_rule_get_type (void) G_GNUC_CONST; - -typedef enum -{ - GIMP_RECTANGLE_TOOL_FIXED_ASPECT, /*< desc="Aspect ratio" >*/ - GIMP_RECTANGLE_TOOL_FIXED_WIDTH, /*< desc="Width" >*/ - GIMP_RECTANGLE_TOOL_FIXED_HEIGHT, /*< desc="Height" >*/ - GIMP_RECTANGLE_TOOL_FIXED_SIZE, /*< desc="Size" >*/ -} GimpRectangleToolFixedRule; - - #define GIMP_TYPE_RECT_SELECT_MODE (gimp_rect_select_mode_get_type ()) GType gimp_rect_select_mode_get_type (void) G_GNUC_CONST;