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

set the boundaries for the coordinates widget from the property limits. 

2003-11-12  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimppropwidgets.c: set the boundaries for the
	coordinates widget from the property limits.

	* app/widgets/gimpgrideditor.c: removed the explicit calls to
	gimp_size_entry_set_refval_boundaries().
This commit is contained in:
Sven Neumann 2003-11-12 15:15:22 +00:00 committed by Sven Neumann
parent bff0e2a102
commit 3a08620b23
4 changed files with 52 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2003-11-12 Sven Neumann <sven@gimp.org>
* app/widgets/gimppropwidgets.c: set the boundaries for the
coordinates widget from the property limits.
* app/widgets/gimpgrideditor.c: removed the explicit calls to
gimp_size_entry_set_refval_boundaries().
2003-11-12 Sven Neumann <sven@gimp.org>
* app/gui/color-history.[ch]: changed COLOR_HISTORY_SIZE to 12 to

18
app/widgets/gimpgrideditor.c
View File

@ -255,11 +255,6 @@ gimp_grid_editor_constructor (GType type,
editor->yresolution,
TRUE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry),
0, 1.0, GIMP_MAX_IMAGE_SIZE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry),
1, 1.0, GIMP_MAX_IMAGE_SIZE);
gtk_table_set_col_spacings (GTK_TABLE (sizeentry), 2);
gtk_table_set_row_spacings (GTK_TABLE (sizeentry), 2);
@ -293,19 +288,6 @@ gimp_grid_editor_constructor (GType type,
editor->yresolution,
TRUE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry),
0, - GIMP_MAX_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry),
1, - GIMP_MAX_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE);
#ifdef __GNUC__
#warning FIXME: remove this hack when gimp_prop_coordinates_new() accepts boundaries
#endif
g_object_notify (G_OBJECT (editor->grid), "xoffset");
g_object_notify (G_OBJECT (editor->grid), "yoffset");
gtk_table_set_col_spacings (GTK_TABLE (sizeentry), 2);
gtk_table_set_row_spacings (GTK_TABLE (sizeentry), 2);

86
app/widgets/gimppropwidgets.c
View File

