Prevent critical when closing output viewer
[pspp] / src / ui / gui / psppire-output-window.c
index 2e02b4e5ec33503f8ffc08d63676bc64e6d8d30b..4bf8ce5b287918488249cd7df3af47448047d89d 100644 (file)
 
 #include <config.h>
 
-#include <gtk/gtksignal.h>
-#include <gtk/gtkbox.h>
-#include "helper.h"
-
-#include <libpspp/cast.h>
-#include <libpspp/message.h>
-#include <libpspp/string-map.h>
-#include <output/cairo.h>
-#include <output/chart-item.h>
-#include <output/driver-provider.h>
-#include <output/output-item.h>
-#include <output/table-item.h>
-#include <output/text-item.h>
-#include <output/tab.h>
+#include <errno.h>
+#include <gtk/gtk.h>
 #include <stdlib.h>
-
-#include "about.h"
-
-#include "psppire-output-window.h"
-
-
-#include "xalloc.h"
-
-#include <sys/types.h>
 #include <sys/stat.h>
+#include <sys/types.h>
 #include <unistd.h>
 
+#include "libpspp/cast.h"
+#include "libpspp/message.h"
+#include "libpspp/string-map.h"
+#include "output/cairo.h"
+#include "output/chart-item.h"
+#include "output/driver-provider.h"
+#include "output/output-item.h"
+#include "output/tab.h"
+#include "output/table-item.h"
+#include "output/text-item.h"
+#include "ui/gui/help-menu.h"
+#include "ui/gui/helper.h"
+#include "ui/gui/psppire-output-window.h"
+
+#include "gl/error.h"
+#include "gl/tmpdir.h"
+#include "gl/xalloc.h"
+
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
@@ -50,6 +48,7 @@
 enum
   {
     COL_TITLE,                  /* Table title. */
+    COL_ADDR,                   /* Pointer to the table */
     COL_Y,                      /* Y position of top of title. */
     N_COLS
   };
@@ -110,7 +109,8 @@ psppire_output_window_dispose (GObject *obj)
   viewer->items = NULL;
   viewer->n_items = viewer->allocated_items = 0;
 
-  g_object_unref (viewer->print_settings);
+  if (viewer->print_settings != NULL)
+    g_object_unref (viewer->print_settings);
 
   /* Chain up to the parent class */
   G_OBJECT_CLASS (parent_class)->dispose (obj);
@@ -167,7 +167,8 @@ expose_event_callback (GtkWidget *widget, GdkEventExpose *event, gpointer data)
   cairo_t *cr;
 
   cr = gdk_cairo_create (widget->window);
-  xr_rendering_draw (r, cr);
+  xr_rendering_draw (r, cr, event->area.x, event->area.y,
+                     event->area.width, event->area.height);
   cairo_destroy (cr);
 
   return TRUE;
@@ -243,7 +244,6 @@ psppire_output_submit (struct output_driver *this,
          it is already close enough to INT_MAX when expressed as thousands of a
          point.) */
       string_map_insert (&options, "paper-size", "300x200000mm");
-      string_map_insert (&options, "headers", "off");
       string_map_insert (&options, "left-margin", "0");
       string_map_insert (&options, "right-margin", "0");
       string_map_insert (&options, "top-margin", "0");
@@ -312,6 +312,7 @@ psppire_output_submit (struct output_driver *this,
         }
       gtk_tree_store_set (store, &iter,
                           COL_TITLE, ds_cstr (&title),
+                         COL_ADDR, item, 
                           COL_Y, viewer->y,
                           -1);
       ds_destroy (&title);
