Merge remote branch 'origin/sourceview' 20110820030503/pspp
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 20 Aug 2011 05:52:41 +0000 (07:52 +0200)
1  2 
configure.ac
src/ui/gui/automake.mk
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-syntax-window.c

diff --combined configure.ac
index 719f4c7411d68517adaeb31186257da92bceffb5,766d5a43859d43a26aa9c7771dcf959379861a98..1456b66138eaf537a40cedd6a39325b4f143a088
@@@ -75,6 -75,9 +75,9 @@@ if test "$with_cairo" != no && test "$w
    PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= 2.16], [],
      [PSPP_REQUIRED_PREREQ([gtk+ 2.0 version 2.16 or later (or use --without-gui)])])
  
+   PKG_CHECK_MODULES([GTKSOURCEVIEW], [gtksourceview-2.0 >= 2.2], [],
+     [PSPP_REQUIRED_PREREQ([gtksourceview 2.0 version 2.2 or later (or use --without-gui)])])
    AC_ARG_VAR([GLIB_GENMARSHAL])
    AC_CHECK_PROGS([GLIB_GENMARSHAL], [glib-genmarshal])
    if test "x$GLIB_GENMARSHAL" = x; then
@@@ -196,30 -199,24 +199,30 @@@ AC_DEFINE
    [crc32], [gl_crc32],
    [Avoid making zlib call gnulib's crc32() instead of its own.])
  
 -dnl Gnumeric support requires libxml2 and zlib.
 +dnl Gnumeric and OpenDocument (read) support requires libxml2 and zlib.
  if test $HAVE_LIBXML2 = yes && test $HAVE_ZLIB = yes; then
    GNM_SUPPORT=yes
 +  ODF_READ_SUPPORT=yes
    AC_DEFINE(
      [GNM_SUPPORT], [1],
      [Define to 1 if building in support for reading Gnumeric files.])
 +  AC_DEFINE(
 +    [ODF_READ_SUPPORT], [1],
 +    [Define to 1 if building in support for reading OpenDocument files.])
  else
    GNM_SUPPORT=no
 +  ODF_READ_SUPPORT=no
  fi
  AC_SUBST([GNM_SUPPORT])
 +AC_SUBST([ODF_READ_SUPPORT])
  
 -dnl ODT support requires libxml2.
 +dnl ODF support requires libxml2 (zlib is optional).
  if test $HAVE_LIBXML2 = yes; then
    AC_DEFINE(
 -    [ODT_SUPPORT], [1],
 -    [Define to 1 if building in support for writing ODT files.])
 +    [ODF_WRITE_SUPPORT], [1],
 +    [Define to 1 if building in support for writing OpenDocument files.])
  fi
 -AM_CONDITIONAL([ODT_SUPPORT], [test $HAVE_LIBXML2 = yes])
 +AM_CONDITIONAL([ODF_WRITE_SUPPORT], [test $HAVE_LIBXML2 = yes])
  
  AC_ARG_WITH(
    gui_tools,
diff --combined src/ui/gui/automake.mk
index e4ef91eb4f3310877829a923ca78fdee04b33c31,6097d16b82d3a2d9dcec1b46963d4cf06330a337..2c8e02b6ff364be572f90929b1d45727d8431e0a
@@@ -4,11 -4,9 +4,11 @@@ include $(top_srcdir)/src/ui/gui/sheet/
  
  UI_FILES = \
        src/ui/gui/aggregate.ui \
 +      src/ui/gui/autorecode.ui \
        src/ui/gui/binomial.ui \
        src/ui/gui/compute.ui \
        src/ui/gui/correlation.ui \
 +      src/ui/gui/count.ui \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/chi-square.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
 +      src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
 +      src/ui/gui/ks-one-sample.ui \
        src/ui/gui/oneway.ui \
 +      src/ui/gui/paired-samples.ui \
        src/ui/gui/psppire.ui \
        src/ui/gui/rank.ui \
 +      src/ui/gui/runs.ui \
        src/ui/gui/sort.ui \
        src/ui/gui/split-file.ui \
        src/ui/gui/recode.ui \
@@@ -50,7 -44,7 +50,7 @@@ EXTRA_DIST += 
  if HAVE_GUI
  bin_PROGRAMS += src/ui/gui/psppire 
  
- src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
+ src_ui_gui_psppire_CFLAGS = $(GTK_CFLAGS) $(GTKSOURCEVIEW_CFLAGS) -Wall -DGDK_MULTIHEAD_SAFE=1
  
  
  src_ui_gui_psppire_LDFLAGS = \
@@@ -72,7 -66,9 +72,9 @@@ src_ui_gui_psppire_LDADD = 
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
-       $(CAIRO_LIBS)
+       $(GTKSOURCEVIEW_LIBS) \
+       $(CAIRO_LIBS) \
+       $(LIBINTL)
  
  src_ui_gui_psppiredir = $(pkgdatadir)
  
@@@ -81,14 -77,17 +83,17 @@@ themedir = $(DESTDIR)$(datadir)/icons/h
  context = apps
  
  
+ install-lang:
+       $(INSTALL) $(top_srcdir)/src/ui/gui/pspp.lang $(pkgdatadir)
+       
  install-icons:
        for size in 16x16 ; do \
          $(MKDIR_P) $(themedir)/$$size/$(context) ; \
 -          $(INSTALL) $(top_srcdir)/src/ui/gui/psppicon.png $(themedir)/$$size/$(context) ; \
 +          $(INSTALL) $(top_srcdir)/src/ui/gui/icons/$$size/* $(themedir)/$$size/$(context) ; \
        done 
        gtk-update-icon-cache --ignore-theme-index $(themedir)
  
- INSTALL_DATA_HOOKS += install-icons
+ INSTALL_DATA_HOOKS += install-icons install-lang
  
  uninstall-icons:
        for size in 16x16 ; do \
@@@ -100,6 -99,7 +105,7 @@@ UNINSTALL_DATA_HOOKS += uninstall-icon
  
  dist_src_ui_gui_psppire_DATA = \
        $(UI_FILES) \
+       $(top_srcdir)/src/ui/gui/pspp.lang \
        $(top_srcdir)/src/ui/gui/pspplogo.png \
        $(top_srcdir)/src/ui/gui/icons/value-labels.png \
        $(top_srcdir)/src/ui/gui/icons/goto-variable.png\
@@@ -124,11 -124,7 +130,11 @@@ src_ui_gui_psppire_SOURCES = 
        src/ui/gui/psppire-buttonbox.c \
        src/ui/gui/psppire-hbuttonbox.c \
        src/ui/gui/psppire-vbuttonbox.c \
 +      src/ui/gui/psppire-scanf.c \
 +      src/ui/gui/psppire-scanf.h \
        src/ui/gui/psppire-acr.c \
 +      src/ui/gui/autorecode-dialog.c \
 +      src/ui/gui/autorecode-dialog.h \
        src/ui/gui/aggregate-dialog.c \
        src/ui/gui/aggregate-dialog.h \
        src/ui/gui/binomial-dialog.c \
        src/ui/gui/chi-square-dialog.h \
        src/ui/gui/correlation-dialog.c \
        src/ui/gui/correlation-dialog.h \
 +      src/ui/gui/count-dialog.c \
 +      src/ui/gui/count-dialog.h \
        src/ui/gui/crosstabs-dialog.c \
        src/ui/gui/crosstabs-dialog.h \
        src/ui/gui/customentry.c \
        src/ui/gui/helper.h \
        src/ui/gui/k-related-dialog.c \
        src/ui/gui/k-related-dialog.h \
 +      src/ui/gui/k-means-dialog.c \
 +      src/ui/gui/k-means-dialog.h \
 +      src/ui/gui/ks-one-sample-dialog.c \
 +      src/ui/gui/ks-one-sample-dialog.h \
        src/ui/gui/main.c \
        src/ui/gui/missing-val-dialog.c \
        src/ui/gui/missing-val-dialog.h \
          src/ui/gui/oneway-anova-dialog.c \
          src/ui/gui/oneway-anova-dialog.h \
 +      src/ui/gui/paired-dialog.c \
 +      src/ui/gui/paired-dialog.h \
        src/ui/gui/psppire.c \
        src/ui/gui/psppire.h \
        src/ui/gui/psppire-acr.h \
        src/ui/gui/psppire-select-dest.h \
        src/ui/gui/psppire-syntax-window.c \
        src/ui/gui/psppire-syntax-window.h \
 +      src/ui/gui/psppire-val-chooser.c \
 +      src/ui/gui/psppire-val-chooser.h \
        src/ui/gui/psppire-var-ptr.c \
        src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-sheet.c \
        src/ui/gui/reliability-dialog.h \
        src/ui/gui/roc-dialog.c \
        src/ui/gui/roc-dialog.h \
 +      src/ui/gui/runs-dialog.c \
 +      src/ui/gui/runs-dialog.h \
        src/ui/gui/select-cases-dialog.c \
        src/ui/gui/select-cases-dialog.h \
        src/ui/gui/sort-cases-dialog.c \
        src/ui/gui/t-test-options.h \
        src/ui/gui/t-test-paired-samples.c \
        src/ui/gui/t-test-paired-samples.h \
 +      src/ui/gui/npar-two-sample-related.c \
 +      src/ui/gui/npar-two-sample-related.h \
        src/ui/gui/val-labs-dialog.c \
        src/ui/gui/val-labs-dialog.h \
        src/ui/gui/var-display.c \
index 494f924b4e0f65ab81993bba80e67a85913f7304,be4702d34349ee65a1e4ca47726dc08c262a1c34..49438d6cff14f5af7a68150455de8a741aa13410
  #include "libpspp/message.h"
  #include "libpspp/str.h"
  #include "ui/gui/aggregate-dialog.h"
 +#include "ui/gui/autorecode-dialog.h"
  #include "ui/gui/binomial-dialog.h"
  #include "ui/gui/chi-square-dialog.h"
  #include "ui/gui/comments-dialog.h"
  #include "ui/gui/compute-dialog.h"
  #include "ui/gui/correlation-dialog.h"
 +#include "ui/gui/count-dialog.h"
  #include "ui/gui/crosstabs-dialog.h"
  #include "ui/gui/descriptives-dialog.h"
  #include "ui/gui/entry-dialog.h"
  #include "ui/gui/goto-case-dialog.h"
  #include "ui/gui/help-menu.h"
  #include "ui/gui/helper.h"
 +#include "ui/gui/k-means-dialog.h"
  #include "ui/gui/k-related-dialog.h"
 +#include "ui/gui/npar-two-sample-related.h"
  #include "ui/gui/oneway-anova-dialog.h"
  #include "ui/gui/psppire-data-window.h"
  #include "ui/gui/psppire-syntax-window.h"
  #include "ui/gui/psppire-window.h"
  #include "ui/gui/psppire.h"
  #include "ui/gui/rank-dialog.h"
 +#include "ui/gui/runs-dialog.h"
 +#include "ui/gui/ks-one-sample-dialog.h"
  #include "ui/gui/recode-dialog.h"
  #include "ui/gui/regression-dialog.h"
  #include "ui/gui/reliability-dialog.h"
@@@ -391,8 -385,7 +391,8 @@@ load_file (PsppireWindow *de, const gch
    mime_type = (name_has_por_suffix (file_name)
                 ? "application/x-spss-por"
                 : "application/x-spss-sav");
 -  add_most_recent (ds_cstr (&filename), mime_type);
 +
 +  add_most_recent (file_name, mime_type);
  
    return ok;
  }
@@@ -493,7 -486,6 +493,7 @@@ static voi
  data_pick_filename (PsppireWindow *window)
  {
    PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (window);
 +  GtkFileFilter *filter = gtk_file_filter_new ();
    GtkWidget *button_sys;
    GtkWidget *dialog =
      gtk_file_chooser_dialog_new (_("Save"),
                                 GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                                 NULL);
  
 -  GtkFileFilter *filter = gtk_file_filter_new ();
 +  g_object_set (dialog, "local-only", FALSE, NULL);
 +
    gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
    gtk_file_filter_add_pattern (filter, "*.sav");
    gtk_file_filter_add_pattern (filter, "*.SAV");
@@@ -839,6 -830,7 +839,7 @@@ on_recent_files_select (GtkMenuShell *m
  }
  
  
  static void
  enable_delete_cases (GtkWidget *w, gint case_num, gpointer data)
  {
@@@ -1074,8 -1066,6 +1075,8 @@@ psppire_data_window_finish_init (Psppir
  
    connect_action (de, "transform_compute", G_CALLBACK (compute_dialog));
  
 +  connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog));
 +
    connect_action (de, "edit_find", G_CALLBACK (find_dialog));
  
    connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog));
    connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog));
   
    connect_action (de, "transform_rank", G_CALLBACK (rank_dialog));
 +
 +  connect_action (de, "transform_count", G_CALLBACK (count_dialog));
   
    connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
   
   
    connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog));
  
 -  connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog));
 +  connect_action (de, "k-means", G_CALLBACK (k_means_dialog));
  
 +  connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog));
    connect_action (de, "binomial", G_CALLBACK (binomial_dialog));
 -
 +  connect_action (de, "runs", G_CALLBACK (runs_dialog));
 +  connect_action (de, "ks-one-sample", G_CALLBACK (ks_one_sample_dialog));
    connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog));
 +  connect_action (de, "two-related-samples", G_CALLBACK (two_related_dialog));
   
  
    {
      GtkWidget *menu_files = gtk_recent_chooser_menu_new_for_manager (
        gtk_recent_manager_get_default ());
  
 +    g_object_set (menu_data, "show-tips",  TRUE, NULL);
 +    g_object_set (menu_files, "show-tips",  TRUE, NULL);
 +
      {
        GtkRecentFilter *filter = gtk_recent_filter_new ();
  
 -      gtk_recent_filter_add_pattern (filter, "*.sav");
 -      gtk_recent_filter_add_pattern (filter, "*.SAV");
 -      gtk_recent_filter_add_pattern (filter, "*.por");
 -      gtk_recent_filter_add_pattern (filter, "*.POR");
 +      gtk_recent_filter_add_mime_type (filter, "application/x-spss-sav");
 +      gtk_recent_filter_add_mime_type (filter, "application/x-spss-por");
  
        gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU);
  
index 47df52be82922ad83999ba2f251f715d263ab05f,b5cf0d3345d27cc45474bcc24e3cbe53c6562c0c..5ccbca5cb5660635a982b09ae4965a925ca59ae0
  #include <gtk/gtk.h>
  #include <stdlib.h>
  
+ #include <gtksourceview/gtksourcebuffer.h>
+ #include <gtksourceview/gtksourcelanguage.h>
+ #include <gtksourceview/gtksourcelanguagemanager.h>
+ #include <gtksourceview/gtksourceprintcompositor.h>
  #include "language/lexer/lexer.h"
  #include "libpspp/encoding-guesser.h"
  #include "libpspp/i18n.h"
@@@ -180,9 -186,32 +186,32 @@@ psppire_syntax_window_dispose (GObject 
  static void
  psppire_syntax_window_class_init (PsppireSyntaxWindowClass *class)
  {
+   GParamSpec *encoding_spec;
    GObjectClass *gobject_class = G_OBJECT_CLASS (class);
  
-   GParamSpec *encoding_spec =
+   GtkSourceLanguageManager *lm = gtk_source_language_manager_get_default ();
+   const gchar * const *existing_paths =  gtk_source_language_manager_get_search_path (lm);
+   gchar **new_paths = g_strdupv ((gchar **)existing_paths);
+   int n = g_strv_length ((gchar **) existing_paths);
+   new_paths = g_realloc (new_paths, (n + 2) * sizeof (*new_paths));
+   new_paths[n] = g_strdup (relocate (PKGDATADIR));
+   new_paths[n+1] = NULL;
+   lm = gtk_source_language_manager_new ();
+   gtk_source_language_manager_set_search_path (lm, new_paths);
+   class->lan = gtk_source_language_manager_get_language (lm, "pspp");
+   if (class->lan == NULL)
+     g_warning ("pspp.lang file not found.  Syntax highlighting will not be available.");
+   parent_class = g_type_class_peek_parent (class);
+   g_strfreev (new_paths);
+   encoding_spec =
      null_if_empty_param ("encoding",
                           "Character encoding",
                           "IANA character encoding in this syntax file",
@@@ -205,7 -234,6 +234,6 @@@ static voi
  psppire_syntax_window_base_init (PsppireSyntaxWindowClass *class)
  {
    GObjectClass *object_class = G_OBJECT_CLASS (class);
    object_class->finalize = psppire_syntax_window_finalize;
  }
  
@@@ -224,9 -252,7 +252,7 @@@ editor_execute_syntax (const PsppireSyn
  {
    PsppireWindow *win = PSPPIRE_WINDOW (sw);
    struct lex_reader *reader;
-   gchar *text;
-   text = gtk_text_buffer_get_text (sw->buffer, &start, &stop, FALSE);
+   gchar *text = gtk_text_buffer_get_text (GTK_TEXT_BUFFER (sw->buffer), &start, &stop, FALSE);
    reader = lex_reader_for_string (text);
    g_free (text);
  
@@@ -240,14 -266,13 +266,13 @@@ static voi
  on_edit_delete (PsppireSyntaxWindow *sw)
  {
    GtkTextIter begin, end;
+   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
    
-   if ( gtk_text_buffer_get_selection_bounds (sw->buffer, &begin, &end) )
-     gtk_text_buffer_delete (sw->buffer, &begin, &end);
+   if ( gtk_text_buffer_get_selection_bounds (buffer, &begin, &end) )
+     gtk_text_buffer_delete (buffer, &begin, &end);
  }
  
  
  /* The syntax editor's clipboard deals only with text */
  enum {
    SELECT_FMT_NULL,
  static void
  selection_changed (PsppireSyntaxWindow *sw)
  {
-   gboolean sel = gtk_text_buffer_get_has_selection (sw->buffer);
+   gboolean sel = gtk_text_buffer_get_has_selection (GTK_TEXT_BUFFER (sw->buffer));
  
    gtk_action_set_sensitive (sw->edit_copy, sel);
    gtk_action_set_sensitive (sw->edit_cut, sel);
@@@ -311,12 -336,13 +336,13 @@@ static gboolea
  set_clip (PsppireSyntaxWindow *sw, GtkTextIter *begin, GtkTextIter *end)
  {
    GtkClipboard *clipboard ;
+   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
  
-   if ( ! gtk_text_buffer_get_selection_bounds (sw->buffer, begin, end) )
+   if ( ! gtk_text_buffer_get_selection_bounds (buffer, begin, end) )
      return FALSE;
  
    g_free (sw->cliptext);
-   sw->cliptext = gtk_text_buffer_get_text  (sw->buffer, begin, end, FALSE);
+   sw->cliptext = gtk_text_buffer_get_text  (buffer, begin, end, FALSE);
  
    clipboard =
      gtk_widget_get_clipboard (GTK_WIDGET (sw), GDK_SELECTION_CLIPBOARD);
@@@ -336,7 -362,7 +362,7 @@@ on_edit_cut (PsppireSyntaxWindow *sw
    GtkTextIter begin, end;
    
    if ( set_clip (sw, &begin, &end))
-     gtk_text_buffer_delete (sw->buffer, &begin, &end);
+     gtk_text_buffer_delete (GTK_TEXT_BUFFER (sw->buffer), &begin, &end);
  }
  
  static void
@@@ -365,7 -391,7 +391,7 @@@ contents_received_callback (GtkClipboar
  
    c = (gchar *) sd->data;
  
-   gtk_text_buffer_insert_at_cursor (syntax_window->buffer,
+   gtk_text_buffer_insert_at_cursor (GTK_TEXT_BUFFER (syntax_window->buffer),
                                    (gchar *) sd->data,
                                    sd->length);
  
@@@ -418,8 -444,8 +444,8 @@@ on_run_all (GtkMenuItem *menuitem, gpoi
    GtkTextIter begin, end;
    PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
  
-   gtk_text_buffer_get_iter_at_offset (se->buffer, &begin, 0);
-   gtk_text_buffer_get_iter_at_offset (se->buffer, &end, -1);
+   gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &begin, 0);
+   gtk_text_buffer_get_iter_at_offset (GTK_TEXT_BUFFER (se->buffer), &end, -1);
  
    editor_execute_syntax (se, begin, end);
  }
@@@ -431,7 -457,7 +457,7 @@@ on_run_selection (GtkMenuItem *menuitem
    GtkTextIter begin, end;
    PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
  
-   if ( gtk_text_buffer_get_selection_bounds (se->buffer, &begin, &end) )
+   if ( gtk_text_buffer_get_selection_bounds (GTK_TEXT_BUFFER (se->buffer), &begin, &end) )
      editor_execute_syntax (se, begin, end);
  }
  
@@@ -448,17 -474,17 +474,17 @@@ on_run_to_end (GtkMenuItem *menuitem, g
    PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
  
    /* Get the current line */
-   gtk_text_buffer_get_iter_at_mark (se->buffer,
+   gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer),
                                    &here,
-                                   gtk_text_buffer_get_insert (se->buffer)
+                                   gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer))
                                    );
  
    line = gtk_text_iter_get_line (&here) ;
  
    /* Now set begin and end to the start of this line, and end of buffer
       respectively */
-   gtk_text_buffer_get_iter_at_line (se->buffer, &begin, line);
-   gtk_text_buffer_get_iter_at_line (se->buffer, &end, -1);
+   gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &begin, line);
+   gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &end, -1);
  
    editor_execute_syntax (se, begin, end);
  }
