[gimp] app: npd: no CAPS in property and member names

[Michael Natterer <mitch src gnome org>]

commit 87ee494f79dcc4de0933da411f6650c2dca091a2
Author: Michael Natterer <mitch gimp org>
Date:   Sun Mar 1 18:21:17 2015 +0100

    app: npd: no CAPS in property and member names
    
    This commit should also fix setting the tool's options on the GEGL op;
    and it gets rid of one more member of the npd options.

 app/tools/gimpnpointdeformationoptions.c |   31 ++++++++++++++---------------
 app/tools/gimpnpointdeformationoptions.h |    7 ++---
 app/tools/gimpnpointdeformationtool.c    |    8 +++---
 3 files changed, 22 insertions(+), 24 deletions(-)
---
diff --git a/app/tools/gimpnpointdeformationoptions.c b/app/tools/gimpnpointdeformationoptions.c
index 43750a9..59a6b80 100644
--- a/app/tools/gimpnpointdeformationoptions.c
+++ b/app/tools/gimpnpointdeformationoptions.c
@@ -83,17 +83,17 @@ gimp_n_point_deformation_options_class_init (GimpNPointDeformationOptionsClass *
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_ASAP_DEFORMATION,
-                                    "ASAP-deformation", _("Deformation mode"),
+                                    "asap-deformation", _("Deformation mode"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_MLS_WEIGHTS,
-                                    "MLS-weights", _("Use weights"),
+                                    "mls-weights", _("Use weights"),
                                     FALSE,
                                     GIMP_PARAM_STATIC_STRINGS);
 
   GIMP_CONFIG_INSTALL_PROP_DOUBLE  (object_class, PROP_MLS_WEIGHTS_ALPHA,
-                                    "MLS-weights-alpha",
+                                    "mls-weights-alpha",
                                     _("Amount of control points' influence"),
                                     0.1, 2.0, 1.0,
                                     GIMP_PARAM_STATIC_STRINGS);
@@ -128,13 +128,13 @@ gimp_n_point_deformation_options_set_property (GObject      *object,
       options->rigidity = g_value_get_double (value);
       break;
     case PROP_ASAP_DEFORMATION:
-      options->ASAP_deformation = g_value_get_boolean (value);
+      options->asap_deformation = g_value_get_boolean (value);
       break;
     case PROP_MLS_WEIGHTS:
-      options->MLS_weights = g_value_get_boolean (value);
+      options->mls_weights = g_value_get_boolean (value);
       break;
     case PROP_MLS_WEIGHTS_ALPHA:
-      options->MLS_weights_alpha = g_value_get_double (value);
+      options->mls_weights_alpha = g_value_get_double (value);
       break;
     case PROP_MESH_VISIBLE:
       options->mesh_visible = g_value_get_boolean (value);
@@ -165,13 +165,13 @@ gimp_n_point_deformation_options_get_property (GObject    *object,
       g_value_set_double (value, options->rigidity);
       break;
     case PROP_ASAP_DEFORMATION:
-      g_value_set_boolean (value, options->ASAP_deformation);
+      g_value_set_boolean (value, options->asap_deformation);
       break;
     case PROP_MLS_WEIGHTS:
-      g_value_set_boolean (value, options->MLS_weights);
+      g_value_set_boolean (value, options->mls_weights);
       break;
     case PROP_MLS_WEIGHTS_ALPHA:
-      g_value_set_double (value, options->MLS_weights_alpha);
+      g_value_set_double (value, options->mls_weights_alpha);
       break;
     case PROP_MESH_VISIBLE:
       g_value_set_boolean (value, options->mesh_visible);
@@ -215,30 +215,29 @@ gimp_n_point_deformation_options_gui (GimpToolOptions *tool_options)
   gtk_widget_set_can_focus (widget, FALSE);
   gtk_widget_show (widget);
 
-  widget = gimp_prop_boolean_radio_frame_new (config, "ASAP-deformation",
+  widget = gimp_prop_boolean_radio_frame_new (config, "asap-deformation",
                                               _("Deformation mode"),
-                                              _("scale"), _("rigid (rubber)"));
+                                              _("Scale"),
+                                              _("Rigid (Rubber)"));
   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
   gtk_widget_set_can_focus (widget, FALSE);
   gtk_widget_show (widget);
 
-  widget = gimp_prop_check_button_new (config, "MLS-weights",
+  widget = gimp_prop_check_button_new (config, "mls-weights",
                                        _("Use weights"));
   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
   gtk_widget_set_can_focus (widget, FALSE);
   gtk_widget_show (widget);
 
-  widget = gimp_prop_spin_scale_new (config, "MLS-weights-alpha",
+  widget = gimp_prop_spin_scale_new (config, "mls-weights-alpha",
                                      _("Amount of control points' influence"),
                                      0.1, 0.1, 1);
-  npd_options->scale_MLS_weights_alpha = widget;
   gimp_spin_scale_set_scale_limits (GIMP_SPIN_SCALE (widget), 0.1, 2.0);
   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE, 0);
   gtk_widget_set_can_focus (widget, FALSE);
-  gtk_widget_set_sensitive (widget, npd_options->MLS_weights);
   gtk_widget_show (widget);
 
-  g_object_bind_property (config, "MLS-weights",
+  g_object_bind_property (config, "mls-weights",
                           widget, "sensitive",
                           G_BINDING_DEFAULT |
                           G_BINDING_SYNC_CREATE);
diff --git a/app/tools/gimpnpointdeformationoptions.h b/app/tools/gimpnpointdeformationoptions.h
index 3aa09d9..d5183ed 100644
--- a/app/tools/gimpnpointdeformationoptions.h
+++ b/app/tools/gimpnpointdeformationoptions.h
@@ -41,13 +41,12 @@ struct _GimpNPointDeformationOptions
 
   gdouble          square_size;
   gdouble          rigidity;
-  gboolean         ASAP_deformation;
-  gboolean         MLS_weights;
-  gdouble          MLS_weights_alpha;
+  gboolean         asap_deformation;
+  gboolean         mls_weights;
+  gdouble          mls_weights_alpha;
   gboolean         mesh_visible;
 
   GtkWidget       *scale_square_size;
-  GtkWidget       *scale_MLS_weights_alpha;
   GtkWidget       *check_mesh_visible;
 };
 
diff --git a/app/tools/gimpnpointdeformationtool.c b/app/tools/gimpnpointdeformationtool.c
index 4eae733..1b2caed 100644
--- a/app/tools/gimpnpointdeformationtool.c
+++ b/app/tools/gimpnpointdeformationtool.c
@@ -392,11 +392,11 @@ gimp_n_point_deformation_tool_set_options (GimpNPointDeformationTool    *npd_too
                                            GimpNPointDeformationOptions *npd_options)
 {
   gegl_node_set (npd_tool->npd_node,
-                 "square size",       (gint) npd_options->square_size,
+                 "square-size",       (gint) npd_options->square_size,
                  "rigidity",          (gint) npd_options->rigidity,
-                 "ASAP deformation",  npd_options->ASAP_deformation,
-                 "MLS weights",       npd_options->MLS_weights,
-                 "MLS weights alpha", npd_options->MLS_weights_alpha,
+                 "asap-deformation",  npd_options->asap_deformation,
+                 "mls-weights",       npd_options->mls_weights,
+                 "mls-weights-alpha", npd_options->mls_weights_alpha,
                  NULL);
 }