Add support for reading and writing SPV files.

[pspp] / src / ui / gui / psppire-output-window.c

diff --git a/src/ui/gui/psppire-output-window.c b/src/ui/gui/psppire-output-window.c
index bd5047a7bc1430f1d0fb8039ab75396874545385..de57f17f9dab9af6e73cd88e15c02aa9836b7727 100644 (file)
--- a/src/ui/gui/psppire-output-window.c
+++ b/src/ui/gui/psppire-output-window.c
@@ -32,7 +32,6 @@
 #include "output/driver-provider.h"
 #include "output/message-item.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"
@@ -95,7 +94,7 @@ psppire_output_window_dispose (GObject *obj)
 {
   PsppireOutputWindow *window = PSPPIRE_OUTPUT_WINDOW (obj);
 
-  if (window->dispose_has_run) 
+  if (window->dispose_has_run)
     return;
 
   window->dispose_has_run = TRUE;
@@ -113,7 +112,7 @@ psppire_output_window_class_init (PsppireOutputWindowClass *class)
 
   parent_class = g_type_class_peek_parent (class);
   object_class->dispose = psppire_output_window_dispose;
-  
+
   object_class->finalize = psppire_output_window_finalize;
 }
 \f
@@ -251,9 +250,10 @@ struct file_types
   const gchar *ext;
 };
 
-enum 
+enum
   {
     FT_AUTO = 0,
+    FT_SPV,
     FT_PDF,
     FT_HTML,
     FT_ODT,
@@ -268,6 +268,7 @@ enum
 
 struct file_types ft[n_FT] = {
   {N_("Infer file type from extension"),  NULL},
+  {N_("SPSS Viewer (*.spv)"),             ".spv"},
   {N_("PDF (*.pdf)"),                     ".pdf"},
   {N_("HTML (*.html)"),                   ".html"},
   {N_("OpenDocument (*.odt)"),            ".odt"},
@@ -284,7 +285,7 @@ on_combo_change (GtkFileChooser *chooser)
   gboolean sensitive = FALSE;
   GtkWidget *combo = gtk_file_chooser_get_extra_widget (chooser);
 
-  int x = 0; 
+  int x = 0;
   gchar *fn = gtk_file_chooser_get_filename (chooser);
 
   if (combo &&  gtk_widget_get_realized (combo))
@@ -353,7 +354,7 @@ 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 < n_FT ; ++i)
     {
       gtk_list_store_append (list, &iter);
@@ -362,7 +363,7 @@ create_file_type_list (void)
                          1,  ft[i].ext,
                          -1);
     }
-  
+
   return list;
 }
 
@@ -374,7 +375,7 @@ psppire_output_window_export (PsppireOutputWindow *window)
   GtkListStore *list;
 
   GtkFileChooser *chooser;
-  
+
   GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Export Output"),
                                         GTK_WINDOW (window),
                                         GTK_FILE_CHOOSER_ACTION_SAVE,
@@ -448,12 +449,15 @@ psppire_output_window_export (PsppireOutputWindow *window)
           filename = g_strconcat (filename, ft[file_type].ext, NULL);
           g_free (of);
         }
-      
+
       string_map_init (&options);
       string_map_insert (&options, "output-file", filename);
 
       switch (file_type)
        {
+        case FT_SPV:
+          export_output (window, &options, "spv");
+          break;
        case FT_PDF:
           export_output (window, &options, "pdf");
          break;
@@ -475,13 +479,7 @@ psppire_output_window_export (PsppireOutputWindow *window)
          /* Fall through */
 
        case FT_ASCII:
-          string_map_insert (&options, "headers", "false");
-          string_map_insert (&options, "paginate", "false");
-          string_map_insert (&options, "squeeze", "true");
-          string_map_insert (&options, "emphasis", "none");
           string_map_insert (&options, "charts", "none");
-          string_map_insert (&options, "top-margin", "0");
-          string_map_insert (&options, "bottom-margin", "0");
           export_output (window, &options, "txt");
          break;
        default:
@@ -505,7 +503,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
   gtk_container_add (GTK_CONTAINER (window), box);
 
   GtkWidget *paned = get_widget_assert (xml, "paned1");
-  
+
   window->dispose_has_run = FALSE;
 
   window->view = psppire_output_view_new (
@@ -527,7 +525,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
 
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
                         create_windows_menu (GTK_WINDOW (window)));
-    
+
   gtk_menu_shell_append (GTK_MENU_SHELL (menubar),
                         create_help_menu (GTK_WINDOW (window)));
 
@@ -543,7 +541,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
                                           accels);
   }
 
-  
+
   {
     GSimpleAction *export = g_simple_action_new ("export", NULL);
     g_signal_connect_swapped (export, "activate", G_CALLBACK (psppire_output_window_export), window);
@@ -565,7 +563,7 @@ psppire_output_window_init (PsppireOutputWindow *window)
                                           accels);
   }
 
-  
+
   g_object_unref (xml);
 
   g_signal_connect (window, "delete-event",