-/*
- PSPPIRE --- A Graphical User Interface for PSPP
- Copyright (C) 2004,2005 Free Software Foundation
- Written by John Darrington
+/* PSPPIRE - a graphical user interface for PSPP.
+ Copyright (C) 2004, 2005 Free Software Foundation, Inc.
- This program is free software; you can redistribute it and/or modify
+ 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
+ the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301, USA.
-*/
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <stdio.h>
#include "helper.h"
-extern GladeXML *xml;
-
-
-
static void enqueue_msg (const struct msg *m);
void
-message_dialog_init (void)
+message_dialog_init (struct source_stream *ss)
{
- message_queue = g_queue_new();
- msg_init (enqueue_msg);
+ message_queue = g_queue_new ();
+ msg_init (ss, enqueue_msg);
}
void
message_dialog_done (void)
{
- msg_done();
- g_queue_free(message_queue);
+ msg_done ();
+ g_queue_free (message_queue);
}
-static gboolean
-dequeue_message(gpointer data)
+static gboolean
+dequeue_message (gpointer data)
{
struct msg * m ;
/* If a pointer grab is in effect, then the combination of that, and
- a modal dialog box, will cause an impossible situation.
+ a modal dialog box, will cause an impossible situation.
So don't pop it up just yet.
- */
- if ( gdk_pointer_is_grabbed())
+ */
+ if ( gdk_pointer_is_grabbed ())
return TRUE;
- m = g_queue_pop_tail(message_queue);
+ m = g_queue_pop_tail (message_queue);
- if ( m )
+ if ( m )
{
- popup_message(m);
- msg_destroy(m);
+ popup_message (m);
+ msg_destroy (m);
return TRUE;
}
-
+
return FALSE;
}
static void
-enqueue_msg(const struct msg *msg)
+enqueue_msg (const struct msg *msg)
{
- struct msg *m = msg_dup(msg);
+ struct msg *m = msg_dup (msg);
- g_queue_push_head(message_queue, m);
+ g_queue_push_head (message_queue, m);
- g_idle_add(dequeue_message, 0);
+ g_idle_add (dequeue_message, 0);
}
-void
-popup_message(const struct msg *m)
+void
+popup_message (const struct msg *m)
{
- GtkWindow *parent;
GtkWidget *dialog;
+ gchar *location = NULL;
gint message_type;
const char *msg;
message_type = GTK_MESSAGE_INFO;
break;
};
-
- switch (m->category)
+
+ switch (m->category)
{
case MSG_SYNTAX:
msg = _("Script Error");
msg = _("PSPP Error");
break;
};
-
- parent = GTK_WINDOW(get_widget_assert(xml, "data_editor"));
- dialog = gtk_message_dialog_new(parent,
+ dialog = gtk_message_dialog_new ( NULL,
GTK_DIALOG_MODAL,
message_type,
GTK_BUTTONS_CLOSE,
msg);
-
- gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog),
- "%s", m->text);
-
- gtk_window_set_transient_for(GTK_WINDOW(dialog), parent);
+ if ( m->where.line_number != -1)
+ {
+ location = g_strdup_printf (_("%s (line %d)"),
+ m->where.file_name ? m->where.file_name : "",
+ m->where.line_number);
+ }
+ else
+ {
+ location = g_strdup_printf (_("%s"),
+ m->where.file_name ? m->where.file_name : ""); }
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ _("%s %s"),
+ location,
+ m->text);
+ g_free (location);
+
+ gtk_window_set_keep_above (GTK_WINDOW (dialog), TRUE);
- gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
}