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

Makefile.am new file. 

2000-02-10  Michael Natterer  <mitch@gimp.org>

	* Makefile.am
	* pixmaps/wilber.xpm: new file.

	* libgimp/gimpdialog.[ch]: uncommented some lines. Depending on
	your window manager, you'll figure out what it does without having
	to look at the sources...

	* app/app_procs.c
	* app/gradient.c
	* app/menus.c: minor changes to bring the goodie above to all
	places. Did dome cleanups.

	* app/commands.c: I18N fix.

	* app/channels_dialog.c: removed an unused declaration.
This commit is contained in:
Michael Natterer 2000-02-10 00:00:54 +00:00 committed by Michael Natterer
parent a29814cd0e
commit 9cb95b1949
21 changed files with 775 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.am
View File

@ -81,6 +81,7 @@ EXTRA_DIST = \
pixmaps/topath.xpm \ pixmaps/topath.xpm \
pixmaps/toselection.xpm \ pixmaps/toselection.xpm \
pixmaps/update.xpm \ pixmaps/update.xpm \
pixmaps/wilber.xpm \
pixmaps/yes.xpm \ pixmaps/yes.xpm \
pixmaps/zoom_in.xpm \ pixmaps/zoom_in.xpm \
pixmaps/zoom_out.xpm \ pixmaps/zoom_out.xpm \

156
app/actions/help-commands.c
View File

