2004-08-10 Michael Natterer <mitch@gimp.org> Redid the whole internal progress stuff: don't pass around progress_callback and progress_data; instead, provide a pointer to a GimpProgressInterface which can be implemented by a variety of backends. Addresses (but not yet fixes) bugs #6010, #97266 and #135185. * app/display/Makefile.am * app/display/gimpprogress.[ch]: removed the old progress hack. * app/core/Makefile.am * app/core/core-types.h * app/core/gimpprogress.[ch]: implement GimpProgressInterface. * app/widgets/Makefile.am * app/widgets/widgets-types.h * app/widgets/gimpprogressdialog.[ch]: the standalone progress dialog as widget implementing GimpProgressInterface. * app/display/gimpdisplay.c * app/display/gimpstatusbar.[ch] * app/widgets/gimpfiledialog.[ch] * app/widgets/gimpthumbbox.[ch]: added GimpProgressInterface implementation to these classes. * app/core/gimp-gui.[ch] * app/gui/gui-vtable.c: replaced the old progress vtable entries by two new to create and destroy a GimpProgressDialog in case no other progress is available. * app/pdb/procedural_db.[ch] * app/plug-in/plug-in-run.[ch] * tools/pdbgen/app.pl: pass a GimpProgress to all PDB wrappers and all plug-ins. * app/plug-in/plug-in.[ch] * app/plug-in/plug-ins.c * app/plug-in/plug-in-message.c * app/plug-in/plug-in-progress.c: handle the case there the plug-in was crated with a progress as well as the case where it wasn't. * app/app_procs.c * app/batch.c * app/xcf/xcf.c * app/file/file-open.[ch] * app/file/file-save.[ch] * app/widgets/gimphelp.c * app/widgets/gimpbrushselect.c * app/widgets/gimpfontselect.c * app/widgets/gimpgradientselect.c * app/widgets/gimppaletteselect.c * app/widgets/gimppatternselect.c: changed accordingly. * app/core/gimpimagefile.[ch] * app/display/gimpdisplayshell-dnd.c * app/gui/file-open-dialog.c * app/gui/file-open-location-dialog.c * app/gui/file-save-dialog.c * app/widgets/gimplayertreeview.c * app/widgets/gimptoolbox-dnd.c: pass a GimpProgress to all file related functions. Embed the progress in the file dialog where possible. * app/core/gimpdrawable-blend.[ch] * app/core/gimpdrawable-transform.[ch] * app/core/gimpimage-convert.[ch] * app/core/gimpimage-flip.[ch] * app/core/gimpimage-resize.[ch] * app/core/gimpimage-rotate.[ch] * app/core/gimpimage-scale.[ch] * app/core/gimpitem-linked.[ch] * app/core/gimpitem.[ch] * app/core/gimpchannel.c * app/core/gimpdrawable.c * app/core/gimplayer.c * app/core/gimpselection.c * app/vectors/gimpvectors.c: replaced callback/data by GimpProgress. * app/tools/gimpblendtool.c * app/tools/gimptransformtool.c * app/gui/convert-dialog.c * app/actions/documents-commands.c * app/actions/file-commands.c * app/actions/image-commands.c * app/actions/layers-commands.c * app/actions/plug-in-commands.c * app/actions/vectors-commands.c * tools/pdbgen/pdb/convert.pdb * tools/pdbgen/pdb/edit.pdb * tools/pdbgen/pdb/image.pdb * tools/pdbgen/pdb/layer.pdb: changed callers accordingly. * app/pdb/*_cmds.c: regenerated.
224 lines
6 KiB
C
224 lines
6 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995-2003 Spencer Kimball and Peter Mattis
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
|
|
*/
|
|
|
|
/* NOTE: This file is autogenerated by pdbgen.pl. */
|
|
|
|
#include "config.h"
|
|
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "pdb-types.h"
|
|
#include "procedural_db.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "core/gimpdatafactory.h"
|
|
|
|
static ProcRecord patterns_popup_proc;
|
|
static ProcRecord patterns_close_popup_proc;
|
|
static ProcRecord patterns_set_popup_proc;
|
|
|
|
void
|
|
register_pattern_select_procs (Gimp *gimp)
|
|
{
|
|
procedural_db_register (gimp, &patterns_popup_proc);
|
|
procedural_db_register (gimp, &patterns_close_popup_proc);
|
|
procedural_db_register (gimp, &patterns_set_popup_proc);
|
|
}
|
|
|
|
static Argument *
|
|
patterns_popup_invoker (Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
Argument *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
gchar *pattern_callback;
|
|
gchar *popup_title;
|
|
gchar *initial_pattern;
|
|
|
|
pattern_callback = (gchar *) args[0].value.pdb_pointer;
|
|
if (pattern_callback == NULL || !g_utf8_validate (pattern_callback, -1, NULL))
|
|
success = FALSE;
|
|
|
|
popup_title = (gchar *) args[1].value.pdb_pointer;
|
|
if (popup_title == NULL || !g_utf8_validate (popup_title, -1, NULL))
|
|
success = FALSE;
|
|
|
|
initial_pattern = (gchar *) args[2].value.pdb_pointer;
|
|
if (initial_pattern && !g_utf8_validate (initial_pattern, -1, NULL))
|
|
success = FALSE;
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! procedural_db_lookup (gimp, pattern_callback) ||
|
|
! gimp_pdb_dialog_new (gimp, context, gimp->pattern_factory->container,
|
|
popup_title, pattern_callback, initial_pattern,
|
|
NULL))
|
|
success = FALSE;
|
|
}
|
|
|
|
return procedural_db_return_args (&patterns_popup_proc, success);
|
|
}
|
|
|
|
static ProcArg patterns_popup_inargs[] =
|
|
{
|
|
{
|
|
GIMP_PDB_STRING,
|
|
"pattern_callback",
|
|
"The callback PDB proc to call when pattern selection is made"
|
|
},
|
|
{
|
|
GIMP_PDB_STRING,
|
|
"popup_title",
|
|
"Title to give the pattern popup window"
|
|
},
|
|
{
|
|
GIMP_PDB_STRING,
|
|
"initial_pattern",
|
|
"The name of the pattern to set as the first selected"
|
|
}
|
|
};
|
|
|
|
static ProcRecord patterns_popup_proc =
|
|
{
|
|
"gimp_patterns_popup",
|
|
"Invokes the Gimp pattern selection.",
|
|
"This procedure popups the pattern selection dialog.",
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998",
|
|
GIMP_INTERNAL,
|
|
3,
|
|
patterns_popup_inargs,
|
|
0,
|
|
NULL,
|
|
{ { patterns_popup_invoker } }
|
|
};
|
|
|
|
static Argument *
|
|
patterns_close_popup_invoker (Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
Argument *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
gchar *pattern_callback;
|
|
|
|
pattern_callback = (gchar *) args[0].value.pdb_pointer;
|
|
if (pattern_callback == NULL || !g_utf8_validate (pattern_callback, -1, NULL))
|
|
success = FALSE;
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! procedural_db_lookup (gimp, pattern_callback) ||
|
|
! gimp_pdb_dialog_close (gimp, gimp->pattern_factory->container,
|
|
pattern_callback))
|
|
success = FALSE;
|
|
}
|
|
|
|
return procedural_db_return_args (&patterns_close_popup_proc, success);
|
|
}
|
|
|
|
static ProcArg patterns_close_popup_inargs[] =
|
|
{
|
|
{
|
|
GIMP_PDB_STRING,
|
|
"pattern_callback",
|
|
"The name of the callback registered for this popup"
|
|
}
|
|
};
|
|
|
|
static ProcRecord patterns_close_popup_proc =
|
|
{
|
|
"gimp_patterns_close_popup",
|
|
"Popdown the Gimp pattern selection.",
|
|
"This procedure closes an opened pattern selection dialog.",
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998",
|
|
GIMP_INTERNAL,
|
|
1,
|
|
patterns_close_popup_inargs,
|
|
0,
|
|
NULL,
|
|
{ { patterns_close_popup_invoker } }
|
|
};
|
|
|
|
static Argument *
|
|
patterns_set_popup_invoker (Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
Argument *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
gchar *pattern_callback;
|
|
gchar *pattern_name;
|
|
|
|
pattern_callback = (gchar *) args[0].value.pdb_pointer;
|
|
if (pattern_callback == NULL || !g_utf8_validate (pattern_callback, -1, NULL))
|
|
success = FALSE;
|
|
|
|
pattern_name = (gchar *) args[1].value.pdb_pointer;
|
|
if (pattern_name == NULL || !g_utf8_validate (pattern_name, -1, NULL))
|
|
success = FALSE;
|
|
|
|
if (success)
|
|
{
|
|
if (gimp->no_interface ||
|
|
! procedural_db_lookup (gimp, pattern_callback) ||
|
|
! gimp_pdb_dialog_set (gimp, gimp->pattern_factory->container,
|
|
pattern_callback, pattern_name,
|
|
NULL))
|
|
success = FALSE;
|
|
}
|
|
|
|
return procedural_db_return_args (&patterns_set_popup_proc, success);
|
|
}
|
|
|
|
static ProcArg patterns_set_popup_inargs[] =
|
|
{
|
|
{
|
|
GIMP_PDB_STRING,
|
|
"pattern_callback",
|
|
"The name of the callback registered for this popup"
|
|
},
|
|
{
|
|
GIMP_PDB_STRING,
|
|
"pattern_name",
|
|
"The name of the pattern to set as selected"
|
|
}
|
|
};
|
|
|
|
static ProcRecord patterns_set_popup_proc =
|
|
{
|
|
"gimp_patterns_set_popup",
|
|
"Sets the current pattern selection in a popup.",
|
|
"Sets the current pattern selection in a popup.",
|
|
"Andy Thomas",
|
|
"Andy Thomas",
|
|
"1998",
|
|
GIMP_INTERNAL,
|
|
2,
|
|
patterns_set_popup_inargs,
|
|
0,
|
|
NULL,
|
|
{ { patterns_set_popup_invoker } }
|
|
};
|