@@@ -476,17 -502,17 +502,17 @@@ on_run_current_line (GtkMenuItem *menui
    PsppireSyntaxWindow *se = PSPPIRE_SYNTAX_WINDOW (user_data);
  
    /* Get the current line */
-   gtk_text_buffer_get_iter_at_mark (se->buffer,
+   gtk_text_buffer_get_iter_at_mark (GTK_TEXT_BUFFER (se->buffer),
                                    &here,
-                                   gtk_text_buffer_get_insert (se->buffer)
+                                   gtk_text_buffer_get_insert (GTK_TEXT_BUFFER (se->buffer))
                                    );
  
    line = gtk_text_iter_get_line (&here) ;
  
    /* Now set begin and end to the start of this line, and start of
       following line respectively */
-   gtk_text_buffer_get_iter_at_line (se->buffer, &begin, line);
-   gtk_text_buffer_get_iter_at_line (se->buffer, &end, line + 1);
+   gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &begin, line);
+   gtk_text_buffer_get_iter_at_line (GTK_TEXT_BUFFER (se->buffer), &end, line + 1);
  
    editor_execute_syntax (se, begin, end);
  }
@@@ -518,7 -544,7 +544,7 @@@ save_editor_to_file (PsppireSyntaxWindo
                     const gchar *filename,
                     GError **err)
  {
-   GtkTextBuffer *buffer = se->buffer;
+   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (se->buffer);
    struct substring text_locale;
    gboolean result ;
    GtkTextIter start, stop;
@@@ -574,8 -600,6 +600,8 @@@ syntax_pick_filename (PsppireWindow *wi
                                 GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
                                 NULL);
  
 +  g_object_set (dialog, "local-only", FALSE, NULL);
 +
    filter = gtk_file_filter_new ();
    gtk_file_filter_set_name (filter, _("Syntax Files (*.sps) "));
    gtk_file_filter_add_pattern (filter, "*.sps");
@@@ -644,6 -668,21 +670,21 @@@ on_quit (GtkMenuItem *menuitem, gpointe
  }
  
  
+ static void
+ load_and_show_syntax_window (GtkWidget *se, const gchar *filename)
+ {
+   gboolean ok;
+   gtk_source_buffer_begin_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
+   ok = psppire_window_load (PSPPIRE_WINDOW (se), filename);
+   gtk_source_buffer_end_not_undoable_action (PSPPIRE_SYNTAX_WINDOW (se)->buffer);
+   if (ok )
+     gtk_widget_show (se);
+   else
+     gtk_widget_destroy (se);
+ }
  void
  create_syntax_window (void)
  {
@@@ -656,17 -695,13 +697,13 @@@ open_syntax_window (const char *file_na
  {
    GtkWidget *se = psppire_syntax_window_new (encoding);
  
-   if ( psppire_window_load (PSPPIRE_WINDOW (se), file_name) )
-     gtk_widget_show (se);
-   else
-     gtk_widget_destroy (se);
+   if ( file_name)
+     load_and_show_syntax_window (se, file_name);
  }
  
- static void
- on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window)
- {
-   gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context);
- }
+ static void psppire_syntax_window_print (PsppireSyntaxWindow *window);
  
  static void
  on_modified_changed (GtkTextBuffer *buffer, PsppireWindow *window)
      psppire_window_set_unsaved (window);
  }
  
