gimp r27379 - in trunk: . app/core

[mitch svn gnome org]

Author: mitch
Date: Thu Oct 23 21:30:28 2008
New Revision: 27379
URL: http://svn.gnome.org/viewvc/gimp?rev=27379&view=rev

Log:
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.



Modified:
   trunk/ChangeLog
   trunk/app/core/core-enums.c
   trunk/app/core/core-enums.h
   trunk/app/core/gimpdrawable-stroke.c
   trunk/app/core/gimpfilloptions.c
   trunk/app/core/gimpfilloptions.h

Modified: trunk/app/core/core-enums.c
==============================================================================
--- trunk/app/core/core-enums.c	(original)
+++ trunk/app/core/core-enums.c	Thu Oct 23 21:30:28 2008
@@ -265,19 +265,19 @@
 }
 
 GType
-gimp_stroke_method_get_type (void)
+gimp_fill_style_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_STROKE_METHOD_LIBART, "GIMP_STROKE_METHOD_LIBART", "libart" },
-    { GIMP_STROKE_METHOD_PAINT_CORE, "GIMP_STROKE_METHOD_PAINT_CORE", "paint-core" },
+    { 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_STROKE_METHOD_LIBART, N_("Stroke line"), NULL },
-    { GIMP_STROKE_METHOD_PAINT_CORE, N_("Stroke with a paint tool"), NULL },
+    { GIMP_FILL_STYLE_SOLID, N_("Solid color"), NULL },
+    { GIMP_FILL_STYLE_PATTERN, N_("Pattern"), NULL },
     { 0, NULL, NULL }
   };
 
@@ -285,7 +285,7 @@
 
   if (! type)
     {
-      type = g_enum_register_static ("GimpStrokeMethod", values);
+      type = g_enum_register_static ("GimpFillStyle", values);
       gimp_enum_set_value_descriptions (type, descs);
     }
 
@@ -293,19 +293,19 @@
 }
 
 GType
-gimp_stroke_style_get_type (void)
+gimp_stroke_method_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" },
+    { GIMP_STROKE_METHOD_LIBART, "GIMP_STROKE_METHOD_LIBART", "libart" },
+    { GIMP_STROKE_METHOD_PAINT_CORE, "GIMP_STROKE_METHOD_PAINT_CORE", "paint-core" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_STROKE_STYLE_SOLID, N_("Solid color"), NULL },
-    { GIMP_STROKE_STYLE_PATTERN, N_("Pattern"), NULL },
+    { GIMP_STROKE_METHOD_LIBART, N_("Stroke line"), NULL },
+    { GIMP_STROKE_METHOD_PAINT_CORE, N_("Stroke with a paint tool"), NULL },
     { 0, NULL, NULL }
   };
 
@@ -313,7 +313,7 @@
 
   if (! type)
     {
-      type = g_enum_register_static ("GimpStrokeStyle", values);
+      type = g_enum_register_static ("GimpStrokeMethod", values);
       gimp_enum_set_value_descriptions (type, descs);
     }
 

Modified: trunk/app/core/core-enums.h
==============================================================================
--- trunk/app/core/core-enums.h	(original)
+++ trunk/app/core/core-enums.h	Thu Oct 23 21:30:28 2008
@@ -146,26 +146,26 @@
 } GimpFillType;
 
 
-#define GIMP_TYPE_STROKE_METHOD (gimp_stroke_method_get_type ())
+#define GIMP_TYPE_FILL_STYLE (gimp_fill_style_get_type ())
 
-GType gimp_stroke_method_get_type (void) G_GNUC_CONST;
+GType gimp_fill_style_get_type (void) G_GNUC_CONST;
 
 typedef enum  /*< pdb-skip >*/
 {
-  GIMP_STROKE_METHOD_LIBART,     /*< desc="Stroke line"              >*/
-  GIMP_STROKE_METHOD_PAINT_CORE  /*< desc="Stroke with a paint tool" >*/
-} GimpStrokeMethod;
+  GIMP_FILL_STYLE_SOLID,  /*< desc="Solid color" >*/
+  GIMP_FILL_STYLE_PATTERN /*< desc="Pattern"     >*/
+} GimpFillStyle;
 
 
-#define GIMP_TYPE_STROKE_STYLE (gimp_stroke_style_get_type ())
+#define GIMP_TYPE_STROKE_METHOD (gimp_stroke_method_get_type ())
 
-GType gimp_stroke_style_get_type (void) G_GNUC_CONST;
+GType gimp_stroke_method_get_type (void) G_GNUC_CONST;
 
 typedef enum  /*< pdb-skip >*/
 {
-  GIMP_STROKE_STYLE_SOLID,  /*< desc="Solid color" >*/
-  GIMP_STROKE_STYLE_PATTERN /*< desc="Pattern"     >*/
-} GimpStrokeStyle;
+  GIMP_STROKE_METHOD_LIBART,     /*< desc="Stroke line"              >*/
+  GIMP_STROKE_METHOD_PAINT_CORE  /*< desc="Stroke with a paint tool" >*/
+} GimpStrokeMethod;
 
 
 #define GIMP_TYPE_JOIN_STYLE (gimp_join_style_get_type ())

Modified: trunk/app/core/gimpdrawable-stroke.c
==============================================================================
--- trunk/app/core/gimpdrawable-stroke.c	(original)
+++ trunk/app/core/gimpdrawable-stroke.c	Thu Oct 23 21:30:28 2008
@@ -281,7 +281,7 @@
 
   switch (GIMP_FILL_OPTIONS (options)->style)
     {
-    case GIMP_STROKE_STYLE_SOLID:
+    case GIMP_FILL_STYLE_SOLID:
       {
         guchar tmp_col[MAX_CHANNELS] = { 0, };
         guchar col[MAX_CHANNELS]     = { 0, };
@@ -299,7 +299,7 @@
       }
       break;
 
-    case GIMP_STROKE_STYLE_PATTERN:
+    case GIMP_FILL_STYLE_PATTERN:
       {
         GimpPattern *pattern;
         TempBuf     *pat_buf;

Modified: trunk/app/core/gimpfilloptions.c
==============================================================================
--- trunk/app/core/gimpfilloptions.c	(original)
+++ trunk/app/core/gimpfilloptions.c	Thu Oct 23 21:30:28 2008
@@ -62,8 +62,8 @@
 
   GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_STYLE,
                                  "style", NULL,
-                                 GIMP_TYPE_STROKE_STYLE,
-                                 GIMP_STROKE_STYLE_SOLID,
+                                 GIMP_TYPE_FILL_STYLE,
+                                 GIMP_FILL_STYLE_SOLID,
                                  GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ANTIALIAS,

Modified: trunk/app/core/gimpfilloptions.h
==============================================================================
--- trunk/app/core/gimpfilloptions.h	(original)
+++ trunk/app/core/gimpfilloptions.h	Thu Oct 23 21:30:28 2008
@@ -38,11 +38,11 @@
 
 struct _GimpFillOptions
 {
-  GimpContext      parent_instance;
+  GimpContext    parent_instance;
 
-  GimpStrokeStyle  style;
+  GimpFillStyle  style;
 
-  gboolean         antialias;
+  gboolean       antialias;
 };
 
 struct _GimpFillOptionsClass