mirror of
https://gitlab.gnome.org/GNOME/gimp
synced 2024-10-22 12:32:37 +00:00
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.
97 lines
4.5 KiB
C
97 lines
4.5 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 Spencer Kimball and Peter Mattis
|
|
*
|
|
* gimpprogress.h
|
|
* Copyright (C) 2004 Michael Natterer <mitch@gimp.org>
|
|
*
|
|
* 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_PROGRESS_H__
|
|
#define __GIMP_PROGRESS_H__
|
|
|
|
|
|
#define GIMP_TYPE_PROGRESS (gimp_progress_interface_get_type ())
|
|
#define GIMP_IS_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_PROGRESS))
|
|
#define GIMP_PROGRESS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_PROGRESS, GimpProgress))
|
|
#define GIMP_PROGRESS_GET_INTERFACE(obj) (G_TYPE_INSTANCE_GET_INTERFACE ((obj), GIMP_TYPE_PROGRESS, GimpProgressInterface))
|
|
|
|
|
|
typedef struct _GimpProgressInterface GimpProgressInterface;
|
|
|
|
struct _GimpProgressInterface
|
|
{
|
|
GTypeInterface base_iface;
|
|
|
|
/* virtual functions */
|
|
GimpProgress * (* start) (GimpProgress *progress,
|
|
const gchar *message,
|
|
gboolean cancelable);
|
|
void (* end) (GimpProgress *progress);
|
|
gboolean (* is_active) (GimpProgress *progress);
|
|
|
|
void (* set_text) (GimpProgress *progress,
|
|
const gchar *message);
|
|
void (* set_value) (GimpProgress *progress,
|
|
gdouble percentage);
|
|
gdouble (* get_value) (GimpProgress *progress);
|
|
void (* pulse) (GimpProgress *progress);
|
|
|
|
guint32 (* get_window) (GimpProgress *progress);
|
|
|
|
gboolean (* message) (GimpProgress *progress,
|
|
Gimp *gimp,
|
|
GimpMessageSeverity severity,
|
|
const gchar *domain,
|
|
const gchar *message);
|
|
|
|
/* signals */
|
|
void (* cancel) (GimpProgress *progress);
|
|
};
|
|
|
|
|
|
GType gimp_progress_interface_get_type (void) G_GNUC_CONST;
|
|
|
|
GimpProgress * gimp_progress_start (GimpProgress *progress,
|
|
const gchar *message,
|
|
gboolean cancelable);
|
|
void gimp_progress_end (GimpProgress *progress);
|
|
gboolean gimp_progress_is_active (GimpProgress *progress);
|
|
|
|
void gimp_progress_set_text (GimpProgress *progress,
|
|
const gchar *message);
|
|
void gimp_progress_set_value (GimpProgress *progress,
|
|
gdouble percentage);
|
|
gdouble gimp_progress_get_value (GimpProgress *progress);
|
|
void gimp_progress_pulse (GimpProgress *progress);
|
|
|
|
guint32 gimp_progress_get_window (GimpProgress *progress);
|
|
|
|
gboolean gimp_progress_message (GimpProgress *progress,
|
|
Gimp *gimp,
|
|
GimpMessageSeverity severity,
|
|
const gchar *domain,
|
|
const gchar *message);
|
|
|
|
void gimp_progress_cancel (GimpProgress *progress);
|
|
|
|
void gimp_progress_update_and_flush (gint min,
|
|
gint max,
|
|
gint current,
|
|
gpointer data);
|
|
|
|
|
|
#endif /* __GIMP_PROGRESS_H__ */
|