/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008 Free Software Foundation
+ Copyright (C) 2008, 2009, 2010 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 <gtk/gtksignal.h>
#include <gtk/gtkbox.h>
-#include <glade/glade.h>
+#include "executor.h"
#include "helper.h"
#include <libpspp/message.h>
#include <stdlib.h>
+#include "psppire.h"
#include "psppire-syntax-window.h"
#include "psppire-data-window.h"
#include "psppire-window-register.h"
-#include "about.h"
+#include "psppire.h"
+#include "help-menu.h"
#include "psppire-syntax-window.h"
#include "syntax-editor-source.h"
#include <language/lexer/lexer.h>
+#include "xalloc.h"
+
#include <gettext.h>
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
static void psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class);
static void psppire_syntax_window_init (PsppireSyntaxWindow *syntax_editor);
+
+static void psppire_syntax_window_iface_init (PsppireWindowIface *iface);
+
+
GType
psppire_syntax_window_get_type (void)
{
(GInstanceInitFunc) psppire_syntax_window_init,
};
+ static const GInterfaceInfo window_interface_info =
+ {
+ (GInterfaceInitFunc) psppire_syntax_window_iface_init,
+ NULL,
+ NULL
+ };
+
psppire_syntax_window_type =
- g_type_register_static (PSPPIRE_WINDOW_TYPE, "PsppireSyntaxWindow",
+ g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireSyntaxWindow",
&psppire_syntax_window_info, 0);
+
+ g_type_add_interface_static (psppire_syntax_window_type,
+ PSPPIRE_TYPE_WINDOW_MODEL,
+ &window_interface_info);
}
return psppire_syntax_window_type;
}
+static GObjectClass *parent_class ;
+
static void
psppire_syntax_window_finalize (GObject *object)
{
- GObjectClass *class = G_OBJECT_GET_CLASS (object);
-
- GObjectClass *parent_class = g_type_class_peek_parent (class);
-
if (G_OBJECT_CLASS (parent_class)->finalize)
(*G_OBJECT_CLASS (parent_class)->finalize) (object);
}
static void
psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
{
+ parent_class = g_type_class_peek_parent (class);
}
static void
-editor_execute_syntax (const PsppireSyntaxWindow *se, GtkTextIter start,
- GtkTextIter stop)
+editor_execute_syntax (const PsppireSyntaxWindow *sw, GtkTextIter start,
+ 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));
+}
+
+
+\f
+
+/* Delete the currently selected text */
+static void
+on_edit_delete (PsppireSyntaxWindow *sw)
+{
+ GtkTextIter begin, end;
+
+ if ( gtk_text_buffer_get_selection_bounds (sw->buffer, &begin, &end) )
+ gtk_text_buffer_delete (sw->buffer, &begin, &end);
+}
+
+
+
+
+/* The syntax editor's clipboard deals only with text */
+enum {
+ SELECT_FMT_NULL,
+ SELECT_FMT_TEXT,
+};
+
+
+static void
+selection_changed (PsppireSyntaxWindow *sw)
+{
+ gboolean sel = gtk_text_buffer_get_has_selection (sw->buffer);
+
+ gtk_action_set_sensitive (sw->edit_copy, sel);
+ gtk_action_set_sensitive (sw->edit_cut, sel);
+ gtk_action_set_sensitive (sw->edit_delete, sel);
+}
+
+/* The callback which runs when something request clipboard data */
+static void
+clipboard_get_cb (GtkClipboard *clipboard,
+ GtkSelectionData *selection_data,
+ guint info,
+ gpointer data)
+{
+ PsppireSyntaxWindow *sw = data;
+ g_assert (info == SELECT_FMT_TEXT);
+
+ gtk_selection_data_set (selection_data, selection_data->target,
+ 8,
+ (const guchar *) sw->cliptext, strlen (sw->cliptext));
+
+}
+
+static void
+clipboard_clear_cb (GtkClipboard *clipboard,
+ gpointer data)
{
- execute_syntax (create_syntax_editor_source (se->buffer, start, stop));
+ PsppireSyntaxWindow *sw = data;
+ g_free (sw->cliptext);
+ sw->cliptext = NULL;
}
+static const GtkTargetEntry targets[] = {
+ { "UTF8_STRING", 0, SELECT_FMT_TEXT },
+ { "STRING", 0, SELECT_FMT_TEXT },
+ { "TEXT", 0, SELECT_FMT_TEXT },
+ { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
+ { "text/plain;charset=utf-8", 0, SELECT_FMT_TEXT },
+ { "text/plain", 0, SELECT_FMT_TEXT },
+};
+
+
+/*
+ Store a clip containing the currently selected text.
+ Returns true iff something was set.
+ As a side effect, begin and end will be set to indicate
+ the limits of the selected text.
+*/
+static gboolean
+set_clip (PsppireSyntaxWindow *sw, GtkTextIter *begin, GtkTextIter *end)
+{
+ GtkClipboard *clipboard ;
+
+ if ( ! gtk_text_buffer_get_selection_bounds (sw->buffer, begin, end) )
+ return FALSE;
+
+ g_free (sw->cliptext);
+ sw->cliptext = gtk_text_buffer_get_text (sw->buffer, begin, end, FALSE);
+
+ clipboard =
+ gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_CLIPBOARD);
+
+ if (!gtk_clipboard_set_with_owner (clipboard, targets,
+ G_N_ELEMENTS (targets),
+ clipboard_get_cb, clipboard_clear_cb,
+ G_OBJECT (sw)))
+ clipboard_clear_cb (clipboard, sw);
+
+ return TRUE;
+}
+
+static void
+on_edit_cut (PsppireSyntaxWindow *sw)
+{
+ GtkTextIter begin, end;
+
+ if ( set_clip (sw, &begin, &end))
+ gtk_text_buffer_delete (sw->buffer, &begin, &end);
+}
+
+static void
+on_edit_copy (PsppireSyntaxWindow *sw)
+{
+ GtkTextIter begin, end;
+
+ set_clip (sw, &begin, &end);
+}
+
+
+/* A callback for when the clipboard contents have been received */
+static void
+contents_received_callback (GtkClipboard *clipboard,
+ GtkSelectionData *sd,
+ gpointer data)
+{
+ gchar *c;
+ PsppireSyntaxWindow *syntax_window = data;
+
+ if ( sd->length < 0 )
+ return;
+
+ if ( sd->type != gdk_atom_intern ("UTF8_STRING", FALSE))
+ return;
+
+ c = (gchar *) sd->data;
+
+ gtk_text_buffer_insert_at_cursor (syntax_window->buffer,
+ (gchar *) sd->data,
+ sd->length);
+
+}
+
+static void
+on_edit_paste (PsppireSyntaxWindow *sw)
+{
+ GdkDisplay *display = gtk_widget_get_display (GTK_WIDGET (sw));
+ GtkClipboard *clipboard =
+ gtk_clipboard_get_for_display (display, GDK_SELECTION_CLIPBOARD);
+
+ gtk_clipboard_request_contents (clipboard,
+ gdk_atom_intern ("UTF8_STRING", TRUE),
+ contents_received_callback,
+ sw);
+}
+
+static void
+on_owner_change (GtkClipboard *clip, GdkEventOwnerChange *event, gpointer data)
+{
+ gint i;
+ gboolean compatible_target = FALSE;
+ PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (data);
+
+ for (i = 0 ; i < sizeof (targets) / sizeof (targets[0]) ; ++i)
+ {
+ GdkAtom atom = gdk_atom_intern (targets[i].target, TRUE);
+ if ( gtk_clipboard_wait_is_target_available (clip, atom))
+ {
+ compatible_target = TRUE;
+ break;
+ }
+ }
+
+ gtk_action_set_sensitive (sw->edit_paste, compatible_target);
+}
+
+
+\f
+
/* Parse and execute all the text in the buffer */
static void
on_run_all (GtkMenuItem *menuitem, gpointer user_data)
return g_strdup_printf ("%s.sps", filename);
}
- return strdup (filename);
+ return xstrdup (filename);
}
/*
Save BUFFER to the file called FILENAME.
- If successful, clears the buffer's modified flag
+ FILENAME must be encoded in Glib filename encoding.
+ If successful, clears the buffer's modified flag.
*/
static gboolean
save_editor_to_file (PsppireSyntaxWindow *se,
gchar *text;
gchar *suffixedname;
- gchar *glibfilename;
g_assert (filename);
suffixedname = append_suffix (filename);
- glibfilename = g_filename_from_utf8 (suffixedname, -1, 0, 0, err);
-
- g_free ( suffixedname);
-
- if ( ! glibfilename )
- return FALSE;
-
gtk_text_buffer_get_iter_at_line (buffer, &start, 0);
gtk_text_buffer_get_iter_at_offset (buffer, &stop, -1);
text = gtk_text_buffer_get_text (buffer, &start, &stop, FALSE);
- result = g_file_set_contents (glibfilename, text, -1, err);
+ result = g_file_set_contents (suffixedname, text, -1, err);
+
+ g_free (suffixedname);
if ( result )
{
- psppire_window_set_filename (PSPPIRE_WINDOW (se), filename);
+ char *fn = g_filename_display_name (filename);
+ 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);
+ g_free (msg);
}
return result;
}
-/* If the buffer's modified flag is set, then save it, and close the window.
- Otherwise just close the window.
-*/
-static void
-save_if_modified (PsppireSyntaxWindow *se)
-{
-
- if ( TRUE == gtk_text_buffer_get_modified (se->buffer))
- {
- gint response;
- GtkWidget *dialog;
-
- const gchar *filename = psppire_window_get_filename (PSPPIRE_WINDOW (se));
-
- g_return_if_fail (filename != NULL);
-
- dialog =
- gtk_message_dialog_new (GTK_WINDOW (se),
- GTK_DIALOG_MODAL,
- GTK_MESSAGE_QUESTION,
- GTK_BUTTONS_NONE,
- _("Save contents of syntax editor to %s?"),
- filename);
-
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_YES,
- GTK_RESPONSE_ACCEPT);
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_NO,
- GTK_RESPONSE_REJECT);
- gtk_dialog_add_button (GTK_DIALOG (dialog),
- GTK_STOCK_CANCEL,
- GTK_RESPONSE_CANCEL);
-
-
- response = gtk_dialog_run (GTK_DIALOG (dialog));
-
- gtk_widget_destroy (dialog);
-
- if ( response == GTK_RESPONSE_ACCEPT )
- {
- GError *err = NULL;
-
- if ( ! save_editor_to_file (se, filename, &err) )
- {
- msg (ME, err->message);
- g_error_free (err);
- }
- }
-
- if ( response == GTK_RESPONSE_CANCEL )
- return ;
- }
-
- gtk_widget_destroy (GTK_WIDGET (se));
-}
/* Callback for the File->SaveAs menuitem */
static void
-on_syntax_save_as (GtkMenuItem *menuitem, gpointer user_data)
+syntax_save_as (PsppireWindow *se)
{
GtkFileFilter *filter;
gint response;
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
-
GtkWidget *dialog =
gtk_file_chooser_dialog_new (_("Save Syntax"),
GTK_WINDOW (se),
char *filename =
gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog) );
- if ( ! save_editor_to_file (se, filename, &err) )
+ if ( ! save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err) )
{
- msg ( ME, err->message );
+ msg ( ME, "%s", err->message );
g_error_free (err);
}
/* Callback for the File->Save menuitem */
static void
-on_syntax_save (GtkMenuItem *menuitem, gpointer user_data)
+syntax_save (PsppireWindow *se)
{
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
- const gchar *filename = psppire_window_get_filename (PSPPIRE_WINDOW (se));
-
+ const gchar *filename = psppire_window_get_filename (se);
if ( filename == NULL )
- on_syntax_save_as (menuitem, se);
+ syntax_save_as (se);
else
{
GError *err = NULL;
- save_editor_to_file (se, filename, &err);
+ save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err);
if ( err )
{
- msg (ME, err->message);
+ msg (ME, "%s", err->message);
g_error_free (err);
}
}
static gboolean
on_quit (GtkMenuItem *menuitem, gpointer user_data)
{
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
- save_if_modified (se);
- return FALSE;
-}
-
-
-/* Callback for the "delete" action (clicking the x on the top right
- hand corner of the window) */
-static gboolean
-on_delete (GtkWidget *w, GdkEvent *event, gpointer user_data)
-{
- PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
+ psppire_quit ();
- save_if_modified (se);
- return TRUE;
+ return FALSE;
}
gtk_widget_show (w);
}
-/* Callback for the File->Open->Syntax menuitem */
void
-open_syntax_window (GtkMenuItem *menuitem, gpointer parent)
+open_syntax_window (const char *file_name)
{
- GtkFileFilter *filter;
- gint response;
+ GtkWidget *se = psppire_syntax_window_new ();
- GtkWidget *dialog =
- gtk_file_chooser_dialog_new (_("Open Syntax"),
- GTK_WINDOW (parent),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
-
- filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
- gtk_file_filter_add_pattern (filter, "*.sps");
- gtk_file_filter_add_pattern (filter, "*.SPS");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
- filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("All Files"));
- gtk_file_filter_add_pattern (filter, "*");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
- response = gtk_dialog_run (GTK_DIALOG (dialog));
-
- if (response == GTK_RESPONSE_ACCEPT)
- {
- const char *file_name = gtk_file_chooser_get_filename
- (GTK_FILE_CHOOSER (dialog));
-
- GtkWidget *se = psppire_syntax_window_new ();
-
- if ( psppire_syntax_window_load_from_file (PSPPIRE_SYNTAX_WINDOW (se), file_name, NULL) )
-#if RECENT_LISTS_AVAILABLE
- {
- GtkRecentManager *manager = gtk_recent_manager_get_default();
- gchar *uri = g_filename_to_uri (file_name, NULL, NULL);
-
- gtk_recent_manager_remove_item (manager, uri, NULL);
- if ( ! gtk_recent_manager_add_item (manager, uri))
- g_warning ("Could not add item %s to recent list\n",uri);
-
- g_free (uri);
- }
-#else
- ;
-#endif
- gtk_widget_show (se);
- }
-
- gtk_widget_destroy (dialog);
+ if ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) )
+ gtk_widget_show (se);
+ else
+ gtk_widget_destroy (se);
}
+static void
+on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window)
+{
+ gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context);
+}
+static void
+on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window)
+{
+ if (gtk_text_buffer_get_modified (buffer))
+ psppire_window_set_unsaved (window);
+}
extern struct source_stream *the_source_stream ;
static void
psppire_syntax_window_init (PsppireSyntaxWindow *window)
{
- GladeXML *xml = XML_NEW ("syntax-editor.glade");
+ GtkBuilder *xml = builder_new ("syntax-editor.ui");
GtkWidget *box = gtk_vbox_new (FALSE, 0);
-
- GtkWidget *menubar = get_widget_assert (xml, "menubar2");
+
+ GtkWidget *menubar = get_widget_assert (xml, "menubar");
GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8");
- GtkWidget *sb = get_widget_assert (xml, "statusbar2");
+
GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view");
+
+ 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->edit_delete = get_action_assert (xml, "edit_delete");
+ window->edit_copy = get_action_assert (xml, "edit_copy");
+ window->edit_cut = get_action_assert (xml, "edit_cut");
+ 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, "modified-changed",
+ G_CALLBACK (on_modified_changed), window);
+
connect_help (xml);
gtk_container_add (GTK_CONTAINER (window), box);
g_object_ref (menubar);
- gtk_widget_unparent (menubar);
g_object_ref (sw);
- gtk_widget_unparent (sw);
- g_object_ref (sb);
- gtk_widget_unparent (sb);
+ 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), sb, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (box), window->sb, FALSE, TRUE, 0);
gtk_widget_show_all (box);
- g_signal_connect (get_widget_assert (xml,"file_new_syntax"),
- "activate",
- G_CALLBACK (create_syntax_window),
- NULL);
+ g_signal_connect_swapped (get_action_assert (xml,"file_new_syntax"), "activate", G_CALLBACK (create_syntax_window), NULL);
- g_signal_connect (get_widget_assert (xml,"file_open_syntax"),
+#if 0
+ g_signal_connect (get_action_assert (xml,"file_new_data"),
"activate",
- G_CALLBACK (open_syntax_window),
+ G_CALLBACK (create_data_window),
window);
+#endif
+ g_signal_connect_swapped (get_action_assert (xml, "file_save"),
+ "activate",
+ G_CALLBACK (syntax_save),
+ window);
- g_signal_connect (get_widget_assert (xml,"file_new_data"),
+ g_signal_connect_swapped (get_action_assert (xml, "file_save_as"),
"activate",
- G_CALLBACK (create_data_window),
+ G_CALLBACK (syntax_save_as),
window);
- g_signal_connect (get_widget_assert (xml,"help_about"),
+ g_signal_connect (get_action_assert (xml,"file_quit"),
"activate",
- G_CALLBACK (about_new),
+ G_CALLBACK (on_quit),
window);
- g_signal_connect (get_widget_assert (xml,"help_reference"),
+ g_signal_connect_swapped (window->edit_delete,
"activate",
- G_CALLBACK (reference_manual),
- NULL);
+ G_CALLBACK (on_edit_delete),
+ window);
- g_signal_connect (get_widget_assert (xml, "file_save"),
+ g_signal_connect_swapped (window->edit_copy,
"activate",
- G_CALLBACK (on_syntax_save),
+ G_CALLBACK (on_edit_copy),
window);
- g_signal_connect (get_widget_assert (xml, "file_save_as"),
+ g_signal_connect_swapped (window->edit_cut,
"activate",
- G_CALLBACK (on_syntax_save_as),
+ G_CALLBACK (on_edit_cut),
window);
- g_signal_connect (get_widget_assert (xml,"file_quit"),
+ g_signal_connect_swapped (window->edit_paste,
"activate",
- G_CALLBACK (on_quit),
+ G_CALLBACK (on_edit_paste),
window);
- g_signal_connect (get_widget_assert (xml,"run_all"),
+ g_signal_connect (get_action_assert (xml,"run_all"),
"activate",
G_CALLBACK (on_run_all),
window);
-
- g_signal_connect (get_widget_assert (xml,"run_selection"),
+ g_signal_connect (get_action_assert (xml,"run_selection"),
"activate",
G_CALLBACK (on_run_selection),
window);
- g_signal_connect (get_widget_assert (xml,"run_current_line"),
+ g_signal_connect (get_action_assert (xml,"run_current_line"),
"activate",
G_CALLBACK (on_run_current_line),
window);
- g_signal_connect (get_widget_assert (xml,"run_to_end"),
+ g_signal_connect (get_action_assert (xml,"run_to_end"),
"activate",
G_CALLBACK (on_run_to_end),
window);
- g_signal_connect (get_widget_assert (xml,"windows_minimise_all"),
+ g_signal_connect (get_action_assert (xml,"windows_minimise_all"),
"activate",
G_CALLBACK (psppire_window_minimise_all), NULL);
- PSPPIRE_WINDOW (window)->menu = GTK_MENU_SHELL (get_widget_assert (xml,"windows_menu"));
- g_object_unref (xml);
+ {
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
+
+ merge_help_menu (uim);
+
+ PSPPIRE_WINDOW (window)->menu =
+ GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent);
+ }
- g_signal_connect (window, "delete-event",
- G_CALLBACK (on_delete), window);
+ g_object_unref (xml);
}
+
+
+
GtkWidget*
psppire_syntax_window_new (void)
{
return GTK_WIDGET (g_object_new (psppire_syntax_window_get_type (),
- "usage", PSPPIRE_WINDOW_USAGE_SYNTAX,
+ "filename", "Syntax",
+ "description", _("Syntax Editor"),
NULL));
}
+static void
+error_dialog (GtkWindow *w, const gchar *filename, GError *err)
+{
+ gchar *fn = g_filename_display_basename (filename);
+
+ GtkWidget *dialog =
+ gtk_message_dialog_new (w,
+ GTK_DIALOG_DESTROY_WITH_PARENT,
+ GTK_MESSAGE_ERROR,
+ GTK_BUTTONS_CLOSE,
+ _("Cannot load syntax file '%s'"),
+ fn);
+
+ g_free (fn);
+
+ g_object_set (dialog, "icon-name", "psppicon", NULL);
+
+ gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
+ "%s", err->message);
+
+ gtk_dialog_run (GTK_DIALOG (dialog));
+
+ gtk_widget_destroy (dialog);
+}
/*
Loads the buffer from the file called FILENAME
*/
gboolean
-psppire_syntax_window_load_from_file (PsppireSyntaxWindow *se,
- const gchar *filename,
- GError **err)
+syntax_load (PsppireWindow *window, const gchar *filename)
{
- gchar *text;
+ GError *err = NULL;
+ gchar *text_locale = NULL;
+ gchar *text_utf8 = NULL;
+ gsize len_locale = -1;
+ gsize len_utf8 = -1;
GtkTextIter iter;
+ PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
- gchar *glibfilename = g_filename_from_utf8 (filename, -1, 0, 0, err);
+ /* FIXME: What if it's a very big file ? */
+ if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) )
+ {
+ error_dialog (GTK_WINDOW (window), filename, err);
+ g_clear_error (&err);
+ return FALSE;
+ }
- if ( ! glibfilename )
- return FALSE;
+ text_utf8 = g_locale_to_utf8 (text_locale, len_locale, NULL, &len_utf8, &err);
- /* FIXME: What if it's a very big file ? */
- if ( ! g_file_get_contents (glibfilename, &text, NULL, err) )
+ free (text_locale);
+
+ if ( text_utf8 == NULL )
{
- g_free (glibfilename);
+ error_dialog (GTK_WINDOW (window), filename, err);
+ g_clear_error (&err);
return FALSE;
}
- g_free (glibfilename);
- gtk_text_buffer_get_iter_at_line (se->buffer, &iter, 0);
+ gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0);
- gtk_text_buffer_insert (se->buffer, &iter, text, -1);
+ gtk_text_buffer_insert (sw->buffer, &iter, text_utf8, len_utf8);
- psppire_window_set_filename (PSPPIRE_WINDOW (se), filename);
+ gtk_text_buffer_set_modified (sw->buffer, FALSE);
- gtk_text_buffer_set_modified (se->buffer, FALSE);
+ free (text_utf8);
return TRUE;
}
+\f
+
+static void
+psppire_syntax_window_iface_init (PsppireWindowIface *iface)
+{
+ iface->save = syntax_save;
+ iface->load = syntax_load;
+}
+
+
+
projects / pspp / blobdiff