[gimp] app: shorten enum GimpMattingEngine's value names

[Michael Natterer <mitch src gnome org>]

commit a328f9d305f9175c0863353a6f3d4cf9e7a4d2a2
Author: Michael Natterer <mitch gimp org>
Date:   Mon Jun 3 23:11:39 2013 +0200

    app: shorten enum GimpMattingEngine's value names
    
    and reorder code in GimpForegroundSelectOptions to match the order of
    properties.

 app/tools/gimpforegroundselectoptions.c |   54 ++++++++++++++++---------------
 app/tools/gimpforegroundselecttool.c    |    2 +-
 app/tools/tools-enums.c                 |    8 ++--
 app/tools/tools-enums.h                 |    4 +-
 4 files changed, 35 insertions(+), 33 deletions(-)
---
diff --git a/app/tools/gimpforegroundselectoptions.c b/app/tools/gimpforegroundselectoptions.c
index 2c10f05..e89b49b 100644
--- a/app/tools/gimpforegroundselectoptions.c
+++ b/app/tools/gimpforegroundselectoptions.c
@@ -55,8 +55,6 @@ enum
 };
 
 
-
-
 static void   gimp_foreground_select_options_set_property (GObject      *object,
                                                            guint         property_id,
                                                            const GValue *value,
@@ -89,13 +87,6 @@ gimp_foreground_select_options_class_init (GimpForegroundSelectOptionsClass *kla
                                  GIMP_MATTING_DRAW_MODE_FOREGROUND,
                                  GIMP_PARAM_STATIC_STRINGS);
 
-  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ENGINE,
-                                 "engine",
-                                 N_("Matting engine to use"),
-                                 GIMP_TYPE_MATTING_ENGINE,
-                                 GIMP_MATTING_ENGINE_MATTING_GLOBAL,
-                                 GIMP_PARAM_STATIC_STRINGS);
-
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_STROKE_WIDTH,
                                  "stroke-width",
                                  N_("Size of the brush used for refinements"),
@@ -109,16 +100,25 @@ gimp_foreground_select_options_class_init (GimpForegroundSelectOptionsClass *kla
                                  GIMP_BLUE_CHANNEL,
                                  GIMP_PARAM_STATIC_STRINGS);
 
+  GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_ENGINE,
+                                 "engine",
+                                 N_("Matting engine to use"),
+                                 GIMP_TYPE_MATTING_ENGINE,
+                                 GIMP_MATTING_ENGINE_GLOBAL,
+                                 GIMP_PARAM_STATIC_STRINGS);
+
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_LEVELS,
                                  "levels",
                                  N_("Parameter for matting-levin"),
                                  1, 10, 2,
                                  GIMP_PARAM_STATIC_STRINGS);
+
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_ACTIVE_LEVELS,
                                  "active-levels",
                                  N_("Parameter for matting-levin"),
                                  1, 10, 2,
                                  GIMP_PARAM_STATIC_STRINGS);