@ -1709,7 +1709,6 @@ gimp_prop_coordinates_new (GObject *config,
if (has_chainbutton)
{
chainbutton = gimp_chain_button_new (GIMP_CHAIN_BOTTOM);
gtk_table_attach_defaults (GTK_TABLE (sizeentry), chainbutton,
1, 3, 3, 4);
gtk_widget_show (chainbutton);
@ -1744,13 +1743,13 @@ gimp_prop_coordinates_connect (GObject *config,
GParamSpec *x_param_spec;
GParamSpec *y_param_spec;
GParamSpec *unit_param_spec;
gdouble x_value;
gdouble y_value;
gdouble x_value, x_lower, x_upper;
gdouble y_value, y_lower, y_upper;
GimpUnit unit_value;
gdouble *old_x_value;
gdouble *old_y_value;
GimpUnit *old_unit_value;
gboolean chain_checked = FALSE;
gboolean chain_checked;
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (sizeentry), FALSE);
g_return_val_if_fail (GIMP_SIZE_ENTRY (sizeentry)->number_of_fields == 2,
@ -1766,6 +1765,12 @@ gimp_prop_coordinates_connect (GObject *config,
if (! y_param_spec)
return FALSE;
if (! get_numeric_values (config, x_param_spec,
&x_value, &x_lower, &x_upper, G_STRLOC) ||
! get_numeric_values (config, y_param_spec,
&y_value, &y_lower, &y_upper, G_STRLOC))
return FALSE;
if (unit_property_name)
{
unit_param_spec = check_param_spec (config, unit_property_name,
@ -1783,37 +1788,6 @@ gimp_prop_coordinates_connect (GObject *config,
unit_value = GIMP_UNIT_INCH;
}
if (G_IS_PARAM_SPEC_INT (x_param_spec) &&
G_IS_PARAM_SPEC_INT (y_param_spec))
{
gint int_x;
gint int_y;
g_object_get (config,
x_property_name, &int_x,
y_property_name, &int_y,
NULL);
x_value = int_x;
y_value = int_y;
}
else if (G_IS_PARAM_SPEC_DOUBLE (x_param_spec) &&
G_IS_PARAM_SPEC_DOUBLE (y_param_spec))
{
g_object_get (config,
x_property_name, &x_value,
y_property_name, &y_value,
NULL);
}
else
{
g_warning ("%s: properties '%s' and '%s' of %s are not either "
" both int or both double",
G_STRLOC, x_property_name, y_property_name,
g_type_name (G_TYPE_FROM_INSTANCE (config)));
return FALSE;
}
set_param_spec (NULL,
gimp_size_entry_get_help_widget (GIMP_SIZE_ENTRY (sizeentry),
0),
@ -1836,34 +1810,23 @@ gimp_prop_coordinates_connect (GObject *config,
xresolution, FALSE);
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (sizeentry), 1,
yresolution, FALSE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
GIMP_MIN_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
GIMP_MIN_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE);
if (ABS (x_value - y_value) < 1)
chain_checked = TRUE;
chain_checked = (ABS (x_value - y_value) < 1);
break;
case GIMP_SIZE_ENTRY_UPDATE_RESOLUTION:
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
GIMP_MIN_RESOLUTION,
GIMP_MAX_RESOLUTION);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
GIMP_MIN_RESOLUTION,
GIMP_MAX_RESOLUTION);
if (ABS (x_value - y_value) < GIMP_MIN_RESOLUTION)
chain_checked = TRUE;
chain_checked = (ABS (x_value - y_value) < GIMP_MIN_RESOLUTION);
break;
default:
chain_checked = (x_value == y_value);
break;
}
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
x_lower, x_upper);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
y_lower, y_upper);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0, x_value);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, y_value);
@ -1997,16 +1960,17 @@ gimp_prop_coordinates_callback (GimpSizeEntry *sizeentry,
if (old_unit_value)
*old_unit_value = unit_value;
if (unit_param_spec)
g_object_set (config,
unit_param_spec->name, unit_value,
NULL);
if (G_IS_PARAM_SPEC_INT (x_param_spec) &&
G_IS_PARAM_SPEC_INT (y_param_spec))
{
g_object_set (config,
x_param_spec->name, ROUND (x_value),
y_param_spec->name, ROUND (y_value),
unit_param_spec ?
unit_param_spec->name : NULL, unit_value,
NULL);
}
else if (G_IS_PARAM_SPEC_DOUBLE (x_param_spec) &&
@ -2015,10 +1979,6 @@ gimp_prop_coordinates_callback (GimpSizeEntry *sizeentry,
g_object_set (config,
x_param_spec->name, x_value,
y_param_spec->name, y_value,
unit_param_spec ?
unit_param_spec->name : NULL, unit_value,
NULL);
}
}
@ -2560,8 +2520,6 @@ gimp_prop_stock_image_new (GObject *config,
property_name, &stock_id,
NULL);
g_print ("stock_id: %s\n", stock_id);
image = gtk_image_new_from_stock (stock_id, icon_size);
if (stock_id)

86
libgimpwidgets/gimppropwidgets.c
View File

@ -1709,7 +1709,6 @@ gimp_prop_coordinates_new (GObject *config,
if (has_chainbutton)
{
chainbutton = gimp_chain_button_new (GIMP_CHAIN_BOTTOM);
gtk_table_attach_defaults (GTK_TABLE (sizeentry), chainbutton,
1, 3, 3, 4);
gtk_widget_show (chainbutton);
@ -1744,13 +1743,13 @@ gimp_prop_coordinates_connect (GObject *config,
GParamSpec *x_param_spec;
GParamSpec *y_param_spec;
GParamSpec *unit_param_spec;
gdouble x_value;
gdouble y_value;
gdouble x_value, x_lower, x_upper;
gdouble y_value, y_lower, y_upper;
GimpUnit unit_value;
gdouble *old_x_value;
gdouble *old_y_value;
GimpUnit *old_unit_value;
gboolean chain_checked = FALSE;
gboolean chain_checked;
g_return_val_if_fail (GIMP_IS_SIZE_ENTRY (sizeentry), FALSE);
g_return_val_if_fail (GIMP_SIZE_ENTRY (sizeentry)->number_of_fields == 2,
@ -1766,6 +1765,12 @@ gimp_prop_coordinates_connect (GObject *config,
if (! y_param_spec)
return FALSE;
if (! get_numeric_values (config, x_param_spec,
&x_value, &x_lower, &x_upper, G_STRLOC) ||
! get_numeric_values (config, y_param_spec,
&y_value, &y_lower, &y_upper, G_STRLOC))
return FALSE;
if (unit_property_name)
{
unit_param_spec = check_param_spec (config, unit_property_name,
@ -1783,37 +1788,6 @@ gimp_prop_coordinates_connect (GObject *config,
unit_value = GIMP_UNIT_INCH;
}
if (G_IS_PARAM_SPEC_INT (x_param_spec) &&
G_IS_PARAM_SPEC_INT (y_param_spec))
{
gint int_x;
gint int_y;
g_object_get (config,
x_property_name, &int_x,
y_property_name, &int_y,
NULL);
x_value = int_x;
y_value = int_y;
}
else if (G_IS_PARAM_SPEC_DOUBLE (x_param_spec) &&
G_IS_PARAM_SPEC_DOUBLE (y_param_spec))
{
g_object_get (config,
x_property_name, &x_value,
y_property_name, &y_value,
NULL);
}
else
{
g_warning ("%s: properties '%s' and '%s' of %s are not either "
" both int or both double",
G_STRLOC, x_property_name, y_property_name,
g_type_name (G_TYPE_FROM_INSTANCE (config)));
return FALSE;
}
set_param_spec (NULL,
gimp_size_entry_get_help_widget (GIMP_SIZE_ENTRY (sizeentry),
0),
@ -1836,34 +1810,23 @@ gimp_prop_coordinates_connect (GObject *config,
xresolution, FALSE);
gimp_size_entry_set_resolution (GIMP_SIZE_ENTRY (sizeentry), 1,
yresolution, FALSE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
GIMP_MIN_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
GIMP_MIN_IMAGE_SIZE,
GIMP_MAX_IMAGE_SIZE);
if (ABS (x_value - y_value) < 1)
chain_checked = TRUE;
chain_checked = (ABS (x_value - y_value) < 1);
break;
case GIMP_SIZE_ENTRY_UPDATE_RESOLUTION:
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
GIMP_MIN_RESOLUTION,
GIMP_MAX_RESOLUTION);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
GIMP_MIN_RESOLUTION,
GIMP_MAX_RESOLUTION);
if (ABS (x_value - y_value) < GIMP_MIN_RESOLUTION)
chain_checked = TRUE;
chain_checked = (ABS (x_value - y_value) < GIMP_MIN_RESOLUTION);
break;
default:
chain_checked = (x_value == y_value);
break;
}
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 0,
x_lower, x_upper);
gimp_size_entry_set_refval_boundaries (GIMP_SIZE_ENTRY (sizeentry), 1,
y_lower, y_upper);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 0, x_value);
gimp_size_entry_set_refval (GIMP_SIZE_ENTRY (sizeentry), 1, y_value);
@ -1997,16 +1960,17 @@ gimp_prop_coordinates_callback (GimpSizeEntry *sizeentry,
if (old_unit_value)
*old_unit_value = unit_value;
if (unit_param_spec)
g_object_set (config,
unit_param_spec->name, unit_value,
NULL);
if (G_IS_PARAM_SPEC_INT (x_param_spec) &&
G_IS_PARAM_SPEC_INT (y_param_spec))
{
g_object_set (config,
x_param_spec->name, ROUND (x_value),
y_param_spec->name, ROUND (y_value),
unit_param_spec ?
unit_param_spec->name : NULL, unit_value,
NULL);
}
else if (G_IS_PARAM_SPEC_DOUBLE (x_param_spec) &&
@ -2015,10 +1979,6 @@ gimp_prop_coordinates_callback (GimpSizeEntry *sizeentry,
g_object_set (config,
x_param_spec->name, x_value,
y_param_spec->name, y_value,
unit_param_spec ?
unit_param_spec->name : NULL, unit_value,
NULL);
}
}
@ -2560,8 +2520,6 @@ gimp_prop_stock_image_new (GObject *config,
property_name, &stock_id,
NULL);
g_print ("stock_id: %s\n", stock_id);
image = gtk_image_new_from_stock (stock_id, icon_size);
if (stock_id)