[gimp/gimp-2-10] app: move GimpColorFrameMode to the core and name it GimpColorPickMode
- From: Michael Natterer <mitch src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gimp/gimp-2-10] app: move GimpColorFrameMode to the core and name it GimpColorPickMode
- Date: Sun, 15 Jul 2018 21:42:59 +0000 (UTC)
commit 6e86e2233e76c40538699f8949fa9910c40653b3
Author: Michael Natterer <mitch gimp org>
Date: Sun Jul 15 23:24:50 2018 +0200
app: move GimpColorFrameMode to the core and name it GimpColorPickMode
(cherry picked from commit f676f2aa79532ee8dd98648e1a9cca1e385e7420)
app/core/core-enums.c | 39 ++++++++++++++++++++++++
app/core/core-enums.h | 16 ++++++++++
app/display/gimpcursorview.c | 14 ++++-----
app/tools/gimpcolorpickeroptions.c | 10 +++----
app/tools/gimpcolorpickeroptions.h | 4 +--
app/widgets/gimpcolorframe.c | 60 ++++++++++++++++++-------------------
app/widgets/gimpcolorframe.h | 6 ++--
app/widgets/gimpsamplepointeditor.c | 2 +-
app/widgets/widgets-enums.c | 39 ------------------------
app/widgets/widgets-enums.h | 16 ----------
10 files changed, 103 insertions(+), 103 deletions(-)
---
diff --git a/app/core/core-enums.c b/app/core/core-enums.c
index d76ec0692b..2bc635773f 100644
--- a/app/core/core-enums.c
+++ b/app/core/core-enums.c
@@ -129,6 +129,45 @@ gimp_channel_border_style_get_type (void)
return type;
}
+GType
+gimp_color_pick_mode_get_type (void)
+{
+ static const GEnumValue values[] =
+ {
+ { GIMP_COLOR_PICK_MODE_PIXEL, "GIMP_COLOR_PICK_MODE_PIXEL", "pixel" },
+ { GIMP_COLOR_PICK_MODE_RGB_PERCENT, "GIMP_COLOR_PICK_MODE_RGB_PERCENT", "rgb-percent" },
+ { GIMP_COLOR_PICK_MODE_RGB_U8, "GIMP_COLOR_PICK_MODE_RGB_U8", "rgb-u8" },
+ { GIMP_COLOR_PICK_MODE_HSV, "GIMP_COLOR_PICK_MODE_HSV", "hsv" },
+ { GIMP_COLOR_PICK_MODE_LCH, "GIMP_COLOR_PICK_MODE_LCH", "lch" },
+ { GIMP_COLOR_PICK_MODE_LAB, "GIMP_COLOR_PICK_MODE_LAB", "lab" },
+ { GIMP_COLOR_PICK_MODE_CMYK, "GIMP_COLOR_PICK_MODE_CMYK", "cmyk" },
+ { 0, NULL, NULL }
+ };
+
+ static const GimpEnumDesc descs[] =
+ {
+ { GIMP_COLOR_PICK_MODE_PIXEL, NC_("color-pick-mode", "Pixel"), NULL },
+ { GIMP_COLOR_PICK_MODE_RGB_PERCENT, NC_("color-pick-mode", "RGB (%)"), NULL },
+ { GIMP_COLOR_PICK_MODE_RGB_U8, NC_("color-pick-mode", "RGB (0..255)"), NULL },
+ { GIMP_COLOR_PICK_MODE_HSV, NC_("color-pick-mode", "HSV"), NULL },
+ { GIMP_COLOR_PICK_MODE_LCH, NC_("color-pick-mode", "CIE LCh"), NULL },
+ { GIMP_COLOR_PICK_MODE_LAB, NC_("color-pick-mode", "CIE LAB"), NULL },
+ { GIMP_COLOR_PICK_MODE_CMYK, NC_("color-pick-mode", "CMYK"), NULL },
+ { 0, NULL, NULL }
+ };
+
+ static GType type = 0;
+
+ if (G_UNLIKELY (! type))
+ {
+ type = g_enum_register_static ("GimpColorPickMode", values);
+ gimp_type_set_translation_context (type, "color-pick-mode");
+ gimp_enum_set_value_descriptions (type, descs);
+ }
+
+ return type;
+}
+
GType
gimp_color_profile_policy_get_type (void)
{
diff --git a/app/core/core-enums.h b/app/core/core-enums.h
index 7f8bb62004..4916ae117f 100644
--- a/app/core/core-enums.h
+++ b/app/core/core-enums.h
@@ -86,6 +86,22 @@ typedef enum /*< pdb-skip >*/
} GimpChannelBorderStyle;
+#define GIMP_TYPE_COLOR_PICK_MODE (gimp_color_pick_mode_get_type ())
+
+GType gimp_color_pick_mode_get_type (void) G_GNUC_CONST;
+
+typedef enum /*< pdb-skip >*/
+{
+ GIMP_COLOR_PICK_MODE_PIXEL, /*< desc="Pixel" >*/
+ GIMP_COLOR_PICK_MODE_RGB_PERCENT, /*< desc="RGB (%)" >*/
+ GIMP_COLOR_PICK_MODE_RGB_U8, /*< desc="RGB (0..255)" >*/
+ GIMP_COLOR_PICK_MODE_HSV, /*< desc="HSV" >*/
+ GIMP_COLOR_PICK_MODE_LCH, /*< desc="CIE LCh" >*/
+ GIMP_COLOR_PICK_MODE_LAB, /*< desc="CIE LAB" >*/
+ GIMP_COLOR_PICK_MODE_CMYK /*< desc="CMYK" >*/
+} GimpColorPickMode;
+
+
#define GIMP_TYPE_COLOR_PROFILE_POLICY (gimp_color_profile_policy_get_type ())
GType gimp_color_profile_policy_get_type (void) G_GNUC_CONST;
diff --git a/app/display/gimpcursorview.c b/app/display/gimpcursorview.c
index a591c8523d..970fb67d75 100644
--- a/app/display/gimpcursorview.c
+++ b/app/display/gimpcursorview.c
@@ -321,7 +321,7 @@ gimp_cursor_view_init (GimpCursorView *view)
view->priv->color_frame_1 = gimp_color_frame_new ();
gimp_color_frame_set_mode (GIMP_COLOR_FRAME (view->priv->color_frame_1),
- GIMP_COLOR_FRAME_MODE_PIXEL);
+ GIMP_COLOR_PICK_MODE_PIXEL);
gimp_color_frame_set_ellipsize (GIMP_COLOR_FRAME (view->priv->color_frame_1),
PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (view->priv->color_hbox), view->priv->color_frame_1,
@@ -330,7 +330,7 @@ gimp_cursor_view_init (GimpCursorView *view)
view->priv->color_frame_2 = gimp_color_frame_new ();
gimp_color_frame_set_mode (GIMP_COLOR_FRAME (view->priv->color_frame_2),
- GIMP_COLOR_FRAME_MODE_RGB_PERCENT);
+ GIMP_COLOR_PICK_MODE_RGB_PERCENT);
gtk_box_pack_start (GTK_BOX (view->priv->color_hbox), view->priv->color_frame_2,
TRUE, TRUE, 0);
gtk_widget_show (view->priv->color_frame_2);
@@ -442,7 +442,7 @@ gimp_cursor_view_set_aux_info (GimpDocked *docked,
GEnumClass *enum_class;
GEnumValue *enum_value;
- enum_class = g_type_class_peek (GIMP_TYPE_COLOR_FRAME_MODE);
+ enum_class = g_type_class_peek (GIMP_TYPE_COLOR_PICK_MODE);
enum_value = g_enum_get_value_by_nick (enum_class, aux->value);
if (enum_value)
@@ -462,16 +462,16 @@ gimp_cursor_view_get_aux_info (GimpDocked *docked)
aux_info = parent_docked_iface->get_aux_info (docked);
- if (gimp_enum_get_value (GIMP_TYPE_COLOR_FRAME_MODE,
- GIMP_COLOR_FRAME (view->priv->color_frame_1)->frame_mode,
+ if (gimp_enum_get_value (GIMP_TYPE_COLOR_PICK_MODE,
+ GIMP_COLOR_FRAME (view->priv->color_frame_1)->pick_mode,
NULL, &nick, NULL, NULL))
{
aux = gimp_session_info_aux_new (AUX_INFO_FRAME_1_MODE, nick);
aux_info = g_list_append (aux_info, aux);
}
- if (gimp_enum_get_value (GIMP_TYPE_COLOR_FRAME_MODE,
- GIMP_COLOR_FRAME (view->priv->color_frame_2)->frame_mode,
+ if (gimp_enum_get_value (GIMP_TYPE_COLOR_PICK_MODE,
+ GIMP_COLOR_FRAME (view->priv->color_frame_2)->pick_mode,
NULL, &nick, NULL, NULL))
{
aux = gimp_session_info_aux_new (AUX_INFO_FRAME_2_MODE, nick);
diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
index 802bd00c76..5305304dd9 100644
--- a/app/tools/gimpcolorpickeroptions.c
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -39,7 +39,7 @@ enum
PROP_PICK_TARGET,
PROP_USE_INFO_WINDOW,
PROP_FRAME1_MODE,
- PROP_FRAME2_MODE,
+ PROP_FRAME2_MODE
};
@@ -93,15 +93,15 @@ gimp_color_picker_options_class_init (GimpColorPickerOptionsClass *klass)
GIMP_CONFIG_PROP_ENUM (object_class, PROP_FRAME1_MODE,
"frame1-mode",
"Frame 1 Mode", NULL,
- GIMP_TYPE_COLOR_FRAME_MODE,
- GIMP_COLOR_FRAME_MODE_PIXEL,
+ GIMP_TYPE_COLOR_PICK_MODE,
+ GIMP_COLOR_PICK_MODE_PIXEL,
GIMP_PARAM_STATIC_STRINGS);
GIMP_CONFIG_PROP_ENUM (object_class, PROP_FRAME2_MODE,
"frame2-mode",
"Frame 2 Mode", NULL,
- GIMP_TYPE_COLOR_FRAME_MODE,
- GIMP_COLOR_FRAME_MODE_RGB_PERCENT,
+ GIMP_TYPE_COLOR_PICK_MODE,
+ GIMP_COLOR_PICK_MODE_RGB_PERCENT,
GIMP_PARAM_STATIC_STRINGS);
}
diff --git a/app/tools/gimpcolorpickeroptions.h b/app/tools/gimpcolorpickeroptions.h
index b74d28c0b7..8fc7024a07 100644
--- a/app/tools/gimpcolorpickeroptions.h
+++ b/app/tools/gimpcolorpickeroptions.h
@@ -39,8 +39,8 @@ struct _GimpColorPickerOptions
GimpColorPickTarget pick_target;
gboolean use_info_window;
- GimpColorFrameMode frame1_mode;
- GimpColorFrameMode frame2_mode;
+ GimpColorPickMode frame1_mode;
+ GimpColorPickMode frame2_mode;
};
diff --git a/app/widgets/gimpcolorframe.c b/app/widgets/gimpcolorframe.c
index cf1760ebc2..01454c1252 100644
--- a/app/widgets/gimpcolorframe.c
+++ b/app/widgets/gimpcolorframe.c
@@ -66,7 +66,7 @@ static void gimp_color_frame_style_set (GtkWidget *widget,
static gboolean gimp_color_frame_expose (GtkWidget *widget,
GdkEventExpose *eevent);
-static void gimp_color_frame_menu_callback (GtkWidget *widget,
+static void gimp_color_frame_combo_callback (GtkWidget *widget,
GimpColorFrame *frame);
static void gimp_color_frame_update (GimpColorFrame *frame);
@@ -96,8 +96,8 @@ gimp_color_frame_class_init (GimpColorFrameClass *klass)
g_object_class_install_property (object_class, PROP_MODE,
g_param_spec_enum ("mode",
NULL, NULL,
- GIMP_TYPE_COLOR_FRAME_MODE,
- GIMP_COLOR_FRAME_MODE_PIXEL,
+ GIMP_TYPE_COLOR_PICK_MODE,
+ GIMP_COLOR_PICK_MODE_PIXEL,
GIMP_PARAM_READWRITE));
g_object_class_install_property (object_class, PROP_HAS_NUMBER,
@@ -145,12 +145,12 @@ gimp_color_frame_init (GimpColorFrame *frame)
gimp_rgba_set (&frame->color, 0.0, 0.0, 0.0, GIMP_OPACITY_OPAQUE);
- frame->menu = gimp_enum_combo_box_new (GIMP_TYPE_COLOR_FRAME_MODE);
- gtk_frame_set_label_widget (GTK_FRAME (frame), frame->menu);
- gtk_widget_show (frame->menu);
+ frame->combo = gimp_enum_combo_box_new (GIMP_TYPE_COLOR_PICK_MODE);
+ gtk_frame_set_label_widget (GTK_FRAME (frame), frame->combo);
+ gtk_widget_show (frame->combo);
- g_signal_connect (frame->menu, "changed",
- G_CALLBACK (gimp_color_frame_menu_callback),
+ g_signal_connect (frame->combo, "changed",
+ G_CALLBACK (gimp_color_frame_combo_callback),
frame);
vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
@@ -254,7 +254,7 @@ gimp_color_frame_get_property (GObject *object,
switch (property_id)
{
case PROP_MODE:
- g_value_set_enum (value, frame->frame_mode);
+ g_value_set_enum (value, frame->pick_mode);
break;
case PROP_ELLIPSIZE:
@@ -344,7 +344,7 @@ gimp_color_frame_expose (GtkWidget *widget,
{
GtkStyle *style = gtk_widget_get_style (widget);
GtkAllocation allocation;
- GtkAllocation menu_allocation;
+ GtkAllocation combo_allocation;
GtkAllocation color_area_allocation;
GtkAllocation coords_box_x_allocation;
GtkAllocation coords_box_y_allocation;
@@ -354,7 +354,7 @@ gimp_color_frame_expose (GtkWidget *widget,
gdouble scale;
gtk_widget_get_allocation (widget, &allocation);
- gtk_widget_get_allocation (frame->menu, &menu_allocation);
+ gtk_widget_get_allocation (frame->combo, &combo_allocation);
gtk_widget_get_allocation (frame->color_area, &color_area_allocation);
gtk_widget_get_allocation (frame->coords_box_x, &coords_box_x_allocation);
gtk_widget_get_allocation (frame->coords_box_y, &coords_box_y_allocation);
@@ -376,7 +376,7 @@ gimp_color_frame_expose (GtkWidget *widget,
pango_layout_get_pixel_size (frame->number_layout, &w, &h);
scale = ((gdouble) (allocation.height -
- menu_allocation.height -
+ combo_allocation.height -
color_area_allocation.height -
(coords_box_x_allocation.height +
coords_box_y_allocation.height)) /
@@ -387,7 +387,7 @@ gimp_color_frame_expose (GtkWidget *widget,
cairo_move_to (cr,
(allocation.width / 2.0) / scale - w / 2.0,
(allocation.height / 2.0 +
- menu_allocation.height / 2.0 +
+ combo_allocation.height / 2.0 +
color_area_allocation.height / 2.0 +
coords_box_x_allocation.height / 2.0 +
coords_box_y_allocation.height / 2.0) / scale - h / 2.0);
@@ -421,16 +421,16 @@ gimp_color_frame_new (void)
* @frame: The #GimpColorFrame.
* @mode: The new @mode.
*
- * Sets the #GimpColorFrame's color @mode. Calling this function does
- * the same as selecting the @mode from the frame's #GtkOptionMenu.
+ * Sets the #GimpColorFrame's color pick @mode. Calling this function
+ * does the same as selecting the @mode from the frame's #GtkComboBox.
**/
void
-gimp_color_frame_set_mode (GimpColorFrame *frame,
- GimpColorFrameMode mode)
+gimp_color_frame_set_mode (GimpColorFrame *frame,
+ GimpColorPickMode mode)
{
g_return_if_fail (GIMP_IS_COLOR_FRAME (frame));
- gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (frame->menu), mode);
+ gimp_int_combo_box_set_active (GIMP_INT_COMBO_BOX (frame->combo), mode);
}
void
@@ -631,14 +631,14 @@ gimp_color_frame_set_color_config (GimpColorFrame *frame,
/* private functions */
static void
-gimp_color_frame_menu_callback (GtkWidget *widget,
- GimpColorFrame *frame)
+gimp_color_frame_combo_callback (GtkWidget *widget,
+ GimpColorFrame *frame)
{
gint value;
if (gimp_int_combo_box_get_active (GIMP_INT_COMBO_BOX (widget), &value))
{
- frame->frame_mode = value;
+ frame->pick_mode = value;
gimp_color_frame_update (frame);
g_object_notify (G_OBJECT (frame), "mode");
@@ -676,9 +676,9 @@ gimp_color_frame_update (GimpColorFrame *frame)
gtk_label_set_text (GTK_LABEL (frame->coords_label_y), C_("Coordinates", "n/a"));
}
- switch (frame->frame_mode)
+ switch (frame->pick_mode)
{
- case GIMP_COLOR_FRAME_MODE_PIXEL:
+ case GIMP_COLOR_PICK_MODE_PIXEL:
{
GimpImageBaseType base_type;
@@ -788,8 +788,8 @@ gimp_color_frame_update (GimpColorFrame *frame)
}
break;
- case GIMP_COLOR_FRAME_MODE_RGB_PERCENT:
- case GIMP_COLOR_FRAME_MODE_RGB_U8:
+ case GIMP_COLOR_PICK_MODE_RGB_PERCENT:
+ case GIMP_COLOR_PICK_MODE_RGB_U8:
/* TRANSLATORS: R for Red (RGB) */
names[0] = C_("RGB", "R:");
/* TRANSLATORS: G for Green (RGB) */
@@ -812,7 +812,7 @@ gimp_color_frame_update (GimpColorFrame *frame)
gimp_rgba_get_uchar (&frame->color, &r, &g, &b, &a);
- if (frame->frame_mode == GIMP_COLOR_FRAME_MODE_RGB_PERCENT)
+ if (frame->pick_mode == GIMP_COLOR_PICK_MODE_RGB_PERCENT)
{
values[0] = g_strdup_printf ("%.01f %%", frame->color.r * 100.0);
values[1] = g_strdup_printf ("%.01f %%", frame->color.g * 100.0);
@@ -831,7 +831,7 @@ gimp_color_frame_update (GimpColorFrame *frame)
}
break;
- case GIMP_COLOR_FRAME_MODE_HSV:
+ case GIMP_COLOR_PICK_MODE_HSV:
/* TRANSLATORS: H for Hue (HSV color space) */
names[0] = C_("HSV color space", "H:");
/* TRANSLATORS: S for Saturation (HSV color space) */
@@ -859,7 +859,7 @@ gimp_color_frame_update (GimpColorFrame *frame)
}
break;
- case GIMP_COLOR_FRAME_MODE_LCH:
+ case GIMP_COLOR_PICK_MODE_LCH:
/* TRANSLATORS: L for Lightness (LCH color space) */
names[0] = C_("LCH color space", "L*:");
/* TRANSLATORS: C for Chroma (LCH color space) */
@@ -891,7 +891,7 @@ gimp_color_frame_update (GimpColorFrame *frame)
}
break;
- case GIMP_COLOR_FRAME_MODE_LAB:
+ case GIMP_COLOR_PICK_MODE_LAB:
/* TRANSLATORS: L* for Lightness (Lab color space) */
names[0] = C_("Lab color space", "L*:");
/* TRANSLATORS: a* color channel in Lab color space */
@@ -923,7 +923,7 @@ gimp_color_frame_update (GimpColorFrame *frame)
}
break;
- case GIMP_COLOR_FRAME_MODE_CMYK:
+ case GIMP_COLOR_PICK_MODE_CMYK:
/* TRANSLATORS: C for Cyan (CMYK) */
names[0] = C_("CMYK", "C:");
/* TRANSLATORS: M for Magenta (CMYK) */
diff --git a/app/widgets/gimpcolorframe.h b/app/widgets/gimpcolorframe.h
index 6b409b7435..cf2812a4c3 100644
--- a/app/widgets/gimpcolorframe.h
+++ b/app/widgets/gimpcolorframe.h
@@ -44,7 +44,7 @@ struct _GimpColorFrame
gint x;
gint y;
- GimpColorFrameMode frame_mode;
+ GimpColorPickMode pick_mode;
PangoEllipsizeMode ellipsize;
@@ -54,7 +54,7 @@ struct _GimpColorFrame
gboolean has_color_area;
gboolean has_coords;
- GtkWidget *menu;
+ GtkWidget *combo;
GtkWidget *color_area;
GtkWidget *coords_box_x;
GtkWidget *coords_box_y;
@@ -80,7 +80,7 @@ GType gimp_color_frame_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_color_frame_new (void);
void gimp_color_frame_set_mode (GimpColorFrame *frame,
- GimpColorFrameMode mode);
+ GimpColorPickMode mode);
void gimp_color_frame_set_ellipsize (GimpColorFrame *frame,
PangoEllipsizeMode ellipsize);
diff --git a/app/widgets/gimpsamplepointeditor.c b/app/widgets/gimpsamplepointeditor.c
index e12bb143bf..f8349ea4a8 100644
--- a/app/widgets/gimpsamplepointeditor.c
+++ b/app/widgets/gimpsamplepointeditor.c
@@ -456,7 +456,7 @@ gimp_sample_point_editor_points_changed (GimpSamplePointEditor *editor)
editor->color_frames[i] =
g_object_new (GIMP_TYPE_COLOR_FRAME,
- "mode", GIMP_COLOR_FRAME_MODE_PIXEL,
+ "mode", GIMP_COLOR_PICK_MODE_PIXEL,
"has-number", TRUE,
"number", i + 1,
"has-color-area", TRUE,
diff --git a/app/widgets/widgets-enums.c b/app/widgets/widgets-enums.c
index e0d1c1ccc7..22295d4288 100644
--- a/app/widgets/widgets-enums.c
+++ b/app/widgets/widgets-enums.c
@@ -97,45 +97,6 @@ gimp_color_dialog_state_get_type (void)
return type;
}
-GType
-gimp_color_frame_mode_get_type (void)
-{
- static const GEnumValue values[] =
- {
- { GIMP_COLOR_FRAME_MODE_PIXEL, "GIMP_COLOR_FRAME_MODE_PIXEL", "pixel" },
- { GIMP_COLOR_FRAME_MODE_RGB_PERCENT, "GIMP_COLOR_FRAME_MODE_RGB_PERCENT", "rgb-percent" },
- { GIMP_COLOR_FRAME_MODE_RGB_U8, "GIMP_COLOR_FRAME_MODE_RGB_U8", "rgb-u8" },
- { GIMP_COLOR_FRAME_MODE_HSV, "GIMP_COLOR_FRAME_MODE_HSV", "hsv" },
- { GIMP_COLOR_FRAME_MODE_LCH, "GIMP_COLOR_FRAME_MODE_LCH", "lch" },
- { GIMP_COLOR_FRAME_MODE_LAB, "GIMP_COLOR_FRAME_MODE_LAB", "lab" },
- { GIMP_COLOR_FRAME_MODE_CMYK, "GIMP_COLOR_FRAME_MODE_CMYK", "cmyk" },
- { 0, NULL, NULL }
- };
-
- static const GimpEnumDesc descs[] =
- {
- { GIMP_COLOR_FRAME_MODE_PIXEL, NC_("color-frame-mode", "Pixel"), NULL },
- { GIMP_COLOR_FRAME_MODE_RGB_PERCENT, NC_("color-frame-mode", "RGB (%)"), NULL },
- { GIMP_COLOR_FRAME_MODE_RGB_U8, NC_("color-frame-mode", "RGB (0..255)"), NULL },
- { GIMP_COLOR_FRAME_MODE_HSV, NC_("color-frame-mode", "HSV"), NULL },
- { GIMP_COLOR_FRAME_MODE_LCH, NC_("color-frame-mode", "CIE LCh"), NULL },
- { GIMP_COLOR_FRAME_MODE_LAB, NC_("color-frame-mode", "CIE LAB"), NULL },
- { GIMP_COLOR_FRAME_MODE_CMYK, NC_("color-frame-mode", "CMYK"), NULL },
- { 0, NULL, NULL }
- };
-
- static GType type = 0;
-
- if (G_UNLIKELY (! type))
- {
- type = g_enum_register_static ("GimpColorFrameMode", values);
- gimp_type_set_translation_context (type, "color-frame-mode");
- gimp_enum_set_value_descriptions (type, descs);
- }
-
- return type;
-}
-
GType
gimp_color_pick_target_get_type (void)
{
diff --git a/app/widgets/widgets-enums.h b/app/widgets/widgets-enums.h
index c519ca9489..26788ca142 100644
--- a/app/widgets/widgets-enums.h
+++ b/app/widgets/widgets-enums.h
@@ -57,22 +57,6 @@ typedef enum
} GimpColorDialogState;
-#define GIMP_TYPE_COLOR_FRAME_MODE (gimp_color_frame_mode_get_type ())
-
-GType gimp_color_frame_mode_get_type (void) G_GNUC_CONST;
-
-typedef enum
-{
- GIMP_COLOR_FRAME_MODE_PIXEL, /*< desc="Pixel" >*/
- GIMP_COLOR_FRAME_MODE_RGB_PERCENT, /*< desc="RGB (%)" >*/
- GIMP_COLOR_FRAME_MODE_RGB_U8, /*< desc="RGB (0..255)" >*/
- GIMP_COLOR_FRAME_MODE_HSV, /*< desc="HSV" >*/
- GIMP_COLOR_FRAME_MODE_LCH, /*< desc="CIE LCh" >*/
- GIMP_COLOR_FRAME_MODE_LAB, /*< desc="CIE LAB" >*/
- GIMP_COLOR_FRAME_MODE_CMYK /*< desc="CMYK" >*/
-} GimpColorFrameMode;
-
-
#define GIMP_TYPE_COLOR_PICK_TARGET (gimp_color_pick_target_get_type ())
GType gimp_color_pick_target_get_type (void) G_GNUC_CONST;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