@ -142,7 +142,7 @@ void
edit_undo_cmd_callback (GtkWidget *widget, edit_undo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_pop (gdisp->gimage); undo_pop (gdisp->gimage);
@ -152,7 +152,7 @@ void
edit_redo_cmd_callback (GtkWidget *widget, edit_redo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_redo (gdisp->gimage); undo_redo (gdisp->gimage);
@ -162,7 +162,7 @@ void
edit_cut_cmd_callback (GtkWidget *widget, edit_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_cut (gdisp); global_edit_cut (gdisp);
@ -172,7 +172,7 @@ void
edit_copy_cmd_callback (GtkWidget *widget, edit_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_copy (gdisp); global_edit_copy (gdisp);
@ -182,7 +182,7 @@ void
edit_paste_cmd_callback (GtkWidget *widget, edit_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 0); global_edit_paste (gdisp, 0);
@ -192,7 +192,7 @@ void
edit_paste_into_cmd_callback (GtkWidget *widget, edit_paste_into_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 1); global_edit_paste (gdisp, 1);
@ -202,7 +202,7 @@ void
edit_paste_as_new_cmd_callback (GtkWidget *widget, edit_paste_as_new_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste_as_new (gdisp); global_edit_paste_as_new (gdisp);
@ -212,7 +212,7 @@ void
edit_named_cut_cmd_callback (GtkWidget *widget, edit_named_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_cut (gdisp); named_edit_cut (gdisp);
@ -222,7 +222,7 @@ void
edit_named_copy_cmd_callback (GtkWidget *widget, edit_named_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_copy (gdisp); named_edit_copy (gdisp);
@ -232,7 +232,7 @@ void
edit_named_paste_cmd_callback (GtkWidget *widget, edit_named_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_paste (gdisp); named_edit_paste (gdisp);
@ -242,7 +242,7 @@ void
edit_clear_cmd_callback (GtkWidget *widget, edit_clear_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -253,7 +253,7 @@ void
edit_fill_cmd_callback (GtkWidget *widget, edit_fill_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -264,7 +264,7 @@ void
edit_stroke_cmd_callback (GtkWidget *widget, edit_stroke_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -277,7 +277,7 @@ void
select_invert_cmd_callback (GtkWidget *widget, select_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_invert (gdisp->gimage); gimage_mask_invert (gdisp->gimage);
@ -288,7 +288,7 @@ void
select_all_cmd_callback (GtkWidget *widget, select_all_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_all (gdisp->gimage); gimage_mask_all (gdisp->gimage);
@ -299,7 +299,7 @@ void
select_none_cmd_callback (GtkWidget *widget, select_none_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_none (gdisp->gimage); gimage_mask_none (gdisp->gimage);
@ -310,7 +310,7 @@ void
select_float_cmd_callback (GtkWidget *widget, select_float_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage), gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
@ -330,7 +330,7 @@ select_feather_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Feather Selection"), qbox = gimp_query_size_box (_("Feather Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/feather_selection.html", "dialogs/feather_selection.html",
_("Feather selection by:"), _("Feather Selection by:"),
selection_feather_radius, 0, 32767, 3, selection_feather_radius, 0, 32767, 3,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -345,7 +345,7 @@ void
select_sharpen_cmd_callback (GtkWidget *widget, select_sharpen_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_sharpen (gdisp->gimage); gimage_mask_sharpen (gdisp->gimage);
@ -359,14 +359,14 @@ select_shrink_cmd_callback (GtkWidget *widget,
GtkWidget *edge_lock; GtkWidget *edge_lock;
GtkWidget *shrink_dialog; GtkWidget *shrink_dialog;
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
shrink_dialog = shrink_dialog =
gimp_query_size_box (N_("Shrink Selection"), gimp_query_size_box (N_("Shrink Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/shrink_selection.html", "dialogs/shrink_selection.html",
N_("Shrink selection by:"), _("Shrink Selection by:"),
selection_shrink_pixels, 1, 32767, 0, selection_shrink_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -400,7 +400,7 @@ select_grow_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Grow Selection"), qbox = gimp_query_size_box (_("Grow Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/grow_selection.html", "dialogs/grow_selection.html",
_("Grow selection by:"), _("Grow Selection by:"),
selection_grow_pixels, 1, 32767, 0, selection_grow_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -423,7 +423,7 @@ select_border_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Border Selection"), qbox = gimp_query_size_box (_("Border Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/border_selection.html", "dialogs/border_selection.html",
_("Border selection by:"), _("Border Selection by:"),
selection_border_radius, 1, 32767, 0, selection_border_radius, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -438,7 +438,7 @@ void
select_save_cmd_callback (GtkWidget *widget, select_save_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_save (gdisp->gimage); gimage_mask_save (gdisp->gimage);
@ -555,7 +555,7 @@ void
view_info_window_cmd_callback (GtkWidget *widget, view_info_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!info_window_follows_mouse) if (!info_window_follows_mouse)
@ -576,7 +576,7 @@ void
view_nav_window_cmd_callback (GtkWidget *widget, view_nav_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (nav_window_per_display) if (nav_window_per_display)
@ -596,8 +596,8 @@ void
view_undo_history_cmd_callback (GtkWidget *widget, view_undo_history_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GImage * gimage; GImage *gimage;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage = gdisp->gimage; gimage = gdisp->gimage;
@ -615,8 +615,8 @@ void
view_toggle_selection_cmd_callback (GtkWidget *widget, view_toggle_selection_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int new_val; gint new_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -634,7 +634,7 @@ void
view_toggle_rulers_cmd_callback (GtkWidget *widget, view_toggle_rulers_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -665,7 +665,7 @@ void
view_toggle_statusbar_cmd_callback (GtkWidget *widget, view_toggle_statusbar_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -684,8 +684,8 @@ void
view_toggle_guides_cmd_callback (GtkWidget *widget, view_toggle_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int old_val; gint old_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -703,7 +703,7 @@ void
view_snap_to_guides_cmd_callback (GtkWidget *widget, view_snap_to_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active; gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active;
@ -735,7 +735,7 @@ void
image_convert_rgb_cmd_callback (GtkWidget *widget, image_convert_rgb_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_rgb (gdisp->gimage); convert_to_rgb (gdisp->gimage);
@ -745,7 +745,7 @@ void
image_convert_grayscale_cmd_callback (GtkWidget *widget, image_convert_grayscale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_grayscale (gdisp->gimage); convert_to_grayscale (gdisp->gimage);
@ -755,7 +755,7 @@ void
image_convert_indexed_cmd_callback (GtkWidget *widget, image_convert_indexed_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_indexed (gdisp->gimage); convert_to_indexed (gdisp->gimage);
@ -765,7 +765,7 @@ void
image_desaturate_cmd_callback (GtkWidget *widget, image_desaturate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_desaturate (gdisp->gimage); image_desaturate (gdisp->gimage);
@ -776,7 +776,7 @@ void
image_invert_cmd_callback (GtkWidget *widget, image_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_invert (gdisp->gimage); image_invert (gdisp->gimage);
@ -798,7 +798,7 @@ void
image_offset_cmd_callback (GtkWidget *widget, image_offset_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_offset (gdisp->gimage); channel_ops_offset (gdisp->gimage);
@ -808,9 +808,9 @@ void
image_resize_cmd_callback (GtkWidget *widget, image_resize_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_resize; ImageResize *image_resize;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -839,9 +839,9 @@ void
image_scale_cmd_callback (GtkWidget *widget, image_scale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_scale; ImageResize *image_scale;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -870,7 +870,7 @@ void
image_duplicate_cmd_callback (GtkWidget *widget, image_duplicate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_duplicate (gdisp->gimage); channel_ops_duplicate (gdisp->gimage);
@ -882,9 +882,9 @@ void
layers_previous_cmd_callback (GtkWidget *widget, layers_previous_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -908,9 +908,9 @@ void
layers_next_cmd_callback (GtkWidget *widget, layers_next_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -934,7 +934,7 @@ void
layers_raise_cmd_callback (GtkWidget *widget, layers_raise_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -945,7 +945,7 @@ void
layers_lower_cmd_callback (GtkWidget *widget, layers_lower_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -956,7 +956,7 @@ void
layers_raise_to_top_cmd_callback (GtkWidget *widget, layers_raise_to_top_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer);
@ -967,7 +967,7 @@ void
layers_lower_to_bottom_cmd_callback (GtkWidget *widget, layers_lower_to_bottom_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer);
@ -978,7 +978,7 @@ void
layers_anchor_cmd_callback (GtkWidget *widget, layers_anchor_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
floating_sel_anchor (gimage_get_active_layer (gdisp->gimage)); floating_sel_anchor (gimage_get_active_layer (gdisp->gimage));
@ -989,7 +989,7 @@ void
layers_merge_cmd_callback (GtkWidget *widget, layers_merge_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layers_dialog_layer_merge_query (gdisp->gimage, TRUE); layers_dialog_layer_merge_query (gdisp->gimage, TRUE);
@ -999,7 +999,7 @@ void
layers_flatten_cmd_callback (GtkWidget *widget, layers_flatten_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_flatten (gdisp->gimage); gimage_flatten (gdisp->gimage);
@ -1010,7 +1010,7 @@ void
layers_mask_select_cmd_callback (GtkWidget *widget, layers_mask_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer);
@ -1021,7 +1021,7 @@ void
layers_add_alpha_channel_cmd_callback (GtkWidget *widget, layers_add_alpha_channel_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layer_add_alpha ( gdisp->gimage->active_layer); layer_add_alpha ( gdisp->gimage->active_layer);
@ -1032,7 +1032,7 @@ void
layers_alpha_select_cmd_callback (GtkWidget *widget, layers_alpha_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer);
@ -1071,8 +1071,8 @@ tools_select_cmd_callback (GtkWidget *widget,
gpointer callback_data, gpointer callback_data,
guint callback_action) guint callback_action)
{ {
ToolType tool_type; ToolType tool_type;
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
tool_type = (ToolType) callback_action; tool_type = (ToolType) callback_action;
@ -1116,7 +1116,7 @@ void
dialogs_lc_cmd_callback (GtkWidget *widget, dialogs_lc_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
lc_dialog_create (gdisp ? gdisp->gimage : NULL); lc_dialog_create (gdisp ? gdisp->gimage : NULL);
@ -1158,18 +1158,20 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
} }
static void static void
dialogs_indexed_palette_select_callback (ColormapDialog *dlg, dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer user_data) gpointer data)
{ {
guchar *c; guchar *color;
GimpImage *img = colormap_dialog_image (dlg); GimpImage *image = colormap_dialog_image (dialog);
c = &img->cmap[colormap_dialog_col_index (dlg) * 3]; color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND) if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_foreground (gimp_context_get_user (),
color[0], color[1], color[2]);
else if (active_color == BACKGROUND) else if (active_color == BACKGROUND)
gimp_context_set_background (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_background (gimp_context_get_user (),
color[0], color[1], color[2]);
} }
void void
@ -1232,10 +1234,10 @@ void
dialogs_module_browser_cmd_callback (GtkWidget *widget, dialogs_module_browser_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GtkWidget *w; GtkWidget *module_browser;
w = module_db_browser_new (); module_browser = module_db_browser_new ();
gtk_widget_show (w); gtk_widget_show (module_browser);
} }
/***** Help *****/ /***** Help *****/

2
app/app_procs.c
View File

@ -362,6 +362,8 @@ make_initialization_status_window (void)
gtk_window_set_position (GTK_WINDOW (win_initstatus), GTK_WIN_POS_CENTER); gtk_window_set_position (GTK_WINDOW (win_initstatus), GTK_WIN_POS_CENTER);
gtk_window_set_policy (GTK_WINDOW (win_initstatus), FALSE, FALSE, FALSE); gtk_window_set_policy (GTK_WINDOW (win_initstatus), FALSE, FALSE, FALSE);
gimp_dialog_set_icon (GTK_WINDOW (win_initstatus));
if (no_splash_image == FALSE && if (no_splash_image == FALSE &&
splash_logo_load_size (win_initstatus)) splash_logo_load_size (win_initstatus))
{ {

131
app/channels_dialog.c
View File

@ -100,67 +100,98 @@ struct _ChannelWidget
/* channels dialog widget routines */ /* channels dialog widget routines */
static void channels_dialog_preview_extents (void); static void channels_dialog_preview_extents (void);
static void channels_dialog_set_menu_sensitivity (void); static void channels_dialog_set_menu_sensitivity (void);
static void channels_dialog_scroll_index (gint index); static void channels_dialog_set_channel (ChannelWidget *cw);
static void channels_dialog_set_channel (ChannelWidget *); static void channels_dialog_unset_channel (ChannelWidget *cw);
static void channels_dialog_unset_channel (ChannelWidget *); static void channels_dialog_position_channel (Channel *channel,
static void channels_dialog_position_channel (Channel *, gint); gint position);
static void channels_dialog_add_channel (Channel *); static void channels_dialog_add_channel (Channel *channel);
static void channels_dialog_remove_channel (ChannelWidget *); static void channels_dialog_remove_channel (ChannelWidget *cw);
static gint channel_list_events (GtkWidget *, GdkEvent *); static gint channel_list_events (GtkWidget *widget,
GdkEvent *event);
/* for (un)installing the menu accelarators */ /* for (un)installing the menu accelarators */
static void channels_dialog_map_callback (GtkWidget *, gpointer); static void channels_dialog_map_callback (GtkWidget *widget,
static void channels_dialog_unmap_callback (GtkWidget *, gpointer); gpointer data);
static void channels_dialog_unmap_callback (GtkWidget *widget,
gpointer data);
/* ops buttons dnd callbacks */ /* ops buttons dnd callbacks */
static gboolean channels_dialog_drag_new_channel_callback (GtkWidget *, static gboolean channels_dialog_drag_new_channel_callback
GdkDragContext *, (GtkWidget *widget,
gint, gint, guint); GdkDragContext *context,
static gboolean channels_dialog_drag_duplicate_channel_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
gint, gint, guint); guint time);
static gboolean channels_dialog_drag_channel_to_sel_callback (GtkWidget *, static gboolean channels_dialog_drag_duplicate_channel_callback
GdkDragContext *, (GtkWidget *widget,
gint, gint, guint); GdkDragContext *context,
static gboolean channels_dialog_drag_delete_channel_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
gint, gint, guint); guint time);
static gboolean channels_dialog_drag_channel_to_sel_callback
(GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
guint time);
static gboolean channels_dialog_drag_delete_channel_callback
(GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
guint time);
/* channel widget function prototypes */ /* channel widget function prototypes */
static ChannelWidget *channel_widget_get_ID (Channel *); static ChannelWidget * channel_widget_get_ID (Channel *channel);
static ChannelWidget *channel_widget_create (GImage *, Channel *, ChannelType); static ChannelWidget * channel_widget_create (GImage *gimage,
Channel *channel,
ChannelType channel_type);
static gboolean channel_widget_drag_motion_callback (GtkWidget *, static gboolean channel_widget_drag_motion_callback
GdkDragContext *, (GtkWidget *widget,
gint, gint, guint); GdkDragContext *context,
static gboolean channel_widget_drag_drop_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
gint, gint, guint); guint time);
static void channel_widget_drag_begin_callback (GtkWidget *, static gboolean channel_widget_drag_drop_callback(GtkWidget *widget,
GdkDragContext *); GdkDragContext *context,
static void channel_widget_drag_leave_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
guint); guint time);
static void channel_widget_drag_indicator_callback (GtkWidget *, gpointer); static void channel_widget_drag_begin_callback (GtkWidget *widget,
GdkDragContext *context);
static void channel_widget_drag_leave_callback (GtkWidget *widget,
GdkDragContext *context,
guint time);
static void channel_widget_drag_indicator_callback
(GtkWidget *widget,
gpointer data);
static void channel_widget_drop_color (GtkWidget *, static void channel_widget_drop_color (GtkWidget *widget,
guchar, guchar, guchar, guchar r,
gpointer); guchar g,
static void channel_widget_draw_drop_indicator (ChannelWidget *, GimpDropType); guchar b,
static void channel_widget_delete (ChannelWidget *); gpointer data);
static void channel_widget_select_update (GtkWidget *, gpointer); static void channel_widget_draw_drop_indicator (ChannelWidget *cw,
static gint channel_widget_button_events (GtkWidget *, GdkEvent *); GimpDropType drop_type);
static gint channel_widget_preview_events (GtkWidget *, GdkEvent *); static void channel_widget_delete (ChannelWidget *cw);
static void channel_widget_preview_redraw (ChannelWidget *); static void channel_widget_select_update (GtkWidget *widget,
static void channel_widget_no_preview_redraw (ChannelWidget *); gpointer data);
static void channel_widget_eye_redraw (ChannelWidget *); static gint channel_widget_button_events (GtkWidget *widget,
static void channel_widget_exclusive_visible (ChannelWidget *); GdkEvent *event);
static void channel_widget_channel_flush (GtkWidget *, gpointer); static gint channel_widget_preview_events (GtkWidget *widget,
GdkEvent *event);
static void channel_widget_preview_redraw (ChannelWidget *cw);
static void channel_widget_no_preview_redraw (ChannelWidget *cw);
static void channel_widget_eye_redraw (ChannelWidget *cw);
static void channel_widget_exclusive_visible (ChannelWidget *cw);
static void channel_widget_channel_flush (GtkWidget *widget,
gpointer data);
/* assorted query dialogs */ /* assorted query dialogs */
static void channels_dialog_new_channel_query (GimpImage *); static void channels_dialog_new_channel_query (GimpImage *gimage);
static void channels_dialog_edit_channel_query (ChannelWidget *); static void channels_dialog_edit_channel_query (ChannelWidget *cw);
/****************/ /****************/
/* Local data */ /* Local data */

156
app/commands.c
View File

@ -142,7 +142,7 @@ void
edit_undo_cmd_callback (GtkWidget *widget, edit_undo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_pop (gdisp->gimage); undo_pop (gdisp->gimage);
@ -152,7 +152,7 @@ void
edit_redo_cmd_callback (GtkWidget *widget, edit_redo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_redo (gdisp->gimage); undo_redo (gdisp->gimage);
@ -162,7 +162,7 @@ void
edit_cut_cmd_callback (GtkWidget *widget, edit_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_cut (gdisp); global_edit_cut (gdisp);
@ -172,7 +172,7 @@ void
edit_copy_cmd_callback (GtkWidget *widget, edit_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_copy (gdisp); global_edit_copy (gdisp);
@ -182,7 +182,7 @@ void
edit_paste_cmd_callback (GtkWidget *widget, edit_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 0); global_edit_paste (gdisp, 0);
@ -192,7 +192,7 @@ void
edit_paste_into_cmd_callback (GtkWidget *widget, edit_paste_into_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 1); global_edit_paste (gdisp, 1);
@ -202,7 +202,7 @@ void
edit_paste_as_new_cmd_callback (GtkWidget *widget, edit_paste_as_new_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste_as_new (gdisp); global_edit_paste_as_new (gdisp);
@ -212,7 +212,7 @@ void
edit_named_cut_cmd_callback (GtkWidget *widget, edit_named_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_cut (gdisp); named_edit_cut (gdisp);
@ -222,7 +222,7 @@ void
edit_named_copy_cmd_callback (GtkWidget *widget, edit_named_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_copy (gdisp); named_edit_copy (gdisp);
@ -232,7 +232,7 @@ void
edit_named_paste_cmd_callback (GtkWidget *widget, edit_named_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_paste (gdisp); named_edit_paste (gdisp);
@ -242,7 +242,7 @@ void
edit_clear_cmd_callback (GtkWidget *widget, edit_clear_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -253,7 +253,7 @@ void
edit_fill_cmd_callback (GtkWidget *widget, edit_fill_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -264,7 +264,7 @@ void
edit_stroke_cmd_callback (GtkWidget *widget, edit_stroke_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -277,7 +277,7 @@ void
select_invert_cmd_callback (GtkWidget *widget, select_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_invert (gdisp->gimage); gimage_mask_invert (gdisp->gimage);
@ -288,7 +288,7 @@ void
select_all_cmd_callback (GtkWidget *widget, select_all_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_all (gdisp->gimage); gimage_mask_all (gdisp->gimage);
@ -299,7 +299,7 @@ void
select_none_cmd_callback (GtkWidget *widget, select_none_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_none (gdisp->gimage); gimage_mask_none (gdisp->gimage);
@ -310,7 +310,7 @@ void
select_float_cmd_callback (GtkWidget *widget, select_float_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage), gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
@ -330,7 +330,7 @@ select_feather_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Feather Selection"), qbox = gimp_query_size_box (_("Feather Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/feather_selection.html", "dialogs/feather_selection.html",
_("Feather selection by:"), _("Feather Selection by:"),
selection_feather_radius, 0, 32767, 3, selection_feather_radius, 0, 32767, 3,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -345,7 +345,7 @@ void
select_sharpen_cmd_callback (GtkWidget *widget, select_sharpen_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_sharpen (gdisp->gimage); gimage_mask_sharpen (gdisp->gimage);
@ -359,14 +359,14 @@ select_shrink_cmd_callback (GtkWidget *widget,
GtkWidget *edge_lock; GtkWidget *edge_lock;
GtkWidget *shrink_dialog; GtkWidget *shrink_dialog;
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
shrink_dialog = shrink_dialog =
gimp_query_size_box (N_("Shrink Selection"), gimp_query_size_box (N_("Shrink Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/shrink_selection.html", "dialogs/shrink_selection.html",
N_("Shrink selection by:"), _("Shrink Selection by:"),
selection_shrink_pixels, 1, 32767, 0, selection_shrink_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -400,7 +400,7 @@ select_grow_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Grow Selection"), qbox = gimp_query_size_box (_("Grow Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/grow_selection.html", "dialogs/grow_selection.html",
_("Grow selection by:"), _("Grow Selection by:"),
selection_grow_pixels, 1, 32767, 0, selection_grow_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -423,7 +423,7 @@ select_border_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Border Selection"), qbox = gimp_query_size_box (_("Border Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/border_selection.html", "dialogs/border_selection.html",
_("Border selection by:"), _("Border Selection by:"),
selection_border_radius, 1, 32767, 0, selection_border_radius, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -438,7 +438,7 @@ void
select_save_cmd_callback (GtkWidget *widget, select_save_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_save (gdisp->gimage); gimage_mask_save (gdisp->gimage);
@ -555,7 +555,7 @@ void
view_info_window_cmd_callback (GtkWidget *widget, view_info_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!info_window_follows_mouse) if (!info_window_follows_mouse)
@ -576,7 +576,7 @@ void
view_nav_window_cmd_callback (GtkWidget *widget, view_nav_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (nav_window_per_display) if (nav_window_per_display)
@ -596,8 +596,8 @@ void
view_undo_history_cmd_callback (GtkWidget *widget, view_undo_history_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GImage * gimage; GImage *gimage;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage = gdisp->gimage; gimage = gdisp->gimage;
@ -615,8 +615,8 @@ void
view_toggle_selection_cmd_callback (GtkWidget *widget, view_toggle_selection_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int new_val; gint new_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -634,7 +634,7 @@ void
view_toggle_rulers_cmd_callback (GtkWidget *widget, view_toggle_rulers_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -665,7 +665,7 @@ void
view_toggle_statusbar_cmd_callback (GtkWidget *widget, view_toggle_statusbar_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -684,8 +684,8 @@ void
view_toggle_guides_cmd_callback (GtkWidget *widget, view_toggle_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int old_val; gint old_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -703,7 +703,7 @@ void
view_snap_to_guides_cmd_callback (GtkWidget *widget, view_snap_to_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active; gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active;
@ -735,7 +735,7 @@ void
image_convert_rgb_cmd_callback (GtkWidget *widget, image_convert_rgb_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_rgb (gdisp->gimage); convert_to_rgb (gdisp->gimage);
@ -745,7 +745,7 @@ void
image_convert_grayscale_cmd_callback (GtkWidget *widget, image_convert_grayscale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_grayscale (gdisp->gimage); convert_to_grayscale (gdisp->gimage);
@ -755,7 +755,7 @@ void
image_convert_indexed_cmd_callback (GtkWidget *widget, image_convert_indexed_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_indexed (gdisp->gimage); convert_to_indexed (gdisp->gimage);
@ -765,7 +765,7 @@ void
image_desaturate_cmd_callback (GtkWidget *widget, image_desaturate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_desaturate (gdisp->gimage); image_desaturate (gdisp->gimage);
@ -776,7 +776,7 @@ void
image_invert_cmd_callback (GtkWidget *widget, image_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_invert (gdisp->gimage); image_invert (gdisp->gimage);
@ -798,7 +798,7 @@ void
image_offset_cmd_callback (GtkWidget *widget, image_offset_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_offset (gdisp->gimage); channel_ops_offset (gdisp->gimage);
@ -808,9 +808,9 @@ void
image_resize_cmd_callback (GtkWidget *widget, image_resize_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_resize; ImageResize *image_resize;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -839,9 +839,9 @@ void
image_scale_cmd_callback (GtkWidget *widget, image_scale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_scale; ImageResize *image_scale;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -870,7 +870,7 @@ void
image_duplicate_cmd_callback (GtkWidget *widget, image_duplicate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_duplicate (gdisp->gimage); channel_ops_duplicate (gdisp->gimage);
@ -882,9 +882,9 @@ void
layers_previous_cmd_callback (GtkWidget *widget, layers_previous_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -908,9 +908,9 @@ void
layers_next_cmd_callback (GtkWidget *widget, layers_next_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -934,7 +934,7 @@ void
layers_raise_cmd_callback (GtkWidget *widget, layers_raise_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -945,7 +945,7 @@ void
layers_lower_cmd_callback (GtkWidget *widget, layers_lower_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -956,7 +956,7 @@ void
layers_raise_to_top_cmd_callback (GtkWidget *widget, layers_raise_to_top_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer);
@ -967,7 +967,7 @@ void
layers_lower_to_bottom_cmd_callback (GtkWidget *widget, layers_lower_to_bottom_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer);
@ -978,7 +978,7 @@ void
layers_anchor_cmd_callback (GtkWidget *widget, layers_anchor_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
floating_sel_anchor (gimage_get_active_layer (gdisp->gimage)); floating_sel_anchor (gimage_get_active_layer (gdisp->gimage));
@ -989,7 +989,7 @@ void
layers_merge_cmd_callback (GtkWidget *widget, layers_merge_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layers_dialog_layer_merge_query (gdisp->gimage, TRUE); layers_dialog_layer_merge_query (gdisp->gimage, TRUE);
@ -999,7 +999,7 @@ void
layers_flatten_cmd_callback (GtkWidget *widget, layers_flatten_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_flatten (gdisp->gimage); gimage_flatten (gdisp->gimage);
@ -1010,7 +1010,7 @@ void
layers_mask_select_cmd_callback (GtkWidget *widget, layers_mask_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer);
@ -1021,7 +1021,7 @@ void
layers_add_alpha_channel_cmd_callback (GtkWidget *widget, layers_add_alpha_channel_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layer_add_alpha ( gdisp->gimage->active_layer); layer_add_alpha ( gdisp->gimage->active_layer);
@ -1032,7 +1032,7 @@ void
layers_alpha_select_cmd_callback (GtkWidget *widget, layers_alpha_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer);
@ -1071,8 +1071,8 @@ tools_select_cmd_callback (GtkWidget *widget,
gpointer callback_data, gpointer callback_data,
guint callback_action) guint callback_action)
{ {
ToolType tool_type; ToolType tool_type;
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
tool_type = (ToolType) callback_action; tool_type = (ToolType) callback_action;
@ -1116,7 +1116,7 @@ void
dialogs_lc_cmd_callback (GtkWidget *widget, dialogs_lc_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
lc_dialog_create (gdisp ? gdisp->gimage : NULL); lc_dialog_create (gdisp ? gdisp->gimage : NULL);
@ -1158,18 +1158,20 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
} }
static void static void
dialogs_indexed_palette_select_callback (ColormapDialog *dlg, dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer user_data) gpointer data)
{ {
guchar *c; guchar *color;
GimpImage *img = colormap_dialog_image (dlg); GimpImage *image = colormap_dialog_image (dialog);
c = &img->cmap[colormap_dialog_col_index (dlg) * 3]; color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND) if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_foreground (gimp_context_get_user (),
color[0], color[1], color[2]);
else if (active_color == BACKGROUND) else if (active_color == BACKGROUND)
gimp_context_set_background (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_background (gimp_context_get_user (),
color[0], color[1], color[2]);
} }
void void
@ -1232,10 +1234,10 @@ void
dialogs_module_browser_cmd_callback (GtkWidget *widget, dialogs_module_browser_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GtkWidget *w; GtkWidget *module_browser;
w = module_db_browser_new (); module_browser = module_db_browser_new ();
gtk_widget_show (w); gtk_widget_show (module_browser);
} }
/***** Help *****/ /***** Help *****/

3
app/gradient.c
View File

@ -4447,6 +4447,9 @@ cpopup_create_color_dialog (gchar *title,
window = gtk_color_selection_dialog_new (title); window = gtk_color_selection_dialog_new (title);
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html");
csd = GTK_COLOR_SELECTION_DIALOG (window); csd = GTK_COLOR_SELECTION_DIALOG (window);
cs = GTK_COLOR_SELECTION (csd->colorsel); cs = GTK_COLOR_SELECTION (csd->colorsel);

3
app/gradient_editor.c
View File

@ -4447,6 +4447,9 @@ cpopup_create_color_dialog (gchar *title,
window = gtk_color_selection_dialog_new (title); window = gtk_color_selection_dialog_new (title);
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html");
csd = GTK_COLOR_SELECTION_DIALOG (window); csd = GTK_COLOR_SELECTION_DIALOG (window);
cs = GTK_COLOR_SELECTION (csd->colorsel); cs = GTK_COLOR_SELECTION (csd->colorsel);

131
app/gui/channels-dialog.c
View File

@ -100,67 +100,98 @@ struct _ChannelWidget
/* channels dialog widget routines */ /* channels dialog widget routines */
static void channels_dialog_preview_extents (void); static void channels_dialog_preview_extents (void);
static void channels_dialog_set_menu_sensitivity (void); static void channels_dialog_set_menu_sensitivity (void);
static void channels_dialog_scroll_index (gint index); static void channels_dialog_set_channel (ChannelWidget *cw);
static void channels_dialog_set_channel (ChannelWidget *); static void channels_dialog_unset_channel (ChannelWidget *cw);
static void channels_dialog_unset_channel (ChannelWidget *); static void channels_dialog_position_channel (Channel *channel,
static void channels_dialog_position_channel (Channel *, gint); gint position);
static void channels_dialog_add_channel (Channel *); static void channels_dialog_add_channel (Channel *channel);
static void channels_dialog_remove_channel (ChannelWidget *); static void channels_dialog_remove_channel (ChannelWidget *cw);
static gint channel_list_events (GtkWidget *, GdkEvent *); static gint channel_list_events (GtkWidget *widget,
GdkEvent *event);
/* for (un)installing the menu accelarators */ /* for (un)installing the menu accelarators */
static void channels_dialog_map_callback (GtkWidget *, gpointer); static void channels_dialog_map_callback (GtkWidget *widget,
static void channels_dialog_unmap_callback (GtkWidget *, gpointer); gpointer data);
static void channels_dialog_unmap_callback (GtkWidget *widget,
gpointer data);
/* ops buttons dnd callbacks */ /* ops buttons dnd callbacks */
static gboolean channels_dialog_drag_new_channel_callback (GtkWidget *, static gboolean channels_dialog_drag_new_channel_callback
GdkDragContext *, (GtkWidget *widget,
gint, gint, guint); GdkDragContext *context,
static gboolean channels_dialog_drag_duplicate_channel_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
gint, gint, guint); guint time);
static gboolean channels_dialog_drag_channel_to_sel_callback (GtkWidget *, static gboolean channels_dialog_drag_duplicate_channel_callback
GdkDragContext *, (GtkWidget *widget,
gint, gint, guint); GdkDragContext *context,
static gboolean channels_dialog_drag_delete_channel_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
gint, gint, guint); guint time);
static gboolean channels_dialog_drag_channel_to_sel_callback
(GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
guint time);
static gboolean channels_dialog_drag_delete_channel_callback
(GtkWidget *widget,
GdkDragContext *context,
gint x,
gint y,
guint time);
/* channel widget function prototypes */ /* channel widget function prototypes */
static ChannelWidget *channel_widget_get_ID (Channel *); static ChannelWidget * channel_widget_get_ID (Channel *channel);
static ChannelWidget *channel_widget_create (GImage *, Channel *, ChannelType); static ChannelWidget * channel_widget_create (GImage *gimage,
Channel *channel,
ChannelType channel_type);
static gboolean channel_widget_drag_motion_callback (GtkWidget *, static gboolean channel_widget_drag_motion_callback
GdkDragContext *, (GtkWidget *widget,
gint, gint, guint); GdkDragContext *context,
static gboolean channel_widget_drag_drop_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
gint, gint, guint); guint time);
static void channel_widget_drag_begin_callback (GtkWidget *, static gboolean channel_widget_drag_drop_callback(GtkWidget *widget,
GdkDragContext *); GdkDragContext *context,
static void channel_widget_drag_leave_callback (GtkWidget *, gint x,
GdkDragContext *, gint y,
guint); guint time);
static void channel_widget_drag_indicator_callback (GtkWidget *, gpointer); static void channel_widget_drag_begin_callback (GtkWidget *widget,
GdkDragContext *context);
static void channel_widget_drag_leave_callback (GtkWidget *widget,
GdkDragContext *context,
guint time);
static void channel_widget_drag_indicator_callback
(GtkWidget *widget,
gpointer data);
static void channel_widget_drop_color (GtkWidget *, static void channel_widget_drop_color (GtkWidget *widget,
guchar, guchar, guchar, guchar r,
gpointer); guchar g,
static void channel_widget_draw_drop_indicator (ChannelWidget *, GimpDropType); guchar b,
static void channel_widget_delete (ChannelWidget *); gpointer data);
static void channel_widget_select_update (GtkWidget *, gpointer); static void channel_widget_draw_drop_indicator (ChannelWidget *cw,
static gint channel_widget_button_events (GtkWidget *, GdkEvent *); GimpDropType drop_type);
static gint channel_widget_preview_events (GtkWidget *, GdkEvent *); static void channel_widget_delete (ChannelWidget *cw);
static void channel_widget_preview_redraw (ChannelWidget *); static void channel_widget_select_update (GtkWidget *widget,
static void channel_widget_no_preview_redraw (ChannelWidget *); gpointer data);
static void channel_widget_eye_redraw (ChannelWidget *); static gint channel_widget_button_events (GtkWidget *widget,
static void channel_widget_exclusive_visible (ChannelWidget *); GdkEvent *event);
static void channel_widget_channel_flush (GtkWidget *, gpointer); static gint channel_widget_preview_events (GtkWidget *widget,
GdkEvent *event);
static void channel_widget_preview_redraw (ChannelWidget *cw);
static void channel_widget_no_preview_redraw (ChannelWidget *cw);
static void channel_widget_eye_redraw (ChannelWidget *cw);
static void channel_widget_exclusive_visible (ChannelWidget *cw);
static void channel_widget_channel_flush (GtkWidget *widget,
gpointer data);
/* assorted query dialogs */ /* assorted query dialogs */
static void channels_dialog_new_channel_query (GimpImage *); static void channels_dialog_new_channel_query (GimpImage *gimage);
static void channels_dialog_edit_channel_query (ChannelWidget *); static void channels_dialog_edit_channel_query (ChannelWidget *cw);
/****************/ /****************/
/* Local data */ /* Local data */

156
app/gui/commands.c
View File

@ -142,7 +142,7 @@ void
edit_undo_cmd_callback (GtkWidget *widget, edit_undo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_pop (gdisp->gimage); undo_pop (gdisp->gimage);
@ -152,7 +152,7 @@ void
edit_redo_cmd_callback (GtkWidget *widget, edit_redo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_redo (gdisp->gimage); undo_redo (gdisp->gimage);
@ -162,7 +162,7 @@ void
edit_cut_cmd_callback (GtkWidget *widget, edit_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_cut (gdisp); global_edit_cut (gdisp);
@ -172,7 +172,7 @@ void
edit_copy_cmd_callback (GtkWidget *widget, edit_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_copy (gdisp); global_edit_copy (gdisp);
@ -182,7 +182,7 @@ void
edit_paste_cmd_callback (GtkWidget *widget, edit_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 0); global_edit_paste (gdisp, 0);
@ -192,7 +192,7 @@ void
edit_paste_into_cmd_callback (GtkWidget *widget, edit_paste_into_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 1); global_edit_paste (gdisp, 1);
@ -202,7 +202,7 @@ void
edit_paste_as_new_cmd_callback (GtkWidget *widget, edit_paste_as_new_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste_as_new (gdisp); global_edit_paste_as_new (gdisp);
@ -212,7 +212,7 @@ void
edit_named_cut_cmd_callback (GtkWidget *widget, edit_named_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_cut (gdisp); named_edit_cut (gdisp);
@ -222,7 +222,7 @@ void
edit_named_copy_cmd_callback (GtkWidget *widget, edit_named_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_copy (gdisp); named_edit_copy (gdisp);
@ -232,7 +232,7 @@ void
edit_named_paste_cmd_callback (GtkWidget *widget, edit_named_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_paste (gdisp); named_edit_paste (gdisp);
@ -242,7 +242,7 @@ void
edit_clear_cmd_callback (GtkWidget *widget, edit_clear_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -253,7 +253,7 @@ void
edit_fill_cmd_callback (GtkWidget *widget, edit_fill_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -264,7 +264,7 @@ void
edit_stroke_cmd_callback (GtkWidget *widget, edit_stroke_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -277,7 +277,7 @@ void
select_invert_cmd_callback (GtkWidget *widget, select_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_invert (gdisp->gimage); gimage_mask_invert (gdisp->gimage);
@ -288,7 +288,7 @@ void
select_all_cmd_callback (GtkWidget *widget, select_all_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_all (gdisp->gimage); gimage_mask_all (gdisp->gimage);
@ -299,7 +299,7 @@ void
select_none_cmd_callback (GtkWidget *widget, select_none_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_none (gdisp->gimage); gimage_mask_none (gdisp->gimage);
@ -310,7 +310,7 @@ void
select_float_cmd_callback (GtkWidget *widget, select_float_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage), gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
@ -330,7 +330,7 @@ select_feather_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Feather Selection"), qbox = gimp_query_size_box (_("Feather Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/feather_selection.html", "dialogs/feather_selection.html",
_("Feather selection by:"), _("Feather Selection by:"),
selection_feather_radius, 0, 32767, 3, selection_feather_radius, 0, 32767, 3,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -345,7 +345,7 @@ void
select_sharpen_cmd_callback (GtkWidget *widget, select_sharpen_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_sharpen (gdisp->gimage); gimage_mask_sharpen (gdisp->gimage);
@ -359,14 +359,14 @@ select_shrink_cmd_callback (GtkWidget *widget,
GtkWidget *edge_lock; GtkWidget *edge_lock;
GtkWidget *shrink_dialog; GtkWidget *shrink_dialog;
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
shrink_dialog = shrink_dialog =
gimp_query_size_box (N_("Shrink Selection"), gimp_query_size_box (N_("Shrink Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/shrink_selection.html", "dialogs/shrink_selection.html",
N_("Shrink selection by:"), _("Shrink Selection by:"),
selection_shrink_pixels, 1, 32767, 0, selection_shrink_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -400,7 +400,7 @@ select_grow_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Grow Selection"), qbox = gimp_query_size_box (_("Grow Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/grow_selection.html", "dialogs/grow_selection.html",
_("Grow selection by:"), _("Grow Selection by:"),
selection_grow_pixels, 1, 32767, 0, selection_grow_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -423,7 +423,7 @@ select_border_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Border Selection"), qbox = gimp_query_size_box (_("Border Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/border_selection.html", "dialogs/border_selection.html",
_("Border selection by:"), _("Border Selection by:"),
selection_border_radius, 1, 32767, 0, selection_border_radius, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -438,7 +438,7 @@ void
select_save_cmd_callback (GtkWidget *widget, select_save_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_save (gdisp->gimage); gimage_mask_save (gdisp->gimage);
@ -555,7 +555,7 @@ void
view_info_window_cmd_callback (GtkWidget *widget, view_info_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!info_window_follows_mouse) if (!info_window_follows_mouse)
@ -576,7 +576,7 @@ void
view_nav_window_cmd_callback (GtkWidget *widget, view_nav_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (nav_window_per_display) if (nav_window_per_display)
@ -596,8 +596,8 @@ void
view_undo_history_cmd_callback (GtkWidget *widget, view_undo_history_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GImage * gimage; GImage *gimage;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage = gdisp->gimage; gimage = gdisp->gimage;
@ -615,8 +615,8 @@ void
view_toggle_selection_cmd_callback (GtkWidget *widget, view_toggle_selection_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int new_val; gint new_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -634,7 +634,7 @@ void
view_toggle_rulers_cmd_callback (GtkWidget *widget, view_toggle_rulers_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -665,7 +665,7 @@ void
view_toggle_statusbar_cmd_callback (GtkWidget *widget, view_toggle_statusbar_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -684,8 +684,8 @@ void
view_toggle_guides_cmd_callback (GtkWidget *widget, view_toggle_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int old_val; gint old_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -703,7 +703,7 @@ void
view_snap_to_guides_cmd_callback (GtkWidget *widget, view_snap_to_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active; gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active;
@ -735,7 +735,7 @@ void
image_convert_rgb_cmd_callback (GtkWidget *widget, image_convert_rgb_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_rgb (gdisp->gimage); convert_to_rgb (gdisp->gimage);
@ -745,7 +745,7 @@ void
image_convert_grayscale_cmd_callback (GtkWidget *widget, image_convert_grayscale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_grayscale (gdisp->gimage); convert_to_grayscale (gdisp->gimage);
@ -755,7 +755,7 @@ void
image_convert_indexed_cmd_callback (GtkWidget *widget, image_convert_indexed_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_indexed (gdisp->gimage); convert_to_indexed (gdisp->gimage);
@ -765,7 +765,7 @@ void
image_desaturate_cmd_callback (GtkWidget *widget, image_desaturate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_desaturate (gdisp->gimage); image_desaturate (gdisp->gimage);
@ -776,7 +776,7 @@ void
image_invert_cmd_callback (GtkWidget *widget, image_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_invert (gdisp->gimage); image_invert (gdisp->gimage);
@ -798,7 +798,7 @@ void
image_offset_cmd_callback (GtkWidget *widget, image_offset_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_offset (gdisp->gimage); channel_ops_offset (gdisp->gimage);
@ -808,9 +808,9 @@ void
image_resize_cmd_callback (GtkWidget *widget, image_resize_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_resize; ImageResize *image_resize;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -839,9 +839,9 @@ void
image_scale_cmd_callback (GtkWidget *widget, image_scale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_scale; ImageResize *image_scale;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -870,7 +870,7 @@ void
image_duplicate_cmd_callback (GtkWidget *widget, image_duplicate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_duplicate (gdisp->gimage); channel_ops_duplicate (gdisp->gimage);
@ -882,9 +882,9 @@ void
layers_previous_cmd_callback (GtkWidget *widget, layers_previous_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -908,9 +908,9 @@ void
layers_next_cmd_callback (GtkWidget *widget, layers_next_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -934,7 +934,7 @@ void
layers_raise_cmd_callback (GtkWidget *widget, layers_raise_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -945,7 +945,7 @@ void
layers_lower_cmd_callback (GtkWidget *widget, layers_lower_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -956,7 +956,7 @@ void
layers_raise_to_top_cmd_callback (GtkWidget *widget, layers_raise_to_top_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer);
@ -967,7 +967,7 @@ void
layers_lower_to_bottom_cmd_callback (GtkWidget *widget, layers_lower_to_bottom_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer);
@ -978,7 +978,7 @@ void
layers_anchor_cmd_callback (GtkWidget *widget, layers_anchor_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
floating_sel_anchor (gimage_get_active_layer (gdisp->gimage)); floating_sel_anchor (gimage_get_active_layer (gdisp->gimage));
@ -989,7 +989,7 @@ void
layers_merge_cmd_callback (GtkWidget *widget, layers_merge_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layers_dialog_layer_merge_query (gdisp->gimage, TRUE); layers_dialog_layer_merge_query (gdisp->gimage, TRUE);
@ -999,7 +999,7 @@ void
layers_flatten_cmd_callback (GtkWidget *widget, layers_flatten_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_flatten (gdisp->gimage); gimage_flatten (gdisp->gimage);
@ -1010,7 +1010,7 @@ void
layers_mask_select_cmd_callback (GtkWidget *widget, layers_mask_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer);
@ -1021,7 +1021,7 @@ void
layers_add_alpha_channel_cmd_callback (GtkWidget *widget, layers_add_alpha_channel_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layer_add_alpha ( gdisp->gimage->active_layer); layer_add_alpha ( gdisp->gimage->active_layer);
@ -1032,7 +1032,7 @@ void
layers_alpha_select_cmd_callback (GtkWidget *widget, layers_alpha_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer);
@ -1071,8 +1071,8 @@ tools_select_cmd_callback (GtkWidget *widget,
gpointer callback_data, gpointer callback_data,
guint callback_action) guint callback_action)
{ {
ToolType tool_type; ToolType tool_type;
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
tool_type = (ToolType) callback_action; tool_type = (ToolType) callback_action;
@ -1116,7 +1116,7 @@ void
dialogs_lc_cmd_callback (GtkWidget *widget, dialogs_lc_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
lc_dialog_create (gdisp ? gdisp->gimage : NULL); lc_dialog_create (gdisp ? gdisp->gimage : NULL);
@ -1158,18 +1158,20 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
} }
static void static void
dialogs_indexed_palette_select_callback (ColormapDialog *dlg, dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer user_data) gpointer data)
{ {
guchar *c; guchar *color;
GimpImage *img = colormap_dialog_image (dlg); GimpImage *image = colormap_dialog_image (dialog);
c = &img->cmap[colormap_dialog_col_index (dlg) * 3]; color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND) if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_foreground (gimp_context_get_user (),
color[0], color[1], color[2]);
else if (active_color == BACKGROUND) else if (active_color == BACKGROUND)
gimp_context_set_background (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_background (gimp_context_get_user (),
color[0], color[1], color[2]);
} }
void void
@ -1232,10 +1234,10 @@ void
dialogs_module_browser_cmd_callback (GtkWidget *widget, dialogs_module_browser_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GtkWidget *w; GtkWidget *module_browser;
w = module_db_browser_new (); module_browser = module_db_browser_new ();
gtk_widget_show (w); gtk_widget_show (module_browser);
} }
/***** Help *****/ /***** Help *****/

3
app/gui/gradient-editor.c
View File

@ -4447,6 +4447,9 @@ cpopup_create_color_dialog (gchar *title,
window = gtk_color_selection_dialog_new (title); window = gtk_color_selection_dialog_new (title);
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html");
csd = GTK_COLOR_SELECTION_DIALOG (window); csd = GTK_COLOR_SELECTION_DIALOG (window);
cs = GTK_COLOR_SELECTION (csd->colorsel); cs = GTK_COLOR_SELECTION (csd->colorsel);

156
app/gui/help-commands.c
View File

@ -142,7 +142,7 @@ void
edit_undo_cmd_callback (GtkWidget *widget, edit_undo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_pop (gdisp->gimage); undo_pop (gdisp->gimage);
@ -152,7 +152,7 @@ void
edit_redo_cmd_callback (GtkWidget *widget, edit_redo_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
undo_redo (gdisp->gimage); undo_redo (gdisp->gimage);
@ -162,7 +162,7 @@ void
edit_cut_cmd_callback (GtkWidget *widget, edit_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_cut (gdisp); global_edit_cut (gdisp);
@ -172,7 +172,7 @@ void
edit_copy_cmd_callback (GtkWidget *widget, edit_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_copy (gdisp); global_edit_copy (gdisp);
@ -182,7 +182,7 @@ void
edit_paste_cmd_callback (GtkWidget *widget, edit_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 0); global_edit_paste (gdisp, 0);
@ -192,7 +192,7 @@ void
edit_paste_into_cmd_callback (GtkWidget *widget, edit_paste_into_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste (gdisp, 1); global_edit_paste (gdisp, 1);
@ -202,7 +202,7 @@ void
edit_paste_as_new_cmd_callback (GtkWidget *widget, edit_paste_as_new_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
global_edit_paste_as_new (gdisp); global_edit_paste_as_new (gdisp);
@ -212,7 +212,7 @@ void
edit_named_cut_cmd_callback (GtkWidget *widget, edit_named_cut_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_cut (gdisp); named_edit_cut (gdisp);
@ -222,7 +222,7 @@ void
edit_named_copy_cmd_callback (GtkWidget *widget, edit_named_copy_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_copy (gdisp); named_edit_copy (gdisp);
@ -232,7 +232,7 @@ void
edit_named_paste_cmd_callback (GtkWidget *widget, edit_named_paste_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
named_edit_paste (gdisp); named_edit_paste (gdisp);
@ -242,7 +242,7 @@ void
edit_clear_cmd_callback (GtkWidget *widget, edit_clear_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_clear (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -253,7 +253,7 @@ void
edit_fill_cmd_callback (GtkWidget *widget, edit_fill_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); edit_fill (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -264,7 +264,7 @@ void
edit_stroke_cmd_callback (GtkWidget *widget, edit_stroke_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage)); gimage_mask_stroke (gdisp->gimage, gimage_active_drawable (gdisp->gimage));
@ -277,7 +277,7 @@ void
select_invert_cmd_callback (GtkWidget *widget, select_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_invert (gdisp->gimage); gimage_mask_invert (gdisp->gimage);
@ -288,7 +288,7 @@ void
select_all_cmd_callback (GtkWidget *widget, select_all_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_all (gdisp->gimage); gimage_mask_all (gdisp->gimage);
@ -299,7 +299,7 @@ void
select_none_cmd_callback (GtkWidget *widget, select_none_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_none (gdisp->gimage); gimage_mask_none (gdisp->gimage);
@ -310,7 +310,7 @@ void
select_float_cmd_callback (GtkWidget *widget, select_float_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage), gimage_mask_float (gdisp->gimage, gimage_active_drawable (gdisp->gimage),
@ -330,7 +330,7 @@ select_feather_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Feather Selection"), qbox = gimp_query_size_box (_("Feather Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/feather_selection.html", "dialogs/feather_selection.html",
_("Feather selection by:"), _("Feather Selection by:"),
selection_feather_radius, 0, 32767, 3, selection_feather_radius, 0, 32767, 3,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -345,7 +345,7 @@ void
select_sharpen_cmd_callback (GtkWidget *widget, select_sharpen_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_sharpen (gdisp->gimage); gimage_mask_sharpen (gdisp->gimage);
@ -359,14 +359,14 @@ select_shrink_cmd_callback (GtkWidget *widget,
GtkWidget *edge_lock; GtkWidget *edge_lock;
GtkWidget *shrink_dialog; GtkWidget *shrink_dialog;
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
shrink_dialog = shrink_dialog =
gimp_query_size_box (N_("Shrink Selection"), gimp_query_size_box (N_("Shrink Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/shrink_selection.html", "dialogs/shrink_selection.html",
N_("Shrink selection by:"), _("Shrink Selection by:"),
selection_shrink_pixels, 1, 32767, 0, selection_shrink_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -400,7 +400,7 @@ select_grow_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Grow Selection"), qbox = gimp_query_size_box (_("Grow Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/grow_selection.html", "dialogs/grow_selection.html",
_("Grow selection by:"), _("Grow Selection by:"),
selection_grow_pixels, 1, 32767, 0, selection_grow_pixels, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -423,7 +423,7 @@ select_border_cmd_callback (GtkWidget *widget,
qbox = gimp_query_size_box (_("Border Selection"), qbox = gimp_query_size_box (_("Border Selection"),
gimp_standard_help_func, gimp_standard_help_func,
"dialogs/border_selection.html", "dialogs/border_selection.html",
_("Border selection by:"), _("Border Selection by:"),
selection_border_radius, 1, 32767, 0, selection_border_radius, 1, 32767, 0,
gdisp->gimage->unit, gdisp->gimage->unit,
MIN (gdisp->gimage->xresolution, MIN (gdisp->gimage->xresolution,
@ -438,7 +438,7 @@ void
select_save_cmd_callback (GtkWidget *widget, select_save_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_save (gdisp->gimage); gimage_mask_save (gdisp->gimage);
@ -555,7 +555,7 @@ void
view_info_window_cmd_callback (GtkWidget *widget, view_info_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!info_window_follows_mouse) if (!info_window_follows_mouse)
@ -576,7 +576,7 @@ void
view_nav_window_cmd_callback (GtkWidget *widget, view_nav_window_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (nav_window_per_display) if (nav_window_per_display)
@ -596,8 +596,8 @@ void
view_undo_history_cmd_callback (GtkWidget *widget, view_undo_history_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GImage * gimage; GImage *gimage;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage = gdisp->gimage; gimage = gdisp->gimage;
@ -615,8 +615,8 @@ void
view_toggle_selection_cmd_callback (GtkWidget *widget, view_toggle_selection_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int new_val; gint new_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -634,7 +634,7 @@ void
view_toggle_rulers_cmd_callback (GtkWidget *widget, view_toggle_rulers_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -665,7 +665,7 @@ void
view_toggle_statusbar_cmd_callback (GtkWidget *widget, view_toggle_statusbar_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
if (!GTK_CHECK_MENU_ITEM (widget)->active) if (!GTK_CHECK_MENU_ITEM (widget)->active)
@ -684,8 +684,8 @@ void
view_toggle_guides_cmd_callback (GtkWidget *widget, view_toggle_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
int old_val; gint old_val;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -703,7 +703,7 @@ void
view_snap_to_guides_cmd_callback (GtkWidget *widget, view_snap_to_guides_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active; gdisp->snap_to_guides = GTK_CHECK_MENU_ITEM (widget)->active;
@ -735,7 +735,7 @@ void
image_convert_rgb_cmd_callback (GtkWidget *widget, image_convert_rgb_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_rgb (gdisp->gimage); convert_to_rgb (gdisp->gimage);
@ -745,7 +745,7 @@ void
image_convert_grayscale_cmd_callback (GtkWidget *widget, image_convert_grayscale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_grayscale (gdisp->gimage); convert_to_grayscale (gdisp->gimage);
@ -755,7 +755,7 @@ void
image_convert_indexed_cmd_callback (GtkWidget *widget, image_convert_indexed_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
convert_to_indexed (gdisp->gimage); convert_to_indexed (gdisp->gimage);
@ -765,7 +765,7 @@ void
image_desaturate_cmd_callback (GtkWidget *widget, image_desaturate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_desaturate (gdisp->gimage); image_desaturate (gdisp->gimage);
@ -776,7 +776,7 @@ void
image_invert_cmd_callback (GtkWidget *widget, image_invert_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
image_invert (gdisp->gimage); image_invert (gdisp->gimage);
@ -798,7 +798,7 @@ void
image_offset_cmd_callback (GtkWidget *widget, image_offset_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_offset (gdisp->gimage); channel_ops_offset (gdisp->gimage);
@ -808,9 +808,9 @@ void
image_resize_cmd_callback (GtkWidget *widget, image_resize_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_resize; ImageResize *image_resize;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -839,9 +839,9 @@ void
image_scale_cmd_callback (GtkWidget *widget, image_scale_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
GimpImage * gimage; GimpImage *gimage;
ImageResize * image_scale; ImageResize *image_scale;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -870,7 +870,7 @@ void
image_duplicate_cmd_callback (GtkWidget *widget, image_duplicate_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
channel_ops_duplicate (gdisp->gimage); channel_ops_duplicate (gdisp->gimage);
@ -882,9 +882,9 @@ void
layers_previous_cmd_callback (GtkWidget *widget, layers_previous_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -908,9 +908,9 @@ void
layers_next_cmd_callback (GtkWidget *widget, layers_next_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
Layer * new_layer; Layer *new_layer;
gint current_layer; gint current_layer;
return_if_no_display (gdisp); return_if_no_display (gdisp);
@ -934,7 +934,7 @@ void
layers_raise_cmd_callback (GtkWidget *widget, layers_raise_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -945,7 +945,7 @@ void
layers_lower_cmd_callback (GtkWidget *widget, layers_lower_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer (gdisp->gimage, gdisp->gimage->active_layer);
@ -956,7 +956,7 @@ void
layers_raise_to_top_cmd_callback (GtkWidget *widget, layers_raise_to_top_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer); gimage_raise_layer_to_top (gdisp->gimage, gdisp->gimage->active_layer);
@ -967,7 +967,7 @@ void
layers_lower_to_bottom_cmd_callback (GtkWidget *widget, layers_lower_to_bottom_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer); gimage_lower_layer_to_bottom (gdisp->gimage, gdisp->gimage->active_layer);
@ -978,7 +978,7 @@ void
layers_anchor_cmd_callback (GtkWidget *widget, layers_anchor_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
floating_sel_anchor (gimage_get_active_layer (gdisp->gimage)); floating_sel_anchor (gimage_get_active_layer (gdisp->gimage));
@ -989,7 +989,7 @@ void
layers_merge_cmd_callback (GtkWidget *widget, layers_merge_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layers_dialog_layer_merge_query (gdisp->gimage, TRUE); layers_dialog_layer_merge_query (gdisp->gimage, TRUE);
@ -999,7 +999,7 @@ void
layers_flatten_cmd_callback (GtkWidget *widget, layers_flatten_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_flatten (gdisp->gimage); gimage_flatten (gdisp->gimage);
@ -1010,7 +1010,7 @@ void
layers_mask_select_cmd_callback (GtkWidget *widget, layers_mask_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_mask (gdisp->gimage, gdisp->gimage->active_layer);
@ -1021,7 +1021,7 @@ void
layers_add_alpha_channel_cmd_callback (GtkWidget *widget, layers_add_alpha_channel_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
layer_add_alpha ( gdisp->gimage->active_layer); layer_add_alpha ( gdisp->gimage->active_layer);
@ -1032,7 +1032,7 @@ void
layers_alpha_select_cmd_callback (GtkWidget *widget, layers_alpha_select_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
return_if_no_display (gdisp); return_if_no_display (gdisp);
gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer); gimage_mask_layer_alpha (gdisp->gimage, gdisp->gimage->active_layer);
@ -1071,8 +1071,8 @@ tools_select_cmd_callback (GtkWidget *widget,
gpointer callback_data, gpointer callback_data,
guint callback_action) guint callback_action)
{ {
ToolType tool_type; ToolType tool_type;
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
tool_type = (ToolType) callback_action; tool_type = (ToolType) callback_action;
@ -1116,7 +1116,7 @@ void
dialogs_lc_cmd_callback (GtkWidget *widget, dialogs_lc_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GDisplay * gdisp; GDisplay *gdisp;
gdisp = gdisplay_active (); gdisp = gdisplay_active ();
lc_dialog_create (gdisp ? gdisp->gimage : NULL); lc_dialog_create (gdisp ? gdisp->gimage : NULL);
@ -1158,18 +1158,20 @@ dialogs_palette_cmd_callback (GtkWidget *widget,
} }
static void static void
dialogs_indexed_palette_select_callback (ColormapDialog *dlg, dialogs_indexed_palette_select_callback (ColormapDialog *dialog,
gpointer user_data) gpointer data)
{ {
guchar *c; guchar *color;
GimpImage *img = colormap_dialog_image (dlg); GimpImage *image = colormap_dialog_image (dialog);
c = &img->cmap[colormap_dialog_col_index (dlg) * 3]; color = &image->cmap[colormap_dialog_col_index (dialog) * 3];
if (active_color == FOREGROUND) if (active_color == FOREGROUND)
gimp_context_set_foreground (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_foreground (gimp_context_get_user (),
color[0], color[1], color[2]);
else if (active_color == BACKGROUND) else if (active_color == BACKGROUND)
gimp_context_set_background (gimp_context_get_user (), c[0], c[1], c[2]); gimp_context_set_background (gimp_context_get_user (),
color[0], color[1], color[2]);
} }
void void
@ -1232,10 +1234,10 @@ void
dialogs_module_browser_cmd_callback (GtkWidget *widget, dialogs_module_browser_cmd_callback (GtkWidget *widget,
gpointer client_data) gpointer client_data)
{ {
GtkWidget *w; GtkWidget *module_browser;
w = module_db_browser_new (); module_browser = module_db_browser_new ();
gtk_widget_show (w); gtk_widget_show (module_browser);
} }
/***** Help *****/ /***** Help *****/

3
app/gui/menus.c
View File

@ -26,6 +26,7 @@
#include "dialog_handler.h" #include "dialog_handler.h"
#include "fileops.h" #include "fileops.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "interface.h" #include "interface.h"
#include "layers_dialog.h" #include "layers_dialog.h"
#include "menus.h" #include "menus.h"
@ -1826,6 +1827,8 @@ tearoff_cmd_callback (GtkWidget *widget,
gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top", gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top",
top); top);
gimp_dialog_set_icon (GTK_WINDOW (top));
} }
} }
else else

3
app/menus.c
View File

@ -26,6 +26,7 @@
#include "dialog_handler.h" #include "dialog_handler.h"
#include "fileops.h" #include "fileops.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "interface.h" #include "interface.h"
#include "layers_dialog.h" #include "layers_dialog.h"
#include "menus.h" #include "menus.h"
@ -1826,6 +1827,8 @@ tearoff_cmd_callback (GtkWidget *widget,
gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top", gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top",
top); top);
gimp_dialog_set_icon (GTK_WINDOW (top));
} }
} }
else else

3
app/menus/menus.c
View File

@ -26,6 +26,7 @@
#include "dialog_handler.h" #include "dialog_handler.h"
#include "fileops.h" #include "fileops.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "interface.h" #include "interface.h"
#include "layers_dialog.h" #include "layers_dialog.h"
#include "menus.h" #include "menus.h"
@ -1826,6 +1827,8 @@ tearoff_cmd_callback (GtkWidget *widget,
gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top", gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top",
top); top);
gimp_dialog_set_icon (GTK_WINDOW (top));
} }
} }
else else

3
app/widgets/gimpgradienteditor.c
View File

@ -4447,6 +4447,9 @@ cpopup_create_color_dialog (gchar *title,
window = gtk_color_selection_dialog_new (title); window = gtk_color_selection_dialog_new (title);
gimp_help_connect_help_accel (window, gimp_standard_help_func,
"dialogs/gradient_editor/gradient_editor.html");
csd = GTK_COLOR_SELECTION_DIALOG (window); csd = GTK_COLOR_SELECTION_DIALOG (window);
cs = GTK_COLOR_SELECTION (csd->colorsel); cs = GTK_COLOR_SELECTION (csd->colorsel);

3
app/widgets/gimpitemfactory.c
View File

@ -26,6 +26,7 @@
#include "dialog_handler.h" #include "dialog_handler.h"
#include "fileops.h" #include "fileops.h"
#include "gimprc.h" #include "gimprc.h"
#include "gimpui.h"
#include "interface.h" #include "interface.h"
#include "layers_dialog.h" #include "layers_dialog.h"
#include "menus.h" #include "menus.h"
@ -1826,6 +1827,8 @@ tearoff_cmd_callback (GtkWidget *widget,
gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top", gtk_object_set_data (GTK_OBJECT (widget), "tearoff_menu_top",
top); top);
gimp_dialog_set_icon (GTK_WINDOW (top));
} }
} }
else else

14
libgimp/gimpdialog.c
View File

@ -21,9 +21,7 @@
*/ */
#include "libgimp/gimpdialog.h" #include "libgimp/gimpdialog.h"
/*
#include "pixmaps/wilber.xpm" #include "pixmaps/wilber.xpm"
*/
/* local callbacks of gimp_dialog_new () */ /* local callbacks of gimp_dialog_new () */
static gint static gint
@ -52,9 +50,6 @@ static void
gimp_dialog_realize_callback (GtkWidget *widget, gimp_dialog_realize_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
return;
/*
static GdkPixmap *wilber_pixmap = NULL; static GdkPixmap *wilber_pixmap = NULL;
static GdkBitmap *wilber_mask = NULL; static GdkBitmap *wilber_mask = NULL;
GtkStyle *style; GtkStyle *style;
@ -66,11 +61,10 @@ gimp_dialog_realize_callback (GtkWidget *widget,
gdk_pixmap_create_from_xpm_d (widget->window, gdk_pixmap_create_from_xpm_d (widget->window,
&wilber_mask, &wilber_mask,
&style->bg[GTK_STATE_NORMAL], &style->bg[GTK_STATE_NORMAL],
gimp_xpm); wilber_xpm);
gdk_window_set_icon (widget->window, NULL, gdk_window_set_icon (widget->window, NULL,
wilber_pixmap, wilber_mask); wilber_pixmap, wilber_mask);
*/
} }
GtkWidget * GtkWidget *
@ -149,13 +143,13 @@ gimp_dialog_newv (const gchar *title,
} }
void void
gimp_dialog_set_icon (GtkWidget *dialog) gimp_dialog_set_icon (GtkWindow *dialog)
{ {
g_return_if_fail (dialog); g_return_if_fail (dialog);
g_return_if_fail (GTK_IS_WINDOW (dialog)); g_return_if_fail (GTK_IS_WINDOW (dialog));
if (GTK_WIDGET_REALIZED (dialog)) if (GTK_WIDGET_REALIZED (GTK_WIDGET (dialog)))
gimp_dialog_realize_callback (dialog, NULL); gimp_dialog_realize_callback (GTK_WIDGET (dialog), NULL);
else else
gtk_signal_connect (GTK_OBJECT (dialog), "realize", gtk_signal_connect (GTK_OBJECT (dialog), "realize",
GTK_SIGNAL_FUNC (gimp_dialog_realize_callback), GTK_SIGNAL_FUNC (gimp_dialog_realize_callback),

6
libgimp/gimpdialog.h
View File

@ -24,8 +24,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimp/gimphelpui.h" #include "gimphelpui.h"
#include "libgimp/gimpunit.h" #include "gimpunit.h"
GtkWidget * gimp_dialog_new (const gchar *title, GtkWidget * gimp_dialog_new (const gchar *title,
const gchar *wmclass_name, const gchar *wmclass_name,
@ -59,7 +59,7 @@ GtkWidget * gimp_dialog_newv (const gchar *title,
gint auto_shrink, gint auto_shrink,
va_list args); va_list args);
void gimp_dialog_set_icon (GtkWidget *dialog); void gimp_dialog_set_icon (GtkWindow *dialog);
void gimp_dialog_create_action_area (GtkDialog *dialog, void gimp_dialog_create_action_area (GtkDialog *dialog,

14
libgimpwidgets/gimpdialog.c
View File

@ -21,9 +21,7 @@
*/ */
#include "libgimp/gimpdialog.h" #include "libgimp/gimpdialog.h"
/*
#include "pixmaps/wilber.xpm" #include "pixmaps/wilber.xpm"
*/
/* local callbacks of gimp_dialog_new () */ /* local callbacks of gimp_dialog_new () */
static gint static gint
@ -52,9 +50,6 @@ static void
gimp_dialog_realize_callback (GtkWidget *widget, gimp_dialog_realize_callback (GtkWidget *widget,
gpointer data) gpointer data)
{ {
return;
/*
static GdkPixmap *wilber_pixmap = NULL; static GdkPixmap *wilber_pixmap = NULL;
static GdkBitmap *wilber_mask = NULL; static GdkBitmap *wilber_mask = NULL;
GtkStyle *style; GtkStyle *style;
@ -66,11 +61,10 @@ gimp_dialog_realize_callback (GtkWidget *widget,
gdk_pixmap_create_from_xpm_d (widget->window, gdk_pixmap_create_from_xpm_d (widget->window,
&wilber_mask, &wilber_mask,
&style->bg[GTK_STATE_NORMAL], &style->bg[GTK_STATE_NORMAL],
gimp_xpm); wilber_xpm);
gdk_window_set_icon (widget->window, NULL, gdk_window_set_icon (widget->window, NULL,
wilber_pixmap, wilber_mask); wilber_pixmap, wilber_mask);
*/
} }
GtkWidget * GtkWidget *
@ -149,13 +143,13 @@ gimp_dialog_newv (const gchar *title,
} }
void void
gimp_dialog_set_icon (GtkWidget *dialog) gimp_dialog_set_icon (GtkWindow *dialog)
{ {
g_return_if_fail (dialog); g_return_if_fail (dialog);
g_return_if_fail (GTK_IS_WINDOW (dialog)); g_return_if_fail (GTK_IS_WINDOW (dialog));
if (GTK_WIDGET_REALIZED (dialog)) if (GTK_WIDGET_REALIZED (GTK_WIDGET (dialog)))
gimp_dialog_realize_callback (dialog, NULL); gimp_dialog_realize_callback (GTK_WIDGET (dialog), NULL);
else else
gtk_signal_connect (GTK_OBJECT (dialog), "realize", gtk_signal_connect (GTK_OBJECT (dialog), "realize",
GTK_SIGNAL_FUNC (gimp_dialog_realize_callback), GTK_SIGNAL_FUNC (gimp_dialog_realize_callback),

6
libgimpwidgets/gimpdialog.h
View File

@ -24,8 +24,8 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include "libgimp/gimphelpui.h" #include "gimphelpui.h"
#include "libgimp/gimpunit.h" #include "gimpunit.h"
GtkWidget * gimp_dialog_new (const gchar *title, GtkWidget * gimp_dialog_new (const gchar *title,
const gchar *wmclass_name, const gchar *wmclass_name,
@ -59,7 +59,7 @@ GtkWidget * gimp_dialog_newv (const gchar *title,
gint auto_shrink, gint auto_shrink,
va_list args); va_list args);
void gimp_dialog_set_icon (GtkWidget *dialog); void gimp_dialog_set_icon (GtkWindow *dialog);
void gimp_dialog_create_action_area (GtkDialog *dialog, void gimp_dialog_create_action_area (GtkDialog *dialog,

256
pixmaps/wilber.xpm Normal file
View File

@ -0,0 +1,256 @@
/* XPM */
static char * wilber_xpm[] = {
"62 62 191 2",
" c None",
". c #797561",
"+ c #797161",
"@ c #CFBE9E",
"# c #797159",
"$ c #D7CBB6",
"% c #CFBEA6",
"& c #969286",
"* c #716D59",
"= c #DFDBD7",
"- c #BEB296",
"; c #BEB6A6",
"> c #BEAE96",
", c #B6AA8E",
"' c #B6AE96",
") c #716951",
"! c #716959",
"~ c #CFC7B6",
"{ c #B6A68E",
"] c #AE9E86",
"^ c #A69E8E",
"/ c #696951",
"( c #696959",
"_ c #696551",
": c #E7DFDF",
"< c #AEA68E",
"[ c #9E9279",
"} c #867D69",
"| c #696151",
"1 c #9E9679",
"2 c #968A71",
"3 c #C7BEB6",
"4 c #696149",
"5 c #616151",
"6 c #CFC7BE",
"7 c #8E8269",
"8 c #797961",
"9 c #BEBEBE",
"0 c #615D49",
"a c #615949",
"b c #968E71",
"c c #867561",
"d c #796D59",
"e c #9E9286",
"f c #A69E96",
"g c #717161",
"h c #DFDBDF",
"i c #A69679",
"j c #9E8E71",
"k c #8E8671",
"l c #868271",
"m c #595541",
"n c #8E8679",
"o c #CFCBC7",
"p c #A69A79",
"q c #AEAEAE",
"r c #968E86",
"s c #595941",
"t c #AEAAAE",
"u c #D7D3D7",
"v c #B6AEA6",
"w c #595949",
"x c #595141",
"y c #C7C3BE",
"z c #867961",
"A c #AEA6A6",
"B c #9E9A8E",
"C c #515549",
"D c #8E8A86",
"E c #C7C7C7",
"F c #AEAAA6",
"G c #968671",
"H c #8E7D69",
"I c #A6A296",
"J c #9E9A96",
"K c #9E968E",
"L c #DFDFDF",
"M c #515141",
"N c #969696",
"O c #EFEBEF",
"P c #EFEFEF",
"Q c #F7F3F7",
"R c #FFFFFF",
"S c #F7EFEF",
"T c #CFCBBE",
"U c #9E9271",
"V c #AEA696",
"W c #DFD7D7",
"X c #F7F3EF",
"Y c #D7D7D7",
"Z c #AEA69E",
"` c #867D61",
" . c #696961",
".. c #F7F7F7",
"+. c #E7E3DF",
"@. c #FFFBFF",
"#. c #D7CFC7",
"$. c #717159",
"%. c #514D41",
"&. c #514D38",
"*. c #514938",
"=. c #9E9E9E",
"-. c #C7C3C7",
";. c #CFCFCF",
">. c #FFF7F7",
",. c #494538",
"'. c #494938",
"). c #8E8A8E",
"!. c #B6B6B6",
"~. c #616561",
"{. c #494D49",
"]. c #595D59",
"^. c #868286",
"/. c #B6B2B6",
"(. c #282C28",
"_. c #B6B2AE",
":. c #BEBAB6",
"<. c #E7E7E7",
"[. c #EFEBE7",
"}. c #414130",
"|. c #494130",
"1. c #797979",
"2. c #A6A2A6",
"3. c #515151",
"4. c #414541",
"5. c #383838",
"6. c #282828",
"7. c #202020",
"8. c #303030",
"9. c #000000",
"0. c #9E9A9E",
"a. c #696969",
"b. c #202420",
"c. c #CFCBCF",
"d. c #413C30",
"e. c #413828",
"f. c #383C28",
"g. c #717171",
"h. c #494949",
"i. c #616161",
"j. c #868686",
"k. c #414141",
"l. c #181818",
"m. c #000400",
"n. c #101010",
"o. c #080808",
"p. c #383828",
"q. c #383C30",
"r. c #696D69",
"s. c #797D79",
"t. c #969296",
"u. c #595959",
"v. c #383830",
"w. c #494941",
"x. c #080C08",
"y. c #181C18",
"z. c #383C38",
"A. c #515551",
"B. c #D7D3CF",
"C. c #101410",
"D. c #383428",
"E. c #303430",
"F. c #AEAA9E",
"G. c #8E8E8E",
"H. c #A6A6A6",
"I. c #303028",
"J. c #616159",
"K. c #383430",
"L. c #717571",
"M. c #302C28",
"N. c #494138",
"O. c #413830",
"P. c #717169",
"Q. c #202018",
"R. c #282820",
"S. c #515541",
"T. c #181810",
"U. c #303020",
"V. c #201C18",
"W. c #413C38",
"X. c #595951",
"Y. c #282420",
"Z. c #414538",
"`. c #181410",
" + c #100C08",
".+ c #101008",
"++ c #080800",
"@+ c #080400",
"#+ c #BEBABE",
"$+ c #A6A29E",
"%+ c #494541",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" + ",
" @ # # ",
" $ % & # * ",
" = - ; # * * ",
" > , ' * * ) ! ",
" ~ { ] ^ * ! / ( _ ",
" : < ] [ [ } ) ) _ _ | ",
" ; ^ 1 2 2 3 } ) / | 4 5 5 ",
" 6 ^ 1 2 7 8 9 * ! _ _ | 0 a 0 ",
" = < 1 b 7 c d e f * _ _ | 0 0 a 0 g ",
" h ; i j k } . * l 7 * * _ _ 5 0 a m m n ",
" o p [ 2 7 c * ! / q r * * ) _ _ 5 0 a s m m t ",
" u v i j k } . d ) _ l & * * ! ) 4 4 0 a w m x _ ",
" y p j 2 7 z . # * ! * } A 6 B * ! ) ) ) _ _ | | 0 0 w m x C D ",
" E F [ b G H } z . . + . . . z z k I f J K K + | | _ _ ) _ _ _ _ 5 5 0 0 w a m m x 0 ",
" L 6 I 1 [ b G H } z z z . z z } z 8 . # # ( _ | 4 5 4 4 0 0 0 0 0 a m a m m x x M M N ",
" O P Q R S T U 2 k 7 } V W X R Q Y Z ` 8 . # ! / | 5 0 0 0 0 a m m m m m m M x x x M . ",
" ....R R R R R +.b G k W R R R R R R @.#.` . $.* _ _ 0 a m m M x M %.M %.&.*.%.M %.&.m =. ",
" Y @.O R ..Y -.;.Q R 6 2 = R R R R R R @.>.Q o . d ) _ 4 0 a m x M %.&.*.,.,.'.'.'.&.&.m ). ",
" !.~.{.{.].^. W X R 9 /.(.(._.R P :.R R R @.<.;.E +.Q Q [.I $./ _ 0 a m x &.'.'.,.}.}.|.|.|.,.'.&.1. ",
" 2.3.4.4.5.6.7.3._.o i R R 3.2.8.9.(.R R +.R R R Y 0.a.b.~.c.O +.3 ) ) _ 0 a m M *.,.}.}.d.e.d.f.d.}.'.g. ",
" /.h.i.j.j.a.h.(.7.k.* j X R l.b.m.9.n.R [.X @.@.R N !./.8.o.1.<.h ;.* _ | 0 s x &.'.,.}.d.p.q.p.e.d.,.i.r.s. ",
" r.3.t.E 9 ).u.v.b.b.w.+ 6 R ~.x.9.x.i.@.3 P ......i.1.1.y.9.h.L Y E / / 4 a m x *.'.}.d.d.p.p.v.p.d.{.].r.^. ",
" z.A.2.Y u N ].5.6.(.5.M 2 = h r.z.a.W B.G B.Q Q ..u.l.C.9.9.3.Y c.A _ 5 0 s M M *.|.d.d.p.p.D.D.q.d.{.].g. ",
" 8.{.j.t 2.1.{.E.8.E.z.h.+ 7 3 <.@.<.3 k k F.P P P =.b.9.9.7.).;.E r | 0 a m %.&.,.}.d.e.p.p.p.D.p.k.{.i.1. ",
" t 7.z.a.^.1.u.z.8.E.z.4.{.w z z z } 7 7 } H H E O <.u N {.h.G.-.-.0._ | 4 a m M ,.,.}.}.q.p.D.p.p.v.z.3.a. ",
" H.b.8.3.i.u.h.z.5.z.4.{.A.A.* . . z z } } } } } :.L h h = h u ;.f * 4 0 0 m x &.'.,.}.d.e.q.p.v.p.I.k.A.g. ",
" 6.b.5.4.4.z.5.z.h.{.A.].J._ * d . 8 z ` ` z z 8 I v E Y ;._.& _ | | a x M %.'.,.|.d.d.p.p.D.p.K.8.4.i. ",
" 8.7.8.E.5.z.k.4.3.u.i.~.~.0 _ ) * # . z c . . + . + * ! * _ _ 4 5 0 w ,.}.*.'.|.}.d.d.D.p.p.p.I.E.{.a. ",
" g.6.6.E.z.k.h.3.u.i.~.g. .m 0 5 / * # # . # d # * ) ( ) _ | | 5 a a %.D.d.,.,.}.d.e.D.D.p.p.D.b.5.A.L. ",
" z.8.5.k.h.3.u.i.a.r.1. .x s a 0 _ ) * $.$.* ) ! _ _ | _ 0 0 a s m M.p.}.N.}.d.p.p.p.p.O.d.b.6.k.i.s. ",
" j.h.k.h.3.u.i.a.g.1.s.w &.M m s a 5 _ ) _ _ _ _ 4 5 5 a a m s x (.I.}.M &.d.q.e.p.v.p.p.(.y.8.{.a. ",
" s.3.A.].~.r.P.1.^.P.'.'.*.&.m x m 0 | 0 0 0 0 a s a m m M '.Q.R.k.C ].S.e.p.D.p.p.p.I.T.b.5.u.1. ",
" E ).~.i.a.g.s.^.s.u.,.,.,.'.*.M x m a a w m s m x x M %.U.V.(.W.x ~.* X.O.p.v.p.p.p.T.l.8.h.J. ",
" 2.^.P.1.^.a.S.'.|.}.|.'.*.*.%.M m M M &.%.M M ,.Y.V.Q.(.q.M _ . + ,.q.p.p.D.p.y.C.7.5.u. ",
" u B _ 0 a x '.,.}.Z.,.,.'.,.'.&.'.&.}.I.Q.y.V.Q.R.E.d.M J.r.L.~.p.p.p.D.I.n.n.y.8.h.~. ",
" !.g d.U.R.I.I.I.I.I.U.Q.`.T.C. +.+T.V.Q.M.D.d.w.x 0 .! _ d.p.O.p.R.n.n.y.(.k.]. ",
" .M..+.+o.++++++@+++x. +C.y.Q.R.E.q.'.M ].J._ _ J.q.q.f.I.C.x.n.y.6.z.A. ",
" #+ 0.J.E.T.x.x.o.x.C.T.Q.R.E.p.Z.&.A.0 ~.~.0 '.O.M.y.x.x.n.T.7.(.W.A.r. ",
" $+t.s.r.].z.I.Q.b.Y.I.p.W.,.%.X.5 5 M W.7.T.o.x.x.n.C.l.b.8.4.u.g. ",
" ).L.~.A.4.5.(.7.l.C.C.n.x.o.x.x.x.x.x.x.n.C.l.y.6.8.z.h. ",
" j.g.~.3.%+5.8.6.b.y.y.l.l.l.l.l.l.y.7.7.Y.(.E. ",
" j.1.a.].{.4.z.5.8.8.8.(.(.(.8.8.8.E.z.k. ",
" j.L.r.i.u.A.3.{.{.h.h.{.h.{.3.A. ",
" ^.1.L.g.r.g.r.r.r. ",
" N t.N ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};