[gimp/gimp-2-10] libgimpwidgets: keep gimpwidgetsenums.h in alphabetical order

[Michael Natterer <mitch src gnome org>]

commit dd3529c0e97947a6f9e667a4b96e1c22099c7e7b
Author: Michael Natterer <mitch gimp org>
Date:   Sat Jun 1 16:41:59 2019 +0200

    libgimpwidgets: keep gimpwidgetsenums.h in alphabetical order
    
    (cherry picked from commit 2f925e72771298938c35d37b17db506c589fa12c)

 libgimpwidgets/gimpwidgetsenums.c | 64 +++++++++++++++++++--------------------
 libgimpwidgets/gimpwidgetsenums.h | 44 ++++++++++++++-------------
 2 files changed, 55 insertions(+), 53 deletions(-)
---
diff --git a/libgimpwidgets/gimpwidgetsenums.c b/libgimpwidgets/gimpwidgetsenums.c
index 8bd6dcdd3e..82b16a1d67 100644
--- a/libgimpwidgets/gimpwidgetsenums.c
+++ b/libgimpwidgets/gimpwidgetsenums.c
@@ -185,19 +185,21 @@ gimp_color_selector_model_get_type (void)
 }
 
 GType
-gimp_page_selector_target_get_type (void)
+gimp_int_combo_box_layout_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_PAGE_SELECTOR_TARGET_LAYERS, "GIMP_PAGE_SELECTOR_TARGET_LAYERS", "layers" },
-    { GIMP_PAGE_SELECTOR_TARGET_IMAGES, "GIMP_PAGE_SELECTOR_TARGET_IMAGES", "images" },
+    { GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY, "GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY", "icon-only" },
+    { GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED, "GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED", "abbreviated" },
+    { GIMP_INT_COMBO_BOX_LAYOUT_FULL, "GIMP_INT_COMBO_BOX_LAYOUT_FULL", "full" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_PAGE_SELECTOR_TARGET_LAYERS, NC_("page-selector-target", "Layers"), NULL },
-    { GIMP_PAGE_SELECTOR_TARGET_IMAGES, NC_("page-selector-target", "Images"), NULL },
+    { GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY, "GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY", NULL },
+    { GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED, "GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED", NULL },
+    { GIMP_INT_COMBO_BOX_LAYOUT_FULL, "GIMP_INT_COMBO_BOX_LAYOUT_FULL", NULL },
     { 0, NULL, NULL }
   };
 
@@ -205,9 +207,9 @@ gimp_page_selector_target_get_type (void)
 
   if (G_UNLIKELY (! type))
     {
-      type = g_enum_register_static ("GimpPageSelectorTarget", values);
+      type = g_enum_register_static ("GimpIntComboBoxLayout", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
-      gimp_type_set_translation_context (type, "page-selector-target");
+      gimp_type_set_translation_context (type, "int-combo-box-layout");
       gimp_enum_set_value_descriptions (type, descs);
     }
 
@@ -215,21 +217,19 @@ gimp_page_selector_target_get_type (void)
 }
 
 GType
-gimp_size_entry_update_policy_get_type (void)
+gimp_page_selector_target_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_SIZE_ENTRY_UPDATE_NONE, "GIMP_SIZE_ENTRY_UPDATE_NONE", "none" },
-    { GIMP_SIZE_ENTRY_UPDATE_SIZE, "GIMP_SIZE_ENTRY_UPDATE_SIZE", "size" },
-    { GIMP_SIZE_ENTRY_UPDATE_RESOLUTION, "GIMP_SIZE_ENTRY_UPDATE_RESOLUTION", "resolution" },
+    { GIMP_PAGE_SELECTOR_TARGET_LAYERS, "GIMP_PAGE_SELECTOR_TARGET_LAYERS", "layers" },
+    { GIMP_PAGE_SELECTOR_TARGET_IMAGES, "GIMP_PAGE_SELECTOR_TARGET_IMAGES", "images" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_SIZE_ENTRY_UPDATE_NONE, "GIMP_SIZE_ENTRY_UPDATE_NONE", NULL },
-    { GIMP_SIZE_ENTRY_UPDATE_SIZE, "GIMP_SIZE_ENTRY_UPDATE_SIZE", NULL },
-    { GIMP_SIZE_ENTRY_UPDATE_RESOLUTION, "GIMP_SIZE_ENTRY_UPDATE_RESOLUTION", NULL },
+    { GIMP_PAGE_SELECTOR_TARGET_LAYERS, NC_("page-selector-target", "Layers"), NULL },
+    { GIMP_PAGE_SELECTOR_TARGET_IMAGES, NC_("page-selector-target", "Images"), NULL },
     { 0, NULL, NULL }
   };
 
