callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed rgb and hsv parameters from gimp_color_scale_new().

Browse Source 
2002-10-31  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpcolorscale.[ch]: removed rgb and hsv parameters
	from gimp_color_scale_new().

	* libgimpwidgets/gimpwidgets.c: changed accordingly.
This commit is contained in:
Sven Neumann
2002-10-31 12:48:19 +00:00
committed by Sven Neumann
parent aa6ec604ba
commit 437856281b
8 changed files with 68 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2002-10-31 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorscale.[ch]: removed rgb and hsv parameters
from gimp_color_scale_new().
* libgimpwidgets/gimpwidgets.c: changed accordingly.
2002-10-31 Sven Neumann <sven@gimp.org> 2002-10-31 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpcolorscale.c: made inverted and flippable work * libgimpwidgets/gimpcolorscale.c: made inverted and flippable work

6
devel-docs/ChangeLog
View File

@ -1,3 +1,9 @@
2002-10-31 Sven Neumann <sven@gimp.org>
* libgimpwidgets/libgimpwidgets-sections.txt
* libgimpwidgets/tmpl/gimpcolorscale.sgml
* libgimpwidgets/tmpl/gimpwidgets.sgml: updated.
2002-10-30 Sven Neumann <sven@gimp.org> 2002-10-30 Sven Neumann <sven@gimp.org>
* libgimpwidgets/tmpl/gimpcolorscale.sgml: added GimpColorScale. * libgimpwidgets/tmpl/gimpcolorscale.sgml: added GimpColorScale.

3
devel-docs/libgimpwidgets/libgimpwidgets-sections.txt
View File

@ -361,6 +361,7 @@ GIMP_SCALE_ENTRY_SPINBUTTON
GIMP_SCALE_ENTRY_SPINBUTTON_ADJ GIMP_SCALE_ENTRY_SPINBUTTON_ADJ
gimp_scale_entry_new gimp_scale_entry_new
gimp_scale_entry_set_sensitive gimp_scale_entry_set_sensitive
gimp_color_scale_entry_new
GIMP_RANDOM_SEED_SPINBUTTON GIMP_RANDOM_SEED_SPINBUTTON
GIMP_RANDOM_SEED_SPINBUTTON_ADJ GIMP_RANDOM_SEED_SPINBUTTON_ADJ
GIMP_RANDOM_SEED_TOGGLEBUTTON GIMP_RANDOM_SEED_TOGGLEBUTTON
@ -448,6 +449,8 @@ GIMP_COLOR_NOTEBOOK_GET_CLASS
<TITLE>GimpColorScale</TITLE> <TITLE>GimpColorScale</TITLE>
GimpColorScale GimpColorScale
gimp_color_scale_new gimp_color_scale_new
gimp_color_scale_set_channel
gimp_color_scale_set_color
<SUBSECTION Standard> <SUBSECTION Standard>
GIMP_COLOR_SCALE GIMP_COLOR_SCALE
GIMP_IS_COLOR_SCALE GIMP_IS_COLOR_SCALE

22
devel-docs/libgimpwidgets/tmpl/gimpcolorscale.sgml
View File

@ -27,8 +27,28 @@ GimpColorScale
@orientation: @orientation:
@channel: @channel:
@Returns:
<!-- # Unused Parameters # -->
@rgb:
@hsv:
<!-- ##### FUNCTION gimp_color_scale_set_channel ##### -->
<para>
</para>
@scale:
@channel:
<!-- ##### FUNCTION gimp_color_scale_set_color ##### -->
<para>
</para>
@scale:
@rgb: @rgb:
@hsv: @hsv:
@Returns:

22
devel-docs/libgimpwidgets/tmpl/gimpwidgets.sgml
View File

@ -336,6 +336,28 @@ Returns the #GtkAdjustment of the scale_entry's #GtkSpinButton.
@sensitive: @sensitive:
<!-- ##### FUNCTION gimp_color_scale_entry_new ##### -->
<para>
</para>
@table:
@column:
@row:
@text:
@scale_width:
@spinbutton_width:
@value:
@lower:
@upper:
@step_increment:
@page_increment:
@digits:
@tooltip:
@help_data:
@Returns:
<!-- ##### MACRO GIMP_RANDOM_SEED_SPINBUTTON ##### --> <!-- ##### MACRO GIMP_RANDOM_SEED_SPINBUTTON ##### -->
<para> <para>
Returns the random_seed's #GtkSpinButton. Returns the random_seed's #GtkSpinButton.

