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.
165 lines
5.2 KiB
C
165 lines
5.2 KiB
C
/* The GIMP -- an image manipulation program
|
|
* Copyright (C) 1995 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.
|
|
*/
|
|
|
|
#include "config.h"
|
|
|
|
#include <gtk/gtk.h>
|
|
|
|
#include "libgimpbase/gimpbase.h"
|
|
#include "libgimpwidgets/gimpwidgets.h"
|
|
|
|
#include "actions-types.h"
|
|
|
|
#include "core/gimp.h"
|
|
|
|
#include "widgets/gimperrorconsole.h"
|
|
#include "widgets/gimphelp-ids.h"
|
|
#include "widgets/gimpwidgets-utils.h"
|
|
|
|
#include "error-console-commands.h"
|
|
|
|
#include "gimp-intl.h"
|
|
|
|
|
|
/* local function prototypes */
|
|
|
|
static void error_console_save_response (GtkWidget *dialog,
|
|
gint response_id,
|
|
GimpErrorConsole *console);
|
|
|
|
|
|
/* public functions */
|
|
|
|
void
|
|
error_console_clear_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
|
|
GtkTextIter start_iter;
|
|
GtkTextIter end_iter;
|
|
|
|
gtk_text_buffer_get_bounds (console->text_buffer, &start_iter, &end_iter);
|
|
gtk_text_buffer_delete (console->text_buffer, &start_iter, &end_iter);
|
|
}
|
|
|
|
void
|
|
error_console_select_all_cmd_callback (GtkAction *action,
|
|
gpointer data)
|
|
{
|
|
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
|
|
GtkTextIter start_iter;
|
|
GtkTextIter end_iter;
|
|
|
|
gtk_text_buffer_get_bounds (console->text_buffer, &start_iter, &end_iter);
|
|
gtk_text_buffer_select_range (console->text_buffer, &start_iter, &end_iter);
|
|
}
|
|
|
|
void
|
|
error_console_save_cmd_callback (GtkAction *action,
|
|
gint value,
|
|
gpointer data)
|
|
{
|
|
GimpErrorConsole *console = GIMP_ERROR_CONSOLE (data);
|
|
GtkFileChooser *chooser;
|
|
|
|
if (value && ! gtk_text_buffer_get_selection_bounds (console->text_buffer,
|
|
NULL, NULL))
|
|
{
|
|
gimp_message (console->gimp, G_OBJECT (console), GIMP_MESSAGE_WARNING,
|
|
_("Cannot save. Nothing is selected."));
|
|
return;
|
|
}
|
|
|
|
if (console->file_dialog)
|
|
{
|
|
gtk_window_present (GTK_WINDOW (console->file_dialog));
|
|
return;
|
|
}
|
|
|
|
console->file_dialog =
|
|
gtk_file_chooser_dialog_new (_("Save Error Log to File"), NULL,
|
|
GTK_FILE_CHOOSER_ACTION_SAVE,
|
|
|
|
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
|
|
GTK_STOCK_SAVE, GTK_RESPONSE_OK,
|
|
|
|
NULL);
|
|
|
|
gtk_dialog_set_alternative_button_order (GTK_DIALOG (console->file_dialog),
|
|
GTK_RESPONSE_OK,
|
|
GTK_RESPONSE_CANCEL,
|
|
-1);
|
|
|
|
console->save_selection = value;
|
|
|
|
g_object_add_weak_pointer (G_OBJECT (console->file_dialog),
|
|
(gpointer) &console->file_dialog);
|
|
|
|
chooser = GTK_FILE_CHOOSER (console->file_dialog);
|
|
|
|
gtk_window_set_screen (GTK_WINDOW (chooser),
|
|
gtk_widget_get_screen (GTK_WIDGET (console)));
|
|
|
|
gtk_window_set_position (GTK_WINDOW (chooser), GTK_WIN_POS_MOUSE);
|
|
gtk_window_set_role (GTK_WINDOW (chooser), "gimp-save-errors");
|
|
|
|
g_signal_connect (chooser, "response",
|
|
G_CALLBACK (error_console_save_response),
|
|
console);
|
|
g_signal_connect (chooser, "delete-event",
|
|
G_CALLBACK (gtk_true),
|
|
NULL);
|
|
|
|
gimp_help_connect (GTK_WIDGET (chooser), gimp_standard_help_func,
|
|
GIMP_HELP_ERRORS_DIALOG, NULL);
|
|
|
|
gtk_widget_show (GTK_WIDGET (chooser));
|
|
}
|
|
|
|
|
|
/* private functions */
|
|
|
|
static void
|
|
error_console_save_response (GtkWidget *dialog,
|
|
gint response_id,
|
|
GimpErrorConsole *console)
|
|
{
|
|
if (response_id == GTK_RESPONSE_OK)
|
|
{
|
|
GError *error = NULL;
|
|
gchar *filename;
|
|
|
|
filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
|
|
|
|
if (! gimp_text_buffer_save (console->text_buffer, filename,
|
|
console->save_selection, &error))
|
|
{
|
|
gimp_message (console->gimp, G_OBJECT (dialog), GIMP_MESSAGE_ERROR,
|
|
_("Error writing file '%s':\n%s"),
|
|
gimp_filename_to_utf8 (filename),
|
|
error->message);
|
|
g_clear_error (&error);
|
|
g_free (filename);
|
|
return;
|
|
}
|
|
|
|
g_free (filename);
|
|
}
|
|
|
|
gtk_widget_destroy (dialog);
|
|
}
|