+ static void undo_redo_update (PsppireSyntaxWindow *window);
+ static void undo_last_edit (PsppireSyntaxWindow *window);
+ static void redo_last_edit (PsppireSyntaxWindow *window);
+ static void
+ on_text_changed (GtkTextBuffer *buffer, PsppireSyntaxWindow *window)
+ {
+   gtk_statusbar_pop (GTK_STATUSBAR (window->sb), window->text_context);
+   undo_redo_update (window);
+ }
  static void
  psppire_syntax_window_init (PsppireSyntaxWindow *window)
  {
    GtkWidget *menubar = get_widget_assert (xml, "menubar");
    GtkWidget *sw = get_widget_assert (xml, "scrolledwindow8");
  
    GtkWidget *text_view = get_widget_assert (xml, "syntax_text_view");
  
+   PsppireSyntaxWindowClass *class
+     = PSPPIRE_SYNTAX_WINDOW_CLASS (G_OBJECT_GET_CLASS (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);
  
+   window->print_settings = NULL;
+   window->undo_menuitem = get_action_assert (xml, "edit_undo");
+   window->redo_menuitem = get_action_assert (xml, "edit_redo");
+   if (class->lan)
+     window->buffer = gtk_source_buffer_new_with_language (class->lan);
+   else
+     window->buffer = gtk_source_buffer_new (NULL);
+   gtk_text_view_set_buffer (GTK_TEXT_VIEW (text_view), GTK_TEXT_BUFFER (window->buffer));
+   g_object_set (window->buffer,
+               "highlight-matching-brackets", TRUE,
+               NULL);
+   g_object_set (text_view,
+               "show-line-numbers", TRUE,
+               "show-line-marks", TRUE,
+               "auto-indent", TRUE,
+               "indent-width", 4,
+               "highlight-current-line", TRUE,
+               NULL);
    window->encoding = NULL;
  
    window->cliptext = NULL;
    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->buffer = GTK_SOURCE_BUFFER (gtk_text_view_get_buffer (GTK_TEXT_VIEW (text_view)));
  
    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, "modified-changed", 
                    G_CALLBACK (on_modified_changed), window);
  
+   g_signal_connect_swapped (get_action_assert (xml, "file_print"), "activate",
+                             G_CALLBACK (psppire_syntax_window_print), window);
+   g_signal_connect_swapped (window->undo_menuitem,
+                           "activate",
+                             G_CALLBACK (undo_last_edit),
+                           window);
+   g_signal_connect_swapped (window->redo_menuitem,
+                           "activate",
+                             G_CALLBACK (redo_last_edit),
+                           window);
+   undo_redo_update (window);
    window->sel_handler = g_signal_connect_swapped (clip_primary, "owner-change", 
                                                   G_CALLBACK (selection_changed), window);
  
                    G_CALLBACK (psppire_window_minimise_all), NULL);
  
  
    {
    GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (xml, "uimanager1", GTK_TYPE_UI_MANAGER));
  
