f5afb754a5
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.
189 lines
7.4 KiB
C
189 lines
7.4 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995-1997 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.
|
|
*/
|
|
|
|
#ifndef __GIMP_H__
|
|
#define __GIMP_H__
|
|
|
|
|
|
#include "gimpobject.h"
|
|
#include "gimp-gui.h"
|
|
|
|
|
|
#define GIMP_TYPE_GIMP (gimp_get_type ())
|
|
#define GIMP(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_GIMP, Gimp))
|
|
#define GIMP_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_GIMP, GimpClass))
|
|
#define GIMP_IS_GIMP(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_GIMP))
|
|
#define GIMP_IS_GIMP_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_GIMP))
|
|
|
|
|
|
typedef struct _GimpClass GimpClass;
|
|
|
|
struct _Gimp
|
|
{
|
|
GimpObject parent_instance;
|
|
|
|
GimpCoreConfig *config;
|
|
GimpCoreConfig *edit_config; /* don't use this one, it's just
|
|
* for the preferences dialog
|
|
*/
|
|
gchar *session_name;
|
|
|
|
gboolean be_verbose;
|
|
gboolean no_data;
|
|
gboolean no_fonts;
|
|
gboolean no_interface;
|
|
gboolean use_shm;
|
|
GimpMessageHandlerType message_handler;
|
|
gboolean console_messages;
|
|
GimpStackTraceMode stack_trace_mode;
|
|
GimpPDBCompatMode pdb_compat_mode;
|
|
|
|
GimpGui gui; /* gui vtable */
|
|
|
|
gint busy;
|
|
guint busy_idle_id;
|
|
|
|
GList *user_units;
|
|
gint n_user_units;
|
|
|
|
GimpParasiteList *parasites;
|
|
|
|
GimpContainer *paint_info_list;
|
|
GimpPaintInfo *standard_paint_info;
|
|
|
|
GimpModuleDB *module_db;
|
|
gboolean write_modulerc;
|
|
|
|
GimpPlugInManager *plug_in_manager;
|
|
|
|
GimpContainer *images;
|
|
gint next_image_ID;
|
|
guint32 next_guide_ID;
|
|
guint32 next_sample_point_ID;
|
|
GHashTable *image_table;
|
|
|
|
gint next_item_ID;
|
|
GHashTable *item_table;
|
|
|
|
GimpContainer *displays;
|
|
gint next_display_ID;
|
|
|
|
GimpBuffer *global_buffer;
|
|
GimpContainer *named_buffers;
|
|
|
|
GimpContainer *fonts;
|
|
|
|
GimpDataFactory *brush_factory;
|
|
GimpDataFactory *pattern_factory;
|
|
GimpDataFactory *gradient_factory;
|
|
GimpDataFactory *palette_factory;
|
|
|
|
GimpPDB *pdb;
|
|
|
|
GimpContainer *tool_info_list;
|
|
GimpToolInfo *standard_tool_info;
|
|
|
|
/* the opened and saved images in MRU order */
|
|
GimpContainer *documents;
|
|
|
|
/* image_new values */
|
|
GimpContainer *templates;
|
|
GimpTemplate *image_new_last_template;
|
|
|
|
/* the list of all contexts */
|
|
GList *context_list;
|
|
|
|
/* the default context which is initialized from gimprc */
|
|
GimpContext *default_context;
|
|
|
|
/* the context used by the interface */
|
|
GimpContext *user_context;
|
|
};
|
|
|
|
struct _GimpClass
|
|
{
|
|
GimpObjectClass parent_class;
|
|
|
|
void (* initialize) (Gimp *gimp,
|
|
GimpInitStatusFunc status_callback);
|
|
void (* restore) (Gimp *gimp,
|
|
GimpInitStatusFunc status_callback);
|
|
gboolean (* exit) (Gimp *gimp,
|
|
gboolean force);
|
|
|
|
void (* buffer_changed) (Gimp *gimp);
|
|
};
|
|
|
|
|
|
GType gimp_get_type (void) G_GNUC_CONST;
|
|
|
|
Gimp * gimp_new (const gchar *name,
|
|
const gchar *session_name,
|
|
gboolean be_verbose,
|
|
gboolean no_data,
|
|
gboolean no_fonts,
|
|
gboolean no_interface,
|
|
gboolean use_shm,
|
|
gboolean console_messages,
|
|
GimpStackTraceMode stack_trace_mode,
|
|
GimpPDBCompatMode pdb_compat_mode);
|
|
|
|
void gimp_load_config (Gimp *gimp,
|
|
const gchar *alternate_system_gimprc,
|
|
const gchar *alternate_gimprc);
|
|
void gimp_initialize (Gimp *gimp,
|
|
GimpInitStatusFunc status_callback);
|
|
void gimp_restore (Gimp *gimp,
|
|
GimpInitStatusFunc status_callback);
|
|
|
|
void gimp_exit (Gimp *gimp,
|
|
gboolean force);
|
|
|
|
void gimp_set_global_buffer (Gimp *gimp,
|
|
GimpBuffer *buffer);
|
|
|
|
GimpImage * gimp_create_image (Gimp *gimp,
|
|
gint width,
|
|
gint height,
|
|
GimpImageBaseType type,
|
|
gboolean attach_comment);
|
|
|
|
void gimp_set_default_context (Gimp *gimp,
|
|
GimpContext *context);
|
|
GimpContext * gimp_get_default_context (Gimp *gimp);
|
|
|
|
void gimp_set_user_context (Gimp *gimp,
|
|
GimpContext *context);
|
|
GimpContext * gimp_get_user_context (Gimp *gimp);
|
|
|
|
GimpToolInfo * gimp_get_tool_info (Gimp *gimp,
|
|
const gchar *tool_name);
|
|
|
|
void gimp_message (Gimp *gimp,
|
|
GObject *handler,
|
|
GimpMessageSeverity severity,
|
|
const gchar *format,
|
|
...) G_GNUC_PRINTF(4,5);
|
|
void gimp_message_valist (Gimp *gimp,
|
|
GObject *handler,
|
|
GimpMessageSeverity severity,
|
|
const gchar *format,
|
|
va_list args);
|
|
|
|
|
|
#endif /* __GIMP_H__ */
|