new function which does the same as gtk_dialog_run() except it does not

2003-11-11  Michael Natterer  <mitch@gimp.org>

	* libgimpwidgets/gimpdialog.[ch] (gimp_dialog_run): new function
	which does the same as gtk_dialog_run() except it does not make
	the dialog modal.

	* app/gui/resolution-calibrate-dialog.c
	* libgimp/gimpexport.c
	* plug-ins/*/*.c: use gimp_dialog_run() instead of gtk_dialog_run().

	* plug-ins/common/grid.c: set update_continuous to TRUE for
	the GimpColorButtons so this feature gets some testing.
This commit is contained in:
Michael Natterer 2003-11-11 18:11:56 +00:00 committed by Michael Natterer
parent e34358d8c3
commit f72b8b1e39
121 changed files with 268 additions and 128 deletions

View file

@ -1,3 +1,16 @@
2003-11-11 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpdialog.[ch] (gimp_dialog_run): new function
which does the same as gtk_dialog_run() except it does not make
the dialog modal.
* app/gui/resolution-calibrate-dialog.c
* libgimp/gimpexport.c
* plug-ins/*/*.c: use gimp_dialog_run() instead of gtk_dialog_run().
* plug-ins/common/grid.c: set update_continuous to TRUE for
the GimpColorButtons so this feature gets some testing.
2003-11-11 Michael Natterer <mitch@gimp.org>
* libgimpwidgets/gimpcolorbutton.[ch]: added new API

View file

