[gimp] warp: reorder warp tool options

[N/A <ell src gnome org>]

commit cd5930d813b88a74c31fcc4f6dc3daa3c03a7a34
Author: Ell <ell_se yahoo com>
Date:   Fri May 19 04:24:01 2017 -0400

    warp: reorder warp tool options
    
    ... to be more similar to the paint options.

 app/tools/gimpwarpoptions.c |   40 ++++++++++++++++++++--------------------
 app/tools/gimpwarpoptions.h |    2 +-
 app/tools/gimpwarptool.c    |    2 +-
 3 files changed, 22 insertions(+), 22 deletions(-)
---
diff --git a/app/tools/gimpwarpoptions.c b/app/tools/gimpwarpoptions.c
index 40385a1..1f87a43 100644
--- a/app/tools/gimpwarpoptions.c
+++ b/app/tools/gimpwarpoptions.c
@@ -40,9 +40,9 @@ enum
 {
   PROP_0,
   PROP_BEHAVIOR,
-  PROP_EFFECT_STRENGTH,
   PROP_EFFECT_SIZE,
   PROP_EFFECT_HARDNESS,
+  PROP_EFFECT_STRENGTH,
   PROP_STROKE_SPACING,
   PROP_STROKE_DURING_MOTION,
   PROP_STROKE_PERIODICALLY,
@@ -83,13 +83,6 @@ gimp_warp_options_class_init (GimpWarpOptionsClass *klass)
                          GIMP_WARP_BEHAVIOR_MOVE,
                          GIMP_PARAM_STATIC_STRINGS);
 
-  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EFFECT_STRENGTH,
-                           "effect-strength",
-                           _("Strength"),
-                           _("Effect Strength"),
-                           1.0, 100.0, 50.0,
-                           GIMP_PARAM_STATIC_STRINGS);
-
   GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EFFECT_SIZE,
                            "effect-size",
                            _("Size"),
@@ -104,6 +97,13 @@ gimp_warp_options_class_init (GimpWarpOptionsClass *klass)
                            0.0, 100.0, 50.0,
                            GIMP_PARAM_STATIC_STRINGS);
 
+  GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_EFFECT_STRENGTH,
+                           "effect-strength",
+                           _("Strength"),
+                           _("Effect Strength"),
+                           1.0, 100.0, 50.0,
+                           GIMP_PARAM_STATIC_STRINGS);
+
   GIMP_CONFIG_PROP_DOUBLE (object_class, PROP_STROKE_SPACING,
                            "stroke-spacing",
                            _("Spacing"),
@@ -158,15 +158,15 @@ gimp_warp_options_set_property (GObject      *object,
     case PROP_BEHAVIOR:
       options->behavior = g_value_get_enum (value);
       break;
-    case PROP_EFFECT_STRENGTH:
-      options->effect_strength = g_value_get_double (value);
-      break;
     case PROP_EFFECT_SIZE:
       options->effect_size = g_value_get_double (value);
       break;
     case PROP_EFFECT_HARDNESS:
       options->effect_hardness = g_value_get_double (value);
       break;
+    case PROP_EFFECT_STRENGTH:
+      options->effect_strength = g_value_get_double (value);
+      break;
     case PROP_STROKE_SPACING:
       options->stroke_spacing = g_value_get_double (value);
       break;
@@ -202,15 +202,15 @@ gimp_warp_options_get_property (GObject    *object,
     case PROP_BEHAVIOR:
       g_value_set_enum (value, options->behavior);
       break;
-    case PROP_EFFECT_STRENGTH:
-      g_value_set_double (value, options->effect_strength);
-      break;
     case PROP_EFFECT_SIZE:
       g_value_set_double (value, options->effect_size);
       break;
     case PROP_EFFECT_HARDNESS:
       g_value_set_double (value, options->effect_hardness);
       break;
+    case PROP_EFFECT_STRENGTH:
+      g_value_set_double (value, options->effect_strength);
+      break;
     case PROP_STROKE_SPACING:
       g_value_set_double (value, options->stroke_spacing);
       break;
@@ -250,12 +250,6 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
   gtk_widget_show (combo);
 
-  scale = gimp_prop_spin_scale_new (config, "effect-strength", NULL,
-                                    1, 10, 1);
-  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
-  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
-  gtk_widget_show (scale);
-
   scale = gimp_prop_spin_scale_new (config, "effect-size", NULL,
                                     0.01, 1.0, 2);
   gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 1000.0);
@@ -268,6 +262,12 @@ gimp_warp_options_gui (GimpToolOptions *tool_options)
   gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
   gtk_widget_show (scale);
 
+  scale = gimp_prop_spin_scale_new (config, "effect-strength", NULL,
+                                    1, 10, 1);
+  gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, FALSE, 0);
+  gtk_widget_show (scale);
+
   scale = gimp_prop_spin_scale_new (config, "stroke-spacing", NULL,
                                     1, 10, 1);
   gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (scale), 1.0, 100.0);
diff --git a/app/tools/gimpwarpoptions.h b/app/tools/gimpwarpoptions.h
index f66beda..9d143d7 100644
--- a/app/tools/gimpwarpoptions.h
+++ b/app/tools/gimpwarpoptions.h
@@ -40,9 +40,9 @@ struct _GimpWarpOptions
   GimpToolOptions   parent_instance;
 
   GimpWarpBehavior  behavior;
-  gdouble           effect_strength;
   gdouble           effect_size;
   gdouble           effect_hardness;
+  gdouble           effect_strength;
   gdouble           stroke_spacing;
 
   gboolean          stroke_during_motion;
diff --git a/app/tools/gimpwarptool.c b/app/tools/gimpwarptool.c
index bed1676..4cdf358 100644
--- a/app/tools/gimpwarptool.c
+++ b/app/tools/gimpwarptool.c
@@ -257,9 +257,9 @@ gimp_warp_tool_button_press (GimpTool            *tool,
   new_op = gegl_node_new_child (NULL,
                                 "operation", "gegl:warp",
                                 "behavior",  options->behavior,
-                                "strength",  options->effect_strength,
                                 "size",      options->effect_size,
                                 "hardness",  options->effect_hardness / 100.0,
+                                "strength",  options->effect_strength,
                                 "spacing",   options->stroke_spacing / 100.0,
                                 "stroke",    wt->current_stroke,
                                 NULL);