2006-10-09 Michael Natterer <mitch@gimp.org>
Added message severities and make sure all messages are routed
through a central function, so redirecting to the error console or
stderr work again:
* app/core/core-enums.[ch]: added enum GimpMessageSeverity { INFO,
WARNING, ERROR }.
* app/core/gimp.[ch] (gimp_message)
(gimp_message_valist): added severity parameter. Changed
"GimpProgress *progress" parameter to "GObject *handler", where
"handler" can be either a GimpProgress, a GtkWidget or NULL.
* app/core/gimp-gui.[ch] (gimp_show_message): ditto. Honor
--console-messages again. Always dispatch to the GUI message
handler first if it exists.
* app/gui/gui-message.[ch]: pass severity parameters around.
(gui_message_error_dialog): if "handler" is a progress, dispatch
the message to it first. If it is a widget (and *not* a progress),
use a GtkMessageDialog on top of that widget's toplevel. Fall
back to the usual GimpErrorDialog otherwise.
* app/core/gimpprogress.[ch] (gimp_progress_message): added
severity parameter. Also added boolean return value to the virtual
function so it can decide to fail if it can't handle the message.
* app/display/gimpdisplay.c: implement GimpProgress::message() and
redirect the message to GimpDisplayShell.
* app/display/gimpdisplayshell-progress.c: implement
GimpProgress::message() and redirect the message to GimpStatusbar
if it is not an error and if the status bar is visible.
* app/display/gimpstatusbar.[ch]: implement GimpProgress::message(),
but fail on messages that contain a newline. Show the right icons
for the message severities (work in progress).
* app/display/gimpdisplayshell.[ch]: removed
gimp_display_shell_message() and its _valist() variant.
* app/widgets/gimperrorconsole.[ch]: show the right icons for the
message severities.
* app/widgets/gimpthumbbox.c (gimp_thumb_box_progress_message):
return TRUE to swallow all messages.
* app/widgets/gimpwidgets-utils.[ch]: removed
gimp_show_message_dialog(). Added gimp_get_message_stock_id().
* app/errors.c
* app/actions/edit-commands.c
* app/actions/error-console-commands.c
* app/actions/file-commands.c
* app/actions/select-commands.c
* app/actions/text-editor-commands.c
* app/actions/vectors-commands.c
* app/core/gimpimage-convert.c
* app/core/gimpimagefile.c
* app/dialogs/convert-dialog.c
* app/dialogs/file-open-dialog.c
* app/dialogs/file-open-location-dialog.c
* app/dialogs/file-save-dialog.c
* app/dialogs/palette-import-dialog.c
* app/dialogs/stroke-dialog.c
* app/display/gimpdisplayshell-dnd.c
* app/pdb/gimppdb.c
* app/plug-in/gimpplugin.c
* app/tools/gimpimagemaptool.c
* app/tools/gimptool.c
* app/tools/gimpvectortool.c
* app/widgets/gimpactionview.c
* app/widgets/gimpcontrollerlist.c
* app/widgets/gimppdbdialog.c
* app/widgets/gimpvectorstreeview.c
* app/xcf/xcf-load.c
* app/xcf/xcf-save.c
* app/xcf/xcf.c
* tools/pdbgen/pdb/brush.pdb
* tools/pdbgen/pdb/gradient.pdb
* tools/pdbgen/pdb/image.pdb
* tools/pdbgen/pdb/message.pdb
* tools/pdbgen/pdb/palette.pdb: added severity parameter to
gimp_message() calls. Convert all calls to
gimp_show_message_dialog() and gimp_display_shell_message() to
gimp_message(). Also converted some more g_message() calls.
* app/pdb/brush_cmds.c
* app/pdb/gradient_cmds.c
* app/pdb/image_cmds.c
* app/pdb/message_cmds.c
* app/pdb/palette_cmds.c: regenerated.
176 lines
6.8 KiB
C
176 lines
6.8 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 <string.h>
|
|
|
|
#include <glib-object.h>
|
|
|
|
#include "pdb-types.h"
|
|
#include "gimppdb.h"
|
|
#include "gimpprocedure.h"
|
|
#include "core/gimpparamspecs.h"
|
|
|
|
#include "core/gimp.h"
|
|
#include "gimp-intl.h"
|
|
#include "plug-in/gimpplugin.h"
|
|
#include "plug-in/gimppluginmanager.h"
|
|
|
|
|
|
static GValueArray *
|
|
message_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
const gchar *message;
|
|
|
|
message = g_value_get_string (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
gchar *domain = NULL;
|
|
|
|
if (gimp->plug_in_manager->current_plug_in)
|
|
domain = gimp_plug_in_get_undo_desc (gimp->plug_in_manager->current_plug_in);
|
|
gimp_show_message (gimp, G_OBJECT (progress), GIMP_MESSAGE_WARNING,
|
|
domain, message);
|
|
|
|
g_free (domain);
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
static GValueArray *
|
|
message_get_handler_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
GValueArray *return_vals;
|
|
gint32 handler = 0;
|
|
|
|
handler = gimp->message_handler;
|
|
|
|
return_vals = gimp_procedure_get_return_values (procedure, TRUE);
|
|
g_value_set_enum (&return_vals->values[1], handler);
|
|
|
|
return return_vals;
|
|
}
|
|
|
|
static GValueArray *
|
|
message_set_handler_invoker (GimpProcedure *procedure,
|
|
Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
const GValueArray *args)
|
|
{
|
|
gboolean success = TRUE;
|
|
gint32 handler;
|
|
|
|
handler = g_value_get_enum (&args->values[0]);
|
|
|
|
if (success)
|
|
{
|
|
gimp->message_handler = handler;
|
|
}
|
|
|
|
return gimp_procedure_get_return_values (procedure, success);
|
|
}
|
|
|
|
void
|
|
register_message_procs (GimpPDB *pdb)
|
|
{
|
|
GimpProcedure *procedure;
|
|
|
|
/*
|
|
* gimp-message
|
|
*/
|
|
procedure = gimp_procedure_new (message_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-message");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-message",
|
|
"Displays a dialog box with a message.",
|
|
"Displays a dialog box with a message. Useful for status or error reporting. The message must be in UTF-8 encoding.",
|
|
"Manish Singh",
|
|
"Manish Singh",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
gimp_param_spec_string ("message",
|
|
"message",
|
|
"Message to display in the dialog",
|
|
FALSE, FALSE,
|
|
NULL,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-message-get-handler
|
|
*/
|
|
procedure = gimp_procedure_new (message_get_handler_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-message-get-handler");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-message-get-handler",
|
|
"Returns the current state of where warning messages are displayed.",
|
|
"This procedure returns the way g_message warnings are displayed. They can be shown in a dialog box or printed on the console where gimp was started.",
|
|
"Manish Singh",
|
|
"Manish Singh",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_return_value (procedure,
|
|
g_param_spec_enum ("handler",
|
|
"handler",
|
|
"The current handler type",
|
|
GIMP_TYPE_MESSAGE_HANDLER_TYPE,
|
|
GIMP_MESSAGE_BOX,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
|
|
/*
|
|
* gimp-message-set-handler
|
|
*/
|
|
procedure = gimp_procedure_new (message_set_handler_invoker);
|
|
gimp_object_set_static_name (GIMP_OBJECT (procedure), "gimp-message-set-handler");
|
|
gimp_procedure_set_static_strings (procedure,
|
|
"gimp-message-set-handler",
|
|
"Controls where warning messages are displayed.",
|
|
"This procedure controls how g_message warnings are displayed. They can be shown in a dialog box or printed on the console where gimp was started.",
|
|
"Manish Singh",
|
|
"Manish Singh",
|
|
"1998",
|
|
NULL);
|
|
gimp_procedure_add_argument (procedure,
|
|
g_param_spec_enum ("handler",
|
|
"handler",
|
|
"The new handler type",
|
|
GIMP_TYPE_MESSAGE_HANDLER_TYPE,
|
|
GIMP_MESSAGE_BOX,
|
|
GIMP_PARAM_READWRITE));
|
|
gimp_pdb_register_procedure (pdb, procedure);
|
|
g_object_unref (procedure);
|
|
}
|