callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

app: move enum GimpRectangleGuide from tools/ to display/

Browse Source 
and rename it to enum GimpGuidesType.
This commit is contained in:
Michael Natterer
2011-05-20 19:41:48 +02:00
parent da380504bf
commit 0dcdfe9e80
7 changed files with 62 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
app/display/display-enums.c
View File

@ -39,6 +39,43 @@ gimp_cursor_precision_get_type (void)
return type;
}
GType
gimp_guides_type_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_GUIDES_NONE, "GIMP_GUIDES_NONE", "none" },
{ GIMP_GUIDES_CENTER_LINES, "GIMP_GUIDES_CENTER_LINES", "center-lines" },
{ GIMP_GUIDES_THIRDS, "GIMP_GUIDES_THIRDS", "thirds" },
{ GIMP_GUIDES_FIFTHS, "GIMP_GUIDES_FIFTHS", "fifths" },
{ GIMP_GUIDES_GOLDEN, "GIMP_GUIDES_GOLDEN", "golden" },
{ GIMP_GUIDES_DIAGONALS, "GIMP_GUIDES_DIAGONALS", "diagonals" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_GUIDES_NONE, NC_("guides-type", "No guides"), NULL },
{ GIMP_GUIDES_CENTER_LINES, NC_("guides-type", "Center lines"), NULL },
{ GIMP_GUIDES_THIRDS, NC_("guides-type", "Rule of thirds"), NULL },
{ GIMP_GUIDES_FIFTHS, NC_("guides-type", "Rule of fifths"), NULL },
{ GIMP_GUIDES_GOLDEN, NC_("guides-type", "Golden sections"), NULL },
{ GIMP_GUIDES_DIAGONALS, NC_("guides-type", "Diagonal lines"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpGuidesType", values);
gimp_type_set_translation_context (type, "guides-type");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_handle_type_get_type (void)
{

15
app/display/display-enums.h
View File

@ -31,6 +31,21 @@ typedef enum
} GimpCursorPrecision;
#define GIMP_TYPE_GUIDES_TYPE (gimp_guides_type_get_type ())
GType gimp_guides_type_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_GUIDES_NONE, /*< desc="No guides" >*/
GIMP_GUIDES_CENTER_LINES, /*< desc="Center lines" >*/
GIMP_GUIDES_THIRDS, /*< desc="Rule of thirds" >*/
GIMP_GUIDES_FIFTHS, /*< desc="Rule of fifths" >*/
GIMP_GUIDES_GOLDEN, /*< desc="Golden sections" >*/
GIMP_GUIDES_DIAGONALS /*< desc="Diagonal lines" >*/
} GimpGuidesType;
#define GIMP_TYPE_HANDLE_TYPE (gimp_handle_type_get_type ())
GType gimp_handle_type_get_type (void) G_GNUC_CONST;

4
app/tools/gimprectangleoptions.c
View File

@ -120,8 +120,8 @@ gimp_rectangle_options_iface_base_init (GimpRectangleOptionsInterface *iface)
g_param_spec_enum ("guide",
NULL,
N_("Composition guides such as rule of thirds"),
GIMP_TYPE_RECTANGLE_GUIDE,
GIMP_RECTANGLE_GUIDE_NONE,
GIMP_TYPE_GUIDES_TYPE,
GIMP_GUIDES_NONE,
GIMP_CONFIG_PARAM_FLAGS |
GIMP_PARAM_STATIC_STRINGS));

2
app/tools/gimprectangleoptions.h
View File

@ -80,7 +80,7 @@ struct _GimpRectangleOptionsPrivate
gboolean shrink_merged;
gboolean highlight;
GimpRectangleGuide guide;
GimpGuidesType guide;
gdouble x;
gdouble y;

14
app/tools/gimprectangletool.c
View File

