/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2008 Free Software Foundation
+ Copyright (C) 2008, 2009 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 <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 "psppire.h"
#include "about.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;
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 )
{
- 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);
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);
- }
- psppire_window_set_filename (PSPPIRE_WINDOW (se), filename);
- }
-
- 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 );
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);
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;
}
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);
+ if ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) )
+ gtk_widget_show (se);
+ else
+ gtk_widget_destroy (se);
}
gtk_widget_destroy (dialog);
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
gtk_widget_show_all (box);
- g_signal_connect (get_object_assert (xml,"file_new_syntax"),
+ g_signal_connect (get_action_assert (xml,"file_new_syntax"),
"activate",
G_CALLBACK (create_syntax_window),
NULL);
- g_signal_connect (get_object_assert (xml,"file_open_syntax"),
+ g_signal_connect (get_action_assert (xml,"file_open_syntax"),
"activate",
G_CALLBACK (open_syntax_window),
window);
#if 0
- g_signal_connect (get_object_assert (xml,"file_new_data"),
+ g_signal_connect (get_action_assert (xml,"file_new_data"),
"activate",
G_CALLBACK (create_data_window),
window);
#endif
- g_signal_connect (get_object_assert (xml,"help_about"),
- "activate",
- G_CALLBACK (about_new),
- window);
+ {
+ 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_object_assert (xml,"help_reference"),
+ g_signal_connect (get_action_assert (xml,"help_reference"),
"activate",
G_CALLBACK (reference_manual),
NULL);
- g_signal_connect (get_object_assert (xml, "file_save"),
+ g_signal_connect_swapped (get_action_assert (xml, "file_save"),
"activate",
- G_CALLBACK (on_syntax_save),
+ G_CALLBACK (syntax_save),
window);
- g_signal_connect (get_object_assert (xml, "file_save_as"),
+ g_signal_connect_swapped (get_action_assert (xml, "file_save_as"),
"activate",
- G_CALLBACK (on_syntax_save_as),
+ G_CALLBACK (syntax_save_as),
window);
- g_signal_connect (get_object_assert (xml,"file_quit"),
+ g_signal_connect (get_action_assert (xml,"file_quit"),
"activate",
G_CALLBACK (on_quit),
window);
- g_signal_connect (get_object_assert (xml,"run_all"),
+ g_signal_connect (get_action_assert (xml,"run_all"),
"activate",
G_CALLBACK (on_run_all),
window);
- g_signal_connect (get_object_assert (xml,"run_selection"),
+ g_signal_connect (get_action_assert (xml,"run_selection"),
"activate",
G_CALLBACK (on_run_selection),
window);
- g_signal_connect (get_object_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_object_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_object_assert (xml,"windows_minimise_all"),
+ g_signal_connect (get_action_assert (xml,"windows_minimise_all"),
"activate",
G_CALLBACK (psppire_window_minimise_all), NULL);
- GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1"));
+
+ {
+ GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
PSPPIRE_WINDOW (window)->menu =
GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar2/windows/windows_minimise_all")->parent);
-
+ }
g_object_unref (xml);
-
- g_signal_connect (window, "delete-event",
- G_CALLBACK (on_delete), window);
}
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),
+ 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)
+static gboolean
+syntax_load (PsppireWindow *window, const gchar *filename)
{
+ GError *err = NULL;
gchar *text;
GtkTextIter iter;
-
- gchar *glibfilename = g_filename_from_utf8 (filename, -1, 0, 0, err);
-
- if ( ! glibfilename )
- return FALSE;
+ PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
/* FIXME: What if it's a very big file ? */
- if ( ! g_file_get_contents (glibfilename, &text, NULL, err) )
+ 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 (se->buffer, &iter, 0);
- gtk_text_buffer_insert (se->buffer, &iter, text, -1);
+ gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0);
- psppire_window_set_filename (PSPPIRE_WINDOW (se), filename);
+ gtk_text_buffer_insert (sw->buffer, &iter, text, -1);
- gtk_text_buffer_set_modified (se->buffer, FALSE);
+ gtk_text_buffer_set_modified (sw->buffer, FALSE);
return TRUE;
}
+\f
+
+static void
+psppire_syntax_window_iface_init (PsppireWindowIface *iface)
+{
+ iface->save = syntax_save;
+ iface->load = syntax_load;
+}
projects / pspp-builds.git / blobdiff