Windows Icons for a lot of windows ... Michael Weber xmw at gentoo dot org in 20100401 --- cinepaint/app/about_dialog.c +++ cinepaint/app/about_dialog.c @@ -27,6 +27,7 @@ #include "about_dialog.h" #include "interface.h" +#include "window_icon.h" #include "minimize.h" #include "app_procs.h" @@ -192,6 +193,7 @@ #else about_dialog = gtk_window_new (GTK_WINDOW_DIALOG); #endif + set_icon(about_dialog); minimize_register(about_dialog); gtk_window_set_wmclass (GTK_WINDOW (about_dialog), "about_dialog", "cinepaint"); gtk_window_set_title (GTK_WINDOW (about_dialog), title); --- cinepaint/app/app_procs.c +++ cinepaint/app/app_procs.c @@ -78,6 +78,7 @@ #include "config.h" #include "../lib/wire/wire.h" +#include "window_icon.h" #define SHOW_NEVER 0 #define SHOW_LATER 1 @@ -432,6 +433,7 @@ #else win_initstatus = gtk_window_new (GTK_WINDOW_DIALOG); #endif + set_icon(win_initstatus); gtk_signal_connect (GTK_OBJECT (win_initstatus), "delete_event", GTK_SIGNAL_FUNC (gtk_true), NULL); @@ -836,6 +838,7 @@ menus_set_sensitive ("/File/Quit", FALSE); dialog = gtk_dialog_new (); + set_icon(dialog); gtk_window_set_wmclass (GTK_WINDOW (dialog), "really_quit", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (dialog), _("Really Quit?")); gtk_window_set_policy (GTK_WINDOW (dialog), FALSE, FALSE, FALSE); --- cinepaint/app/brush_edit.c +++ cinepaint/app/brush_edit.c @@ -31,6 +31,7 @@ #include "layout.h" #include "rc.h" #include "minimize.h" +#include "window_icon.h" static void brush_edit_close_callback (GtkWidget *w, void *data); static gint brush_edit_preview_resize (GtkWidget *widget, GdkEvent *event, @@ -201,6 +202,7 @@ begw->brush = NULL; begw->shell = gtk_dialog_new (); + set_icon(begw->shell); gtk_window_set_wmclass (GTK_WINDOW (begw->shell), "generatedbrusheditor",PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (begw->shell), _("Brush Editor")); /* gtk_window_set_policy(GTK_WINDOW(begw->shell), FALSE, TRUE, FALSE); */ --- cinepaint/app/bugs_dialog.c +++ cinepaint/app/bugs_dialog.c @@ -27,6 +27,7 @@ #include "bugs_dialog.h" #include "interface.h" +#include "window_icon.h" #include "config.h" #include "minimize.h" @@ -82,6 +83,7 @@ #else bugs_dialog = gtk_window_new (GTK_WINDOW_DIALOG); #endif + set_icon(bugs_dialog); minimize_register(bugs_dialog); gtk_window_set_wmclass (GTK_WINDOW (bugs_dialog), "bugs_dialog", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (bugs_dialog), "Where to send bug reports and kudos"); --- cinepaint/app/by_color_select.c +++ cinepaint/app/by_color_select.c @@ -37,6 +37,7 @@ #include "pixelarea.h" #include "pixelrow.h" #include "minimize.h" +#include "window_icon.h" #define DEFAULT_FUZZINESS 0.10 /* was 15/255 originally */ @@ -458,6 +459,7 @@ /* The shell and main vbox */ bcd->shell = gtk_dialog_new (); + set_icon(bcd->shell); gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "by_color_selection", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (bcd->shell), _("By Color Selection")); gtk_container_border_width (GTK_CONTAINER (GTK_DIALOG (bcd->shell)->action_area), 2); --- cinepaint/app/channel_ops.c +++ cinepaint/app/channel_ops.c @@ -37,6 +37,7 @@ #include "layout.h" #include "rc.h" #include "minimize.h" +#include "window_icon.h" #include "channel_pvt.h" @@ -111,6 +112,7 @@ off_d->gimage_id = gimage->ID; off_d->dlg = gtk_dialog_new (); + set_icon(off_d->dlg); gtk_window_set_wmclass (GTK_WINDOW (off_d->dlg), "offset", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (off_d->dlg), _("Offset")); --- cinepaint/app/channels_dialog.c +++ cinepaint/app/channels_dialog.c @@ -41,6 +41,7 @@ #include "paint_funcs_area.h" #include "resize.h" #include "minimize.h" +#include "window_icon.h" #include "buttons/eye.xbm" #include "buttons/channel.xbm" @@ -1928,6 +1929,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "new_channel_options", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("New Channel Options")); gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE); @@ -2223,6 +2225,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "edit_channel_atributes", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Channel Attributes")); gtk_window_position (GTK_WINDOW (options->query_box), GTK_WIN_POS_MOUSE); --- cinepaint/app/cinepaint-remote.c +++ cinepaint/app/cinepaint-remote.c @@ -59,6 +59,7 @@ #include /* for XmuClientWindow () */ #include "lib/version.h" /* for GIMP_VERSION */ +#include "window_icon.h" static gboolean start_new = TRUE; @@ -341,6 +342,7 @@ /* set up an DND-source */ source = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(source); gtk_signal_connect (GTK_OBJECT (source), "selection_get", GTK_SIGNAL_FUNC (source_selection_get), file_list->str); gtk_widget_realize (source); --- cinepaint/app/cms.c +++ cinepaint/app/cms.c @@ -63,6 +63,7 @@ #include "pixelrow.h" #include "rc.h" #include "tag.h" +#include "window_icon.h" /* parameter for the transform cache */ @@ -2846,6 +2847,7 @@ CMSConvertDialogData *data=g_new(CMSConvertDialogData, 1); data->image = image; data->shell = gtk_dialog_new(); + set_icon(data->shell); gtk_window_set_wmclass (GTK_WINDOW (data->shell), "cms_convert", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (data->shell), _("Select Profile and Intent")); @@ -2961,6 +2963,7 @@ data->image = image; data->shell = gtk_dialog_new(); + set_icon(data->shell); data->type = type; gtk_window_set_wmclass (GTK_WINDOW (data->shell), "cms_assign", PROGRAM_NAME); @@ -3092,6 +3095,7 @@ data->image = image; data->shell = gtk_dialog_new(); + set_icon(data->shell); gtk_window_set_wmclass (GTK_WINDOW (data->shell), "cms_open_assign", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (data->shell), _("Select Profile")); @@ -3242,6 +3246,7 @@ CMSConvertOnOpenPromptData *data = g_new(CMSConvertOnOpenPromptData, 1); data->shell = gtk_dialog_new(); + set_icon(data->shell); gtk_window_set_wmclass (GTK_WINDOW (data->shell), "cms_convert_profile_prompt", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (data->shell), _("Select Profile")); gtk_window_set_position(GTK_WINDOW(data->shell), GTK_WIN_POS_CENTER); --- cinepaint/app/color_correction_gui.c +++ cinepaint/app/color_correction_gui.c @@ -9,6 +9,7 @@ #include "paint_funcs_area.h" #include "pixelarea.h" #include "rc.h" +#include "window_icon.h" #define SQR(x) ((x) * (x)) @@ -298,6 +299,7 @@ /*** MAIN SHELL AND NOTEBOOK */ data->shell = gtk_dialog_new (); + set_icon(data->shell); gtk_window_set_wmclass (GTK_WINDOW (data->shell), "color_correction", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (data->shell), "Color Correction"); @@ -1174,6 +1176,7 @@ _ColorCorrectionGuiOptions *data = g_new(_ColorCorrectionGuiOptions, 1); data->parent = parent; data->shell = gtk_dialog_new(); + set_icon(data->shell); gtk_container_border_width(GTK_CONTAINER(GTK_DIALOG(data->shell)->vbox), 5); /*** PRESERVE ***/ @ -1282,6 +1282,7 @@ data->parent = parent; data->shell = gtk_file_selection_new("Save Look Profile"); + set_icon(data->shell); if (look_profile_path != NULL) { gtk_file_selection_set_filename(GTK_FILE_SELECTION(data->shell), look_profile_path); } --- cinepaint/app/convert.c +++ cinepaint/app/convert.c @@ -82,6 +82,7 @@ #include "../lib/wire/enums.h" #include "paint_funcs_area.h" #include "rc.h" +#include "window_icon.h" static Argument * convert_rgb_invoker (Argument *); static Argument * convert_grayscale_invoker (Argument *); @@ -584,6 +585,7 @@ dialog->monopal_flag = FALSE; dialog->reusepal_flag = FALSE; dialog->shell = gtk_dialog_new (); + set_icon(dialog->shell); gtk_window_set_wmclass (GTK_WINDOW (dialog->shell), "indexed_color_conversion", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (dialog->shell), _("Indexed Color Conversion")); gtk_signal_connect (GTK_OBJECT (dialog->shell), "delete_event", --- cinepaint/app/depth/brightness_contrast.c +++ cinepaint/app/depth/brightness_contrast.c @@ -36,6 +36,7 @@ #include "../pixelrow.h" #include "../minimize.h" #include "../pixelarea.h" +#include "../window_icon.h" #define TEXT_WIDTH 45 #define TEXT_HEIGHT 25 @@ -714,6 +715,7 @@ /* The shell and main vbox */ bcd->shell = gtk_dialog_new (); + set_icon(bcd->shell); gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "brightness_contrast", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (bcd->shell), _("Brightness-Contrast")); minimize_register(bcd->shell); --- cinepaint/app/depth/brush_select.c +++ cinepaint/app/depth/brush_select.c @@ -40,6 +40,7 @@ #include "../layout.h" #include "../minimize.h" #include "../rc.h" +#include "../window_icon.h" #define STD_CELL_WIDTH 24 #define STD_CELL_HEIGHT 24 @@ -241,6 +242,7 @@ /* The shell and main vbox */ bsp->shell = gtk_dialog_new (); + set_icon(bsp->shell); gtk_window_set_wmclass (GTK_WINDOW (bsp->shell), "brushselection", PROGRAM_NAME); gtk_widget_set_uposition(bsp->shell, brush_select_x, brush_select_y); layout_connect_window_position(bsp->shell, &brush_select_x, &brush_select_y, TRUE); @@ -721,6 +723,7 @@ GtkWidget *frame; bsp->brush_popup = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(bsp->brush_popup); minimize_register(bsp->brush_popup); /* gtk_window_set_policy (GTK_WINDOW (bsp->brush_popup), FALSE, FALSE, TRUE); */ --- cinepaint/app/depth/color_balance.c +++ cinepaint/app/depth/color_balance.c @@ -37,6 +37,7 @@ #include "../pixelarea.h" #include "../pixelrow.h" #include "../minimize.h" +#include "../window_icon.h" #define TEXT_WIDTH 55 #define SQR(x) ((x) * (x)) @@ -1050,6 +1051,7 @@ /* The shell and main vbox */ cbd->shell = gtk_dialog_new (); + set_icon(cbd->shell); gtk_window_set_wmclass (GTK_WINDOW (cbd->shell), "color_balance", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (cbd->shell), _("Color Balance")); minimize_register(cbd->shell); --- cinepaint/app/depth/color_select.c +++ cinepaint/app/depth/color_select.c @@ -32,6 +32,7 @@ #include "../pixelrow.h" #include "../layout.h" #include "../minimize.h" +#include "../window_icon.h" #define XY_DEF_WIDTH 192 #define XY_DEF_HEIGHT 192 @@ -196,6 +197,7 @@ color_select_update_pos (csp); csp->shell = gtk_dialog_new (); + set_icon(csp->shell); gtk_window_set_wmclass (GTK_WINDOW (csp->shell), "color_selection", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (csp->shell), _("Color Selection")); gtk_window_set_policy (GTK_WINDOW (csp->shell), FALSE, FALSE, FALSE); --- cinepaint/app/depth/commands.c +++ cinepaint/app/depth/commands.c @@ -94,6 +94,7 @@ #include "../brushlist.h" #include "../cursorutil.h" #include "../lib/wire/precision.h" +#include "../window_icon.h" /* external functions */ extern void layers_dialog_layer_merge_query (GImage *, int); @@ -406,6 +407,7 @@ vals->format = FORMAT_RGB; /* no indexed images */ vals->dlg = gtk_dialog_new (); + set_icon(vals->dlg); gtk_window_set_wmclass (GTK_WINDOW (vals->dlg), "new_image", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (vals->dlg), _("New Image")); gtk_widget_set_uposition(vals->dlg, generic_window_x, generic_window_y); @@ -1562,6 +1564,7 @@ file_prefs_strset (&old_gradient_path, edit_gradient_path); prefs_dlg = gtk_dialog_new (); + set_icon(prefs_dlg); gtk_window_set_wmclass (GTK_WINDOW (prefs_dlg), "preferences", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (prefs_dlg), _("Preferences")); /* gtk_widget_set_uposition(prefs_dlg, generic_window_x, generic_window_y); */ @@ -3732,6 +3735,7 @@ /* the dialog */ image_resize->shell = gtk_dialog_new (); + set_icon(image_resize->shell); gtk_window_set_wmclass (GTK_WINDOW (image_resize->shell), "image_resize", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (image_resize->shell), _("Image Resize")); gtk_window_set_policy (GTK_WINDOW (image_resize->shell), FALSE, FALSE, TRUE); @@ -3785,6 +3789,7 @@ /* the dialog */ image_scale->shell = gtk_dialog_new (); + set_icon(gtk_dialog_new); gtk_window_set_wmclass (GTK_WINDOW (image_scale->shell), "image_scale", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (image_scale->shell), _("Image Scale")); gtk_window_set_policy (GTK_WINDOW (image_scale->shell), FALSE, FALSE, TRUE); --- cinepaint/app/depth/curves.c +++ cinepaint/app/depth/curves.c @@ -41,6 +41,7 @@ #include "../pixelrow.h" #include "../minimize.h" #include "../rc.h" +#include "../window_icon.h" #define ROUND(x) ((int) ((x) + 0.5)) @@ -904,6 +905,7 @@ /* The shell and main vbox */ cd->shell = gtk_dialog_new (); + set_icon(cd->shell); gtk_window_set_wmclass (GTK_WINDOW (cd->shell), "curves", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (cd->shell), _("Curves")); minimize_register(cd->shell); @@ -2147,6 +2147,7 @@ gchar *temp; file_dlg = gtk_file_selection_new (_("Load/Save Curves")); + set_icon(file_dlg); gtk_window_set_wmclass (GTK_WINDOW (file_dlg), "load_save_curves", PROGRAM_NAME); gtk_window_set_position (GTK_WINDOW (file_dlg), GTK_WIN_POS_MOUSE); --- cinepaint/app/depth/gamma_expose.c +++ cinepaint/app/depth/gamma_expose.c @@ -34,6 +34,7 @@ #include "../interface.h" #include "../pixelarea.h" #include "../pixelrow.h" +#include "../window_icon.h" #define TEXT_WIDTH 45 #define TEXT_HEIGHT 25 @@ -704,6 +705,7 @@ } /* The shell and main vbox */ bcd->shell = gtk_dialog_new (); + set_icon(bcd->shell); gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "gamma_expose",PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (bcd->shell), _("Expose Image")); --- cinepaint/app/depth/levels.c +++ cinepaint/app/depth/levels.c @@ -39,6 +39,7 @@ #include "../pixelarea.h" #include "../pixelrow.h" #include "../minimize.h" +#include "../window_icon.h" #include "../buttons/picker_white.xpm" #include "../buttons/picker_white_is.xpm" @@ -3574,7 +3575,8 @@ color_option_items [i].user_data = (gpointer) ld; /* The shell and main vbox */ - ld->shell = gtk_dialog_new (); + ld->shell = gtk_dialog_new (); + set_icon(ld->shell); gtk_window_set_wmclass (GTK_WINDOW (ld->shell), "levels", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (ld->shell), _("Levels")); minimize_register(ld->shell); --- cinepaint/app/depth/Makefile.am +++ cinepaint/app/depth/Makefile.am @@ -65,7 +65,10 @@ threshold.c \ trace.c \ transform_core.c \ - xcf.c + xcf.c \ + ../window_icon.c \ + ../window_icon.h + --- cinepaint/app/depth/plug_in.c +++ cinepaint/app/depth/plug_in.c @@ -75,6 +75,7 @@ #include "libgimp/gimpintl.h" #include "../regex_fake.h" #include "float16.h" +#include "../window_icon.h" #define FIXME #define TILE_WIDTH 64 @@ -3777,6 +3778,7 @@ if (!plug_in->progress) { plug_in->progress = gtk_dialog_new (); + set_icon(plug_in->progress); gtk_window_set_wmclass (GTK_WINDOW (plug_in->progress), "plug_in_progress", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (plug_in->progress), prune_filename (plug_in->args[0])); gtk_widget_set_uposition (plug_in->progress, progress_x, progress_y); --- cinepaint/app/depth/text_tool.c +++ cinepaint/app/depth/text_tool.c @@ -49,6 +49,7 @@ #include "../undo.h" #include "float16.h" #include "compat.h" +#include "../window_icon.h" #define FONT_LIST_WIDTH 125 #define FONT_LIST_HEIGHT 200 @@ -430,6 +431,7 @@ /* Create the shell and vertical & horizontal boxes */ text_tool->shell = gtk_dialog_new (); + set_icon(text_tool->shell); gtk_window_set_wmclass (GTK_WINDOW (text_tool->shell), "text_tool", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (text_tool->shell), _("Text Tool")); gtk_window_set_policy (GTK_WINDOW (text_tool->shell), FALSE, TRUE, TRUE); --- cinepaint/app/depth/threshold.c +++ cinepaint/app/depth/threshold.c @@ -34,6 +34,7 @@ #include "../threshold.h" #include "../pixelarea.h" #include "../minimize.h" +#include "../window_icon.h" #define TEXT_WIDTH 75 #define HISTOGRAM_WIDTH 256 @@ -1197,6 +1198,7 @@ /* The shell and main vbox */ td->shell = gtk_dialog_new (); + set_icon(td->shell); gtk_window_set_wmclass (GTK_WINDOW (td->shell), "threshold", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (td->shell), _("Threshold")); minimize_register(td->shell); --- cinepaint/app/devices.c +++ cinepaint/app/devices.c @@ -34,6 +34,7 @@ #include "tools.h" #include "brushlist.h" #include "libgimp/gimpintl.h" +#include "window_icon.h" typedef struct DeviceInfo DeviceInfo; @@ -741,6 +742,7 @@ { deviceD = g_new (DeviceInfoDialog, 1); deviceD->shell = gtk_dialog_new (); + set_icon(deviceD->shell); gtk_window_set_title (GTK_WINDOW(deviceD->shell), _("Device Status")); gtk_window_set_policy (GTK_WINDOW (deviceD->shell), FALSE, FALSE, TRUE); --- cinepaint/app/dnd.c +++ cinepaint/app/dnd.c @@ -26,6 +26,7 @@ #include "rc.h" #include "gradient.h" #include "tools.h" +#include "window_icon.h" /*#include "libgimp/gimplimits.h"*/ @@ -281,6 +282,7 @@ GtkWidget *window; window = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(window); gtk_widget_realize (window); frame = gtk_frame_new (NULL); --- cinepaint/app/expose_image.c +++ cinepaint/app/expose_image.c @@ -33,6 +33,7 @@ #include "interface.h" #include "pixelarea.h" #include "pixelrow.h" +#include "window_icon.h" #define USE_OFFSET 0 @@ -261,6 +262,7 @@ /* The shell and main vbox */ bcd->shell = gtk_dialog_new (); + set_icon(bcd->shell); gtk_window_set_wmclass (GTK_WINDOW (bcd->shell), "expose_view", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (bcd->shell), _("Expose View")); --- cinepaint/app/fileops.c +++ cinepaint/app/fileops.c @@ -53,6 +53,7 @@ #include "layout.h" #include "minimize.h" #include "../lib/wire/datadir.h" +#include "window_icon.h" #define RUN_INTERACTIVE 0x0 #define RUN_NONINTERACTIVE 0x1 @@ -524,6 +525,7 @@ } warning_dialog = gtk_dialog_new (); + set_icon(warning_dialog); gtk_window_set_wmclass (GTK_WINDOW (warning_dialog), "really_reload", PROGRAM_NAME); gtk_window_set_policy (GTK_WINDOW (warning_dialog), FALSE, FALSE, FALSE); gtk_window_set_title (GTK_WINDOW (warning_dialog), _("Warning")); @@ -569,6 +569,7 @@ strcpy(path,GetDirHome()); strcat(path,"/x.png");*/ fileload = gtk_file_selection_new (_("Load Image")); + set_icon(fileload); /* gtk_file_selection_set_filename(GTK_FILE_SELECTION(fileload),path); gtk_clist_set_text(GTK_CLIST(GTK_FILE_SELECTION(fileload)->dir_list),0,0,path); @@ -691,6 +692,7 @@ if (!filesave) { filesave = gtk_file_selection_new (_("Save Image")); + set_icon(filesave); gtk_window_set_wmclass (GTK_WINDOW (filesave), "save_image", PROGRAM_NAME); gtk_window_position (GTK_WINDOW (filesave), GTK_WIN_POS_MOUSE); gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filesave)->cancel_button), @@ -786,6 +788,7 @@ if (!filesave) { filesave = gtk_file_selection_new (_("Save Image")); + set_icon(filesave); gtk_window_set_wmclass (GTK_WINDOW (filesave), "save_image", PROGRAM_NAME); gtk_window_position (GTK_WINDOW (filesave), GTK_WIN_POS_MOUSE); gtk_signal_connect_object (GTK_OBJECT (GTK_FILE_SELECTION (filesave)->cancel_button), @@ -1547,6 +1552,7 @@ overwrite_box->full_filename = filename; overwrite_box->raw_filename = raw_filename; overwrite_box->obox = gtk_dialog_new (); + set_icon(overwrite_box->obox); gtk_window_set_wmclass (GTK_WINDOW (overwrite_box->obox), "file_exists", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (overwrite_box->obox), _("File Exists!")); gtk_widget_set_uposition(overwrite_box->obox, generic_window_x, generic_window_y); --- cinepaint/app/gdisplay_ops.c +++ cinepaint/app/gdisplay_ops.c @@ -37,6 +37,7 @@ #include "minimize.h" #include "layout.h" #include "base_frame_manager.h" +#include "window_icon.h" static void gdisplay_close_warning_callback (GtkWidget *, gpointer); static void gdisplay_cancel_warning_callback (GtkWidget *, gpointer); @@ -350,6 +351,7 @@ menus_set_sensitive ("/File/Close", FALSE); warning_dialog = mbox = gtk_dialog_new (); + set_icon(warning_dialog); /* should this be image_window or the actual image name??? */ gtk_window_set_wmclass (GTK_WINDOW (mbox), "really_close", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (mbox), image_name); --- cinepaint/app/global_edit.c +++ cinepaint/app/global_edit.c @@ -40,6 +40,7 @@ #include "rc.h" #include "layout.h" #include "minimize.h" +#include "window_icon.h" #include "global_edit.h" @@ -654,6 +655,7 @@ pn_dlg->gdisp = gdisp; pn_dlg->shell = gtk_dialog_new (); + set_icon(pn_dlg->shell); gtk_window_set_wmclass (GTK_WINDOW (pn_dlg->shell), "paste_named_buffer", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (pn_dlg->shell), _("Paste Named Buffer")); gtk_widget_set_uposition(pn_dlg->shell, generic_window_x, generic_window_y); --- cinepaint/app/gradient.c +++ cinepaint/app/gradient.c @@ -170,6 +170,7 @@ #include "layout.h" #include "minimize.h" #include "../lib/wire/datadir.h" +#include "window_icon.h" /***** Magic numbers *****/ @@ -812,6 +813,7 @@ /* Shell and main vbox */ g_editor->shell = gtk_window_new(GTK_WINDOW_TOPLEVEL); + set_icon(g_editor->shell); minimize_register(g_editor->shell); gtk_window_set_wmclass (GTK_WINDOW(g_editor->shell), "gradient_editor", PROGRAM_NAME); gtk_container_border_width(GTK_CONTAINER(g_editor->shell), 0); @@ -1603,6 +1603,7 @@ if (curr_gradient == NULL) return; window = gtk_file_selection_new(_("Save as POV-Ray")); + set_icon(window); gtk_window_position(GTK_WINDOW(window), GTK_WIN_POS_MOUSE); gtk_signal_connect(GTK_OBJECT(GTK_FILE_SELECTION(window)->ok_button), --- cinepaint/app/histogram_tool.c +++ cinepaint/app/histogram_tool.c @@ -32,6 +32,7 @@ #include "image_map.h" #include "interface.h" #include "minimize.h" +#include "window_icon.h" #define TEXT_WIDTH 45 #define HISTOGRAM_WIDTH 256 @@ -380,6 +381,7 @@ /* The shell and main vbox */ htd->shell = gtk_dialog_new (); + set_icon(htd->shell); gtk_window_set_wmclass (GTK_WINDOW (htd->shell), "histogram", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (htd->shell), _("Histogram")); minimize_register(htd->shell); --- cinepaint/app/indexed_palette.c +++ cinepaint/app/indexed_palette.c @@ -39,6 +39,7 @@ #include "pixelrow.h" #include "undo.h" #include "minimize.h" +#include "window_icon.h" #define EVENT_MASK GDK_BUTTON_PRESS_MASK | GDK_ENTER_NOTIFY_MASK @@ -135,6 +136,7 @@ /* The shell and main vbox */ indexedP->shell = gtk_dialog_new (); + set_icon(indexedP->shell); gtk_window_set_wmclass (GTK_WINDOW (indexedP->shell), "indexed_color_palette", PROGRAM_NAME); gtk_window_set_policy (GTK_WINDOW (indexedP->shell), FALSE, FALSE, FALSE); gtk_window_set_title (GTK_WINDOW (indexedP->shell), "Indexed Color Palette"); --- cinepaint/app/info_dialog.c +++ cinepaint/app/info_dialog.c @@ -26,6 +26,7 @@ #include "appenv.h" #include "libgimp/gimpintl.h" +#include "window_icon.h" #ifdef GIMP_VERSION @@ -189,6 +190,7 @@ idialog->nfields = 0; shell = gtk_dialog_new (); + set_icon(shell); gtk_window_set_wmclass (GTK_WINDOW (shell), "info_dialog", "CinePaint"); gtk_window_set_title (GTK_WINDOW (shell), title); session_set_window_geometry (shell, &info_dialog_session_info, FALSE ); --- cinepaint/app/install.c +++ cinepaint/app/install.c @@ -39,6 +39,7 @@ #include "rc.h" #include "../lib/wire/datadir.h" #include "user_install.h" +#include "window_icon.h" static void install_run (InstallCallback); static void install_help (InstallCallback); @@ -127,6 +128,7 @@ action_items[2].label = _("Quit"); help_widget = gtk_dialog_new (); + set_icon(help_widget); gtk_signal_connect (GTK_OBJECT (help_widget), "delete_event", GTK_SIGNAL_FUNC (gtk_true), NULL); @@ -428,6 +430,7 @@ action_items[1].label = _(action_items[1].label); install_widget = gtk_dialog_new (); + set_icon(install_widget); gtk_signal_connect (GTK_OBJECT (install_widget), "delete_event", GTK_SIGNAL_FUNC (gtk_true), NULL); --- cinepaint/app/interface.c +++ cinepaint/app/interface.c @@ -44,6 +44,7 @@ #include "pixmaps.h" #include "minimize.h" #include "tango_tools_pixmaps.h" +#include "window_icon.h" /* local functions */ static gint tools_button_press (GtkWidget *widget, @@ -732,6 +733,7 @@ tool_data[i].tool_desc = _("Spline Edit"); ++i; window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(window); gtk_window_set_wmclass (GTK_WINDOW (window), "toolbox", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (window),/*"CP"*/ PROGRAM_NAME " " PROGRAM_VERSION); gtk_widget_set_uposition (window, toolbox_x, toolbox_y); @@ -907,6 +907,7 @@ /* The toplevel shell */ gdisp->shell = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(gdisp->shell); gtk_widget_ref (gdisp->shell); gtk_window_set_title (GTK_WINDOW (gdisp->shell), title); gtk_window_set_wmclass (GTK_WINDOW (gdisp->shell), "image_window", PROGRAM_NAME); @@ -1296,6 +1299,7 @@ query_box = (QueryBox *) g_malloc_zero (sizeof (QueryBox)); qbox = gtk_dialog_new (); + set_icon(qbox); gtk_window_set_title (GTK_WINDOW (qbox), title); gtk_window_set_wmclass (GTK_WINDOW (qbox), "query_box", PROGRAM_NAME); @@ -1489,6 +1493,7 @@ msg_box->i = i; mbox = gtk_dialog_new (); + set_icon(mbox); gtk_window_set_wmclass (GTK_WINDOW (mbox), "gimp_message", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (mbox), PROGRAM_NAME " Message"); gtk_widget_set_uposition(mbox, generic_window_x, generic_window_y); --- cinepaint/app/layers_dialog.c +++ cinepaint/app/layers_dialog.c @@ -48,6 +48,7 @@ #include "fileops.h" #include "layout.h" #include "minimize.h" +#include "window_icon.h" #include "buttons/eye.xbm" #include "buttons/linked.xbm" @@ -322,6 +323,7 @@ if (lc_shell == NULL) { lc_shell = gtk_dialog_new (); + set_icon(lc_shell); gtk_window_set_title (GTK_WINDOW (lc_shell), _("Layers & Channels")); gtk_window_set_wmclass (GTK_WINDOW (lc_shell), "layers_and_channels", PROGRAM_NAME); @@ -3381,6 +3383,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "new_layer_options", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("New Layer Options")); gtk_widget_set_uposition(options->query_box, generic_window_x, generic_window_y); @@ -3566,6 +3569,7 @@ options->layer_ID = drawable_ID (GIMP_DRAWABLE (layer_widget->layer)); /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "edit_layer_attrributes", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Edit Layer Attributes")); gtk_widget_set_uposition(options->query_box, generic_window_x, generic_window_y); @@ -3740,6 +3744,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "add_mask_options", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Add Mask Options")); gtk_widget_set_uposition(options->query_box, generic_window_x, generic_window_y); @@ -3875,6 +3880,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "layer_mask_options", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Layer Mask Options")); gtk_widget_set_uposition(options->query_box, generic_window_x, generic_window_y); @@ -4006,6 +4012,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "scale_layer", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Scale Layer")); gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, FALSE, TRUE); @@ -4134,6 +4141,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "resize_layer", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Resize Layer")); gtk_window_set_policy (GTK_WINDOW (options->query_box), FALSE, TRUE, TRUE); @@ -4288,6 +4296,7 @@ /* the dialog */ options->query_box = gtk_dialog_new (); + set_icon(options->query_box); gtk_window_set_wmclass (GTK_WINDOW (options->query_box), "layer_merge_options", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options->query_box), _("Layer Merge Options")); gtk_widget_set_uposition(options->query_box, generic_window_x, generic_window_y); --- cinepaint/app/layer_select.c +++ cinepaint/app/layer_select.c @@ -30,6 +30,7 @@ #include "layer_select.h" #include "layers_dialogP.h" #include "minimize.h" +#include "window_icon.h" #define PREVIEW_EVENT_MASK GDK_EXPOSURE_MASK | GDK_ENTER_NOTIFY_MASK @@ -100,6 +101,7 @@ /* The shell and main vbox */ layer_select->shell = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(layer_select->shell); minimize_register(layer_select->shell); gtk_window_set_wmclass (GTK_WINDOW (layer_select->shell), "layer_select", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (layer_select->shell), _("Layer Select")); --- cinepaint/app/look_profile.c +++ cinepaint/app/look_profile.c @@ -22,6 +22,7 @@ #include "buttons/look_profile_on.xpm" #include "buttons/look_profile_apply.xpm" #include "buttons/look_profile_apply_all.xpm" +#include "window_icon.h" @@ -614,6 +615,8 @@ ((GDisplay*)display)->look_profile_manager = data; data->display = display; data->shell = gtk_dialog_new(); + set_icon(data->shell); + gtk_window_set_wmclass (GTK_WINDOW (data->shell), "look_profile", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (data->shell), "Look Profiles"); @@ -833,6 +833,7 @@ static void _look_profile_gui_open_cb (GtkWidget *widget, _LookProfileGui *data) { data->file_selector = gtk_file_selection_new("Change Look Profile Store"); + set_icon(data->file_selector); if (look_profile_path != NULL) { gtk_file_selection_set_filename(GTK_FILE_SELECTION(data->file_selector), look_profile_path); @@ -942,6 +946,7 @@ #else progress_dialog = gtk_window_new (GTK_WINDOW_DIALOG); #endif + set_icon(progress_dialog); gtk_window_set_wmclass (GTK_WINDOW (progress_dialog), "progress", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (progress_dialog), "Applying look to flipbook stores..."); gtk_window_set_position(GTK_WINDOW(progress_dialog), GTK_WIN_POS_CENTER); --- cinepaint/app/zoombookmark.c +++ cinepaint/app/zoombookmark.c @@ -4,6 +4,7 @@ #include "scroll.h" #include "zoom.h" #include "../lib/wire/iodebug.h" +#include "window_icon.h" ZoomBookmark zoom_bookmarks[ZOOM_BOOKMARK_NUM] = { @@ -113,6 +114,7 @@ { GtkWidget *file_selector; file_selector = gtk_file_selection_new("Save the current bookmarks"); + set_icon(file_selector); gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(file_selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (zoom_bookmark_save_doit), @@ -135,6 +137,7 @@ { GtkWidget *file_selector; file_selector = gtk_file_selection_new("Select a bookmark file to load"); + set_icon(file_selector); gtk_signal_connect (GTK_OBJECT (GTK_FILE_SELECTION(file_selector)->ok_button), "clicked", GTK_SIGNAL_FUNC (zoom_bookmark_load_doit), --- cinepaint/app/Makefile.am +++ cinepaint/app/Makefile.am @@ -334,10 +334,19 @@ zoombookmark.c \ zoombookmark.h \ menus.c \ - menus.h + menus.h \ + window_icon.c \ + window_icon.h \ + ../lib/intl.h \ + ../lib/wire/datadir.h + cinepaint_remote_SOURCES = \ - cinepaint-remote.c + cinepaint-remote.c \ + window_icon.c \ + window_icon.h \ + ../lib/intl.h \ + ../lib/wire/datadir.h ## menus.c depends upon store_frame_manager.o --- cinepaint/app/new.nav_window.c +++ cinepaint/app/new.nav_window.c @@ -47,6 +47,7 @@ #include "pixmaps/zoom_in.xpm" #include "pixmaps/zoom_out.xpm" +#include "window_icon.h" #define MAX_BUF 256 @@ -1657,6 +1658,7 @@ iwp = create_dummy_iwd (gdisp, NAV_POPUP); gdisp->nav_popup = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(gdisp->nav_popup); gtk_widget_set_events (gdisp->nav_popup, PREVIEW_MASK); gtk_window_set_policy (GTK_WINDOW (gdisp->nav_popup), --- cinepaint/app/palette.c +++ cinepaint/app/palette.c @@ -51,6 +51,7 @@ #include "layout.h" #include "minimize.h" #include "../lib/wire/datadir.h" +#include "window_icon.h" #define ENTRY_WIDTH 14 #define ENTRY_HEIGHT 10 @@ -244,6 +245,7 @@ /* The shell and main vbox */ palette->shell = gtk_dialog_new (); + set_icon(palette->shell); gtk_window_set_wmclass (GTK_WINDOW (palette->shell), "color_palette", PROGRAM_NAME); gtk_window_set_policy (GTK_WINDOW (palette->shell), FALSE, FALSE, FALSE); gtk_window_set_title (GTK_WINDOW (palette->shell), _("Color Palette")); --- cinepaint/app/pattern_select.c +++ cinepaint/app/pattern_select.c @@ -32,6 +32,7 @@ #include "errors.h" #include "tag.h" #include "minimize.h" +#include "window_icon.h" #define MIN_CELL_SIZE 32 @@ -114,6 +115,7 @@ /* The shell and main vbox */ psp->shell = gtk_dialog_new (); + set_icon(psp->shell); gtk_window_set_wmclass (GTK_WINDOW (psp->shell), "patternselection", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (psp->shell), _("Pattern Selection")); vbox = gtk_vbox_new (FALSE, 1); @@ -258,6 +260,7 @@ { GtkWidget *frame; psp->pattern_popup = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(psp->pattern_popup); minimize_register(psp->pattern_popup); gtk_window_set_policy (GTK_WINDOW (psp->pattern_popup), FALSE, FALSE, TRUE); frame = gtk_frame_new (NULL); --- cinepaint/app/store_frame_manager.c +++ cinepaint/app/store_frame_manager.c @@ -56,6 +56,7 @@ #include "plug_in.h" #include "spline.h" #include "layer_pvt.h" +#include "window_icon.h" #include "buttons/play_forward.xpm" #include "buttons/play_forward_is.xpm" @@ -282,6 +283,7 @@ /* the shell */ disp->bfm->sfm->shell = gtk_dialog_new (); + set_icon(disp->bfm->sfm->shell); gtk_window_set_wmclass (GTK_WINDOW (disp->bfm->sfm->shell), "sfm", PROGRAM_NAME); gtk_window_set_policy (GTK_WINDOW (disp->bfm->sfm->shell), FALSE, TRUE, FALSE); sprintf (tmp, _("Flipbook for %s"), disp->gimage->filename); --- cinepaint/app/tips_dialog.c +++ cinepaint/app/tips_dialog.c @@ -8,6 +8,7 @@ #include "tips_dialog.h" #include "rc.h" #include "interface.h" +#include "window_icon.h" #include "wilber.h" #include "minimize.h" #include "../lib/wire/datadir.h" @@ -63,6 +64,7 @@ #else tips_dialog = gtk_window_new (GTK_WINDOW_DIALOG); #endif + set_icon(tips_dialog); minimize_register(tips_dialog); gtk_window_set_wmclass (GTK_WINDOW (tips_dialog), "tip_of_the_day", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (tips_dialog), _("Tip of the day")); --- cinepaint/app/tools.c +++ cinepaint/app/tools.c @@ -65,6 +65,7 @@ #include "transform_tool.h" #include "layout.h" #include "minimize.h" +#include "window_icon.h" /* DEBUG and DEBUG_TOOLS stuff added by hsbo */ #include "gtk_debug_helpers.h" @@ -750,6 +751,7 @@ /* The shell and main vbox */ options_shell = gtk_dialog_new (); + set_icon(options_shell); gtk_window_set_wmclass (GTK_WINDOW (options_shell), "tool_options", PROGRAM_NAME); gtk_window_set_title (GTK_WINDOW (options_shell), _("Tool Options")); gtk_window_set_policy (GTK_WINDOW (options_shell), FALSE, TRUE, TRUE); --- cinepaint/app/window_icon.c +++ cinepaint/app/window_icon.c @@ -0,0 +1,20 @@ + +#include "window_icon.h" +#include "../spot.icon.xpm" +#include + +void set_icon(GtkWidget * widget) { + static GdkPixbuf *xmw_pixbuf = NULL; + + if (!widget) return; + if (!xmw_pixbuf) { + GError *error = NULL; + xmw_pixbuf = gdk_pixbuf_new_from_file("/usr/share/pixmaps/cinepaint.png", &error); + if (!xmw_pixbuf) { + printf("error message: %s\n", error->message); + } + } + if (xmw_pixbuf) + gtk_window_set_icon(GTK_WINDOW(widget), xmw_pixbuf); +} + --- cinepaint/app/window_icon.h +++ cinepaint/app/window_icon.h @@ -0,0 +1,5 @@ + +#include + +void set_icon(GtkWidget * window); + --- cinepaint/app/zoom.c +++ cinepaint/app/zoom.c @@ -9,6 +9,7 @@ #include "layout.h" #include "rc.h" #include "minimize.h" +#include "window_icon.h" /************************************************************/ /* Internal Function Declarations */ @@ -198,6 +199,7 @@ } zoom->window = gtk_dialog_new(); + set_icon(zoom->window); gtk_signal_connect(GTK_OBJECT(zoom->window), "destroy", GTK_SIGNAL_FUNC(zoom_control_close), 0); gtk_window_set_policy (GTK_WINDOW (zoom->window), FALSE, FALSE, FALSE); --- cinepaint/lib/dialog.c +++ cinepaint/lib/dialog.c @@ -23,8 +23,7 @@ #include #include "../lib/version.h" #include "dialog.h" - -#include "spot.icon.xpm" +#include "../app/window_icon.h" /* local callbacks of gimp_dialog_new () */ static gint @@ -57,21 +56,7 @@ gimp_dialog_realize_callback (GtkWidget *widget, gpointer data) { - static GdkPixmap *wilber_pixmap = NULL; - static GdkBitmap *wilber_mask = NULL; - GtkStyle *style; - - style = gtk_widget_get_style (widget); - - if (wilber_pixmap == NULL) - wilber_pixmap = - gdk_pixmap_create_from_xpm_d (widget->window, - &wilber_mask, - &style->bg[GTK_STATE_NORMAL], - spot_icon_xpm); - - gdk_window_set_icon (widget->window, NULL, - wilber_pixmap, wilber_mask); + if (widget) set_icon(widget); } /** @@ -169,6 +169,7 @@ g_return_val_if_fail (wmclass_name != NULL, NULL); dialog = gtk_dialog_new (); + set_icon(dialog); gtk_window_set_title (GTK_WINDOW (dialog), title); gtk_window_set_wmclass (GTK_WINDOW (dialog), wmclass_name, PROGRAM_NAME); gtk_window_set_position (GTK_WINDOW (dialog), position); --- cinepaint/lib/Makefile.am +++ cinepaint/lib/Makefile.am @@ -85,7 +85,9 @@ unitmenu.h \ version.h \ widgets.c \ - widgets.h + widgets.h \ + ../app/window_icon.c \ + ../app/window_icon.h library_includedir=${pkgincludedir} library_include_HEADERS = $(wildcard *.h) --- cinepaint/plug-ins/iol/interface.c +++ cinepaint/plug-ins/iol/interface.c @@ -19,6 +19,7 @@ #include "callbacks.h" #include "interface.h" #include "support.h" +#include "../../app/window_icon.h" GtkWidget* create_iol_window (void) @@ -36,6 +37,7 @@ GtkWidget *keepopen_check_button; iol_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(iol_window); gtk_object_set_data (GTK_OBJECT (iol_window), "iol_window", iol_window); gtk_window_set_title (GTK_WINDOW (iol_window), _("IOL - Image Operation Language")); @@ -225,6 +227,7 @@ GtkWidget *help_close_button; iol_help_window = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(iol_help_window); gtk_object_set_data (GTK_OBJECT (iol_help_window), "iol_help_window", iol_help_window); gtk_window_set_title (GTK_WINDOW (iol_help_window), _("IOL Help")); --- cinepaint/plug-ins/iol/Makefile.am +++ cinepaint/plug-ins/iol/Makefile.am @@ -24,7 +24,9 @@ parser.tab.h \ parser.tab.c \ support.h \ - support.c + support.c \ + ../../app/window_icon.h \ + ../../app/window_icon.c INCLUDES = \ --- cinepaint/plug-ins/print/Makefile.am +++ cinepaint/plug-ins/print/Makefile.am @@ -20,7 +20,9 @@ print.c \ print_gimp.h \ xmalloc.c \ - xmalloc.h + xmalloc.h \ + ../../app/window_icon.c \ + ../../app/window_icon.h INCLUDES = \ $(X_CFLAGS) \ --- cinepaint/plug-ins/print/print-lcms-options.c +++ cinepaint/plug-ins/print/print-lcms-options.c @@ -46,6 +46,7 @@ #include "print-lcms-funcs.h" #include "print-lcms-options.h" #include "print-lcms-options-callbacks.h" +#include "../../app/window_icon.h" #ifndef DEBUG // #define DEBUG @@ -300,6 +301,7 @@ gtk_rc_parse (gimp_gtkrc ()); lcms_options = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(lcms_options); gtk_object_set_data (GTK_OBJECT (lcms_options), "lcms_options", lcms_options); gtk_container_set_border_width (GTK_CONTAINER (lcms_options), 4); gtk_window_set_title (GTK_WINDOW (lcms_options), version_); --- cinepaint/plug-ins/script-fu/gimpbrushmenu.c +++ cinepaint/plug-ins/script-fu/gimpbrushmenu.c @@ -25,6 +25,7 @@ #include "libgimp/gimp.h" #include "libgimp/gimpui.h" #include "gimpmenu.h" +#include "../../app/window_icon.h" /* Idea is to have a function to call that returns a widget that @@ -88,6 +89,7 @@ GtkWidget *frame; bsel->device_brushpopup = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(bsel->device_brushpopup); frame = gtk_frame_new (NULL); gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_OUT); gtk_container_add (GTK_CONTAINER (bsel->device_brushpopup), frame); --- cinepaint/plug-ins/script-fu/gimpcolorbutton.c +++ cinepaint/plug-ins/script-fu/gimpcolorbutton.c @@ -38,6 +38,7 @@ #include "libgimp/stdplugins-intl.h" #include "gtk1_compat.h" +#include "../../app/window_icon.h" /* DND -- remove as soon as gimpdnd is in libgimp */ #define DRAG_PREVIEW_SIZE 32 @@ -732,6 +733,7 @@ GdkColor bg; window = gtk_window_new (GTK_WINDOW_POPUP); + set_icon(window); gtk_widget_set_app_paintable (GTK_WIDGET (window), TRUE); gtk_widget_set_usize (window, DRAG_PREVIEW_SIZE, DRAG_PREVIEW_SIZE); gtk_widget_realize (window); --- cinepaint/plug-ins/script-fu/Makefile.am +++ cinepaint/plug-ins/script-fu/Makefile.am @@ -42,7 +42,9 @@ script-fu-server.h \ script-fu-enums.h \ siod.h \ - siodp.h + siodp.h \ + ../../app/window_icon.c \ + ../../app/window_icon.h EXTRA_DIST = \ pixmaps/yes.xpm \ --- cinepaint/plug-ins/script-fu/script-fu-scripts.c +++ cinepaint/plug-ins/script-fu/script-fu-scripts.c @@ -50,6 +50,7 @@ #include "script-fu-scripts.h" #include "script-fu-intl.h" +#include "../../app/window_icon.h" #ifdef G_OS_WIN32 #define STRICT @@ -1460,6 +1461,7 @@ *buf = '\0'; dlg = gtk_window_new (GTK_WINDOW_TOPLEVEL); + set_icon(dlg); gtk_quit_add_destroy (1, GTK_OBJECT (dlg)); gtk_window_set_title (GTK_WINDOW (dlg), sf_interface->window_title); gtk_window_set_wmclass (GTK_WINDOW (dlg), "script_fu", "Gimp"); --- cinepaint/plug-ins/bmp/bmpwrite.c +++ cinepaint/plug-ins/bmp/bmpwrite.c @@ -40,6 +40,7 @@ #include "libgimp/gimp.h" #include "libgimp/stdplugins-intl.h" +#include "../../app/window_icon.h" #ifndef GIMP_VERSION #include "lib/dialog.h" @@ -571,6 +572,7 @@ NULL, 1, NULL, FALSE, TRUE, NULL); + set_icon(dlg); gtk_signal_connect (GTK_OBJECT (dlg), "destroy", GTK_SIGNAL_FUNC (gtk_main_quit), NULL); --- cinepaint/plug-ins/bmp/Makefile.am +++ cinepaint/plug-ins/bmp/Makefile.am @@ -8,7 +8,9 @@ bmp.c \ bmp.h \ bmpread.c \ - bmpwrite.c + bmpwrite.c \ + ../../app/window_icon.c \ + ../../app/window_icon.h INCLUDES = \ -I$(top_srcdir) \ --- cinepaint/plug-ins/gif/gif.c +++ cinepaint/plug-ins/gif/gif.c @@ -1152,7 +1152,6 @@ NULL, 1, NULL, FALSE, TRUE, NULL); - gtk_signal_connect (GTK_OBJECT (dlg), "destroy", GTK_SIGNAL_FUNC (gtk_main_quit), NULL); --- cinepaint/plug-ins/gif/Makefile.am +++ cinepaint/plug-ins/gif/Makefile.am @@ -7,7 +7,7 @@ libexec_PROGRAMS = gif gif_SOURCES = \ - gif.c + gif.c INCLUDES = \ --- cinepaint/plug-ins/png/Makefile.am +++ cinepaint/plug-ins/png/Makefile.am @@ -5,7 +5,9 @@ pluginlib_PROGRAMS = png png_SOURCES = \ - png.c + png.c \ + ../../app/window_icon.c \ + ../../app/window_icon.h INCLUDES = \ $(X_CFLAGS) \ --- cinepaint/plug-ins/png/png.c +++ cinepaint/plug-ins/png/png.c @@ -57,6 +57,7 @@ #include "../../lib/dialog.h" #include "../../lib/widgets.h" #include "libgimp/stdplugins-intl.h" +#include "../../app/window_icon.h" #include /* PNG library definitions */ @@ -1304,6 +1305,7 @@ g_return_val_if_fail (wmclass_name != NULL, NULL); dialog = gtk_dialog_new (); + set_icon(dialog); gtk_window_set_title (GTK_WINDOW (dialog), title); gtk_window_set_wmclass (GTK_WINDOW (dialog), wmclass_name, PROGRAM_NAME); gtk_window_set_position (GTK_WINDOW (dialog), position); --- cinepaint/plug-ins/tiff/gui.c +++ cinepaint/plug-ins/tiff/gui.c @@ -37,6 +37,7 @@ #include "tiff_plug_in.h" #include "info.h" #include "gui.h" +#include "../../app/window_icon.h" #ifndef DEBUG /* #define DEBUG */ @@ -92,7 +93,7 @@ GTK_SIGNAL_FUNC (gtk_main_quit), NULL); #endif - + set_icon(gimp_dialog_new); vbox = gtk_vbox_new (FALSE, 4); gtk_container_set_border_width (GTK_CONTAINER (vbox), 6); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, FALSE, TRUE, 0); --- cinepaint/plug-ins/tiff/Makefile.am +++ cinepaint/plug-ins/tiff/Makefile.am @@ -12,7 +12,9 @@ info.c \ info.h \ tiff.c \ - tiff_plug_in.h + tiff_plug_in.h \ + ../../app/window_icon.c \ + ../../app/window_icon.h INCLUDES = \ $(X_CFLAGS) \