[gimp/soc-2013-combined-selection-tool] app:add line_orientation; to the list of options
- From: Ajay Ramanathan <ajayr src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/soc-2013-combined-selection-tool] app:add line_orientation; to the list of options
- Date: Wed, 26 Jun 2013 15:17:39 +0000 (UTC)
commit 428ce9a1296f8075b15f78cecd64651d6df36ae8
Author: Ajay Ramanathan <ajay 010293 gmail com>
Date: Wed Jun 26 19:42:40 2013 +0530
app:add line_orientation; to the list of options
app/tools/gimprectangleselectoptions.c | 28 +++++++++++++++-------------
app/tools/gimprectangleselectoptions.h | 2 +-
2 files changed, 16 insertions(+), 14 deletions(-)
---
diff --git a/app/tools/gimprectangleselectoptions.c b/app/tools/gimprectangleselectoptions.c
index 1f18a7a..b96e6ad 100644
--- a/app/tools/gimprectangleselectoptions.c
+++ b/app/tools/gimprectangleselectoptions.c
@@ -46,7 +46,7 @@ enum
PROP_ROUND_CORNERS = GIMP_RECTANGLE_OPTIONS_PROP_LAST + 1,
PROP_CORNER_RADIUS,
PROP_SHAPE_TYPE,
- PROP_HORIZONTAL,
+ PROP_LINE_ORIENTATION,
PROP_N_SIDES
};
@@ -105,10 +105,11 @@ gimp_rectangle_select_options_class_init (GimpRectangleSelectOptionsClass *klass
GIMP_SHAPE_RECTANGLE,
GIMP_PARAM_STATIC_STRINGS);
- GIMP_CONFIG_INSTALL_PROP_BOOLEAN (object_class, PROP_HORIZONTAL,
- "horizontal",
+ GIMP_CONFIG_INSTALL_PROP_ENUM (object_class, PROP_LINE_ORIENTATION,
+ "line-orientation",
N_("Choice between horizontal and vertical"),
- FALSE,
+ GIMP_TYPE_ORIENTATION_TYPE,
+ GIMP_ORIENTATION_HORIZONTAL,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_INSTALL_PROP_INT (object_class, PROP_N_SIDES,
@@ -147,8 +148,8 @@ gimp_rectangle_select_options_set_property (GObject *object,
options->shape_type = g_value_get_enum (value);
break;
- case PROP_HORIZONTAL:
- options->horizontal = g_value_get_boolean (value);
+ case PROP_LINE_ORIENTATION:
+ options->line_orientation = g_value_get_boolean (value);
break;
case PROP_N_SIDES:
@@ -183,8 +184,8 @@ gimp_rectangle_select_options_get_property (GObject *object,
g_value_set_enum (value, options->shape_type);
break;
- case PROP_HORIZONTAL:
- g_value_set_enum (value, options->horizontal);
+ case PROP_LINE_ORIENTATION:
+ g_value_set_enum (value, options->line_orientation);
break;
case PROP_N_SIDES:
@@ -217,7 +218,6 @@ gimp_rectangle_select_options_gui (GimpToolOptions *tool_options)
GObject *config = G_OBJECT (tool_options);
GtkWidget *vbox = gimp_selection_options_gui (tool_options);
GtkWidget *combo;
- GtkWidget *button;
GtkWidget *frame;
GtkWidget *scale;
GtkWidget *inner_vbox;
@@ -288,12 +288,14 @@ gimp_rectangle_select_options_gui (GimpToolOptions *tool_options)
GINT_TO_POINTER (GIMP_SHAPE_N_POLYGON),
NULL);
- button = gimp_prop_check_button_new (config, "horizontal",
- _("Horizontal Line"));
- gtk_box_pack_start (GTK_BOX (inner_vbox), button, FALSE, FALSE, 0);
+ combo = gimp_prop_enum_combo_box_new (config, "line_orientation", 0, 0);
+ gimp_int_combo_box_set_label (GIMP_INT_COMBO_BOX (combo), _("Line Orientation"));
+ g_object_set (combo, "ellipsize", PANGO_ELLIPSIZE_END, NULL);
+ gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE, TRUE, 0);
+ gtk_widget_show (combo);
g_object_bind_property_full (config, "shape-type",
- button, "visible",
+ combo, "visible",
G_BINDING_SYNC_CREATE,
gimp_select_by_shape_options_shape_type,
NULL,
diff --git a/app/tools/gimprectangleselectoptions.h b/app/tools/gimprectangleselectoptions.h
index b2a7832..65687a0 100644
--- a/app/tools/gimprectangleselectoptions.h
+++ b/app/tools/gimprectangleselectoptions.h
@@ -39,9 +39,9 @@ struct _GimpRectangleSelectOptions
gboolean round_corners;
gdouble corner_radius;
- gboolean horizontal;
gint n_sides;
GimpShapeType shape_type;
+ GimpOrientationType line_orientation;
};
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]