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

rename GimpStrokeStyle to GimpFillStyle.

Browse Source 
2008-10-23  Michael Natterer  <mitch@gimp.org>

	* app/core/core-enums.[ch]: rename GimpStrokeStyle to GimpFillStyle.

	* app/core/gimpfilloptions.[ch]
	* app/core/gimpdrawable-stroke.c
	(gimp_drawable_stroke_scan_convert): changed accordingly.


svn path=/trunk/; revision=27379
This commit is contained in:
Michael Natterer
2008-10-23 21:30:28 +00:00
committed by Michael Natterer
parent 67a5eaea68
commit 3dfef0f15a
6 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2008-10-23 Michael Natterer <mitch@gimp.org>
* app/core/core-enums.[ch]: rename GimpStrokeStyle to GimpFillStyle.
* app/core/gimpfilloptions.[ch]
* app/core/gimpdrawable-stroke.c
(gimp_drawable_stroke_scan_convert): changed accordingly.
2008-10-23 Michael Natterer <mitch@gimp.org> 2008-10-23 Michael Natterer <mitch@gimp.org>
Merge a part of SOC 2006's vector layer branch: Merge a part of SOC 2006's vector layer branch:

56
app/core/core-enums.c
View File

@ -264,6 +264,34 @@ gimp_fill_type_get_type (void)
return type; return type;
} }
GType
gimp_fill_style_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_FILL_STYLE_SOLID, "GIMP_FILL_STYLE_SOLID", "solid" },
{ GIMP_FILL_STYLE_PATTERN, "GIMP_FILL_STYLE_PATTERN", "pattern" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_FILL_STYLE_SOLID, N_("Solid color"), NULL },
{ GIMP_FILL_STYLE_PATTERN, N_("Pattern"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (! type)
{
type = g_enum_register_static ("GimpFillStyle", values);
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType GType
gimp_stroke_method_get_type (void) gimp_stroke_method_get_type (void)
{ {
@ -292,34 +320,6 @@ gimp_stroke_method_get_type (void)
return type; return type;
} }
GType
gimp_stroke_style_get_type (void)
{
static const GEnumValue values[] =
{
{ GIMP_STROKE_STYLE_SOLID, "GIMP_STROKE_STYLE_SOLID", "solid" },
{ GIMP_STROKE_STYLE_PATTERN, "GIMP_STROKE_STYLE_PATTERN", "pattern" },
{ 0, NULL, NULL }
};
static const GimpEnumDesc descs[] =
{
{ GIMP_STROKE_STYLE_SOLID, N_("Solid color"), NULL },
{ GIMP_STROKE_STYLE_PATTERN, N_("Pattern"), NULL },
{ 0, NULL, NULL }
};
static GType type = 0;
if (! type)
{
type = g_enum_register_static ("GimpStrokeStyle", values);
gimp_enum_set_value_descriptions (type, descs);
}
return type;
}
GType GType
gimp_join_style_get_type (void) gimp_join_style_get_type (void)
{ {

22
app/core/core-enums.h
View File

@ -146,6 +146,17 @@ typedef enum
} GimpFillType; } GimpFillType;
#define GIMP_TYPE_FILL_STYLE (gimp_fill_style_get_type ())
GType gimp_fill_style_get_type (void) G_GNUC_CONST;
typedef enum /*< pdb-skip >*/
{
GIMP_FILL_STYLE_SOLID, /*< desc="Solid color" >*/
GIMP_FILL_STYLE_PATTERN /*< desc="Pattern" >*/
} GimpFillStyle;
#define GIMP_TYPE_STROKE_METHOD (gimp_stroke_method_get_type ()) #define GIMP_TYPE_STROKE_METHOD (gimp_stroke_method_get_type ())
GType gimp_stroke_method_get_type (void) G_GNUC_CONST; GType gimp_stroke_method_get_type (void) G_GNUC_CONST;
@ -157,17 +168,6 @@ typedef enum /*< pdb-skip >*/
} GimpStrokeMethod; } GimpStrokeMethod;
#define GIMP_TYPE_STROKE_STYLE (gimp_stroke_style_get_type ())
GType gimp_stroke_style_get_type (void) G_GNUC_CONST;
typedef enum /*< pdb-skip >*/
{
GIMP_STROKE_STYLE_SOLID, /*< desc="Solid color" >*/
GIMP_STROKE_STYLE_PATTERN /*< desc="Pattern" >*/
} GimpStrokeStyle;
#define GIMP_TYPE_JOIN_STYLE (gimp_join_style_get_type ()) #define GIMP_TYPE_JOIN_STYLE (gimp_join_style_get_type ())
GType gimp_join_style_get_type (void) G_GNUC_CONST; GType gimp_join_style_get_type (void) G_GNUC_CONST;

4
app/core/gimpdrawable-stroke.c
View File

@ -281,7 +281,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
switch (GIMP_FILL_OPTIONS (options)->style) switch (GIMP_FILL_OPTIONS (options)->style)
{ {
case GIMP_STROKE_STYLE_SOLID: case GIMP_FILL_STYLE_SOLID:
{ {
guchar tmp_col[MAX_CHANNELS] = { 0, }; guchar tmp_col[MAX_CHANNELS] = { 0, };
guchar col[MAX_CHANNELS] = { 0, }; guchar col[MAX_CHANNELS] = { 0, };
@ -299,7 +299,7 @@ gimp_drawable_stroke_scan_convert (GimpDrawable *drawable,
} }
break; break;
case GIMP_STROKE_STYLE_PATTERN: case GIMP_FILL_STYLE_PATTERN:
{ {
GimpPattern *pattern; GimpPattern *pattern;
TempBuf *pat_buf; TempBuf *pat_buf;

4
app/core/gimpfilloptions.c
View File

@ -62,8 +62,8 @@ gimp_fill_options_class_init (GimpFillOptionsClass *klass)
GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_STYLE, GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_STYLE,
"style", NULL, "style", NULL,
GIMP_TYPE_STROKE_STYLE, GIMP_TYPE_FILL_STYLE,
GIMP_STROKE_STYLE_SOLID, GIMP_FILL_STYLE_SOLID,
GIMP_PARAM_STATIC_STRINGS); GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS, GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,

6
app/core/gimpfilloptions.h
View File

@ -38,11 +38,11 @@ typedef struct _GimpFillOptionsClass GimpFillOptionsClass;
struct _GimpFillOptions struct _GimpFillOptions
{ {
GimpContext parent_instance; GimpContext parent_instance;
GimpStrokeStyle style; GimpFillStyle style;
gboolean antialias; gboolean antialias;
}; };
struct _GimpFillOptionsClass struct _GimpFillOptionsClass