@@ -413,17 +414,6 @@ on_row_activate (GtkTreeView *overview,
 static void psppire_output_window_print (PsppireOutputWindow *window);
 
 
-static GtkFileFilter *
-add_filter (GtkFileChooser *chooser, const char *name, const char *pattern)
-{
-  GtkFileFilter *filter = gtk_file_filter_new ();
-  g_object_ref_sink (G_OBJECT (filter));
-  gtk_file_filter_set_name (filter, name);
-  gtk_file_filter_add_pattern (filter, pattern);
-  gtk_file_chooser_add_filter (chooser, filter);
-  return filter;
-}
-
 static void
 export_output (PsppireOutputWindow *window, struct string_map *options,
                const char *format)
@@ -441,62 +431,216 @@ export_output (PsppireOutputWindow *window, struct string_map *options,
   output_driver_destroy (driver);
 }
 
+
+struct file_types
+{
+  const gchar *label;
+  const gchar *ext;
+};
+
+enum 
+  {
+    FT_AUTO = 0,
+    FT_PDF,
+    FT_HTML,
+    FT_ODT,
+    FT_TXT,
+    FT_PS,
+    FT_CSV,
+    n_FT
+  };
+
+#define N_EXTENTIONS (n_FT - 1)
+
+struct file_types ft[n_FT] = {
+  {N_("Infer file type from extension"),  NULL},
+  {N_("PDF (*.pdf)"),                     ".pdf"},
+  {N_("HTML (*.html)"),                   ".html"},
+  {N_("OpenDocument (*.odt)"),            ".odt"},
+  {N_("Text (*.txt)"),                    ".txt"},
+  {N_("PostScript (*.ps)"),               ".ps"},
+  {N_("Comma-Separated Values (*.csv)"),  ".csv"}
+};
+
+
+static void
+on_combo_change (GtkFileChooser *chooser)
+{
+  gboolean sensitive = FALSE;
+  GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser);
+
+  int x = 0; 
+  gchar *fn = gtk_file_chooser_get_filename (chooser);
+
+  if (combo &&  GTK_WIDGET_REALIZED (combo))
+    x = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
+
+  if (fn == NULL)
+    {
+      sensitive = FALSE;
+    }
+  else
+    {
+      gint i;
+      if ( x != 0 )
+       sensitive = TRUE;
+
+      for (i = 1 ; i < N_EXTENTIONS ; ++i)
+       {
+         if ( g_str_has_suffix (fn, ft[i].ext))
+           {
+             sensitive = TRUE;
+             break;
+           }
+       }
+    }
+
+  g_free (fn);
+
+  gtk_dialog_set_response_sensitive (GTK_DIALOG (chooser), GTK_RESPONSE_ACCEPT, sensitive);
+}
+
+
+static void
+on_file_chooser_change (GObject *w, GParamSpec *pspec, gpointer data)
+{
+
+  GtkFileChooser *chooser = data;
+  const gchar *name = g_param_spec_get_name (pspec);
+
+  if ( ! GTK_WIDGET_REALIZED (chooser))
+    return;
+
+  /* Ignore this one.  It causes recursion. */
+  if ( 0 == strcmp ("tooltip-text", name))
+    return;
+
+  on_combo_change (chooser);
+}
+
+
+/* Recursively descend all the children of W, connecting
+   to their "notify" signal */
+static void
+iterate_widgets (GtkWidget *w, gpointer data)
+{
+  if ( GTK_IS_CONTAINER (w))
+    gtk_container_forall (GTK_CONTAINER (w), iterate_widgets, data);
+  else
+    g_signal_connect (w, "notify",  G_CALLBACK (on_file_chooser_change), data);
+}
+
+
+
+static GtkListStore *
+create_file_type_list (void)
+{
+  int i;
+  GtkTreeIter iter;
+  GtkListStore *list = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING);
+  
+  for (i = 0 ; i < 6 ; ++i)
+    {
+      gtk_list_store_append (list, &iter);
+      gtk_list_store_set (list, &iter,
+                         0,  gettext (ft[i].label),
+                         1,  ft[i].ext,
+                         -1);
+    }
+  
+  return list;
+}
+
 static void
 psppire_output_window_export (PsppireOutputWindow *window)
 {
   gint response;
+  GtkWidget *combo;
+  GtkListStore *list;
 
-  GtkFileFilter *pdf_filter;
-  GtkFileFilter *html_filter;
-  GtkFileFilter *odt_filter;
-  GtkFileFilter *txt_filter;
-  GtkFileFilter *ps_filter;
-  GtkFileFilter *csv_filter;
   GtkFileChooser *chooser;
-  GtkWidget *dialog;
-
-  dialog = gtk_file_chooser_dialog_new (_("Export Output"),
+  
+  GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"),
                                         GTK_WINDOW (window),
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
                                         GTK_STOCK_SAVE,   GTK_RESPONSE_ACCEPT,
                                         NULL);
+
   chooser = GTK_FILE_CHOOSER (dialog);
 
-  pdf_filter = add_filter (chooser, _("PDF Files (*.pdf)"), "*.pdf");
-  html_filter = add_filter (chooser, _("HTML Files (*.html)"), "*.html");
-  odt_filter = add_filter (chooser, _("OpenDocument Files (*.odt)"), "*.odt");
-  txt_filter = add_filter (chooser, _("Text Files (*.txt)"), "*.txt");
-  ps_filter = add_filter (chooser, _("PostScript Files (*.ps)"), "*.ps");
-  csv_filter = add_filter (chooser, _("Comma-Separated Value Files (*.csv)"),
-                           "*.csv");
+  list = create_file_type_list ();
+
+  combo = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list));
+
+
+  {
+    /* Create text cell renderer */
+    GtkCellRenderer *cell = gtk_cell_renderer_text_new();
+    gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo), cell, FALSE );
+
+    gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo), cell,  "text", 0);
+  }
+
+  g_signal_connect_swapped (combo, "changed", G_CALLBACK (on_combo_change), chooser);
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
+
+  gtk_file_chooser_set_extra_widget (chooser, combo);
+
+  /* This kludge is necessary because there is no signal to tell us
+     when the candidate filename of a GtkFileChooser has changed */
+  gtk_container_forall (GTK_CONTAINER (dialog), iterate_widgets, dialog);
+
 
   gtk_file_chooser_set_do_overwrite_confirmation (chooser, TRUE);
