gimp r25523 - in trunk: . app/paint

[mitch svn gnome org]

Author: mitch
Date: Fri Apr 25 10:52:01 2008
New Revision: 25523
URL: http://svn.gnome.org/viewvc/gimp?rev=25523&view=rev

Log:
2008-04-25  Michael Natterer  <mitch gimp org>

	* app/paint/gimppaintoptions.[ch]: reorder jitter options stuff to
	be consistently ordered all over the place.



Modified:
   trunk/ChangeLog
   trunk/app/paint/gimppaintoptions.c
   trunk/app/paint/gimppaintoptions.h

Modified: trunk/app/paint/gimppaintoptions.c
==============================================================================
--- trunk/app/paint/gimppaintoptions.c	(original)
+++ trunk/app/paint/gimppaintoptions.c	Fri Apr 25 10:52:01 2008
@@ -63,10 +63,12 @@
 enum
 {
   PROP_0,
+
   PROP_PAINT_INFO,
   PROP_BRUSH_SCALE,
   PROP_APPLICATION_MODE,
   PROP_HARD,
+
   PROP_PRESSURE_EXPANDED,
   PROP_PRESSURE_OPACITY,
   PROP_PRESSURE_HARDNESS,
@@ -74,16 +76,19 @@
   PROP_PRESSURE_SIZE,
   PROP_PRESSURE_INVERSE_SIZE,
   PROP_PRESSURE_COLOR,
+
   PROP_USE_FADE,
   PROP_FADE_LENGTH,
   PROP_FADE_UNIT,
+
+  PROP_USE_JITTER,
+  PROP_JITTER_AMOUNT,
+
   PROP_USE_GRADIENT,
   PROP_GRADIENT_REVERSE,
   PROP_GRADIENT_REPEAT,
   PROP_GRADIENT_LENGTH,
   PROP_GRADIENT_UNIT,
-  PROP_USE_JITTER,
-  PROP_JITTER_AMOUNT,
 
   PROP_BRUSH_VIEW_TYPE,
   PROP_BRUSH_VIEW_SIZE,
@@ -260,8 +265,8 @@
 
   options->pressure_options = g_slice_new0 (GimpPressureOptions);
   options->fade_options     = g_slice_new0 (GimpFadeOptions);
-  options->gradient_options = g_slice_new0 (GimpGradientOptions);
   options->jitter_options   = g_slice_new0 (GimpJitterOptions);
+  options->gradient_options = g_slice_new0 (GimpGradientOptions);
 }
 
 static void
@@ -274,8 +279,8 @@
 
   g_slice_free (GimpPressureOptions, options->pressure_options);
   g_slice_free (GimpFadeOptions,     options->fade_options);
-  g_slice_free (GimpGradientOptions, options->gradient_options);
   g_slice_free (GimpJitterOptions,   options->jitter_options);
+  g_slice_free (GimpGradientOptions, options->gradient_options);
 
   G_OBJECT_CLASS (parent_class)->finalize (object);
 }
@@ -286,16 +291,11 @@
                                  const GValue *value,
                                  GParamSpec   *pspec)
 {
-  GimpPaintOptions    *options = GIMP_PAINT_OPTIONS (object);
-  GimpPressureOptions *pressure_options;
-  GimpFadeOptions     *fade_options;
-  GimpGradientOptions *gradient_options;
-  GimpJitterOptions   *jitter_options;
-
-  pressure_options = options->pressure_options;
-  fade_options     = options->fade_options;
-  gradient_options = options->gradient_options;
-  jitter_options   = options->jitter_options;
+  GimpPaintOptions    *options          = GIMP_PAINT_OPTIONS (object);
+  GimpPressureOptions *pressure_options = options->pressure_options;
+  GimpFadeOptions     *fade_options     = options->fade_options;
+  GimpJitterOptions   *jitter_options   = options->jitter_options;
+  GimpGradientOptions *gradient_options = options->gradient_options;
 
   switch (property_id)
     {
@@ -401,16 +401,11 @@
                                  GValue     *value,
                                  GParamSpec *pspec)
 {
-  GimpPaintOptions    *options = GIMP_PAINT_OPTIONS (object);
-  GimpPressureOptions *pressure_options;
-  GimpFadeOptions     *fade_options;
-  GimpGradientOptions *gradient_options;
-  GimpJitterOptions   *jitter_options;
-
-  pressure_options = options->pressure_options;
-  fade_options     = options->fade_options;
-  gradient_options = options->gradient_options;
-  jitter_options   = options->jitter_options;
+  GimpPaintOptions    *options          = GIMP_PAINT_OPTIONS (object);
+  GimpPressureOptions *pressure_options = options->pressure_options;
+  GimpFadeOptions     *fade_options     = options->fade_options;
+  GimpJitterOptions   *jitter_options   = options->jitter_options;
+  GimpGradientOptions *gradient_options = options->gradient_options;
 
   switch (property_id)
     {

Modified: trunk/app/paint/gimppaintoptions.h
==============================================================================
--- trunk/app/paint/gimppaintoptions.h	(original)
+++ trunk/app/paint/gimppaintoptions.h	Fri Apr 25 10:52:01 2008
@@ -32,8 +32,8 @@
 
 typedef struct _GimpPressureOptions GimpPressureOptions;
 typedef struct _GimpFadeOptions     GimpFadeOptions;
-typedef struct _GimpGradientOptions GimpGradientOptions;
 typedef struct _GimpJitterOptions   GimpJitterOptions;
+typedef struct _GimpGradientOptions GimpGradientOptions;
 
 struct _GimpPressureOptions
 {
@@ -94,8 +94,8 @@
 
   GimpPressureOptions      *pressure_options;
   GimpFadeOptions          *fade_options;
-  GimpGradientOptions      *gradient_options;
   GimpJitterOptions        *jitter_options;
+  GimpGradientOptions      *gradient_options;
 
   GimpViewType              brush_view_type;
   GimpViewSize              brush_view_size;
@@ -119,15 +119,15 @@
                                                 GimpImage        *image,
                                                 gdouble           pixel_dist);
 
+gdouble          gimp_paint_options_get_jitter (GimpPaintOptions *paint_options,
+                                                GimpImage        *image);
+
 gboolean gimp_paint_options_get_gradient_color (GimpPaintOptions *paint_options,
                                                 GimpImage        *image,
                                                 gdouble           pressure,
                                                 gdouble           pixel_dist,
                                                 GimpRGB          *color);
 
-gdouble          gimp_paint_options_get_jitter (GimpPaintOptions *paint_options,
-                                                GimpImage        *image);
-
 GimpBrushApplicationMode
              gimp_paint_options_get_brush_mode (GimpPaintOptions *paint_options);