[gimp/soc-2009-dynamics] Resurrect the paint option's "use-fade" property and UI

[Michael Natterer <mitch src gnome org>]

commit 36523134f569813c4b549991995dd93c0ddb5626
Author: Michael Natterer <mitch gimp org>
Date:   Tue Oct 13 19:19:12 2009 +0200

    Resurrect the paint option's "use-fade" property and UI
    
    Whether to use fade at all is a user input, so should be controllable
    independently from its dynamic mapping. The reborn property is not
    used again yet.

 app/paint/gimppaintoptions.c     |   19 ++++++++++++++++---
 app/tools/gimppaintoptions-gui.c |    8 +++-----
 2 files changed, 19 insertions(+), 8 deletions(-)
---
diff --git a/app/paint/gimppaintoptions.c b/app/paint/gimppaintoptions.c
index 9084504..38187d0 100644
--- a/app/paint/gimppaintoptions.c
+++ b/app/paint/gimppaintoptions.c
@@ -44,6 +44,7 @@
 #define DEFAULT_APPLICATION_MODE       GIMP_PAINT_CONSTANT
 #define DEFAULT_HARD                   FALSE
 
+#define DEFAULT_USE_FADE               FALSE
 #define DEFAULT_FADE_LENGTH            100.0
 #define DEFAULT_FADE_UNIT              GIMP_UNIT_PIXEL
 
@@ -70,6 +71,7 @@ enum
   PROP_APPLICATION_MODE,
   PROP_HARD,
 
+  PROP_USE_FADE,
   PROP_FADE_LENGTH,
   PROP_FADE_UNIT,
 
@@ -151,6 +153,10 @@ gimp_paint_options_class_init (GimpPaintOptionsClass *klass)
                                     DEFAULT_HARD,
                                     GIMP_PARAM_STATIC_STRINGS);
 
+  GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_USE_FADE,
+                                    "use-fade", NULL,
+                                    DEFAULT_USE_FADE,
+                                    GIMP_PARAM_STATIC_STRINGS);
   GIMP_CONFIG_INSTALL_PROP_DOUBLE (object_class, PROP_FADE_LENGTH,
                                    "fade-length", NULL,
                                    0.0, 32767.0, DEFAULT_FADE_LENGTH,
@@ -289,6 +295,10 @@ gimp_paint_options_set_property (GObject      *object,
       options->hard = g_value_get_boolean (value);
       break;
 
+    case PROP_USE_FADE:
+      fade_options->use_fade = g_value_get_boolean (value);
+      break;
+
     case PROP_FADE_LENGTH:
       fade_options->fade_length = g_value_get_double (value);
       break;
@@ -392,6 +402,10 @@ gimp_paint_options_get_property (GObject    *object,
       g_value_set_boolean (value, options->hard);
       break;
 
+    case PROP_USE_FADE:
+      g_value_set_boolean (value, fade_options->use_fade);
+      break;
+
     case PROP_FADE_LENGTH:
       g_value_set_double (value, fade_options->fade_length);
       break;
@@ -505,7 +519,7 @@ gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
                              gdouble           pixel_dist)
 {
   GimpFadeOptions *fade_options;
-  gdouble z = -1.0;
+  gdouble          z = -1.0;
 
 
   g_return_val_if_fail (GIMP_IS_PAINT_OPTIONS (paint_options),
@@ -514,7 +528,7 @@ gimp_paint_options_get_fade (GimpPaintOptions *paint_options,
 
   fade_options = paint_options->fade_options;
 
-  if (gimp_dynamics_input_fade_enabled(gimp_context_get_dynamics (GIMP_CONTEXT (paint_options))))
+  if (gimp_dynamics_input_fade_enabled (gimp_context_get_dynamics (GIMP_CONTEXT (paint_options))))
     {
       gdouble fade_out = 0.0;
       gdouble unit_factor;
@@ -576,7 +590,6 @@ gimp_paint_options_get_jitter (GimpPaintOptions *paint_options,
       return jitter_options->jitter_amount;
     }
 
-
   return 0.0;
 }
 
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 8d2d656..f1fd392 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -206,11 +206,9 @@ fade_options_gui (GimpPaintOptions *paint_options,
   table = gtk_table_new (1, 3, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (table), 2);
 
-  gtk_widget_show (table);
-
-  frame = gtk_frame_new (_("Fade settings"));
-
-  gtk_container_add(GTK_CONTAINER(frame), table);
+  frame = gimp_prop_expanding_frame_new (config, "use-fade",
+                                         _("Fade out"),
+                                         table, NULL);
 
   /*  the fade-out sizeentry  */
   spinbutton = gimp_prop_spin_button_new (config, "fade-length",