@@@ -868,6 -958,7 +960,7 @@@ syntax_load (PsppireWindow *window, con
    gsize len_utf8 = -1;
    GtkTextIter iter;
    PsppireSyntaxWindow *sw = PSPPIRE_SYNTAX_WINDOW (window);
+   GtkTextBuffer *buffer = GTK_TEXT_BUFFER (sw->buffer);
    gchar *encoding;
    char *mime_type;
  
                                       NULL).string;
    free (text_locale);
  
-   gtk_text_buffer_get_iter_at_line (sw->buffer, &iter, 0);
+   if ( text_utf8 == NULL )
+     {
+       error_dialog (GTK_WINDOW (window), filename, err);
+       g_clear_error (&err);
+       return FALSE;
+     }
  
-   gtk_text_buffer_insert (sw->buffer, &iter, text_utf8, len_utf8);
+   gtk_text_buffer_get_iter_at_line (buffer, &iter, 0);
  
-   gtk_text_buffer_set_modified (sw->buffer, FALSE);
+   gtk_text_buffer_insert (buffer, &iter, text_utf8, len_utf8);
+   gtk_text_buffer_set_modified (buffer, FALSE);
  
    free (text_utf8);
  
@@@ -917,3 -1015,113 +1017,113 @@@ psppire_syntax_window_iface_init (Psppi
    iface->load = syntax_load;
  }
  