@@ -237,9 +237,9 @@ gimp_size_entry_update_policy_get_type (void)
 
   if (G_UNLIKELY (! type))
     {
-      type = g_enum_register_static ("GimpSizeEntryUpdatePolicy", values);
+      type = g_enum_register_static ("GimpPageSelectorTarget", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
-      gimp_type_set_translation_context (type, "size-entry-update-policy");
+      gimp_type_set_translation_context (type, "page-selector-target");
       gimp_enum_set_value_descriptions (type, descs);
     }
 
@@ -247,19 +247,21 @@ gimp_size_entry_update_policy_get_type (void)
 }
 
 GType
-gimp_zoom_type_get_type (void)
+gimp_size_entry_update_policy_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_ZOOM_IN, "GIMP_ZOOM_IN", "in" },
-    { GIMP_ZOOM_OUT, "GIMP_ZOOM_OUT", "out" },
+    { GIMP_SIZE_ENTRY_UPDATE_NONE, "GIMP_SIZE_ENTRY_UPDATE_NONE", "none" },
+    { GIMP_SIZE_ENTRY_UPDATE_SIZE, "GIMP_SIZE_ENTRY_UPDATE_SIZE", "size" },
+    { GIMP_SIZE_ENTRY_UPDATE_RESOLUTION, "GIMP_SIZE_ENTRY_UPDATE_RESOLUTION", "resolution" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_ZOOM_IN, NC_("zoom-type", "Zoom in"), NULL },
-    { GIMP_ZOOM_OUT, NC_("zoom-type", "Zoom out"), NULL },
+    { GIMP_SIZE_ENTRY_UPDATE_NONE, "GIMP_SIZE_ENTRY_UPDATE_NONE", NULL },
+    { GIMP_SIZE_ENTRY_UPDATE_SIZE, "GIMP_SIZE_ENTRY_UPDATE_SIZE", NULL },
+    { GIMP_SIZE_ENTRY_UPDATE_RESOLUTION, "GIMP_SIZE_ENTRY_UPDATE_RESOLUTION", NULL },
     { 0, NULL, NULL }
   };
 
@@ -267,9 +269,9 @@ gimp_zoom_type_get_type (void)
 
   if (G_UNLIKELY (! type))
     {
-      type = g_enum_register_static ("GimpZoomType", values);
+      type = g_enum_register_static ("GimpSizeEntryUpdatePolicy", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
-      gimp_type_set_translation_context (type, "zoom-type");
+      gimp_type_set_translation_context (type, "size-entry-update-policy");
       gimp_enum_set_value_descriptions (type, descs);
     }
 
@@ -277,21 +279,19 @@ gimp_zoom_type_get_type (void)
 }
 
 GType
