X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-syntax-window.c;h=de12be49f21d7d96d6a1e9145d599f84bd1ef2bf;hb=608b1765241e7c6f9bd5e86a8f81cf15edeb413b;hp=e3aaa75681930af7c7b3009c225827dab95346ac;hpb=918ac468b75dbfc80a8af78b00b4dd18a714a0ac;p=pspp diff --git a/src/ui/gui/psppire-syntax-window.c b/src/ui/gui/psppire-syntax-window.c index e3aaa75681..de12be49f2 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, 2009 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 @@ -29,11 +30,13 @@ #include "psppire-data-window.h" #include "psppire-window-register.h" #include "psppire.h" -#include "about.h" +#include "help-menu.h" #include "psppire-syntax-window.h" #include "syntax-editor-source.h" #include +#include "xalloc.h" + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -224,7 +227,7 @@ append_suffix (const gchar *filename) return g_strdup_printf ("%s.sps", filename); } - return strdup (filename); + return xstrdup (filename); } /* @@ -308,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); } @@ -333,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); } } @@ -357,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 (); - - if ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) ) - gtk_widget_show (se); - else - gtk_widget_destroy (se); - } + GtkWidget *se = psppire_syntax_window_new (); - 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) { @@ -423,7 +392,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) 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"); @@ -456,15 +425,7 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) gtk_widget_show_all (box); - g_signal_connect (get_action_assert (xml,"file_new_syntax"), - "activate", - G_CALLBACK (create_syntax_window), - NULL); - - g_signal_connect (get_action_assert (xml,"file_open_syntax"), - "activate", - G_CALLBACK (open_syntax_window), - window); + 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"), @@ -473,21 +434,6 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) window); #endif - { - GtkAction *abt = get_action_assert (xml, "help_about"); - g_object_set (abt, "stock-id", "gtk-about", NULL); - - g_signal_connect (abt, - "activate", - G_CALLBACK (about_new), - window); - } - - g_signal_connect (get_action_assert (xml,"help_reference"), - "activate", - G_CALLBACK (reference_manual), - NULL); - g_signal_connect_swapped (get_action_assert (xml, "file_save"), "activate", G_CALLBACK (syntax_save), @@ -532,8 +478,10 @@ psppire_syntax_window_init (PsppireSyntaxWindow *window) { 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/menubar2/windows/windows_minimise_all")->parent); + GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); } g_object_unref (xml); @@ -567,7 +515,7 @@ error_dialog (GtkWindow *w, const gchar *filename, GError *err) g_object_set (dialog, "icon-name", "psppicon", NULL); gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog), - err->message); + "%s", err->message); gtk_dialog_run (GTK_DIALOG (dialog)); @@ -577,16 +525,30 @@ error_dialog (GtkWindow *w, const gchar *filename, GError *err) /* Loads the buffer from the file called FILENAME */ -static gboolean +gboolean syntax_load (PsppireWindow *window, const gchar *filename) { GError *err = NULL; - gchar *text; + gchar *text_locale = NULL; + gchar *text_utf8 = NULL; + gsize len_locale = -1; + gsize len_utf8 = -1; GtkTextIter iter; PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window); /* FIXME: What if it's a very big file ? */ - if ( ! g_file_get_contents (filename, &text, NULL, &err) ) + if ( ! g_file_get_contents (filename, &text_locale, &len_locale, &err) ) + { + error_dialog (GTK_WINDOW (window), filename, err); + g_clear_error (&err); + return FALSE; + } + + text_utf8 = g_locale_to_utf8 (text_locale, len_locale, NULL, &len_utf8, &err); + + free (text_locale); + + if ( text_utf8 == NULL ) { error_dialog (GTK_WINDOW (window), filename, err); g_clear_error (&err); @@ -595,10 +557,12 @@ syntax_load (PsppireWindow *window, const gchar *filename) gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0); - gtk_text_buffer_insert (sw->buffer, &iter, text, -1); + gtk_text_buffer_insert (sw->buffer, &iter, text_utf8, len_utf8); gtk_text_buffer_set_modified (sw->buffer, FALSE); + free (text_utf8); + return TRUE; }