\f
+ static void
+ undo_redo_update (PsppireSyntaxWindow *window)
+ {
+   gtk_action_set_sensitive (window->undo_menuitem,
+                           gtk_source_buffer_can_undo (window->buffer));
+   gtk_action_set_sensitive (window->redo_menuitem,
+                           gtk_source_buffer_can_redo (window->buffer));
+ }
+ static void
+ undo_last_edit (PsppireSyntaxWindow *window)
+ {
+   gtk_source_buffer_undo (window->buffer);
+   undo_redo_update (window);
+ }
+ static void
+ redo_last_edit (PsppireSyntaxWindow *window)
+ {
+   gtk_source_buffer_redo (window->buffer);
+   undo_redo_update (window);
+ }
\f
+ /* Printing related stuff */
+ static void
+ begin_print (GtkPrintOperation *operation,
+           GtkPrintContext   *context,
+           PsppireSyntaxWindow *window)
+ {
+   window->compositor =
+     gtk_source_print_compositor_new (window->buffer);
+ }
+ static void
+ end_print (GtkPrintOperation *operation,
+           GtkPrintContext   *context,
+           PsppireSyntaxWindow *window)
+ {
+   g_object_unref (window->compositor);
+   window->compositor = NULL;
+ }
+ static gboolean
+ paginate (GtkPrintOperation *operation,
+           GtkPrintContext   *context,
+           PsppireSyntaxWindow *window)
+ {
+   if (gtk_source_print_compositor_paginate (window->compositor, context))
+     {
+       gint n_pages = gtk_source_print_compositor_get_n_pages (window->compositor);
+       gtk_print_operation_set_n_pages (operation, n_pages);
+         
+       return TRUE;
+     }
+   return FALSE;
+ }
+ static void
+ draw_page (GtkPrintOperation *operation,
+            GtkPrintContext   *context,
+            gint               page_nr,
+           PsppireSyntaxWindow *window)
+ {
+   gtk_source_print_compositor_draw_page (window->compositor, 
+                                        context,
+                                        page_nr);
+ }
+ static void
+ psppire_syntax_window_print (PsppireSyntaxWindow *window)
+ {
+   GtkPrintOperationResult res;
+   GtkPrintOperation *print = gtk_print_operation_new ();
+   if (window->print_settings != NULL) 
+     gtk_print_operation_set_print_settings (print, window->print_settings);
+   g_signal_connect (print, "begin_print", G_CALLBACK (begin_print), window);
+   g_signal_connect (print, "end_print", G_CALLBACK (end_print),     window);
+   g_signal_connect (print, "draw_page", G_CALLBACK (draw_page),     window);
+   g_signal_connect (print, "paginate", G_CALLBACK (paginate),       window);
+   res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
+                                  GTK_WINDOW (window), NULL);
+   if (res == GTK_PRINT_OPERATION_RESULT_APPLY)
+     {
+       if (window->print_settings != NULL)
+         g_object_unref (window->print_settings);
+       window->print_settings = g_object_ref (gtk_print_operation_get_print_settings (print));
+     }
+   g_object_unref (print);
+ }