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.
This commit is contained in:
Michael Natterer 2011-07-24 17:47:08 +02:00
parent 2ebf1b555a
commit f7a390d5d0
3 changed files with 10 additions and 2 deletions

View File

@ -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 }
};

View File

@ -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;

View File

@ -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);