@ -201,7 +201,7 @@ struct _GimpRectangleToolPrivate
gint suppress_updates;
/* Synced with options->guide, only exists for drawing. */
GimpRectangleGuide guide;
GimpGuidesType guide;
};
@ -1868,10 +1868,10 @@ gimp_rectangle_tool_draw_guides (GimpDrawTool *draw_tool)
switch (GIMP_RECTANGLE_TOOL_GET_PRIVATE (tool)->guide)
{
case GIMP_RECTANGLE_GUIDE_NONE:
case GIMP_GUIDES_NONE:
break;
case GIMP_RECTANGLE_GUIDE_CENTER_LINES:
case GIMP_GUIDES_CENTER_LINES:
gimp_draw_tool_add_line (draw_tool,
x1, (y1 + y2) / 2,
x2, (y1 + y2) / 2);
@ -1881,7 +1881,7 @@ gimp_rectangle_tool_draw_guides (GimpDrawTool *draw_tool)
(x1 + x2) / 2, y2);
break;
case GIMP_RECTANGLE_GUIDE_THIRDS:
case GIMP_GUIDES_THIRDS:
gimp_draw_tool_add_line (draw_tool,
x1, (2 * y1 + y2) / 3,
x2, (2 * y1 + y2) / 3);
@ -1897,7 +1897,7 @@ gimp_rectangle_tool_draw_guides (GimpDrawTool *draw_tool)
(x1 + 2 * x2) / 3, y2);
break;
case GIMP_RECTANGLE_GUIDE_FIFTHS:
case GIMP_GUIDES_FIFTHS:
gimp_draw_tool_add_line (draw_tool,
x1, y1 + (y2 - y1) / 5,
x2, y1 + (y2 - y1) / 5);
@ -1925,7 +1925,7 @@ gimp_rectangle_tool_draw_guides (GimpDrawTool *draw_tool)
x1 + 4 * (x2 - x1) / 5, y2);
break;
case GIMP_RECTANGLE_GUIDE_GOLDEN:
case GIMP_GUIDES_GOLDEN:
gimp_draw_tool_add_line (draw_tool,
x1,
(2 * y1 + (1 + SQRT5) * y2) / (3 + SQRT5),
@ -1952,7 +1952,7 @@ gimp_rectangle_tool_draw_guides (GimpDrawTool *draw_tool)
/* This code implements the method of diagonals discovered by
* Edwin Westhoff - see http://www.diagonalmethod.info/
*/
case GIMP_RECTANGLE_GUIDE_DIAGONALS:
case GIMP_GUIDES_DIAGONALS:
{
/* the side of the largest square that can be
* fitted in whole into the rectangle (x1, y1), (x2, y2)

37
app/tools/tools-enums.c
View File

@ -73,43 +73,6 @@ gimp_button_release_type_get_type (void)
return type;
}
GType
gimp_rectangle_guide_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_RECTANGLE_GUIDE_NONE, "GIMP_RECTANGLE_GUIDE_NONE", "none" },
{ GIMP_RECTANGLE_GUIDE_CENTER_LINES, "GIMP_RECTANGLE_GUIDE_CENTER_LINES", "center-lines" },
{ GIMP_RECTANGLE_GUIDE_THIRDS, "GIMP_RECTANGLE_GUIDE_THIRDS", "thirds" },
{ GIMP_RECTANGLE_GUIDE_FIFTHS, "GIMP_RECTANGLE_GUIDE_FIFTHS", "fifths" },
{ GIMP_RECTANGLE_GUIDE_GOLDEN, "GIMP_RECTANGLE_GUIDE_GOLDEN", "golden" },
{ GIMP_RECTANGLE_GUIDE_DIAGONALS, "GIMP_RECTANGLE_GUIDE_DIAGONALS", "diagonals" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_RECTANGLE_GUIDE_NONE, NC_("rectangle-guide", "No guides"), NULL },
{ GIMP_RECTANGLE_GUIDE_CENTER_LINES, NC_("rectangle-guide", "Center lines"), NULL },
{ GIMP_RECTANGLE_GUIDE_THIRDS, NC_("rectangle-guide", "Rule of thirds"), NULL },
{ GIMP_RECTANGLE_GUIDE_FIFTHS, NC_("rectangle-guide", "Rule of fifths"), NULL },
{ GIMP_RECTANGLE_GUIDE_GOLDEN, NC_("rectangle-guide", "Golden sections"), NULL },
{ GIMP_RECTANGLE_GUIDE_DIAGONALS, NC_("rectangle-guide", "Diagonal lines"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (G_UNLIKELY (! type))
{
type = g_enum_register_static ("GimpRectangleGuide", values);
gimp_type_set_translation_context (type, "rectangle-guide");
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType
gimp_rectangle_constraint_get_type (void)
{

15
app/tools/tools-enums.h
View File

@ -47,21 +47,6 @@ typedef enum
} GimpButtonReleaseType;
#define GIMP_TYPE_RECTANGLE_GUIDE (gimp_rectangle_guide_get_type ())
GType gimp_rectangle_guide_get_type (void) G_GNUC_CONST;
typedef enum
{
GIMP_RECTANGLE_GUIDE_NONE, /*< desc="No guides" >*/
GIMP_RECTANGLE_GUIDE_CENTER_LINES, /*< desc="Center lines" >*/
GIMP_RECTANGLE_GUIDE_THIRDS, /*< desc="Rule of thirds" >*/
GIMP_RECTANGLE_GUIDE_FIFTHS, /*< desc="Rule of fifths" >*/
GIMP_RECTANGLE_GUIDE_GOLDEN, /*< desc="Golden sections" >*/
GIMP_RECTANGLE_GUIDE_DIAGONALS /*< desc="Diagonal lines" >*/
} GimpRectangleGuide;
#define GIMP_TYPE_RECTANGLE_CONSTRAINT (gimp_rectangle_constraint_get_type ())
GType gimp_rectangle_constraint_get_type (void) G_GNUC_CONST;