19
libgimpwidgets/gimpcolorscale.c
View File

@ -106,7 +106,7 @@ gimp_color_scale_init (GimpColorScale *scale)
range->orientation = GTK_ORIENTATION_HORIZONTAL; range->orientation = GTK_ORIENTATION_HORIZONTAL;
range->flippable = TRUE; range->flippable = TRUE;
scale->channel = GIMP_COLOR_SELECTOR_HUE; scale->channel = GIMP_COLOR_SELECTOR_VALUE;
gimp_rgba_set (&scale->rgb, 0.0, 0.0, 0.0, 1.0); gimp_rgba_set (&scale->rgb, 0.0, 0.0, 0.0, 1.0);
gimp_rgb_to_hsv (&scale->rgb, &scale->hsv); gimp_rgb_to_hsv (&scale->rgb, &scale->hsv);
@ -364,30 +364,19 @@ gimp_color_scale_expose (GtkWidget *widget,
GtkWidget * GtkWidget *
gimp_color_scale_new (GtkOrientation orientation, gimp_color_scale_new (GtkOrientation orientation,
GimpColorSelectorChannel channel, GimpColorSelectorChannel channel)
const GimpRGB *rgb,
const GimpHSV *hsv)
{ {
GimpColorScale *scale; GimpColorScale *scale;
GtkRange *range; GtkRange *range;
g_return_val_if_fail ((rgb == NULL && hsv == NULL) ||
(rgb != NULL && hsv != NULL), NULL);
scale = g_object_new (GIMP_TYPE_COLOR_SCALE, NULL); scale = g_object_new (GIMP_TYPE_COLOR_SCALE, NULL);
scale->channel = channel;
range = GTK_RANGE (scale); range = GTK_RANGE (scale);
range->orientation = orientation; range->orientation = orientation;
range->flippable = (orientation == GTK_ORIENTATION_HORIZONTAL); range->flippable = (orientation == GTK_ORIENTATION_HORIZONTAL);
scale->channel = channel;
if (rgb && hsv)
{
scale->rgb = *rgb;
scale->hsv = *hsv;
}
return GTK_WIDGET (scale); return GTK_WIDGET (scale);
} }

4
libgimpwidgets/gimpcolorscale.h
View File

@ -67,9 +67,7 @@ struct _GimpColorScaleClass
GType gimp_color_scale_get_type (void) G_GNUC_CONST; GType gimp_color_scale_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_color_scale_new (GtkOrientation orientation, GtkWidget * gimp_color_scale_new (GtkOrientation orientation,
GimpColorSelectorChannel channel, GimpColorSelectorChannel channel);
const GimpRGB *rgb,
const GimpHSV *hsv);
void gimp_color_scale_set_channel (GimpColorScale *scale, void gimp_color_scale_set_channel (GimpColorScale *scale,
GimpColorSelectorChannel channel); GimpColorSelectorChannel channel);

12
libgimpwidgets/gimpwidgets.c
View File

@ -734,17 +734,11 @@ gimp_scale_entry_new_internal (gboolean color_scale,
if (color_scale) if (color_scale)
{ {
GimpRGB rgb;
GimpHSV hsv;
gimp_rgba_set (&rgb, 0.0, 0.0, 0.0, 1.0);
gimp_rgb_to_hsv (&rgb, &hsv);
scale = gimp_color_scale_new (GTK_ORIENTATION_HORIZONTAL, scale = gimp_color_scale_new (GTK_ORIENTATION_HORIZONTAL,
GIMP_COLOR_SELECTOR_HUE, GIMP_COLOR_SELECTOR_VALUE);
&rgb, &hsv);
gtk_range_set_adjustment (GTK_RANGE (scale), GTK_ADJUSTMENT (adjustment)); gtk_range_set_adjustment (GTK_RANGE (scale),
GTK_ADJUSTMENT (adjustment));
} }
else else
{ {