-  gtk_file_chooser_set_filter (chooser, pdf_filter);
 
   response = gtk_dialog_run (GTK_DIALOG (dialog));
 
   if ( response == GTK_RESPONSE_ACCEPT )
     {
+      int file_type = gtk_combo_box_get_active (GTK_COMBO_BOX (combo));
       char *filename = gtk_file_chooser_get_filename (chooser);
-      GtkFileFilter *filter = gtk_file_chooser_get_filter (chooser);
       struct string_map options;
 
       g_return_if_fail (filename);
-      g_return_if_fail (filter);
 
+      if (file_type == FT_AUTO)
+       {
+         gint i;
+         for (i = 1 ; i < N_EXTENTIONS ; ++i)
+           {
+             if ( g_str_has_suffix (filename, ft[i].ext))
+               {
+                 file_type = i;
+                 break;
+               }
+           }
+       }
+
+      
       string_map_init (&options);
       string_map_insert (&options, "output-file", filename);
-      if (filter == pdf_filter)
-        {
+
+      switch (file_type)
+       {
+       case FT_PDF:
           export_output (window, &options, "pdf");
-        }
-      else if (filter == html_filter)
-        export_output (window, &options, "html");
-      else if (filter == odt_filter)
-        export_output (window, &options, "odt");
-      else if (filter == txt_filter)
-        {
+         break;
+       case FT_HTML:
+          export_output (window, &options, "html");
+         break;
+       case FT_ODT:
+          export_output (window, &options, "odt");
+         break;
+       case FT_PS:
+          export_output (window, &options, "ps");
+         break;
+       case FT_CSV:
+          export_output (window, &options, "csv");
+         break;
+
+       case FT_TXT:
           string_map_insert (&options, "headers", "false");
           string_map_insert (&options, "paginate", "false");
           string_map_insert (&options, "squeeze", "true");
@@ -505,45 +649,344 @@ psppire_output_window_export (PsppireOutputWindow *window)
           string_map_insert (&options, "top-margin", "0");
           string_map_insert (&options, "bottom-margin", "0");
           export_output (window, &options, "txt");
-        }
-      else if (filter == ps_filter)
-        export_output (window, &options, "ps");
-      else if (filter == csv_filter)
-        export_output (window, &options, "csv");
-      else
-        g_return_if_reached ();
+         break;
+       default:
+         g_assert_not_reached ();
+       }
+
+      string_map_destroy (&options);
 
       free (filename);
     }
 