+
   GIMP_CONFIG_INSTALL_PROP_INT  (object_class, PROP_ITERATIONS,
                                  "iterations",
                                  N_("Parameter for matting-global"),
@@ -140,15 +140,11 @@ gimp_foreground_select_options_set_property (GObject      *object,
   GimpForegroundSelectOptions *options = GIMP_FOREGROUND_SELECT_OPTIONS (object);
 
   switch (property_id)
-  {
+    {
     case PROP_DRAW_MODE:
       options->draw_mode = g_value_get_enum (value);
       break;
 
-    case PROP_ENGINE:
-      options->engine = g_value_get_enum (value);
-      break;
-
     case PROP_STROKE_WIDTH:
       options->stroke_width = g_value_get_int (value);
       break;
@@ -157,6 +153,10 @@ gimp_foreground_select_options_set_property (GObject      *object,
       options->mask_color = g_value_get_enum (value);
       break;
 
+    case PROP_ENGINE:
+      options->engine = g_value_get_enum (value);
+      break;
+
     case PROP_LEVELS:
       options->levels = g_value_get_int (value);
       break;
@@ -172,7 +172,7 @@ gimp_foreground_select_options_set_property (GObject      *object,
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
-  }
+    }
 }
 
 static void
@@ -184,16 +184,11 @@ gimp_foreground_select_options_get_property (GObject    *object,
   GimpForegroundSelectOptions *options = GIMP_FOREGROUND_SELECT_OPTIONS (object);
 
   switch (property_id)
-  {
-
+    {
     case PROP_DRAW_MODE:
       g_value_set_enum (value, options->draw_mode);
       break;
 
-    case PROP_ENGINE:
-      g_value_set_enum (value, options->engine);
-      break;
-
     case PROP_STROKE_WIDTH:
       g_value_set_int (value, options->stroke_width);
       break;
@@ -202,7 +197,11 @@ gimp_foreground_select_options_get_property (GObject    *object,
       g_value_set_enum (value, options->mask_color);
       break;
 
-    case PROP_LEVELS:
+    case PROP_ENGINE:
+      g_value_set_enum (value, options->engine);
+      break;
+
+     case PROP_LEVELS:
       g_value_set_int (value, options->levels);
       break;
 
@@ -217,7 +216,7 @@ gimp_foreground_select_options_get_property (GObject    *object,
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
       break;
-  }
+    }
 }
 
 static void
@@ -319,7 +318,8 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
                                G_BINDING_SYNC_CREATE,
                                gimp_foreground_select_options_sync_engine,
                                NULL,
-                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_MATTING_LEVIN), NULL);
+                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_LEVIN),
+                               NULL);
 
   scale = gimp_prop_spin_scale_new (config, "active-levels",
                                     _("Active levels"),
@@ -331,7 +331,8 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
                                G_BINDING_SYNC_CREATE,
                                gimp_foreground_select_options_sync_engine,
                                NULL,
-                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_MATTING_LEVIN), NULL);
+                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_LEVIN),
+                               NULL);
 
   scale = gimp_prop_spin_scale_new (config, "iterations",
                                     _("Iterations"),
@@ -343,7 +344,8 @@ gimp_foreground_select_options_gui (GimpToolOptions *tool_options)
                                G_BINDING_SYNC_CREATE,
                                gimp_foreground_select_options_sync_engine,
                                NULL,
-                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_MATTING_GLOBAL), NULL);
+                               GINT_TO_POINTER (GIMP_MATTING_ENGINE_GLOBAL),
+                               NULL);
 
   return vbox;
 }
diff --git a/app/tools/gimpforegroundselecttool.c b/app/tools/gimpforegroundselecttool.c
index 01d836f..bca38f5 100644
--- a/app/tools/gimpforegroundselecttool.c
+++ b/app/tools/gimpforegroundselecttool.c
@@ -768,7 +768,7 @@ gimp_foreground_select_tool_preview (GimpForegroundSelectTool *fg_select,
                                      "format",    NULL,
                                      NULL);
 
-  if (options->engine == GIMP_MATTING_ENGINE_MATTING_GLOBAL)
+  if (options->engine == GIMP_MATTING_ENGINE_GLOBAL)
     {
       matting_node = gegl_node_new_child (gegl,
                                           "operation",  "gegl:matting-global",
diff --git a/app/tools/tools-enums.c b/app/tools/tools-enums.c
index 3985eee..6b0013c 100644
--- a/app/tools/tools-enums.c
+++ b/app/tools/tools-enums.c
@@ -326,15 +326,15 @@ gimp_matting_engine_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_MATTING_ENGINE_MATTING_GLOBAL, "GIMP_MATTING_ENGINE_MATTING_GLOBAL", "global" },
-    { GIMP_MATTING_ENGINE_MATTING_LEVIN, "GIMP_MATTING_ENGINE_MATTING_LEVIN", "levin" },
+    { GIMP_MATTING_ENGINE_GLOBAL, "GIMP_MATTING_ENGINE_GLOBAL", "global" },
+    { GIMP_MATTING_ENGINE_LEVIN, "GIMP_MATTING_ENGINE_LEVIN", "levin" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_MATTING_ENGINE_MATTING_GLOBAL, NC_("matting-engine", "Matting Global"), NULL },
-    { GIMP_MATTING_ENGINE_MATTING_LEVIN, NC_("matting-engine", "Matting Levin"), NULL },
+    { GIMP_MATTING_ENGINE_GLOBAL, NC_("matting-engine", "Matting Global"), NULL },
+    { GIMP_MATTING_ENGINE_LEVIN, NC_("matting-engine", "Matting Levin"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/app/tools/tools-enums.h b/app/tools/tools-enums.h
index a8c38e2..d6677ba 100644
--- a/app/tools/tools-enums.h
+++ b/app/tools/tools-enums.h
@@ -149,8 +149,8 @@ GType gimp_matting_engine_get_type (void) G_GNUC_CONST;
 
 typedef enum
 {
- GIMP_MATTING_ENGINE_MATTING_GLOBAL,  /*< desc="Matting Global" >*/
- GIMP_MATTING_ENGINE_MATTING_LEVIN,   /*< desc="Matting Levin" >*/
+ GIMP_MATTING_ENGINE_GLOBAL,  /*< desc="Matting Global" >*/
+ GIMP_MATTING_ENGINE_LEVIN,   /*< desc="Matting Levin" >*/
 } GimpMattingEngine;