X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=48e1ea44fe73d3873c4631d6e5b4bc06311e4636;hb=9389f9870643a519cf69b84a9388a0a40315d903;hp=86d87bb92b22a4f7a5086215b8ba7e26eb8e4745;hpb=d112adc6bdbab5593d533fdc8853e80a2cb358e7;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index 86d87bb92b..48e1ea44fe 100644 --- a/src/ui/gui/psppire-syntax-window.c +++ b/src/ui/gui/psppire-syntax-window.c @@ -1,5 +1,5 @@ /* 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 @@ -18,6 +18,7 @@ #include #include +#include "executor.h" #include "helper.h" #include @@ -34,6 +35,8 @@ #include "syntax-editor-source.h" #include +#include "xalloc.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -224,12 +227,13 @@ append_suffix (const gchar *filename) 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, @@ -242,28 +246,24 @@ 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 ) { - gchar *msg = g_strdup_printf (_("Saved file \"%s\""), 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); @@ -311,7 +311,7 @@ syntax_save_as (PsppireWindow *se) if ( ! save_editor_to_file (PSPPIRE_SYNTAX_WINDOW (se), filename, &err) ) { - msg ( ME, err->message ); + msg ( ME, "%s", err->message ); g_error_free (err); } @@ -336,7 +336,7 @@ syntax_save (PsppireWindow *se) 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); } } @@ -360,51 +360,17 @@ create_syntax_window (void) 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 *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 (); - GtkWidget *se = psppire_syntax_window_new (); - - if ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) ) - gtk_widget_show (se); - else - gtk_widget_destroy (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) { @@ -414,10 +380,10 @@ on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window) static void on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window) { - psppire_window_set_unsaved (window, gtk_text_buffer_get_modified (buffer)); + if (gtk_text_buffer_get_modified (buffer)) + psppire_window_set_unsaved (window); } - extern struct source_stream *the_source_stream ; static void @@ -464,11 +430,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) G_CALLBACK (create_syntax_window), NULL); - g_signal_connect (get_action_assert (xml,"file_open_syntax"), - "activate", - G_CALLBACK (open_syntax_window), - window); - #if 0 g_signal_connect (get_action_assert (xml,"file_new_data"), "activate", @@ -552,37 +513,54 @@ psppire_syntax_window_new (void) 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 */ -static gboolean +gboolean syntax_load (PsppireWindow *window, const gchar *filename) { + GError *err = NULL; gchar *text; GtkTextIter iter; PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window); - gchar *glibfilename = g_filename_from_utf8 (filename, -1, 0, 0, NULL); - - if ( ! glibfilename ) - return FALSE; - /* FIXME: What if it's a very big file ? */ - if ( ! g_file_get_contents (glibfilename, &text, NULL, NULL) ) + if ( ! g_file_get_contents (filename, &text, NULL, &err) ) { - 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 (sw->buffer, &iter, 0); gtk_text_buffer_insert (sw->buffer, &iter, text, -1); - psppire_window_set_filename (window, filename); - gtk_text_buffer_set_modified (sw->buffer, FALSE); return TRUE;