-  g_object_unref (G_OBJECT (pdf_filter));
-  g_object_unref (G_OBJECT (html_filter));
-  g_object_unref (G_OBJECT (txt_filter));
-  g_object_unref (G_OBJECT (ps_filter));
-  g_object_unref (G_OBJECT (csv_filter));
-
   gtk_widget_destroy (dialog);
 }
 
+
+enum {
+  SELECT_FMT_NULL,
+  SELECT_FMT_TEXT,
+  SELECT_FMT_UTF8,
+  SELECT_FMT_HTML,
+  SELECT_FMT_ODT
+};
+
+
+static void
+insert_glyph (struct string_map *map, const char *opt, gunichar glyph)
+{
+  char s[6] = {0,0,0,0,0,0};
+
+  g_unichar_to_utf8 (glyph, s);
+  string_map_insert (map, opt, s);
+}
+
+struct glyph_pair
+{
+  gunichar glyph;
+  char opt[10];
+};
+
+/* See the table at 
+   http://en.wikipedia.org/wiki/Box-drawing_characters */
+struct glyph_pair table[] = {
+  {0x2500, "box[1010]"},
+  {0x2501, "box[2020]"},
+  {0x2502, "box[0101]"},
+  {0x2503, "box[0202]"},
+
+  {0x250C, "box[1100]"},
+  {0x250D, "box[2100]"},
+  {0x250E, "box[1200]"},
+  {0x250F, "box[2200]"},
+  {0x2510, "box[0110]"},
+  {0x2511, "box[0110]"},
+  {0x2512, "box[0210]"},
+  {0x2513, "box[0220]"},
+  {0x2514, "box[1001]"},
+  {0x2515, "box[2001]"},
+  {0x2516, "box[1002]"},
+  {0x2517, "box[2002]"},
+  {0x2518, "box[0011]"},
+  {0x2519, "box[0021]"},
+  {0x251A, "box[0012]"},
+  {0x251B, "box[0022]"},
+  {0x251C, "box[1101]"},
+  {0x251D, "box[2101]"},
+  {0x251E, "box[1102]"},
+  {0x251F, "box[1201]"},
+  {0x2520, "box[1202]"},
+  {0x2521, "box[2102]"},
+  {0x2522, "box[2201]"},
+  {0x2523, "box[2202]"},
+  {0x2524, "box[0111]"},
+  {0x2525, "box[0121]"},
+  {0x2526, "box[0112]"},
+  {0x2527, "box[0211]"},
+  {0x2528, "box[0212]"},
+  {0x2529, "box[0122]"},
+  {0x252A, "box[0221]"},
+  {0x252B, "box[0222]"},
+  {0x252C, "box[1110]"},
+  {0x252D, "box[1120]"},
+  {0x252E, "box[2110]"},
+  {0x252F, "box[2120]"},
+  {0x2530, "box[1210]"},
+  {0x2531, "box[1220]"},
+  {0x2532, "box[2210]"},
+  {0x2533, "box[2220]"},
+  {0x2534, "box[1011]"},
+  {0x2535, "box[1021]"},
+  {0x2536, "box[2011]"},
+  {0x2537, "box[2021]"},
+  {0x2538, "box[1012]"},
+  {0x2539, "box[1022]"},
+  {0x253A, "box[2012]"},
+  {0x253B, "box[2022]"},
+  {0x253C, "box[1111]"},
+  {0x253D, "box[1121]"},
+  {0x253E, "box[2111]"},
+  {0x253F, "box[2121]"},
+  {0x2540, "box[1112]"},
+  {0x2541, "box[1211]"},
+  {0x2542, "box[1212]"},
+  {0x2543, "box[1122]"},
+  {0x2544, "box[2112]"},
+  {0x2545, "box[1221]"},
+  {0x2546, "box[2211]"},
+  {0x2547, "box[2122]"},
+  {0x2548, "box[2221]"},
+  {0x2549, "box[1222]"},
+  {0x254A, "box[2212]"},
+  {0x254B, "box[2222]"},
+
+  {0x2574, "box[0010]"},
+  {0x2575, "box[0001]"},
+  {0x2576, "box[1000]"},
+  {0x2577, "box[0100]"},
+  {0x2578, "box[0020]"},
+  {0x2579, "box[0002]"},
+  {0x257A, "box[2000]"},
+  {0x257B, "box[0200]"},
+  {0x257C, "box[2010]"},
+  {0x257D, "box[0201]"},
+  {0x257E, "box[1020]"},
+  {0x257F, "box[0102]"},
+};
+
+
+static void
+utf8_box_chars (struct string_map *map)
+{
+  int i;
+  for (i = 0; i < sizeof (table) / sizeof (table[0]); ++i)
+    {
+      const struct glyph_pair *p = &table[i];
+      insert_glyph (map, p->opt, p->glyph);
+    }
+}
+
+
+
+static void
+clipboard_get_cb (GtkClipboard     *clipboard,
+                 GtkSelectionData *selection_data,
+                 guint             info,
+                 gpointer          data)
+{
+  PsppireOutputWindow *window = data;
+
+  gsize length;
+  gchar *text = NULL;
+  struct output_driver *driver = NULL;
+  char dirname[PATH_MAX], *filename;
+  struct string_map options;
+
+  GtkTreeSelection *sel = gtk_tree_view_get_selection (window->overview);
+  GtkTreeModel *model = gtk_tree_view_get_model (window->overview);
+
+  GList *rows = gtk_tree_selection_get_selected_rows (sel, &model);
+  GList *n = rows;
+
+  if ( n == NULL)
+    return;
+
+  if (path_search (dirname, sizeof dirname, NULL, NULL, true)
+      || mkdtemp (dirname) == NULL)
+    {
+      error (0, errno, _("failed to create temporary directory"));
+      return;
+    }
+  filename = xasprintf ("%s/clip.tmp", dirname);
+
+  string_map_init (&options);
+  string_map_insert (&options, "output-file", filename);
+
+  switch (info)
+    {
+    case SELECT_FMT_UTF8:
+      utf8_box_chars (&options);
+      /* fall-through */
+
+    case SELECT_FMT_TEXT:
+      string_map_insert (&options, "format", "txt");
+      break;
+
+    case SELECT_FMT_HTML:
+      string_map_insert (&options, "format", "html");
+      break;
+
+    case SELECT_FMT_ODT:
+      string_map_insert (&options, "format", "odt");
+      break;
+
+    default:
+      g_warning ("unsupported clip target\n");
+      goto finish;
+      break;
+    }
+
+  driver = output_driver_create (&options);
+  if (driver == NULL)
+    goto finish;
+
+  while (n)
+    {
+      GtkTreePath *path = n->data ; 
+      GtkTreeIter iter;
+      struct output_item *item ;
+
+      gtk_tree_model_get_iter (model, &iter, path);
+      gtk_tree_model_get (model, &iter, COL_ADDR, &item, -1);
+
+      driver->class->submit (driver, item);
+
+      n = n->next;
+    }
+
+  if ( driver->class->flush)
+    driver->class->flush (driver);
+
+
+  /* Some drivers (eg: the odt one) don't write anything until they
+     are closed */
+  output_driver_destroy (driver);
+  driver = NULL;
+
+  if ( g_file_get_contents (filename, &text, &length, NULL) )
+    {
+      gtk_selection_data_set (selection_data, selection_data->target,
+                             8,
+                             (const guchar *) text, length);
+    }
+
+ finish:
+
+  if (driver != NULL)
+    output_driver_destroy (driver);
+
+  g_free (text);
+
+  unlink (filename);
+  free (filename);
+  rmdir (dirname);
+
+  g_list_free (rows);
+}
+
+static void
+clipboard_clear_cb (GtkClipboard *clipboard,
+                   gpointer data)
+{
+}
+
+static const GtkTargetEntry targets[] = {
+
+  { "STRING",        0, SELECT_FMT_TEXT },
+  { "TEXT",          0, SELECT_FMT_TEXT },
+  { "COMPOUND_TEXT", 0, SELECT_FMT_TEXT },
+  { "text/plain",    0, SELECT_FMT_TEXT },
+
+  { "UTF8_STRING",   0, SELECT_FMT_UTF8 },
+  { "text/plain;charset=utf-8", 0, SELECT_FMT_UTF8 },
+
+  { "text/html",     0, SELECT_FMT_HTML },
+
+  { "application/vnd.oasis.opendocument.text", 0, SELECT_FMT_ODT }
+};
+
+static void
+on_copy (PsppireOutputWindow *window)
+{
+  {
+    GtkClipboard *clipboard =
+      gtk_widget_get_clipboard (GTK_WIDGET (window),
+                               GDK_SELECTION_CLIPBOARD);
+
+    if (!gtk_clipboard_set_with_data (clipboard, targets,
+                                      G_N_ELEMENTS (targets),
+                                      clipboard_get_cb, clipboard_clear_cb,
+                                     window))
+
+      clipboard_clear_cb (clipboard, window);
+  }
+}
+
+static void
+on_selection_change (GtkTreeSelection *sel, GtkAction *copy_action)
+{
+  /* The Copy action is available only if there is something selected */
+  gtk_action_set_sensitive (copy_action, gtk_tree_selection_count_selected_rows (sel) > 0);
+}
+
+static void
+on_select_all (PsppireOutputWindow *window)
+{
+  GtkTreeSelection *sel = gtk_tree_view_get_selection (window->overview);
+  gtk_tree_view_expand_all (window->overview);
+  gtk_tree_selection_select_all (sel);
+}
+
+
 static void
 psppire_output_window_init (PsppireOutputWindow *window)
 {
   GtkTreeViewColumn *column;
   GtkCellRenderer *renderer;
   GtkBuilder *xml;
+  GtkAction *copy_action;
+  GtkAction *select_all_action;
+  GtkTreeSelection *sel;
 
   xml = builder_new ("output-viewer.ui");
 
+  copy_action = get_action_assert (xml, "edit_copy");
+  select_all_action = get_action_assert (xml, "edit_select-all");
+
+  gtk_action_set_sensitive (copy_action, FALSE);
+
+  g_signal_connect_swapped (copy_action, "activate", G_CALLBACK (on_copy), window);
+
+  g_signal_connect_swapped (select_all_action, "activate", G_CALLBACK (on_select_all), window);
+
   gtk_widget_reparent (get_widget_assert (xml, "vbox1"), GTK_WIDGET (window));
 
   window->output = GTK_LAYOUT (get_widget_assert (xml, "output"));
   window->y = 0;
 
   window->overview = GTK_TREE_VIEW (get_widget_assert (xml, "overview"));
+
+  sel = gtk_tree_view_get_selection (window->overview);
+
+  gtk_tree_selection_set_mode (sel, GTK_SELECTION_MULTIPLE);
+
+  g_signal_connect (sel, "changed", G_CALLBACK (on_selection_change), copy_action);
+
   gtk_tree_view_set_model (window->overview,
                            GTK_TREE_MODEL (gtk_tree_store_new (
                                              N_COLS,
-                                             G_TYPE_STRING, /* COL_TITLE */
+                                             G_TYPE_STRING,  /* COL_TITLE */
+                                            G_TYPE_POINTER, /* COL_ADDR */
                                              G_TYPE_LONG))); /* COL_Y */
 
   window->in_command = false;
@@ -570,16 +1013,6 @@ psppire_output_window_init (PsppireOutputWindow *window)
                    G_CALLBACK (cancel_urgency),
                    NULL);
 
