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

special case GimpSizeEntry and use the last entry. 

2006-10-18  Sven Neumann  <sven@gimp.org>

	* libgimpwidgets/gimpwidgets.c (find_mnemonic_widget): special
	case GimpSizeEntry and use the last entry.

	* app/tools/gimprotatetool.c
	* app/tools/gimpsheartool.c: added mnemonics (bug #162541).
This commit is contained in:
Sven Neumann 2006-10-18 10:29:16 +00:00 committed by Sven Neumann
parent 783a75d3db
commit dec954cc2a
4 changed files with 36 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
2006-10-18 Sven Neumann <sven@gimp.org>
* libgimpwidgets/gimpwidgets.c (find_mnemonic_widget): special
case GimpSizeEntry and use the last entry.
* app/tools/gimprotatetool.c
* app/tools/gimpsheartool.c: added mnemonics (bug #162541).
2006-10-18 Michael Natterer <mitch@gimp.org>
Separate selection tool function (select, move, cut, ...) from

6
app/tools/gimprotatetool.c
View File

@ -141,7 +141,7 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
0, -180, 180, 0.1, 15, 0, 2, 2);
gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (button), TRUE);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Angle:"),
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("_Angle:"),
0.0, 0.5, button, 1, TRUE);
g_signal_connect (rotate->angle_adj, "value-changed",
@ -156,7 +156,7 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
button = gimp_spin_button_new (&adj, 0, -1, 1, 1, 10, 1, 1, 2);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Center X:"),
gimp_table_attach_aligned (GTK_TABLE (table), 0, 2, _("Center _X:"),
0.0, 0.5, button, 1, TRUE);
rotate->sizeentry = gimp_size_entry_new (1, GIMP_UNIT_PIXEL, "%a",
@ -164,7 +164,7 @@ gimp_rotate_tool_dialog (GimpTransformTool *tr_tool)
GIMP_SIZE_ENTRY_UPDATE_SIZE);
gimp_size_entry_add_field (GIMP_SIZE_ENTRY (rotate->sizeentry),
GTK_SPIN_BUTTON (button), NULL);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Center Y:"),
gimp_table_attach_aligned (GTK_TABLE (table), 0, 3, _("Center _Y:"),
0.0, 0.5, rotate->sizeentry, 1, TRUE);
g_signal_connect (rotate->sizeentry, "value-changed",

4
app/tools/gimpsheartool.c
View File

@ -136,7 +136,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool)
button = gimp_spin_button_new (&shear->x_adj,
0, -65536, 65536, 1, 15, 1, 1, 0);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Shear magnitude X:"),
gimp_table_attach_aligned (GTK_TABLE (table), 0, 0, _("Shear magnitude _X:"),
0.0, 0.5, button, 1, TRUE);
g_signal_connect (shear->x_adj, "value-changed",
@ -146,7 +146,7 @@ gimp_shear_tool_dialog (GimpTransformTool *tr_tool)
button = gimp_spin_button_new (&shear->y_adj,
0, -65536, 65536, 1, 15, 1, 1, 0);
gtk_entry_set_width_chars (GTK_ENTRY (button), SB_WIDTH);
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Shear magnitude Y:"),
gimp_table_attach_aligned (GTK_TABLE (table), 0, 1, _("Shear magnitude _Y:"),
0.0, 0.5, button, 1, TRUE);
g_signal_connect (shear->y_adj, "value-changed",

45
libgimpwidgets/gimpwidgets.c
View File

@ -1397,9 +1397,7 @@ void
gimp_toggle_button_update (GtkWidget *widget,
gpointer data)
{
gint *toggle_val;
toggle_val = (gint *) data;
gint *toggle_val = (gint *) data;
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
*toggle_val = TRUE;
@ -1421,11 +1419,9 @@ void
gimp_radio_button_update (GtkWidget *widget,
gpointer data)
{
gint *toggle_val;
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)))
{
toggle_val = (gint *) data;
gint *toggle_val = (gint *) data;
*toggle_val = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (widget),
"gimp-item-data"));
@ -1447,9 +1443,8 @@ void
gimp_int_adjustment_update (GtkAdjustment *adjustment,
gpointer data)
{
gint *val;
gint *val = (gint *) data;
val = (gint *) data;
*val = RINT (adjustment->value);
}
@ -1466,9 +1461,8 @@ void
gimp_uint_adjustment_update (GtkAdjustment *adjustment,
gpointer data)
{
guint *val;
guint *val = (guint *) data;
val = (guint *) data;
*val = (guint) (adjustment->value + 0.5);
}
@ -1482,10 +1476,9 @@ void
gimp_float_adjustment_update (GtkAdjustment *adjustment,
gpointer data)
{
gfloat *val;
val = (gfloat *) data;
gfloat *val = (gfloat *) data;
*val = adjustment->value;
}
/**
@ -1498,9 +1491,8 @@ void
gimp_double_adjustment_update (GtkAdjustment *adjustment,
gpointer data)
{
gdouble *val;
gdouble *val = (gdouble *) data;
val = (gdouble *) data;
*val = adjustment->value;
}
@ -1522,11 +1514,10 @@ void
gimp_unit_menu_update (GtkWidget *widget,
gpointer data)
{
GimpUnit *val;
GimpUnit *val = (GimpUnit *) data;
GtkWidget *spinbutton;
gint digits;
val = (GimpUnit *) data;
*val = gimp_unit_menu_get_unit (GIMP_UNIT_MENU (widget));
digits = ((*val == GIMP_UNIT_PIXEL) ? 0 :
@ -1552,19 +1543,27 @@ static GtkWidget *
find_mnemonic_widget (GtkWidget *widget,
gint level)
{
GtkWidget *mnemonic_widget = NULL;
if (GTK_WIDGET_GET_CLASS (widget)->activate_signal ||
GTK_WIDGET_CAN_FOCUS (widget) ||
GTK_WIDGET_GET_CLASS (widget)->mnemonic_activate !=
GTK_WIDGET_CLASS (g_type_class_peek (GTK_TYPE_WIDGET))->mnemonic_activate)
{
mnemonic_widget = widget;
return widget;
}
if (GIMP_IS_SIZE_ENTRY (widget))
{
GimpSizeEntry *entry = GIMP_SIZE_ENTRY (widget);
return gimp_size_entry_get_help_widget (entry,
entry->number_of_fields - 1);
}
else if (GTK_IS_CONTAINER (widget))
{
GList *children;
GList *list;
GtkWidget *mnemonic_widget = NULL;
GList *children;
GList *list;
children = gtk_container_get_children (GTK_CONTAINER (widget));
@ -1577,9 +1576,11 @@ find_mnemonic_widget (GtkWidget *widget,
}
g_list_free (children);
return mnemonic_widget;
}
return mnemonic_widget;
return NULL;
}
/**