@ -246,7 +246,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
gtk_widget_show (dialog);
switch (gtk_dialog_run (GTK_DIALOG (dialog)))
switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
{
case GTK_RESPONSE_OK:
{

View file

@ -246,7 +246,7 @@ resolution_calibrate_dialog (GtkWidget *resolution_entry,
gtk_widget_show (dialog);
switch (gtk_dialog_run (GTK_DIALOG (dialog)))
switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
{
case GTK_RESPONSE_OK:
{

View file

@ -369,7 +369,7 @@ confirm_save_dialog (const gchar *message,
gtk_widget_show (dialog);
switch (gimp_dialog_run (GTK_DIALOG (dialog)))
switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
{
case GTK_RESPONSE_OK:
retval = GIMP_EXPORT_EXPORT;
@ -523,7 +523,7 @@ export_dialog (GSList *actions,
gtk_widget_show (dialog);
switch (gimp_dialog_run (GTK_DIALOG (dialog)))
switch (gimp_dialog_run (GIMP_DIALOG (dialog)))
{
case GTK_RESPONSE_OK:
retval = GIMP_EXPORT_EXPORT;

View file

@ -266,3 +266,126 @@ gimp_dialog_add_buttons_valist (GimpDialog *dialog,
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
}
}
typedef struct
{
GtkDialog *dialog;
gint response_id;
GMainLoop *loop;
gboolean destroyed;
} RunInfo;
static void
run_shutdown_loop (RunInfo *ri)
{
if (g_main_loop_is_running (ri->loop))
g_main_loop_quit (ri->loop);
}
static void
run_unmap_handler (GtkDialog *dialog,
RunInfo *ri)
{
run_shutdown_loop (ri);
}
static void
run_response_handler (GtkDialog *dialog,
gint response_id,
RunInfo *ri)
{
ri->response_id = response_id;
run_shutdown_loop (ri);
}
static gint
run_delete_handler (GtkDialog *dialog,
GdkEventAny *event,
RunInfo *ri)
{
run_shutdown_loop (ri);
return TRUE; /* Do not destroy */
}
static void
run_destroy_handler (GtkDialog *dialog,
RunInfo *ri)
{
/* shutdown_loop will be called by run_unmap_handler */
ri->destroyed = TRUE;
}
/**
* gimp_dialog_run:
* @dialog: a #GimpDialog
*
* This function does exactly the same as gtk_dialog_run() except it
* does not make the dialog modal while the #GMainLoop is running.
*
* Return value: response ID
**/
gint
gimp_dialog_run (GimpDialog *dialog)
{
RunInfo ri = { NULL, GTK_RESPONSE_NONE, NULL };
gulong response_handler;
gulong unmap_handler;
gulong destroy_handler;
gulong delete_handler;
g_return_val_if_fail (GIMP_IS_DIALOG (dialog), -1);
g_object_ref (dialog);
gtk_window_present (GTK_WINDOW (dialog));
response_handler =
g_signal_connect (dialog,
"response",
G_CALLBACK (run_response_handler),
&ri);
unmap_handler =
g_signal_connect (dialog,
"unmap",
G_CALLBACK (run_unmap_handler),
&ri);
delete_handler =
g_signal_connect (dialog,
"delete_event",
G_CALLBACK (run_delete_handler),
&ri);
destroy_handler =
g_signal_connect (dialog,
"destroy",
G_CALLBACK (run_destroy_handler),
&ri);
ri.loop = g_main_loop_new (NULL, FALSE);
GDK_THREADS_LEAVE ();
g_main_loop_run (ri.loop);
GDK_THREADS_ENTER ();
g_main_loop_unref (ri.loop);
ri.loop = NULL;
ri.destroyed = FALSE;
if (!ri.destroyed)
{
g_signal_handler_disconnect (dialog, response_handler);
g_signal_handler_disconnect (dialog, unmap_handler);
g_signal_handler_disconnect (dialog, delete_handler);
g_signal_handler_disconnect (dialog, destroy_handler);
}
g_object_unref (dialog);
return ri.response_id;
}

View file

@ -72,6 +72,8 @@ GtkWidget * gimp_dialog_new_valist (const gchar *title,
void gimp_dialog_add_buttons_valist (GimpDialog *dialog,
va_list args);
gint gimp_dialog_run (GimpDialog *dialog);
G_END_DECLS

View file

@ -1218,7 +1218,7 @@ main_dialog (GimpDrawable *drawable)
image_setup (drawable, TRUE);
if (gtk_dialog_run (GTK_DIALOG (appwin)) == GTK_RESPONSE_OK)
if (gimp_dialog_run (GIMP_DIALOG (appwin)) == GTK_RESPONSE_OK)
run = TRUE;
if (preview_rgb_data != NULL)

View file

@ -1486,7 +1486,7 @@ main_dialog (GimpDrawable *drawable)
image_setup (drawable, TRUE);
if (gtk_dialog_run (GTK_DIALOG (appwin)) == GTK_RESPONSE_OK)
if (gimp_dialog_run (GIMP_DIALOG (appwin)) == GTK_RESPONSE_OK)
run = TRUE;
gtk_widget_destroy (appwin);

View file

@ -570,7 +570,7 @@ save_dialog (void)
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1520,7 +1520,7 @@ CML_explorer_dialog (void)
CML_preview_defer = FALSE;
preview_update ();
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
@ -1942,7 +1942,7 @@ function_graph_new (GtkWidget *widget,
gtk_widget_show (preview);
gtk_widget_show (dlg);
gtk_dialog_run (GTK_DIALOG (dlg));
gimp_dialog_run (GIMP_DIALOG (dlg));
gtk_widget_destroy (dlg);
}
@ -2224,7 +2224,7 @@ force_overwrite (const gchar *filename,
gtk_widget_show (dlg);
overwrite = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
overwrite = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -385,7 +385,7 @@ type_dialog (gint selected)
gtk_widget_show (dlg);
if (gtk_dialog_run (GTK_DIALOG (dlg)) != GTK_RESPONSE_OK)
if (gimp_dialog_run (GIMP_DIALOG (dlg)) != GTK_RESPONSE_OK)
selected_type = -1;
gtk_widget_destroy (dlg);

View file

@ -505,7 +505,7 @@ align_layers_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -438,7 +438,7 @@ lens_dialog (GimpDrawable *drawable)
gtk_widget_show (hbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -357,7 +357,7 @@ blinds_dialog (void)
dialog_update_preview ();
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -626,7 +626,7 @@ blur_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -427,7 +427,7 @@ borderaverage_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1109,7 +1109,7 @@ bumpmap_dialog (void)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -608,7 +608,7 @@ doDialog (void)
/* show stuff */
gtk_widget_show_all (dialog);
gtk_dialog_run (GTK_DIALOG (dialog));
gimp_dialog_run (GIMP_DIALOG (dialog));
gtk_widget_destroy (dialog);
}

View file

@ -363,7 +363,7 @@ do_checkerboard_dialog (gint32 image_ID,
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -306,7 +306,7 @@ colorify_dialog (GimpRGB *color)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -350,7 +350,7 @@ colortoalpha_dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1191,7 +1191,7 @@ compose_dialog (const gchar *compose_type,
gtk_widget_show (right_frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -748,7 +748,7 @@ run_save_dialog (Config *config)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -294,7 +294,7 @@ cubism_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1226,7 +1226,7 @@ decompose_dialog (void)
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -313,7 +313,7 @@ deinterlace_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -799,7 +799,7 @@ DepthMerge_dialog (DepthMerge *dm)
gtk_widget_show (dm->interface->dialog);
DepthMerge_updatePreview (dm);
run = (gtk_dialog_run (GTK_DIALOG (dm->interface->dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dm->interface->dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dm->interface->dialog);
dm->interface->dialog = NULL;

View file

@ -768,7 +768,7 @@ despeckle_dialog (void)
preview_update ();
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -665,7 +665,7 @@ destripe_dialog (void)
preview_update ();
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -650,7 +650,7 @@ diffraction_dialog (void)
gtk_widget_show (dialog);
dialog_update_preview ();
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_show (dialog);

View file

@ -417,7 +417,7 @@ displace_dialog (GimpDrawable *drawable)
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -726,7 +726,7 @@ edge_dialog (GimpDrawable *drawable)
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -555,7 +555,7 @@ pluginCoreIA (piArgs *argp)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -233,7 +233,7 @@ engrave_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -559,7 +559,7 @@ exchange_dialog (void)
gtk_widget_show (mainbox);
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -1506,7 +1506,7 @@ film_dialog (gint32 image_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -321,7 +321,7 @@ flare_dialog (GimpDrawable *drawable)
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -852,7 +852,7 @@ dialog_show (void)
gtk_widget_show (dialog);
dialog_preview_draw ();
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -387,7 +387,7 @@ gauss_iir_dialog (void)
gtk_widget_show (hbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
@ -450,7 +450,7 @@ gauss_iir2_dialog (gint32 image_ID,
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -381,7 +381,7 @@ gauss_rle_dialog (void)
gtk_widget_show (hbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
@ -444,7 +444,7 @@ gauss_rle2_dialog (gint32 image_ID,
gtk_widget_show (frame);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -651,7 +651,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -454,7 +454,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1228,7 +1228,7 @@ badbounds_dialog (void)
gtk_widget_show (dlg);
crop = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
crop = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);
@ -1437,7 +1437,7 @@ save_dialog (gint32 image_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1072,7 +1072,7 @@ gih_save_dialog (gint32 image_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -278,7 +278,7 @@ glass_dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -882,7 +882,7 @@ dialog_create (void)
dialog_update_previews (NULL, NULL);
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (run)
qbist_info.info = info[0];

View file

@ -893,6 +893,7 @@ dialog (gint32 image_ID,
COLOR_BUTTON_WIDTH, 16,
&grid_cfg.hcolor,
GIMP_COLOR_AREA_SMALL_CHECKS);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (hcolor_button), TRUE);
gtk_container_add (GTK_CONTAINER (align), hcolor_button);
gtk_widget_show (hcolor_button);
@ -911,6 +912,7 @@ dialog (gint32 image_ID,
COLOR_BUTTON_WIDTH, 16,
&grid_cfg.vcolor,
GIMP_COLOR_AREA_SMALL_CHECKS);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (vcolor_button), TRUE);
gtk_container_add (GTK_CONTAINER (align), vcolor_button);
gtk_widget_show (vcolor_button);
@ -929,6 +931,7 @@ dialog (gint32 image_ID,
COLOR_BUTTON_WIDTH, 16,
&grid_cfg.icolor,
GIMP_COLOR_AREA_SMALL_CHECKS);
gimp_color_button_set_update (GIMP_COLOR_BUTTON (button), TRUE);
gtk_container_add (GTK_CONTAINER (align), button);
gtk_widget_show (button);
@ -955,7 +958,7 @@ dialog (gint32 image_ID,
g_object_set_data (G_OBJECT (dlg), "offset", offset);
g_object_set_data (G_OBJECT (dlg), "drawable", drawable);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
update_values ();
@ -964,4 +967,3 @@ dialog (gint32 image_ID,
return run;
}

View file

@ -642,7 +642,7 @@ save_dialog (gint32 image_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -626,7 +626,7 @@ pluginCoreIA (piArgs *argp)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -455,7 +455,7 @@ dialog (GimpDrawable *mangle)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -2665,7 +2665,7 @@ dialog_box (void)
gtk_widget_show (hbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1930,7 +1930,7 @@ save_dialog (void)
gtk_widget_show (table);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -836,7 +836,7 @@ create_main_dialog (void)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -587,7 +587,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -600,7 +600,7 @@ dialog (gint32 drawable_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
plvals.map_mode = 0; /* Currently always linear mapping */

View file

@ -286,7 +286,7 @@ dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -799,7 +799,7 @@ mblur_dialog (void)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -1423,7 +1423,7 @@ mng_save_dialog (gint32 image_id)
gtk_widget_show (main_vbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -676,7 +676,7 @@ mosaic_dialog (void)
gtk_widget_show (main_hbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1426,7 +1426,7 @@ newsprint_dialog (GimpDrawable *drawable)
gtk_widget_show (st.dlg);
run = (gtk_dialog_run (GTK_DIALOG (st.dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (st.dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (st.dlg);

View file

@ -378,7 +378,7 @@ pluginCoreIA (piArgs *argp, GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -381,7 +381,7 @@ noisify_dialog (GimpDrawable *drawable,
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -380,7 +380,7 @@ nova_dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -469,7 +469,7 @@ oilify_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -400,7 +400,7 @@ open_dialog (void)
gtk_widget_show (dialog);
p.run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
p.run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);
}

View file

@ -476,7 +476,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -340,7 +340,7 @@ pixelize_dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -346,7 +346,7 @@ plasma_dialog (GimpDrawable *drawable,
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1426,7 +1426,7 @@ save_dialog (gint32 image_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -932,7 +932,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -695,7 +695,7 @@ polarize_dialog (void)
gtk_widget_show (dialog);
dialog_update_preview ();
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -2742,7 +2742,7 @@ load_dialog (void)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);
@ -2969,7 +2969,7 @@ save_dialog (void)
gtk_widget_show (hbox);
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -2742,7 +2742,7 @@ load_dialog (void)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);
@ -2969,7 +2969,7 @@ save_dialog (void)
gtk_widget_show (hbox);
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -433,7 +433,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -732,7 +732,7 @@ randomize_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -542,7 +542,7 @@ ripple_dialog (void)
gtk_widget_show (main_vbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -426,7 +426,7 @@ scatter_hsv_dialog (void)
gtk_widget_show (vbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -579,7 +579,7 @@ shoot_dialog (void)
gtk_widget_show (hbox);
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -258,7 +258,7 @@ sel_gauss_dialog (void)
gtk_widget_show (table);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -593,7 +593,7 @@ sharpen_dialog (void)
preview_update ();
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dialog);

View file

@ -378,7 +378,7 @@ shift_dialog (gint32 image_ID)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -940,7 +940,7 @@ sinus_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -447,7 +447,7 @@ dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -563,7 +563,7 @@ solid_noise_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -268,7 +268,7 @@ sobel_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -527,7 +527,7 @@ sparkle_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -367,7 +367,7 @@ spread_dialog (gint32 image_ID,
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -1302,7 +1302,7 @@ struc_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1599,7 +1599,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -877,7 +877,7 @@ load_dialog (const gchar *filename)
gtk_widget_show (dialog);
run = (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dialog)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -1219,7 +1219,7 @@ save_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -240,7 +240,7 @@ threshold_alpha_dialog (void)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -1831,7 +1831,7 @@ save_dialog (void)
gtk_widget_show (vbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -430,7 +430,7 @@ tile_dialog (gint32 image_ID,
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -624,7 +624,7 @@ tileit_dialog (void)
gtk_widget_show (dlg);
dialog_update_preview ();
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

View file

@ -278,7 +278,7 @@ new_unit (GtkWidget *main_dialog,
gchar *singular;
gchar *plural;
if (gtk_dialog_run (GTK_DIALOG (dialog)) != GTK_RESPONSE_OK)
if (gimp_dialog_run (GIMP_DIALOG (dialog)) != GTK_RESPONSE_OK)
break;
identifier = g_strdup (gtk_entry_get_text (GTK_ENTRY (identifier_entry)));

View file

@ -678,7 +678,7 @@ unsharp_mask_dialog (void)
gtk_widget_show (window);
run = (gtk_dialog_run (GTK_DIALOG (window)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (window)) == GTK_RESPONSE_OK);
gtk_widget_destroy (window);

View file

@ -2236,7 +2236,7 @@ video_dialog (void)
in_main_loop = TRUE;
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
in_main_loop = FALSE;

View file

@ -1142,7 +1142,7 @@ vpropagate_dialog (GimpImageBaseType image_type)
gtk_widget_show (hbox);
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
if (run)
{

View file

@ -687,7 +687,7 @@ warp_dialog (GimpDrawable *drawable)
gtk_widget_show (dlg);
run = (gtk_dialog_run (GTK_DIALOG (dlg)) == GTK_RESPONSE_OK);
run = (gimp_dialog_run (GIMP_DIALOG (dlg)) == GTK_RESPONSE_OK);
gtk_widget_destroy (dlg);

Some files were not shown because too many files have changed in this diff Show more