/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008, 2009, 2010 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation
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
#include <config.h>
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include "executor.h"
-#include "helper.h"
-
-#include <libpspp/message.h>
+#include <gtk/gtk.h>
#include <stdlib.h>
-#include "psppire.h"
-#include "psppire-syntax-window.h"
-
-#include "psppire-data-window.h"
-#include "psppire-window-register.h"
-#include "psppire.h"
-#include "help-menu.h"
-#include "psppire-syntax-window.h"
-#include "syntax-editor-source.h"
-#include <language/lexer/lexer.h>
+#include "language/lexer/lexer.h"
+#include "libpspp/message.h"
+#include "ui/gui/executor.h"
+#include "ui/gui/help-menu.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/psppire-data-window.h"
+#include "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-syntax-window.h"
+#include "ui/gui/psppire-window-register.h"
+#include "ui/gui/psppire.h"
+#include "ui/gui/psppire.h"
-#include "xalloc.h"
+#include "gl/xalloc.h"
#include <gettext.h>
#define _(msgid) gettext (msgid)
}
+static void
+psppire_syntax_window_dispose (GObject *obj)
+{
+ PsppireSyntaxWindow *sw = (PsppireSyntaxWindow *)obj;
+
+ GtkClipboard *clip_selection;
+ GtkClipboard *clip_primary;
+
+ if (sw->dispose_has_run)
+ return;
+
+ clip_selection = gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_CLIPBOARD);
+ clip_primary = gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_PRIMARY);
+
+ g_signal_handler_disconnect (clip_primary, sw->sel_handler);
+
+ g_signal_handler_disconnect (clip_selection, sw->ps_handler);
+
+ /* Make sure dispose does not run twice. */
+ sw->dispose_has_run = TRUE;
+
+ /* Chain up to the parent class */
+ G_OBJECT_CLASS (parent_class)->dispose (obj);
+}
+
+
+
static void
psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
{
+ GObjectClass *gobject_class = G_OBJECT_CLASS (class);
+
parent_class = g_type_class_peek_parent (class);
+
+ gobject_class->dispose = psppire_syntax_window_dispose;
}
GtkTextIter stop)
{
PsppireWindow *win = PSPPIRE_WINDOW (sw);
- const gchar *name = psppire_window_get_filename (win);
- execute_syntax (create_syntax_editor_source (sw->buffer, start, stop, name));
-}
+ struct lex_reader *reader;
+ gchar *text;
+ text = gtk_text_buffer_get_text (sw->buffer, &start, &stop, FALSE);
+ reader = lex_reader_for_string (text);
+ g_free (text);
-\f
+ lex_reader_set_file_name (reader, psppire_window_get_filename (win));
+ execute_syntax (psppire_default_data_window (), reader);
+}
+\f
/* Delete the currently selected text */
static void
on_edit_delete (PsppireSyntaxWindow *sw)
sw);
}
+
+/* Check to see if CLIP holds a target which we know how to paste,
+ and set the sensitivity of the Paste action accordingly.
+ */
static void
-on_owner_change (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
+set_paste_sensitivity (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
{
gint i;
gboolean compatible_target = FALSE;
if ( result )
{
char *fn = g_filename_display_name (filename);
- gchar *msg = g_strdup_printf (_("Saved file \"%s\""), fn);
+ gchar *msg = g_strdup_printf (_("Saved file `%s'"), fn);
g_free (fn);
gtk_statusbar_push (GTK_STATUSBAR (se->sb), se->text_context, msg);
gtk_text_buffer_set_modified (buffer, FALSE);
}
-/* Callback for the File->SaveAs menuitem */
+/* PsppireWindow 'pick_Filename' callback. */
static void
-syntax_save_as (PsppireWindow *se)
+syntax_pick_filename (PsppireWindow *se)
{
GtkFileFilter *filter;
gint response;
if ( response == GTK_RESPONSE_ACCEPT )
{
- GError *err = NULL;
char *filename =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) );
-
- if ( ! save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err) )
- {
- msg ( ME, "%s", err->message );
- g_error_free (err);
- }
-
+ psppire_window_set_filename (se, filename);
free (filename);
}
}
-/* Callback for the File->Save menuitem */
+/* PsppireWindow 'save' callback. */
static void
syntax_save (PsppireWindow *se)
{
const gchar *filename = psppire_window_get_filename (se);
-
- if ( filename == NULL )
- syntax_save_as (se);
- else
+ GError *err = NULL;
+ save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err);
+ if ( err )
{
- GError *err = NULL;
- save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err);
- if ( err )
- {
- msg (ME, "%s", err->message);
- g_error_free (err);
- }
+ msg (ME, "%s", err->message);
+ g_error_free (err);
}
}
psppire_window_set_unsaved (window);
}
-extern struct source_stream *the_source_stream ;
-
static void
psppire_syntax_window_init (PsppireSyntaxWindow *window)
{
GtkClipboard *clip_selection = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_CLIPBOARD);
GtkClipboard *clip_primary = gtk_widget_get_clipboard (GTK_WIDGET (window), GDK_SELECTION_PRIMARY);
- g_signal_connect_swapped (clip_primary, "owner-change", G_CALLBACK (selection_changed), window);
-
- g_signal_connect (clip_selection, "owner-change", G_CALLBACK (on_owner_change), window);
-
window->cliptext = NULL;
+ window->dispose_has_run = FALSE;
window->edit_delete = get_action_assert (xml, "edit_delete");
window->edit_copy = get_action_assert (xml, "edit_copy");
window->edit_paste = get_action_assert (xml, "edit_paste");
window->buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view));
- window->lexer = lex_create (the_source_stream);
window->sb = get_widget_assert (xml, "statusbar2");
window->text_context = gtk_statusbar_get_context_id (GTK_STATUSBAR (window->sb), "Text Context");
- g_signal_connect (window->buffer, "changed", G_CALLBACK (on_text_changed), window);
+ g_signal_connect (window->buffer, "changed",
+ G_CALLBACK (on_text_changed), window);
- g_signal_connect (window->buffer, "modified-changed",
+ g_signal_connect (window->buffer, "modified-changed",
G_CALLBACK (on_modified_changed), window);
+ window->sel_handler = g_signal_connect_swapped (clip_primary, "owner-change",
+ G_CALLBACK (selection_changed), window);
+
+ window->ps_handler = g_signal_connect (clip_selection, "owner-change",
+ G_CALLBACK (set_paste_sensitivity), window);
+
connect_help (xml);
gtk_container_add (GTK_CONTAINER (window), box);
g_object_ref (window->sb);
-
gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE, 0);
gtk_box_pack_start (GTK_BOX (box), window->sb, FALSE, TRUE, 0);
g_signal_connect_swapped (get_action_assert (xml,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL);
-#if 0
g_signal_connect (get_action_assert (xml,"file_new_data"),
"activate",
G_CALLBACK (create_data_window),
window);
-#endif
+
+ g_signal_connect_swapped (get_action_assert (xml, "file_open"),
+ "activate",
+ G_CALLBACK (psppire_window_open),
+ window);
g_signal_connect_swapped (get_action_assert (xml, "file_save"),
"activate",
- G_CALLBACK (syntax_save),
+ G_CALLBACK (psppire_window_save),
window);
g_signal_connect_swapped (get_action_assert (xml, "file_save_as"),
"activate",
- G_CALLBACK (syntax_save_as),
+ G_CALLBACK (psppire_window_save_as),
window);
g_signal_connect (get_action_assert (xml,"file_quit"),
{
return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (),
/* TRANSLATORS: This will form a filename. Please avoid whitespace. */
- "filename", _("Syntax"),
"description", _("Syntax Editor"),
NULL));
}
GTK_DIALOG_DESTROY_WITH_PARENT,
GTK_MESSAGE_ERROR,
GTK_BUTTONS_CLOSE,
- _("Cannot load syntax file '%s'"),
+ _("Cannot load syntax file `%s'"),
fn);
g_free (fn);
psppire_syntax_window_iface_init (PsppireWindowIface *iface)
{
iface->save = syntax_save;
+ iface->pick_filename = syntax_pick_filename;
iface->load = syntax_load;
}
-
-
projects / pspp-builds.git / blobdiff