dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

show CMYK color values. 

2003-07-18  Sven Neumann  <sven@gimp.org>

	* app/gui/info-window.c: show CMYK color values.

	* app/tools/gimpcolorpickertool.c: reduced code duplication.
This commit is contained in:
Sven Neumann 2003-07-18 22:00:36 +00:00 committed by Sven Neumann
parent 73af860ff4
commit 3131923268
5 changed files with 172 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2003-07-18 Sven Neumann <sven@gimp.org>
* app/gui/info-window.c: show CMYK color values.
* app/tools/gimpcolorpickertool.c: reduced code duplication.
2003-07-18 Michael Natterer <mitch@gimp.org>
* app/composite/make-gimp-composite-dispatch.py: made generated

88
app/dialogs/info-window.c
View File

@ -68,6 +68,7 @@ struct _InfoWinData
GtkWidget *unit_labels[2];
GtkWidget *rgb_labels[3];
GtkWidget *hsv_labels[3];
GtkWidget *cmyk_labels[4];
GtkWidget *alpha_label;
gboolean showing_extended;
@ -132,7 +133,7 @@ info_window_create_extended (InfoDialog *info_win,
iwd = (InfoWinData *) info_win->user_data;
hbox = gtk_hbox_new (TRUE, 4);
hbox = gtk_hbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
/* cursor information */
@ -202,7 +203,7 @@ info_window_create_extended (InfoDialog *info_win,
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
hbox2 = gtk_hbox_new (FALSE, 4);
hbox2 = gtk_hbox_new (TRUE, 4);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
gtk_widget_show (hbox2);
@ -253,7 +254,7 @@ info_window_create_extended (InfoDialog *info_win,
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_box_pack_end (GTK_BOX (hbox2), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox2), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Hue */
@ -286,6 +287,56 @@ info_window_create_extended (InfoDialog *info_win,
gtk_widget_show (label);
}
/* CMYK */
sep = gtk_vseparator_new ();
gtk_box_pack_start (GTK_BOX (hbox2), sep, FALSE, FALSE, 4);
gtk_widget_show (sep);
table = gtk_table_new (4, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_box_pack_start (GTK_BOX (hbox2), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Cyan */
label = gtk_label_new (_("C:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
/* Magenta */
label = gtk_label_new (_("M:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
/* Yellow */
label = gtk_label_new (_("Y:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
/* Black */
label = gtk_label_new (_("K:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
for (i = 0; i < 4; i++)
{
iwd->cmyk_labels[i] = label = gtk_label_new (_("N/A"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, i, i + 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
}
/* Alpha */
hbox2 = gtk_hbox_new (FALSE, 4);
@ -524,16 +575,19 @@ info_window_update_extended (GimpDisplay *gdisp,
{
for (i = 0; i < 3; i++)
{
gtk_label_set_text (GTK_LABEL (iwd->rgb_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->hsv_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->rgb_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->hsv_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[i]), _("N/A"));
}
gtk_label_set_text (GTK_LABEL (iwd->alpha_label), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[3]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->alpha_label), _("N/A"));
}
else
{
GimpRGB rgb;
GimpHSV hsv;
GimpRGB rgb;
GimpHSV hsv;
GimpCMYK cmyk;
sample_type = gimp_image_projection_type (gdisp->gimage);
@ -570,6 +624,20 @@ info_window_update_extended (GimpDisplay *gdisp,
g_snprintf (buf, sizeof (buf), "%d", ROUND (hsv.v * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->hsv_labels[2]), buf);
gimp_rgb_to_cmyk (&rgb, &cmyk);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.c * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[0]), buf);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.m * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[1]), buf);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.y * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[2]), buf);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.k * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[3]), buf);
g_free (color);
}
}
@ -672,9 +740,7 @@ info_window_update (GimpDisplay *gdisp)
}
{
GdkVisual *visual;
visual = gdk_rgb_get_visual ();
GdkVisual *visual = gdk_rgb_get_visual ();
/* visual class */
g_snprintf (iwd->visual_class_str, MAX_BUF, "%s",

88
app/gui/info-window.c
View File

@ -68,6 +68,7 @@ struct _InfoWinData
GtkWidget *unit_labels[2];
GtkWidget *rgb_labels[3];
GtkWidget *hsv_labels[3];
GtkWidget *cmyk_labels[4];
GtkWidget *alpha_label;
gboolean showing_extended;
@ -132,7 +133,7 @@ info_window_create_extended (InfoDialog *info_win,
iwd = (InfoWinData *) info_win->user_data;
hbox = gtk_hbox_new (TRUE, 4);
hbox = gtk_hbox_new (FALSE, 4);
gtk_container_set_border_width (GTK_CONTAINER (hbox), 4);
/* cursor information */
@ -202,7 +203,7 @@ info_window_create_extended (InfoDialog *info_win,
gtk_container_add (GTK_CONTAINER (frame), vbox);
gtk_widget_show (vbox);
hbox2 = gtk_hbox_new (FALSE, 4);
hbox2 = gtk_hbox_new (TRUE, 4);
gtk_box_pack_start (GTK_BOX (vbox), hbox2, FALSE, FALSE, 0);
gtk_widget_show (hbox2);
@ -253,7 +254,7 @@ info_window_create_extended (InfoDialog *info_win,
table = gtk_table_new (3, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_box_pack_end (GTK_BOX (hbox2), table, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX (hbox2), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Hue */
@ -286,6 +287,56 @@ info_window_create_extended (InfoDialog *info_win,
gtk_widget_show (label);
}
/* CMYK */
sep = gtk_vseparator_new ();
gtk_box_pack_start (GTK_BOX (hbox2), sep, FALSE, FALSE, 4);
gtk_widget_show (sep);
table = gtk_table_new (4, 2, FALSE);
gtk_table_set_col_spacing (GTK_TABLE (table), 0, 4);
gtk_table_set_row_spacings (GTK_TABLE (table), 4);
gtk_box_pack_start (GTK_BOX (hbox2), table, FALSE, FALSE, 0);
gtk_widget_show (table);
/* Cyan */
label = gtk_label_new (_("C:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
/* Magenta */
label = gtk_label_new (_("M:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
/* Yellow */
label = gtk_label_new (_("Y:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
/* Black */
label = gtk_label_new (_("K:"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
for (i = 0; i < 4; i++)
{
iwd->cmyk_labels[i] = label = gtk_label_new (_("N/A"));
gtk_misc_set_alignment (GTK_MISC (label), 1.0, 0.5);
gtk_table_attach (GTK_TABLE (table), label, 1, 2, i, i + 1,
GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0);
gtk_widget_show (label);
}
/* Alpha */
hbox2 = gtk_hbox_new (FALSE, 4);
@ -524,16 +575,19 @@ info_window_update_extended (GimpDisplay *gdisp,
{
for (i = 0; i < 3; i++)
{
gtk_label_set_text (GTK_LABEL (iwd->rgb_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->hsv_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->rgb_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->hsv_labels[i]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[i]), _("N/A"));
}
gtk_label_set_text (GTK_LABEL (iwd->alpha_label), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[3]), _("N/A"));
gtk_label_set_text (GTK_LABEL (iwd->alpha_label), _("N/A"));
}
else
{
GimpRGB rgb;
GimpHSV hsv;
GimpRGB rgb;
GimpHSV hsv;
GimpCMYK cmyk;
sample_type = gimp_image_projection_type (gdisp->gimage);
@ -570,6 +624,20 @@ info_window_update_extended (GimpDisplay *gdisp,
g_snprintf (buf, sizeof (buf), "%d", ROUND (hsv.v * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->hsv_labels[2]), buf);
gimp_rgb_to_cmyk (&rgb, &cmyk);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.c * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[0]), buf);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.m * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[1]), buf);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.y * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[2]), buf);
g_snprintf (buf, sizeof (buf), "%d", ROUND (cmyk.k * 100.0));
gtk_label_set_text (GTK_LABEL (iwd->cmyk_labels[3]), buf);
g_free (color);
}
}
@ -672,9 +740,7 @@ info_window_update (GimpDisplay *gdisp)
}
{
GdkVisual *visual;
visual = gdk_rgb_get_visual ();
GdkVisual *visual = gdk_rgb_get_visual ();
/* visual class */
g_snprintf (iwd->visual_class_str, MAX_BUF, "%s",

25
app/tools/gimpcolorpickertool.c
View File

@ -276,26 +276,20 @@ gimp_color_picker_tool_info_create (GimpTool *tool)
switch (GIMP_IMAGE_TYPE_BASE_TYPE (gimp_drawable_type (tool->drawable)))
{
case GIMP_RGB:
info_dialog_add_label (info_dialog, _("Red:"), red_buf);
info_dialog_add_label (info_dialog, _("Green:"), green_buf);
info_dialog_add_label (info_dialog, _("Blue:"), blue_buf);
info_dialog_add_label (info_dialog, _("Alpha:"), alpha_buf);
info_dialog_add_label (info_dialog, _("Hex Triplet:"), hex_buf);
info_dialog_add_label (info_dialog, _("Red:"), red_buf);
info_dialog_add_label (info_dialog, _("Green:"), green_buf);
info_dialog_add_label (info_dialog, _("Blue:"), blue_buf);
break;
case GIMP_GRAY:
info_dialog_add_label (info_dialog, _("Intensity:"), red_buf);
info_dialog_add_label (info_dialog, _("Alpha:"), alpha_buf);
info_dialog_add_label (info_dialog, _("Hex Triplet:"), hex_buf);
info_dialog_add_label (info_dialog, _("Intensity:"), red_buf);
break;
case GIMP_INDEXED:
info_dialog_add_label (info_dialog, _("Index:"), index_buf);
info_dialog_add_label (info_dialog, _("Red:"), red_buf);
info_dialog_add_label (info_dialog, _("Green:"), green_buf);
info_dialog_add_label (info_dialog, _("Blue:"), blue_buf);
info_dialog_add_label (info_dialog, _("Alpha:"), alpha_buf);
info_dialog_add_label (info_dialog, _("Hex Triplet"), hex_buf);
info_dialog_add_label (info_dialog, _("Index:"), index_buf);
info_dialog_add_label (info_dialog, _("Red:"), red_buf);
info_dialog_add_label (info_dialog, _("Green:"), green_buf);
info_dialog_add_label (info_dialog, _("Blue:"), blue_buf);
break;
default:
@ -303,6 +297,9 @@ gimp_color_picker_tool_info_create (GimpTool *tool)
break;
}
info_dialog_add_label (info_dialog, _("Alpha:"), alpha_buf);
info_dialog_add_label (info_dialog, _("Hex Triplet:"), hex_buf);
hbox = gtk_hbox_new (FALSE, 4);
gtk_box_pack_start (GTK_BOX (info_dialog->vbox), hbox, FALSE, FALSE, 0);
gtk_widget_show (hbox);

2
tips/.cvsignore
View File

@ -3,7 +3,7 @@
Makefile
Makefile.in
POTFILES
gimp14-tips.pot
*.pot
gimp-tips.xml
gimp-tips.xml.in.h
messages