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

app: show the tool options in various other error cases. 

Similar to the previous commit, use the new
gimp_tools_show_tool_options() before blinking various tool options
widgets since these are good hints for wrongly set options and it's nice
to be able to point at these.
This commit is contained in:
Jehan 2022-07-27 10:45:40 +02:00
parent 6c18c7e497
commit 4a5acb2448
6 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/tools/gimpeditselectiontool.c
View File

@ -972,7 +972,7 @@ gimp_edit_selection_tool_translate (GimpTool *tool,
GdkEventKey *kevent, GdkEventKey *kevent,
GimpTransformType translate_type, GimpTransformType translate_type,
GimpDisplay *display, GimpDisplay *display,
GtkWidget *type_box) GtkWidget **type_box)
{ {
gint inc_x = 0; gint inc_x = 0;
gint inc_y = 0; gint inc_y = 0;
@ -1159,7 +1159,11 @@ gimp_edit_selection_tool_translate (GimpTool *tool,
{ {
gimp_tool_message_literal (tool, display, null_message); gimp_tool_message_literal (tool, display, null_message);
if (type_box) if (type_box)
gimp_widget_blink (type_box); {
gimp_tools_show_tool_options (display->gimp);
if (*type_box)
gimp_widget_blink (*type_box);
}
return TRUE; return TRUE;
} }
else if (locked_message) else if (locked_message)

2
app/tools/gimpeditselectiontool.h
View File

@ -44,7 +44,7 @@ gboolean gimp_edit_selection_tool_translate (GimpTool *tool,
GdkEventKey *kevent, GdkEventKey *kevent,
GimpTransformType translate_type, GimpTransformType translate_type,
GimpDisplay *display, GimpDisplay *display,
GtkWidget *type_box); GtkWidget **type_box);
#endif /* __GIMP_EDIT_SELECTION_TOOL_H__ */ #endif /* __GIMP_EDIT_SELECTION_TOOL_H__ */

3
app/tools/gimpmovetool.c
View File

@ -375,6 +375,7 @@ gimp_move_tool_button_press (GimpTool *tool,
if (! active_item && ! selected_items) if (! active_item && ! selected_items)
{ {
gimp_tool_message_literal (tool, display, null_message); gimp_tool_message_literal (tool, display, null_message);
gimp_tools_show_tool_options (display->gimp);
gimp_widget_blink (options->type_box); gimp_widget_blink (options->type_box);
gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display); gimp_tool_control (tool, GIMP_TOOL_ACTION_HALT, display);
return; return;
@ -459,7 +460,7 @@ gimp_move_tool_key_press (GimpTool *tool,
return gimp_edit_selection_tool_translate (tool, kevent, return gimp_edit_selection_tool_translate (tool, kevent,
options->move_type, options->move_type,
display, display,
options->type_box); &options->type_box);
} }
static void static void

3
app/tools/gimppainttool.c
View File

@ -344,7 +344,10 @@ gimp_paint_tool_button_press (GimpTool *tool,
mode_box = gimp_paint_options_gui_get_paint_mode_box (options_gui); mode_box = gimp_paint_options_gui_get_paint_mode_box (options_gui);
if (gtk_widget_is_sensitive (mode_box)) if (gtk_widget_is_sensitive (mode_box))
{
gimp_tools_show_tool_options (display->gimp);
gimp_widget_blink (mode_box); gimp_widget_blink (mode_box);
}
g_clear_error (&error); g_clear_error (&error);
g_list_free (drawables); g_list_free (drawables);

3
app/tools/gimptransformtool.c
View File

@ -742,7 +742,10 @@ gimp_transform_tool_check_selected_objects (GimpTransformTool *tr_tool,
{ {
g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, null_message); g_set_error_literal (error, GIMP_ERROR, GIMP_FAILED, null_message);
if (error) if (error)
{
gimp_tools_show_tool_options (display->gimp);
gimp_widget_blink (options->type_box); gimp_widget_blink (options->type_box);
}
return NULL; return NULL;
} }

2
app/tools/gimpwarptool.c
View File

@ -829,6 +829,7 @@ gimp_warp_tool_can_stroke (GimpWarpTool *wt,
gimp_tool_message_literal (tool, display, gimp_tool_message_literal (tool, display,
_("No stroke events selected.")); _("No stroke events selected."));
gimp_tools_show_tool_options (display->gimp);
gimp_widget_blink (options->stroke_frame); gimp_widget_blink (options->stroke_frame);
} }
@ -863,6 +864,7 @@ gimp_warp_tool_can_stroke (GimpWarpTool *wt,
{ {
gimp_tool_message_literal (tool, display, message); gimp_tool_message_literal (tool, display, message);
gimp_tools_show_tool_options (display->gimp);
gimp_widget_blink (options->behavior_combo); gimp_widget_blink (options->behavior_combo);
} }