From 3291ed358eb10112537f46eb654a8bbe5a608e7e Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Fri, 9 Sep 2005 18:38:00 +0000 Subject: [PATCH] plug-ins/common/aa.c plug-ins/common/csource.c plug-ins/common/gbr.c 2005-09-09 Michael Natterer * plug-ins/common/aa.c * plug-ins/common/csource.c * plug-ins/common/gbr.c * plug-ins/common/gih.c * plug-ins/common/gtm.c * plug-ins/common/mng.c * plug-ins/common/pat.c * plug-ins/common/png.c * plug-ins/common/pnm.c * plug-ins/common/postscript.c * plug-ins/common/psp.c * plug-ins/common/raw.c * plug-ins/common/sunras.c * plug-ins/common/tga.c * plug-ins/common/tiff.c * plug-ins/common/xbm.c * plug-ins/common/xpm.c * plug-ins/gfli/gfli.c * plug-ins/jpeg/jpeg-save.c * plug-ins/sgi/sgi.c * plug-ins/winicon/icodialog.c: actually call gimp_window_set_transient() on save dialogs. Really fixes bug #62988. --- ChangeLog | 26 ++++++++++++++++++++++++++ plug-ins/common/aa.c | 2 ++ plug-ins/common/csource.c | 2 ++ plug-ins/common/gbr.c | 26 ++++++++++++++------------ plug-ins/common/gih.c | 28 ++++++++++++++-------------- plug-ins/common/gtm.c | 26 ++++++++++++++------------ plug-ins/common/mng.c | 26 ++++++++++++++------------ plug-ins/common/pat.c | 26 ++++++++++++++------------ plug-ins/common/png.c | 30 ++++++++++++++++-------------- plug-ins/common/pnm.c | 28 +++++++++++++++------------- plug-ins/common/postscript.c | 2 ++ plug-ins/common/psp.c | 27 +++++++++++++++------------ plug-ins/common/raw.c | 2 ++ plug-ins/common/sunras.c | 27 +++++++++++++++------------ plug-ins/common/tga.c | 27 +++++++++++++++------------ plug-ins/common/tiff.c | 27 +++++++++++++++------------ plug-ins/common/xbm.c | 27 +++++++++++++++------------ plug-ins/common/xpm.c | 27 +++++++++++++++------------ plug-ins/gfli/gfli.c | 7 +++++++ plug-ins/jpeg/jpeg-save.c | 1 + plug-ins/sgi/sgi.c | 27 +++++++++++++++------------ plug-ins/winicon/icodialog.c | 20 ++++++++++++-------- 22 files changed, 260 insertions(+), 181 deletions(-) diff --git a/ChangeLog b/ChangeLog index 0242cff582..1dd30478c9 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,29 @@ +2005-09-09 Michael Natterer + + * plug-ins/common/aa.c + * plug-ins/common/csource.c + * plug-ins/common/gbr.c + * plug-ins/common/gih.c + * plug-ins/common/gtm.c + * plug-ins/common/mng.c + * plug-ins/common/pat.c + * plug-ins/common/png.c + * plug-ins/common/pnm.c + * plug-ins/common/postscript.c + * plug-ins/common/psp.c + * plug-ins/common/raw.c + * plug-ins/common/sunras.c + * plug-ins/common/tga.c + * plug-ins/common/tiff.c + * plug-ins/common/xbm.c + * plug-ins/common/xpm.c + * plug-ins/gfli/gfli.c + * plug-ins/jpeg/jpeg-save.c + * plug-ins/sgi/sgi.c + * plug-ins/winicon/icodialog.c: actually call + gimp_window_set_transient() on save dialogs. + Really fixes bug #62988. + 2005-09-09 Michael Natterer Added parent window API to the GimpProgress interface and to diff --git a/plug-ins/common/aa.c b/plug-ins/common/aa.c index 5585c0dccd..79563973be 100644 --- a/plug-ins/common/aa.c +++ b/plug-ins/common/aa.c @@ -360,6 +360,8 @@ aa_dialog (gint selected) GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + hbox = gtk_hbox_new (FALSE, 6); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), diff --git a/plug-ins/common/csource.c b/plug-ins/common/csource.c index a60ee1a439..262a3b4f68 100644 --- a/plug-ins/common/csource.c +++ b/plug-ins/common/csource.c @@ -648,6 +648,8 @@ run_save_dialog (Config *config) GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox); diff --git a/plug-ins/common/gbr.c b/plug-ins/common/gbr.c index d0c21b6f1b..897980a9a8 100644 --- a/plug-ins/common/gbr.c +++ b/plug-ins/common/gbr.c @@ -671,33 +671,35 @@ save_image (const gchar *filename, static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *table; GtkWidget *entry; GtkWidget *spinbutton; GtkObject *adj; gboolean run; - dlg = gimp_dialog_new (_("Save as Brush"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as Brush"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* The main table */ table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); gtk_widget_show (table); spinbutton = gimp_spin_button_new (&adj, @@ -721,11 +723,11 @@ save_dialog (void) G_CALLBACK (entry_callback), info.description); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/gih.c b/plug-ins/common/gih.c index eed0ccf735..453effbe53 100644 --- a/plug-ins/common/gih.c +++ b/plug-ins/common/gih.c @@ -847,7 +847,7 @@ dim_callback (GtkAdjustment *adjustment, static gboolean gih_save_dialog (gint32 image_ID) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *table; GtkWidget *dimtable; GtkWidget *label; @@ -864,26 +864,28 @@ gih_save_dialog (gint32 image_ID) gint32 nlayers; gboolean run; - dlg = gimp_dialog_new (_("Save as Brush Pipe"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as Brush Pipe"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* The main table */ table = gtk_table_new (8, 2, FALSE); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); gtk_widget_show (table); /* @@ -1076,7 +1078,6 @@ gih_save_dialog (gint32 image_ID) else cellw_adjust.rank0 = cellh_adjust.rank0 = NULL; } - cb = gtk_combo_box_new_text (); @@ -1092,7 +1093,6 @@ gih_save_dialog (gint32 image_ID) gtk_combo_box_set_active (GTK_COMBO_BOX (cb), j); break; } - gtk_table_attach (GTK_TABLE (dimtable), cb, 1, 2, i, i + 1, GTK_EXPAND | GTK_FILL, GTK_EXPAND | GTK_FILL, 0, 0); @@ -1115,9 +1115,9 @@ gih_save_dialog (gint32 image_ID) _("Ranks:"), 0.0, 0.0, dimtable, 1, FALSE); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); if (run) { @@ -1132,7 +1132,7 @@ gih_save_dialog (gint32 image_ID) num_useable_layers * gihparams.rows * gihparams.cols); } - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); for (i = 0; i < cellw_adjust.nguides; i++) gimp_image_delete_guide (image_ID, cellw_adjust.guides[i]); diff --git a/plug-ins/common/gtm.c b/plug-ins/common/gtm.c index 090ff6d416..e4f7a03c44 100644 --- a/plug-ins/common/gtm.c +++ b/plug-ins/common/gtm.c @@ -382,7 +382,7 @@ save_image (const gchar *filename, static gint save_dialog (gint32 image_ID) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *main_vbox; GtkWidget *frame; GtkWidget *vbox; @@ -395,23 +395,25 @@ save_dialog (gint32 image_ID) gimp_ui_init (PLUG_IN_BINARY, FALSE); - dlg = gimp_dialog_new (_("Save as HTML table"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as HTML table"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), main_vbox, + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, TRUE, TRUE, 0); if (gimp_image_width (image_ID) * gimp_image_height (image_ID) > 4096) @@ -636,11 +638,11 @@ save_dialog (gint32 image_ID) gtk_widget_show (table); gtk_widget_show (frame); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/mng.c b/plug-ins/common/mng.c index 954296c091..1bd80169da 100644 --- a/plug-ins/common/mng.c +++ b/plug-ins/common/mng.c @@ -1302,7 +1302,7 @@ mng_save_image (const gchar *filename, static gint mng_save_dialog (gint32 image_id) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *main_vbox; GtkWidget *frame; GtkWidget *vbox; @@ -1319,23 +1319,25 @@ mng_save_dialog (gint32 image_id) gboolean run; - dlg = gimp_dialog_new (_("Save as MNG"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as MNG"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); - gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dlg)->vbox), main_vbox); + gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), main_vbox); frame = gimp_frame_new (_("MNG Options")); gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE, 0); @@ -1549,11 +1551,11 @@ mng_save_dialog (gint32 image_id) gtk_widget_set_sensitive (frame, num_layers > 1); gtk_widget_show (main_vbox); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/pat.c b/plug-ins/common/pat.c index 40162c670b..62cd2dfa62 100644 --- a/plug-ins/common/pat.c +++ b/plug-ins/common/pat.c @@ -511,30 +511,32 @@ save_image (const gchar *filename, static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *table; GtkWidget *entry; gboolean run; - dlg = gimp_dialog_new (_("Save as Pattern"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as Pattern"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* The main table */ table = gtk_table_new (1, 2, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); gtk_widget_show (table); entry = gtk_entry_new (); @@ -549,11 +551,11 @@ save_dialog (void) G_CALLBACK (entry_callback), description); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/png.c b/plug-ins/common/png.c index e85e8be851..a1e453526b 100644 --- a/plug-ins/common/png.c +++ b/plug-ins/common/png.c @@ -1634,34 +1634,36 @@ save_dialog (gint32 image_ID, gboolean alpha) { PngSaveGui pg; - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *table; GtkWidget *toggle; GtkObject *scale; GimpParasite *parasite; - dlg = gimp_dialog_new (_("Save as PNG"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as PNG"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - _("_Load defaults"), RESPONSE_LOAD_DEFAULTS, - _("_Save defaults"), RESPONSE_SAVE_DEFAULTS, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + _("_Load defaults"), RESPONSE_LOAD_DEFAULTS, + _("_Save defaults"), RESPONSE_SAVE_DEFAULTS, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), RESPONSE_LOAD_DEFAULTS, RESPONSE_SAVE_DEFAULTS, GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); - g_signal_connect (dlg, "response", + gimp_window_set_transient (GTK_WINDOW (dialog)); + + g_signal_connect (dialog, "response", G_CALLBACK (save_dialog_response), &pg); - g_signal_connect (dlg, "destroy", + g_signal_connect (dialog, "destroy", G_CALLBACK (gtk_main_quit), NULL); @@ -1669,7 +1671,7 @@ save_dialog (gint32 image_ID, gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_table_set_row_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), table, TRUE, TRUE, 0); gtk_widget_show (table); pg.interlaced = toggle = @@ -1766,7 +1768,7 @@ save_dialog (gint32 image_ID, G_CALLBACK (gimp_int_adjustment_update), &pngvals.compression_level); - gtk_widget_show (dlg); + gtk_widget_show (dialog); pg.run = FALSE; diff --git a/plug-ins/common/pnm.c b/plug-ins/common/pnm.c index 9b2ab27c9b..fef6ebf8f3 100644 --- a/plug-ins/common/pnm.c +++ b/plug-ins/common/pnm.c @@ -952,24 +952,26 @@ save_image (const gchar *filename, static gint save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *frame; gboolean run; - dlg = gimp_dialog_new (_("Save as PNM"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, PNM_SAVE_PROC, + dialog = gimp_dialog_new (_("Save as PNM"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, PNM_SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* file save type */ frame = gimp_int_radio_group_new (TRUE, _("Data formatting"), G_CALLBACK (gimp_radio_button_update), @@ -980,15 +982,15 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 6); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, TRUE, 0); - + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + frame, FALSE, TRUE, 0); gtk_widget_show (frame); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/postscript.c b/plug-ins/common/postscript.c index dc4b6e3880..0d0960b9d5 100644 --- a/plug-ins/common/postscript.c +++ b/plug-ins/common/postscript.c @@ -3261,6 +3261,8 @@ save_dialog (void) GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* Main hbox */ hbox = gtk_hbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (hbox), 12); diff --git a/plug-ins/common/psp.c b/plug-ins/common/psp.c index 7a90488925..33121f2e7d 100644 --- a/plug-ins/common/psp.c +++ b/plug-ins/common/psp.c @@ -393,24 +393,26 @@ query (void) static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *frame; gint run; - dlg = gimp_dialog_new (_("Save as PSP"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as PSP"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* file save type */ frame = gimp_int_radio_group_new (TRUE, _("Data Compression"), G_CALLBACK (gimp_radio_button_update), @@ -423,14 +425,15 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + frame, FALSE, TRUE, 0); gtk_widget_show (frame); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/raw.c b/plug-ins/common/raw.c index f65d857ad8..f61128a11e 100644 --- a/plug-ins/common/raw.c +++ b/plug-ins/common/raw.c @@ -1107,6 +1107,8 @@ save_dialog (gchar * filename, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + main_vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (main_vbox), 12); gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), main_vbox, diff --git a/plug-ins/common/sunras.c b/plug-ins/common/sunras.c index cd510a58c7..084a2369e3 100644 --- a/plug-ins/common/sunras.c +++ b/plug-ins/common/sunras.c @@ -1566,24 +1566,26 @@ save_rgb (FILE *ofp, static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *frame; gboolean run; - dlg = gimp_dialog_new (_("Save as SUNRAS"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as SUNRAS"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* file save type */ frame = gimp_int_radio_group_new (TRUE, _("Data Formatting"), G_CALLBACK (gimp_radio_button_update), @@ -1595,14 +1597,15 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + frame, TRUE, TRUE, 0); gtk_widget_show (frame); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/tga.c b/plug-ins/common/tga.c index 32675af58c..a32bf230ef 100644 --- a/plug-ins/common/tga.c +++ b/plug-ins/common/tga.c @@ -1181,29 +1181,32 @@ save_image (const gchar *filename, static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *toggle; GtkWidget *origin; GtkWidget *vbox; gboolean run; - dlg = gimp_dialog_new (_("Save as TGA"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as TGA"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + vbox, TRUE, TRUE, 0); gtk_widget_show (vbox); /* rle */ @@ -1226,11 +1229,11 @@ save_dialog (void) G_CALLBACK (gimp_toggle_button_update), &tsvals.origin); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/tiff.c b/plug-ins/common/tiff.c index 5b0de19c3b..2e2420dc9b 100644 --- a/plug-ins/common/tiff.c +++ b/plug-ins/common/tiff.c @@ -2238,7 +2238,7 @@ save_image (const gchar *filename, static gboolean save_dialog (gboolean alpha) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *vbox; GtkWidget *frame; GtkWidget *hbox; @@ -2247,23 +2247,26 @@ save_dialog (gboolean alpha) GtkWidget *toggle; gboolean run; - dlg = gimp_dialog_new (_("Save as TIFF"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as TIFF"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), vbox, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + vbox, FALSE, TRUE, 0); /* compression */ frame = gimp_int_radio_group_new (TRUE, _("Compression"), @@ -2315,11 +2318,11 @@ save_dialog (gboolean alpha) gtk_widget_show (frame); gtk_widget_show (vbox); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/xbm.c b/plug-ins/common/xbm.c index 80f7b95064..85452ee3b6 100644 --- a/plug-ins/common/xbm.c +++ b/plug-ins/common/xbm.c @@ -1142,7 +1142,7 @@ save_image (const gchar *filename, static gboolean save_dialog (gint32 drawable_ID) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *frame; GtkWidget *vbox; GtkWidget *toggle; @@ -1152,24 +1152,27 @@ save_dialog (gint32 drawable_ID) GtkObject *adj; gboolean run; - dlg = gimp_dialog_new (_("Save as XBM"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as XBM"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + /* parameter settings */ frame = gimp_frame_new (_("XBM Options")); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + frame, TRUE, TRUE, 0); gtk_widget_show (frame); vbox = gtk_vbox_new (FALSE, 12); @@ -1293,11 +1296,11 @@ save_dialog (gint32 drawable_ID) /* Done. */ gtk_widget_show (vbox); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/common/xpm.c b/plug-ins/common/xpm.c index d1ed87579c..452d8b110d 100644 --- a/plug-ins/common/xpm.c +++ b/plug-ins/common/xpm.c @@ -766,29 +766,32 @@ save_image (const gchar *filename, static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *table; GtkObject *scale_data; gboolean run; - dlg = gimp_dialog_new (_("Save as XPM"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as XPM"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + table = gtk_table_new (1, 3, FALSE); gtk_table_set_col_spacings (GTK_TABLE (table), 6); gtk_container_set_border_width (GTK_CONTAINER (table), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), table, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + table, TRUE, TRUE, 0); gtk_widget_show (table); scale_data = gimp_scale_entry_new (GTK_TABLE (table), 0, 0, @@ -801,11 +804,11 @@ save_dialog (void) G_CALLBACK (gimp_int_adjustment_update), &xpmvals.threshold); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/gfli/gfli.c b/plug-ins/gfli/gfli.c index 73f9b05509..d0c1a80d97 100644 --- a/plug-ins/gfli/gfli.c +++ b/plug-ins/gfli/gfli.c @@ -886,6 +886,13 @@ save_dialog (gint32 image_id) NULL); + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), + GTK_RESPONSE_OK, + GTK_RESPONSE_CANCEL, + -1); + + gimp_window_set_transient (GTK_WINDOW (dialog)); + table = gtk_table_new (2, 2, FALSE); gtk_container_set_border_width (GTK_CONTAINER (table), 12); gtk_table_set_row_spacings (GTK_TABLE (table), 6); diff --git a/plug-ins/jpeg/jpeg-save.c b/plug-ins/jpeg/jpeg-save.c index 9195758403..94fc8aa65e 100644 --- a/plug-ins/jpeg/jpeg-save.c +++ b/plug-ins/jpeg/jpeg-save.c @@ -727,6 +727,7 @@ save_dialog (void) -1); gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE); + gimp_window_set_transient (GTK_WINDOW (dialog)); vbox = gtk_vbox_new (FALSE, 12); gtk_container_set_border_width (GTK_CONTAINER (vbox), 12); diff --git a/plug-ins/sgi/sgi.c b/plug-ins/sgi/sgi.c index b2e704c074..886abcd410 100644 --- a/plug-ins/sgi/sgi.c +++ b/plug-ins/sgi/sgi.c @@ -607,24 +607,26 @@ save_image (const gchar *filename, static gboolean save_dialog (void) { - GtkWidget *dlg; + GtkWidget *dialog; GtkWidget *frame; gboolean run; - dlg = gimp_dialog_new (_("Save as SGI"), PLUG_IN_BINARY, - NULL, 0, - gimp_standard_help_func, SAVE_PROC, + dialog = gimp_dialog_new (_("Save as SGI"), PLUG_IN_BINARY, + NULL, 0, + gimp_standard_help_func, SAVE_PROC, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL); - gtk_dialog_set_alternative_button_order (GTK_DIALOG (dlg), + gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), GTK_RESPONSE_OK, GTK_RESPONSE_CANCEL, -1); + gimp_window_set_transient (GTK_WINDOW (dialog)); + frame = gimp_int_radio_group_new (TRUE, _("Compression type"), G_CALLBACK (gimp_radio_button_update), &compression, compression, @@ -639,14 +641,15 @@ save_dialog (void) NULL); gtk_container_set_border_width (GTK_CONTAINER (frame), 12); - gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dlg)->vbox), frame, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), + frame, TRUE, TRUE, 0); gtk_widget_show (frame); - gtk_widget_show (dlg); + gtk_widget_show (dialog); - run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK); + run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK); - gtk_widget_destroy (dlg); + gtk_widget_destroy (dialog); return run; } diff --git a/plug-ins/winicon/icodialog.c b/plug-ins/winicon/icodialog.c index 8a179c1077..26db28354b 100644 --- a/plug-ins/winicon/icodialog.c +++ b/plug-ins/winicon/icodialog.c @@ -126,16 +126,20 @@ ico_specs_dialog_new (gint num_layers) gint *icon_depths, i; dialog = gimp_dialog_new (_("Save as Windows Icon"), "winicon", - NULL, 0, - gimp_standard_help_func, "plug-in-winicon", - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, - NULL); + NULL, 0, + gimp_standard_help_func, "plug-in-winicon", + + GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_SAVE, GTK_RESPONSE_OK, + + NULL); gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog), - GTK_RESPONSE_OK, - GTK_RESPONSE_CANCEL, - -1); + GTK_RESPONSE_OK, + GTK_RESPONSE_CANCEL, + -1); + + gimp_window_set_transient (GTK_WINDOW (dialog)); /* We store an array that holds each icon's requested bit depth with the dialog. It's queried when the dialog is closed so the -- GitLab