callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

stop adding message boxes and redirect messages to stderr if there are too

Browse Source 
2004-08-25  Sven Neumann  <sven@gimp.org>

	* app/widgets/gimperrordialog.[ch] (gimp_error_dialog_add): stop
	adding message boxes and redirect messages to stderr if there are
	too many messages.
This commit is contained in:
Sven Neumann
2004-08-25 19:49:50 +00:00
committed by Sven Neumann
parent c92a38626b
commit 8b6970ec28
3 changed files with 53 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2004-08-25 Sven Neumann <sven@gimp.org>
* app/widgets/gimperrordialog.[ch] (gimp_error_dialog_add): stop
adding message boxes and redirect messages to stderr if there are
too many messages.
2004-08-25 Bill Skaggs <weskaggs@primate.ucdavis.edu> 2004-08-25 Bill Skaggs <weskaggs@primate.ucdavis.edu>
* devel-docs/ggr.txt: fix incorrect statement, add note re SVG. * devel-docs/ggr.txt: fix incorrect statement, add note re SVG.

67
app/widgets/gimperrordialog.c
View File

@ -34,6 +34,8 @@
#include "gimp-intl.h" #include "gimp-intl.h"
#define GIMP_ERROR_DIALOG_MAX_MESSAGES 3
static void gimp_error_dialog_class_init (GimpErrorDialogClass *klass); static void gimp_error_dialog_class_init (GimpErrorDialogClass *klass);
static void gimp_error_dialog_init (GimpErrorDialog *dialog); static void gimp_error_dialog_init (GimpErrorDialog *dialog);
@ -103,6 +105,11 @@ gimp_error_dialog_init (GimpErrorDialog *dialog)
gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox),
dialog->vbox, TRUE, TRUE, 0); dialog->vbox, TRUE, TRUE, 0);
gtk_widget_show (dialog->vbox); gtk_widget_show (dialog->vbox);
dialog->last_box = NULL;
dialog->last_domain = NULL;
dialog->last_message = NULL;
dialog->num_messages = 0;
} }
static void static void
@ -192,44 +199,58 @@ gimp_error_dialog_new (const gchar *title,
return dialog; return dialog;
} }
gboolean void
gimp_error_dialog_add (GimpErrorDialog *dialog, gimp_error_dialog_add (GimpErrorDialog *dialog,
const gchar *stock_id, const gchar *stock_id,
const gchar *domain, const gchar *domain,
const gchar *message) const gchar *message)
{ {
g_return_val_if_fail (GIMP_IS_ERROR_DIALOG (dialog), FALSE); GtkWidget *box;
g_return_val_if_fail (domain != NULL, FALSE); gboolean overflow = FALSE;
g_return_val_if_fail (message != NULL, FALSE);
g_return_if_fail (GIMP_IS_ERROR_DIALOG (dialog));
g_return_if_fail (domain != NULL);
g_return_if_fail (message != NULL);
if (++dialog->num_messages > GIMP_ERROR_DIALOG_MAX_MESSAGES)
{
g_printerr ("%s: %s\n\n", domain, message);
overflow = TRUE;
stock_id = GIMP_STOCK_WILBER_EEK;
domain = _("Too many error messages!");
message = _("Messages are redirected to stderr.");
}
if (dialog->last_box && if (dialog->last_box &&
dialog->last_domain && strcmp (dialog->last_domain, domain) == 0 && dialog->last_domain && strcmp (dialog->last_domain, domain) == 0 &&
dialog->last_message && strcmp (dialog->last_message, message) == 0) dialog->last_message && strcmp (dialog->last_message, message) == 0)
{ {
gimp_message_box_repeat (GIMP_MESSAGE_BOX (dialog->last_box)); if (gimp_message_box_repeat (GIMP_MESSAGE_BOX (dialog->last_box)))
return;
} }
box = g_object_new (GIMP_TYPE_MESSAGE_BOX,
"stock_id", stock_id,
"border_width", 12,
NULL);
if (overflow)
gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), domain);
else else
{ gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box),
GtkWidget *box = g_object_new (GIMP_TYPE_MESSAGE_BOX, _("%s Message"), domain);
"stock_id", GIMP_STOCK_WARNING,
"border_width", 12,
NULL);
gimp_message_box_set_primary_text (GIMP_MESSAGE_BOX (box), gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), message);
_("%s Message"), domain);
gimp_message_box_set_text (GIMP_MESSAGE_BOX (box), message);
gtk_container_add (GTK_CONTAINER (dialog->vbox), box); gtk_container_add (GTK_CONTAINER (dialog->vbox), box);
gtk_widget_show (box); gtk_widget_show (box);
dialog->last_box = box; dialog->last_box = box;
g_free (dialog->last_domain); g_free (dialog->last_domain);
dialog->last_domain = g_strdup (domain); dialog->last_domain = g_strdup (domain);
g_free (dialog->last_message); g_free (dialog->last_message);
dialog->last_message = g_strdup (message); dialog->last_message = g_strdup (message);
}
return TRUE;
} }

5
app/widgets/gimperrordialog.h
View File

@ -44,6 +44,7 @@ struct _GimpErrorDialog
GtkWidget *last_box; GtkWidget *last_box;
gchar *last_domain; gchar *last_domain;
gchar *last_message; gchar *last_message;
gint num_messages;
}; };
struct _GimpErrorDialogClass struct _GimpErrorDialogClass
@ -56,8 +57,8 @@ GType gimp_error_dialog_get_type (void) G_GNUC_CONST;
GtkWidget * gimp_error_dialog_new (const gchar *title, GtkWidget * gimp_error_dialog_new (const gchar *title,
const gchar *stock_id); const gchar *stock_id);
gboolean gimp_error_dialog_add (GimpErrorDialog *dialog, void gimp_error_dialog_add (GimpErrorDialog *dialog,
const gchar *stock_id, const gchar *stock_id,
const gchar *domain, const gchar *domain,
const gchar *message); const gchar *message);