[gimp/export-dialog-cleanup-tmp: 3/3] plug-ins: Port PNG, TIFF, BMP and JPEG to new export API
- From: Martin Nordholts <martinn src gnome org>
- To: svn-commits-list gnome org
- Subject: [gimp/export-dialog-cleanup-tmp: 3/3] plug-ins: Port PNG, TIFF, BMP and JPEG to new export API
- Date: Wed, 15 Jul 2009 10:50:03 +0000 (UTC)
commit 1c25db001708036079d198382e68f98c82100861
Author: Martin Nordholts <martinn src gnome org>
Date: Wed Jul 15 12:15:09 2009 +0200
plug-ins: Port PNG, TIFF, BMP and JPEG to new export API
plug-ins/common/file-png.c | 37 +++++++++----------------------------
plug-ins/common/file-tiff-save.c | 33 +++++++--------------------------
plug-ins/file-bmp/bmp-write.c | 18 ++----------------
plug-ins/file-bmp/bmp.c | 16 +++++-----------
plug-ins/file-jpeg/jpeg-save.c | 19 +++----------------
plug-ins/file-jpeg/jpeg.c | 12 ++++--------
6 files changed, 30 insertions(+), 105 deletions(-)
---
diff --git a/plug-ins/common/file-png.c b/plug-ins/common/file-png.c
index 8ebde1a..04742fb 100644
--- a/plug-ins/common/file-png.c
+++ b/plug-ins/common/file-png.c
@@ -433,18 +433,11 @@ run (const gchar *name,
case GIMP_RUN_INTERACTIVE:
case GIMP_RUN_WITH_LAST_VALS:
gimp_ui_init (PLUG_IN_BINARY, FALSE);
- export = gimp_export_image (&image_ID, &drawable_ID, "PNG",
- (GIMP_EXPORT_CAN_HANDLE_RGB |
- GIMP_EXPORT_CAN_HANDLE_GRAY |
- GIMP_EXPORT_CAN_HANDLE_INDEXED |
- GIMP_EXPORT_CAN_HANDLE_ALPHA));
-
- if (export == GIMP_EXPORT_CANCEL)
- {
- *nreturn_vals = 1;
- values[0].data.d_status = GIMP_PDB_CANCEL;
- return;
- }
+ export = gimp_export_prepare_image (&image_ID, &drawable_ID,
+ (GIMP_EXPORT_CAN_HANDLE_RGB |
+ GIMP_EXPORT_CAN_HANDLE_GRAY |
+ GIMP_EXPORT_CAN_HANDLE_INDEXED |
+ GIMP_EXPORT_CAN_HANDLE_ALPHA));
break;
default:
break;
@@ -1781,21 +1774,9 @@ save_dialog (gint32 image_ID,
GtkWidget *button;
GimpParasite *parasite;
- dialog = gimp_dialog_new (_("Save as PNG"), PLUG_IN_BINARY,
- NULL, 0,
- gimp_standard_help_func, SAVE_PROC,
-
- 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);
-
- gimp_window_set_transient (GTK_WINDOW (dialog));
+ dialog = gimp_export_dialog_new ("PNG",
+ PLUG_IN_BINARY,
+ SAVE_PROC);
g_signal_connect (dialog, "response",
G_CALLBACK (save_dialog_response),
@@ -1808,7 +1789,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 (dialog)->vbox),
+ gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_vbox (dialog)),
table, TRUE, TRUE, 0);
gtk_widget_show (table);
diff --git a/plug-ins/common/file-tiff-save.c b/plug-ins/common/file-tiff-save.c
index 70d61a9..2ac9654 100644
--- a/plug-ins/common/file-tiff-save.c
+++ b/plug-ins/common/file-tiff-save.c
@@ -250,16 +250,11 @@ run (const gchar *name,
case GIMP_RUN_INTERACTIVE:
case GIMP_RUN_WITH_LAST_VALS:
gimp_ui_init (PLUG_IN_BINARY, FALSE);
- export = gimp_export_image (&image, &drawable, "TIFF",
- (GIMP_EXPORT_CAN_HANDLE_RGB |
- GIMP_EXPORT_CAN_HANDLE_GRAY |
- GIMP_EXPORT_CAN_HANDLE_INDEXED |
- GIMP_EXPORT_CAN_HANDLE_ALPHA ));
- if (export == GIMP_EXPORT_CANCEL)
- {
- values[0].data.d_status = GIMP_PDB_CANCEL;
- return;
- }
+ export = gimp_export_prepare_image (&image, &drawable,
+ (GIMP_EXPORT_CAN_HANDLE_RGB |
+ GIMP_EXPORT_CAN_HANDLE_GRAY |
+ GIMP_EXPORT_CAN_HANDLE_INDEXED |
+ GIMP_EXPORT_CAN_HANDLE_ALPHA));
break;
default:
break;
@@ -1058,25 +1053,11 @@ save_dialog (gboolean has_alpha,
GtkWidget *g4;
gboolean run;
- 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,
-
- NULL);
-
- gtk_dialog_set_alternative_button_order (GTK_DIALOG (dialog),
- GTK_RESPONSE_OK,
- GTK_RESPONSE_CANCEL,
- -1);
-
- gimp_window_set_transient (GTK_WINDOW (dialog));
+ dialog = gimp_export_dialog_new ("TIFF", PLUG_IN_BINARY, SAVE_PROC);
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
+ gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_vbox (dialog)),
vbox, FALSE, TRUE, 0);
/* compression */
diff --git a/plug-ins/file-bmp/bmp-write.c b/plug-ins/file-bmp/bmp-write.c
index cb5f8cd..27f79cd 100644
--- a/plug-ins/file-bmp/bmp-write.c
+++ b/plug-ins/file-bmp/bmp-write.c
@@ -789,27 +789,13 @@ save_dialog (gint channels)
GSList *group;
gboolean run;
- dialog = gimp_dialog_new (_("Save as BMP"), PLUG_IN_BINARY,
- NULL, 0,
- gimp_standard_help_func, SAVE_PROC,
-
- 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);
-
- gimp_window_set_transient (GTK_WINDOW (dialog));
+ dialog = gimp_export_dialog_new ("BMP", PLUG_IN_BINARY, SAVE_PROC);
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
vbox_main = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox_main), 12);
- gtk_container_add (GTK_CONTAINER (GTK_DIALOG (dialog)->vbox), vbox_main);
+ gtk_container_add (GTK_CONTAINER (gimp_export_dialog_get_vbox (dialog)), vbox_main);
gtk_widget_show (vbox_main);
toggle = gtk_check_button_new_with_mnemonic (_("_Run-Length Encoded"));
diff --git a/plug-ins/file-bmp/bmp.c b/plug-ins/file-bmp/bmp.c
index 5aa08f3..e427c35 100644
--- a/plug-ins/file-bmp/bmp.c
+++ b/plug-ins/file-bmp/bmp.c
@@ -222,17 +222,11 @@ run (const gchar *name,
case GIMP_RUN_WITH_LAST_VALS:
if (run_mode == GIMP_RUN_WITH_LAST_VALS) lastvals = TRUE;
gimp_ui_init (PLUG_IN_BINARY, FALSE);
- export = gimp_export_image (&image_ID, &drawable_ID, "BMP",
- (GIMP_EXPORT_CAN_HANDLE_RGB |
- GIMP_EXPORT_CAN_HANDLE_ALPHA |
- GIMP_EXPORT_CAN_HANDLE_GRAY |
- GIMP_EXPORT_CAN_HANDLE_INDEXED));
-
- if (export == GIMP_EXPORT_CANCEL)
- {
- values[0].data.d_status = GIMP_PDB_CANCEL;
- return;
- }
+ export = gimp_export_prepare_image (&image_ID, &drawable_ID,
+ (GIMP_EXPORT_CAN_HANDLE_RGB |
+ GIMP_EXPORT_CAN_HANDLE_ALPHA |
+ GIMP_EXPORT_CAN_HANDLE_GRAY |
+ GIMP_EXPORT_CAN_HANDLE_INDEXED));
break;
case GIMP_RUN_NONINTERACTIVE:
diff --git a/plug-ins/file-jpeg/jpeg-save.c b/plug-ins/file-jpeg/jpeg-save.c
index dffd49a..f8d090a 100644
--- a/plug-ins/file-jpeg/jpeg-save.c
+++ b/plug-ins/file-jpeg/jpeg-save.c
@@ -828,19 +828,7 @@ save_dialog (void)
gchar *text;
- dialog = gimp_dialog_new (_("Save as JPEG"), PLUG_IN_BINARY,
- NULL, 0,
- gimp_standard_help_func, SAVE_PROC,
-
- 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);
+ dialog = gimp_export_dialog_new ("JPEG", PLUG_IN_BINARY, SAVE_PROC);
g_signal_connect (dialog, "response",
G_CALLBACK (save_dialog_response),
@@ -850,11 +838,10 @@ save_dialog (void)
NULL);
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);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_vbox (dialog)), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
table = gtk_table_new (1, 3, FALSE);
@@ -1179,7 +1166,7 @@ save_dialog (void)
vbox = gtk_vbox_new (FALSE, 12);
gtk_container_set_border_width (GTK_CONTAINER (vbox), 12);
- gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (gimp_export_dialog_get_vbox (dialog)), vbox, TRUE, TRUE, 0);
gtk_widget_show (vbox);
tabledefaults = gtk_table_new (1, 3, FALSE);
diff --git a/plug-ins/file-jpeg/jpeg.c b/plug-ins/file-jpeg/jpeg.c
index a57c33d..9043d87 100644
--- a/plug-ins/file-jpeg/jpeg.c
+++ b/plug-ins/file-jpeg/jpeg.c
@@ -290,9 +290,9 @@ run (const gchar *name,
case GIMP_RUN_INTERACTIVE:
case GIMP_RUN_WITH_LAST_VALS:
gimp_ui_init (PLUG_IN_BINARY, FALSE);
- export = gimp_export_image (&image_ID, &drawable_ID, "JPEG",
- (GIMP_EXPORT_CAN_HANDLE_RGB |
- GIMP_EXPORT_CAN_HANDLE_GRAY));
+ export = gimp_export_prepare_image (&image_ID, &drawable_ID,
+ (GIMP_EXPORT_CAN_HANDLE_RGB |
+ GIMP_EXPORT_CAN_HANDLE_GRAY));
switch (export)
{
case GIMP_EXPORT_EXPORT:
@@ -308,11 +308,7 @@ run (const gchar *name,
display_ID = -1;
}
break;
- case GIMP_EXPORT_IGNORE:
- break;
- case GIMP_EXPORT_CANCEL:
- values[0].data.d_status = GIMP_PDB_CANCEL;
- return;
+ default:
break;
}
break;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
