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.
152 lines
8.3 KiB
C
152 lines
8.3 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_GUI_H__
|
|
#define __GIMP_GUI_H__
|
|
|
|
|
|
typedef struct _GimpGui GimpGui;
|
|
|
|
struct _GimpGui
|
|
{
|
|
void (* ungrab) (Gimp *gimp);
|
|
|
|
void (* threads_enter) (Gimp *gimp);
|
|
void (* threads_leave) (Gimp *gimp);
|
|
|
|
void (* set_busy) (Gimp *gimp);
|
|
void (* unset_busy) (Gimp *gimp);
|
|
|
|
void (* show_message) (Gimp *gimp,
|
|
GObject *handler,
|
|
GimpMessageSeverity severity,
|
|
const gchar *domain,
|
|
const gchar *message);
|
|
void (* help) (Gimp *gimp,
|
|
const gchar *help_domain,
|
|
const gchar *help_id);
|
|
|
|
const gchar * (* get_program_class) (Gimp *gimp);
|
|
gchar * (* get_display_name) (Gimp *gimp,
|
|
gint display_ID,
|
|
gint *monitor_number);
|
|
const gchar * (* get_theme_dir) (Gimp *gimp);
|
|
|
|
GimpObject * (* display_get_by_id) (Gimp *gimp,
|
|
gint ID);
|
|
gint (* display_get_id) (GimpObject *display);
|
|
guint32 (* display_get_window) (GimpObject *display);
|
|
GimpObject * (* display_create) (GimpImage *image,
|
|
GimpUnit unit,
|
|
gdouble scale);
|
|
void (* display_delete) (GimpObject *display);
|
|
void (* displays_reconnect) (Gimp *gimp,
|
|
GimpImage *old_image,
|
|
GimpImage *new_image);
|
|
|
|
GimpProgress * (* progress_new) (Gimp *gimp,
|
|
GimpObject *display);
|
|
void (* progress_free) (Gimp *gimp,
|
|
GimpProgress *progress);
|
|
|
|
gboolean (* pdb_dialog_new) (Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
GimpContainer *container,
|
|
const gchar *title,
|
|
const gchar *callback_name,
|
|
const gchar *object_name,
|
|
va_list args);
|
|
gboolean (* pdb_dialog_set) (Gimp *gimp,
|
|
GimpContainer *container,
|
|
const gchar *callback_name,
|
|
const gchar *object_name,
|
|
va_list args);
|
|
gboolean (* pdb_dialog_close) (Gimp *gimp,
|
|
GimpContainer *container,
|
|
const gchar *callback_name);
|
|
};
|
|
|
|
|
|
void gimp_gui_init (Gimp *gimp);
|
|
|
|
void gimp_gui_ungrab (Gimp *gimp);
|
|
|
|
void gimp_threads_enter (Gimp *gimp);
|
|
void gimp_threads_leave (Gimp *gimp);
|
|
|
|
GimpObject * gimp_get_display_by_ID (Gimp *gimp,
|
|
gint ID);
|
|
gint gimp_get_display_ID (Gimp *gimp,
|
|
GimpObject *display);
|
|
guint32 gimp_get_display_window (Gimp *gimp,
|
|
GimpObject *display);
|
|
GimpObject * gimp_create_display (Gimp *gimp,
|
|
GimpImage *image,
|
|
GimpUnit unit,
|
|
gdouble scale);
|
|
void gimp_delete_display (Gimp *gimp,
|
|
GimpObject *display);
|
|
void gimp_reconnect_displays (Gimp *gimp,
|
|
GimpImage *old_image,
|
|
GimpImage *new_image);
|
|
|
|
void gimp_set_busy (Gimp *gimp);
|
|
void gimp_set_busy_until_idle (Gimp *gimp);
|
|
void gimp_unset_busy (Gimp *gimp);
|
|
|
|
void gimp_show_message (Gimp *gimp,
|
|
GObject *handler,
|
|
GimpMessageSeverity severity,
|
|
const gchar *domain,
|
|
const gchar *message);
|
|
void gimp_help (Gimp *gimp,
|
|
const gchar *help_domain,
|
|
const gchar *help_id);
|
|
|
|
GimpProgress * gimp_new_progress (Gimp *gimp,
|
|
GimpObject *display);
|
|
void gimp_free_progress (Gimp *gimp,
|
|
GimpProgress *progress);
|
|
|
|
const gchar * gimp_get_program_class (Gimp *gimp);
|
|
gchar * gimp_get_display_name (Gimp *gimp,
|
|
gint display_ID,
|
|
gint *monitor_number);
|
|
const gchar * gimp_get_theme_dir (Gimp *gimp);
|
|
|
|
gboolean gimp_pdb_dialog_new (Gimp *gimp,
|
|
GimpContext *context,
|
|
GimpProgress *progress,
|
|
GimpContainer *container,
|
|
const gchar *title,
|
|
const gchar *callback_name,
|
|
const gchar *object_name,
|
|
...) G_GNUC_NULL_TERMINATED;
|
|
gboolean gimp_pdb_dialog_set (Gimp *gimp,
|
|
GimpContainer *container,
|
|
const gchar *callback_name,
|
|
const gchar *object_name,
|
|
...) G_GNUC_NULL_TERMINATED;
|
|
gboolean gimp_pdb_dialog_close (Gimp *gimp,
|
|
GimpContainer *container,
|
|
const gchar *callback_name);
|
|
|
|
|
|
#endif /* __GIMP_GUI_H__ */
|