[gimp] app: add N_LINES and SPACING to enum GimpGuidesType

[Michael Natterer <mitch src gnome org>]

commit f7a390d5d00a000c39bf48043a11328dc78f7fd9
Author: Michael Natterer <mitch gimp org>
Date:   Sun Jul 24 17:47:08 2011 +0200

    app: add N_LINES and SPACING to enum GimpGuidesType
    
    but don't show them in the rectangle options UI, this is just a step
    towards unifying the enums.

 app/display/display-enums.c      |    4 ++++
 app/display/display-enums.h      |    4 +++-
 app/tools/gimprectangleoptions.c |    4 +++-
 3 files changed, 10 insertions(+), 2 deletions(-)
---
diff --git a/app/display/display-enums.c b/app/display/display-enums.c
index 83c7423..827d6da 100644
--- a/app/display/display-enums.c
+++ b/app/display/display-enums.c
@@ -50,6 +50,8 @@ gimp_guides_type_get_type (void)
     { GIMP_GUIDES_FIFTHS, "GIMP_GUIDES_FIFTHS", "fifths" },
     { GIMP_GUIDES_GOLDEN, "GIMP_GUIDES_GOLDEN", "golden" },
     { GIMP_GUIDES_DIAGONALS, "GIMP_GUIDES_DIAGONALS", "diagonals" },
+    { GIMP_GUIDES_N_LINES, "GIMP_GUIDES_N_LINES", "n-lines" },
+    { GIMP_GUIDES_SPACING, "GIMP_GUIDES_SPACING", "spacing" },
     { 0, NULL, NULL }
   };
 
@@ -61,6 +63,8 @@ gimp_guides_type_get_type (void)
     { GIMP_GUIDES_FIFTHS, NC_("guides-type", "Rule of fifths"), NULL },
     { GIMP_GUIDES_GOLDEN, NC_("guides-type", "Golden sections"), NULL },
     { GIMP_GUIDES_DIAGONALS, NC_("guides-type", "Diagonal lines"), NULL },
+    { GIMP_GUIDES_N_LINES, NC_("guides-type", "Number of lines"), NULL },
+    { GIMP_GUIDES_SPACING, NC_("guides-type", "Line spacing"), NULL },
     { 0, NULL, NULL }
   };
 
diff --git a/app/display/display-enums.h b/app/display/display-enums.h
index 11c5cba..da76552 100644
--- a/app/display/display-enums.h
+++ b/app/display/display-enums.h
@@ -42,7 +42,9 @@ typedef enum
   GIMP_GUIDES_THIRDS,        /*< desc="Rule of thirds"  >*/
   GIMP_GUIDES_FIFTHS,        /*< desc="Rule of fifths"  >*/
   GIMP_GUIDES_GOLDEN,        /*< desc="Golden sections" >*/
-  GIMP_GUIDES_DIAGONALS      /*< desc="Diagonal lines"  >*/
+  GIMP_GUIDES_DIAGONALS,     /*< desc="Diagonal lines"  >*/
+  GIMP_GUIDES_N_LINES,       /*< desc="Number of lines" >*/
+  GIMP_GUIDES_SPACING        /*< desc="Line spacing"    >*/
 } GimpGuidesType;
 
 
diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c
index 8ef6732..25ca9a6 100644
--- a/app/tools/gimprectangleoptions.c
+++ b/app/tools/gimprectangleoptions.c
@@ -1030,7 +1030,9 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
   gtk_widget_show (button);
 
   /*  Guide  */
-  combo = gimp_prop_enum_combo_box_new (config, "guide", 0, 0);
+  combo = gimp_prop_enum_combo_box_new (config, "guide",
+                                        GIMP_GUIDES_NONE,
+                                        GIMP_GUIDES_DIAGONALS);
   gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, FALSE, 0);
   gtk_widget_show (combo);