-gimp_int_combo_box_layout_get_type (void)
+gimp_zoom_type_get_type (void)
 {
   static const GEnumValue values[] =
   {
-    { GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY, "GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY", "icon-only" },
-    { GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED, "GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED", "abbreviated" },
-    { GIMP_INT_COMBO_BOX_LAYOUT_FULL, "GIMP_INT_COMBO_BOX_LAYOUT_FULL", "full" },
+    { GIMP_ZOOM_IN, "GIMP_ZOOM_IN", "in" },
+    { GIMP_ZOOM_OUT, "GIMP_ZOOM_OUT", "out" },
     { 0, NULL, NULL }
   };
 
   static const GimpEnumDesc descs[] =
   {
-    { GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY, "GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY", NULL },
-    { GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED, "GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED", NULL },
-    { GIMP_INT_COMBO_BOX_LAYOUT_FULL, "GIMP_INT_COMBO_BOX_LAYOUT_FULL", NULL },
+    { GIMP_ZOOM_IN, NC_("zoom-type", "Zoom in"), NULL },
+    { GIMP_ZOOM_OUT, NC_("zoom-type", "Zoom out"), NULL },
     { 0, NULL, NULL }
   };
 
@@ -299,9 +299,9 @@ gimp_int_combo_box_layout_get_type (void)
 
   if (G_UNLIKELY (! type))
     {
-      type = g_enum_register_static ("GimpIntComboBoxLayout", values);
+      type = g_enum_register_static ("GimpZoomType", values);
       gimp_type_set_translation_domain (type, GETTEXT_PACKAGE "-libgimp");
-      gimp_type_set_translation_context (type, "int-combo-box-layout");
+      gimp_type_set_translation_context (type, "zoom-type");
       gimp_enum_set_value_descriptions (type, descs);
     }
 
diff --git a/libgimpwidgets/gimpwidgetsenums.h b/libgimpwidgets/gimpwidgetsenums.h
index b70485b97a..23f162e662 100644
--- a/libgimpwidgets/gimpwidgetsenums.h
+++ b/libgimpwidgets/gimpwidgetsenums.h
@@ -145,6 +145,29 @@ typedef enum
 } GimpColorSelectorModel;
 
 
+/**
+ * GimpIntComboBoxLayout:
+ * @GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY:   show icons only
+ * @GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED: show icons and abbreviated labels,
+ *                                         when available
+ * @GIMP_INT_COMBO_BOX_LAYOUT_FULL:        show icons and full labels
+ *
+ * Possible layouts for #GimpIntComboBox.
+ *
+ * Since: 2.10
+ **/
+#define GIMP_TYPE_INT_COMBO_BOX_LAYOUT (gimp_int_combo_box_layout_get_type ())
+
+GType gimp_int_combo_box_layout_get_type (void) G_GNUC_CONST;
+
+typedef enum
+{
+  GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY,
+  GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED,
+  GIMP_INT_COMBO_BOX_LAYOUT_FULL
+} GimpIntComboBoxLayout;
+
+
 /**
  * GimpPageSelectorTarget:
  * @GIMP_PAGE_SELECTOR_TARGET_LAYERS: import as layers of one image
@@ -211,27 +234,6 @@ typedef enum
 } GimpZoomType;
 
 
-/**
- * GimpIntComboBoxLayout:
- * @GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY:   show icons only
- * @GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED: show icons and abbreviated labels,
- *                                         when available
- * @GIMP_INT_COMBO_BOX_LAYOUT_FULL:        show icons and full labels
- *
- * Possible layouts for #GimpIntComboBox.
- **/
-#define GIMP_TYPE_INT_COMBO_BOX_LAYOUT (gimp_int_combo_box_layout_get_type ())
-
-GType gimp_int_combo_box_layout_get_type (void) G_GNUC_CONST;
-
-typedef enum
-{
-  GIMP_INT_COMBO_BOX_LAYOUT_ICON_ONLY,
-  GIMP_INT_COMBO_BOX_LAYOUT_ABBREVIATED,
-  GIMP_INT_COMBO_BOX_LAYOUT_FULL
-} GimpIntComboBoxLayout;
-
-
 G_END_DECLS
 
 #endif  /* __GIMP_WIDGETS_ENUMS_H__ */