-  g_signal_connect (get_action_assert (xml,"help_about"),
-                   "activate",
-                   G_CALLBACK (about_new),
-                   window);
-
-  g_signal_connect (get_action_assert (xml,"help_reference"),
-                   "activate",
-                   G_CALLBACK (reference_manual),
-                   NULL);
-
   g_signal_connect (get_action_assert (xml,"windows_minimise-all"),
                    "activate",
                    G_CALLBACK (psppire_window_minimise_all),
@@ -587,9 +1020,10 @@ psppire_output_window_init (PsppireOutputWindow *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/menubar1/windows_menuitem/windows_minimise-all")->parent);
+      GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows_menuitem/windows_minimise-all")->parent);
   }
 
   g_signal_connect_swapped (get_action_assert (xml, "file_export"), "activate",
@@ -610,7 +1044,8 @@ GtkWidget*
 psppire_output_window_new (void)
 {
   return GTK_WIDGET (g_object_new (psppire_output_window_get_type (),
-                                  "filename", "Output",
+                                  /* TRANSLATORS: This will form a filename.  Please avoid whitespace. */
+                                  "filename", _("Output"),
                                   "description", _("Output Viewer"),
                                   NULL));
 }
@@ -659,16 +1094,11 @@ paginate (GtkPrintOperation *operation,
          GtkPrintContext   *context,
          PsppireOutputWindow *window)
 {
-  g_print ("%s\n", __FUNCTION__);
-
   if ( window->print_item < window->n_items )
     {
-      g_print ("Passing item %d\n", window->print_item);
       xr_driver_output_item (window->print_xrd, window->items[window->print_item++]);
-      bool x = xr_driver_need_new_page (window->print_xrd);
-      if ( x )
+      if (xr_driver_need_new_page (window->print_xrd))
        {
-         g_print ("Need new page: %d\n", x);
          xr_driver_next_page (window->print_xrd, NULL);
          window->print_n_pages ++;
        }
@@ -676,12 +1106,9 @@ paginate (GtkPrintOperation *operation,
     }
   else
     {
-      g_print ("Number of pages is %d\n", window->print_n_pages);
       gtk_print_operation_set_n_pages (operation, window->print_n_pages);
       window->print_item = 0;
-
       create_xr_print_driver (context, window);
-
       return TRUE;
     }
 }
@@ -691,8 +1118,6 @@ begin_print (GtkPrintOperation *operation,
             GtkPrintContext   *context,
             PsppireOutputWindow *window)
 {
-  g_print ("%s\n", __FUNCTION__);
-
   create_xr_print_driver (context, window);
 
   window->print_item = 0;
@@ -704,16 +1129,7 @@ end_print (GtkPrintOperation *operation,
           GtkPrintContext   *context,
           PsppireOutputWindow *window)
 {
-  g_print ("%s\n", __FUNCTION__);
-  //  xr_driver_destroy (window->print_xrd);
-}
-
-static void
-done (GtkPrintOperation *operation,
-      GtkPrintOperationResult   result,
-      gpointer           user_data)    
-{
-  g_print ("%s %d\n", __FUNCTION__, result);
+  xr_driver_destroy (window->print_xrd);
 }
 
 
@@ -723,8 +1139,6 @@ draw_page (GtkPrintOperation *operation,
           gint               page_number,
           PsppireOutputWindow *window)
 {
-  g_print ("%s: %d\n", __FUNCTION__, page_number);
-
   xr_driver_next_page (window->print_xrd, gtk_print_context_get_cairo_context (context));
   while ( window->print_item < window->n_items)
     {
@@ -749,7 +1163,6 @@ psppire_output_window_print (PsppireOutputWindow *window)
   g_signal_connect (print, "end_print", G_CALLBACK (end_print),     window);
   g_signal_connect (print, "paginate", G_CALLBACK (paginate),       window);
   g_signal_connect (print, "draw_page", G_CALLBACK (draw_page),     window);
-  g_signal_connect (print, "done", G_CALLBACK (done),               window);
 
   res = gtk_print_operation_run (print, GTK_PRINT_OPERATION_ACTION_PRINT_DIALOG,
                                  GTK_WINDOW (window), NULL);