Rewrite Import Dialog.
authorJohn Darrington <john@darrington.wattle.id.au>
Sat, 26 Dec 2015 10:15:15 +0000 (11:15 +0100)
committerJohn Darrington <john@darrington.wattle.id.au>
Sat, 26 Dec 2015 10:15:15 +0000 (11:15 +0100)
This is a major rewrite of the text/spreadsheet import assistant.
Hopefully there are less bugs and it will be easier to maintain.

20 files changed:
src/data/ods-reader.c
src/ui/gui/automake.mk
src/ui/gui/page-assistant.c [deleted file]
src/ui/gui/page-file.c [deleted file]
src/ui/gui/page-first-line.c [deleted file]
src/ui/gui/page-first-line.h [deleted file]
src/ui/gui/page-formats.c [deleted file]
src/ui/gui/page-formats.h [deleted file]
src/ui/gui/page-intro.c [deleted file]
src/ui/gui/page-intro.h [deleted file]
src/ui/gui/page-separators.c [deleted file]
src/ui/gui/page-separators.h [deleted file]
src/ui/gui/page-sheet-spec.c [deleted file]
src/ui/gui/page-sheet-spec.h [deleted file]
src/ui/gui/psppire-data-window.c
src/ui/gui/psppire-import-assistant.c [new file with mode: 0644]
src/ui/gui/psppire-import-assistant.h [new file with mode: 0644]
src/ui/gui/text-data-import-dialog.c [deleted file]
src/ui/gui/text-data-import-dialog.h [deleted file]
src/ui/gui/text-data-import.ui

index 64ae8a6142e910935051fda76b70f636ce4c9c36..c5ada6e09101bc3977ee2ecb67af59b0621aed6f 100644 (file)
@@ -173,9 +173,7 @@ ods_unref (struct spreadsheet *s)
        
       zip_reader_destroy (r->zreader);
       free (r->sheets);
-
       free (s->file_name);
-       
       free (r);
     }
 }
index 0200348656aa3cec6dba9b7b121a23c92a0d1830..d9fa465b937d2c3cbcf0fa151a84342f99050e34 100644 (file)
@@ -147,6 +147,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-scanf.c \
        src/ui/gui/psppire-scanf.h \
        src/ui/gui/psppire-acr.c \
+       src/ui/gui/psppire-import-assistant.c \
+       src/ui/gui/psppire-import-assistant.h \
        src/ui/gui/builder-wrapper.c \
        src/ui/gui/builder-wrapper.h \
        src/ui/gui/comments-dialog.c \
@@ -307,20 +309,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/select-cases-dialog.h \
        src/ui/gui/split-file-dialog.c \
        src/ui/gui/split-file-dialog.h \
-       src/ui/gui/page-assistant.c \
-       src/ui/gui/page-intro.c \
-       src/ui/gui/page-intro.h \
-       src/ui/gui/page-file.c \
-       src/ui/gui/page-first-line.c \
-       src/ui/gui/page-first-line.h \
-       src/ui/gui/page-formats.c \
-       src/ui/gui/page-formats.h \
-       src/ui/gui/page-separators.c \
-       src/ui/gui/page-separators.h \
-       src/ui/gui/page-sheet-spec.c \
-       src/ui/gui/page-sheet-spec.h \
-       src/ui/gui/text-data-import-dialog.c \
-       src/ui/gui/text-data-import-dialog.h \
        src/ui/gui/t-test-options.c \
        src/ui/gui/t-test-options.h \
        src/ui/gui/val-labs-dialog.c \
@@ -336,6 +324,24 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/widgets.c \
        src/ui/gui/widgets.h
 
+
+OBSOLETE = \
+       src/ui/gui/page-assistant.c \
+       src/ui/gui/page-intro.c \
+       src/ui/gui/page-intro.h \
+       src/ui/gui/page-file.c \
+       src/ui/gui/page-first-line.c \
+       src/ui/gui/page-first-line.h \
+       src/ui/gui/page-formats.c \
+       src/ui/gui/page-formats.h \
+       src/ui/gui/page-separators.c \
+       src/ui/gui/page-separators.h \
+       src/ui/gui/page-sheet-spec.c \
+       src/ui/gui/page-sheet-spec.h \
+       src/ui/gui/text-data-import-dialog.c \
+       src/ui/gui/text-data-import-dialog.h
+
+
 nodist_src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-marshal.c \
        src/ui/gui/psppire-marshal.h
diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
deleted file mode 100644 (file)
index c55359e..0000000
+++ /dev/null
@@ -1,272 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-/* Assistant. */
-
-static void close_assistant (struct import_assistant *, int response);
-static void on_prepare (GtkAssistant *assistant, GtkWidget *page,
-                        struct import_assistant *);
-static void on_cancel (GtkAssistant *assistant, struct import_assistant *);
-static void on_close (GtkAssistant *assistant, struct import_assistant *);
-static void on_paste (GtkButton *button, struct import_assistant *);
-static void on_reset (GtkButton *button, struct import_assistant *);
-
-/* Initializes IA's asst substructure.  PARENT_WINDOW must be the
-   window to use as the assistant window's parent.  */
-struct import_assistant *
-init_assistant (GtkWindow *parent_window)
-{
-  struct import_assistant *ia = xzalloc (sizeof *ia);
-  struct assistant *a = &ia->asst;
-
-  a->builder = builder_new ("text-data-import.ui");
-  a->assistant = GTK_ASSISTANT (gtk_assistant_new ());
-
-  a->prop_renderer = gtk_cell_renderer_text_new ();
-  g_object_ref_sink (a->prop_renderer);
-  a->fixed_renderer = gtk_cell_renderer_text_new ();
-  g_object_ref_sink (a->fixed_renderer);
-  g_object_set (G_OBJECT (a->fixed_renderer),
-                "family", "Monospace",
-                (void *) NULL);
-
-  g_signal_connect (a->assistant, "prepare", G_CALLBACK (on_prepare), ia);
-  g_signal_connect (a->assistant, "cancel", G_CALLBACK (on_cancel), ia);
-  g_signal_connect (a->assistant, "close", G_CALLBACK (on_close), ia);
-  a->paste_button = gtk_button_new_with_label (_("Paste"));
-  gtk_assistant_add_action_widget (a->assistant, a->paste_button);
-  g_signal_connect (a->paste_button, "clicked", G_CALLBACK (on_paste), ia);
-  a->reset_button = gtk_button_new_with_label (_("Reset"));
-  gtk_assistant_add_action_widget (a->assistant, a->reset_button);
-  g_signal_connect (a->reset_button, "clicked", G_CALLBACK (on_reset), ia);
-  gtk_window_set_title (GTK_WINDOW (a->assistant),
-                        _("Importing Delimited Text Data"));
-  gtk_window_set_transient_for (GTK_WINDOW (a->assistant), parent_window);
-  gtk_window_set_icon_name (GTK_WINDOW (a->assistant), "pspp");
-
-
-  return ia;
-}
-
-/* Frees IA's asst substructure. */
-void
-destroy_assistant (struct import_assistant *ia)
-{
-  struct assistant *a = &ia->asst;
-
-  g_object_unref (a->prop_renderer);
-  g_object_unref (a->fixed_renderer);
-  g_object_unref (a->builder);
-}
-
-/* Appends a page of the given TYPE, with PAGE as its content, to
-   the GtkAssistant encapsulated by IA.  Returns the GtkWidget
-   that represents the page. */
-GtkWidget *
-add_page_to_assistant (struct import_assistant *ia,
-                       GtkWidget *page, GtkAssistantPageType type)
-{
-  const char *title;
-  char *title_copy;
-  GtkWidget *content;
-
-  title = gtk_window_get_title (GTK_WINDOW (page));
-  title_copy = xstrdup (title ? title : "");
-
-  content = gtk_bin_get_child (GTK_BIN (page));
-  assert (content);
-  g_object_ref (content);
-  gtk_container_remove (GTK_CONTAINER (page), content);
-
-  gtk_widget_destroy (page);
-
-  gtk_assistant_append_page (ia->asst.assistant, content);
-  gtk_assistant_set_page_type (ia->asst.assistant, content, type);
-  gtk_assistant_set_page_title (ia->asst.assistant, content, title_copy);
-  gtk_assistant_set_page_complete (ia->asst.assistant, content, true);
-
-  free (title_copy);
-
-  return content;
-}
-
-/* Called just before PAGE is displayed as the current page of
-   ASSISTANT, this updates IA content according to the new
-   page. */
-static void
-on_prepare (GtkAssistant *assistant, GtkWidget *page,
-            struct import_assistant *ia)
-{
-  int pn = gtk_assistant_get_current_page (assistant);
-
-  gtk_widget_show (ia->asst.reset_button);
-  gtk_widget_hide (ia->asst.paste_button);
-
-  if ( ia->spreadsheet) 
-    {
-      if (pn == 0)
-       {
-         prepare_sheet_spec_page (ia);
-        }
-      else if (pn == 1)
-       {
-         post_sheet_spec_page (ia);
-         prepare_formats_page (ia);
-       }
-    }
-  else
-    {
-      switch (pn)
-       {
-       case 0:
-         reset_intro_page (ia);
-         break;
-       case 1:
-         reset_first_line_page (ia);
-         break;
-       case 2:
-         prepare_separators_page (ia);
-         reset_separators_page (ia);
-         break;
-       case 3:
-         prepare_formats_page (ia);
-         reset_formats_page (ia);
-         break;
-       }
-    }
-
-
-#if GTK3_TRANSITION
-  if (gtk_assistant_get_page_type (assistant, page)
-      == GTK_ASSISTANT_PAGE_CONFIRM)
-    gtk_widget_grab_focus (assistant->apply);
-  else
-    gtk_widget_grab_focus (assistant->forward);
-#endif
-}
-
-/* Called when the Cancel button in the assistant is clicked. */
-static void
-on_cancel (GtkAssistant *assistant, struct import_assistant *ia)
-{
-  close_assistant (ia, GTK_RESPONSE_CANCEL);
-}
-
-/* Called when the Apply button on the last page of the assistant
-   is clicked. */
-static void
-on_close (GtkAssistant *assistant, struct import_assistant *ia)
-{
-  close_assistant (ia, GTK_RESPONSE_APPLY);
-}
-
-/* Called when the Paste button on the last page of the assistant
-   is clicked. */
-static void
-on_paste (GtkButton *button, struct import_assistant *ia)
-{
-  close_assistant (ia, PSPPIRE_RESPONSE_PASTE);
-}
-
-/* Called when the Reset button is clicked. */
-static void
-on_reset (GtkButton *button, struct import_assistant *ia)
-{
-  gint pn = gtk_assistant_get_current_page (ia->asst.assistant);
-  
-  if ( ia->spreadsheet) 
-    {
-      switch (pn)
-       {
-       case 0:
-         reset_sheet_spec_page (ia);
-        break;
-       case 1:
-         reset_formats_page (ia);
-         break;
-       }
-    }
-  else
-    {
-      switch (pn)
-       {
-       case 0:
-         reset_intro_page (ia);
-         break;
-       case 1:
-         reset_first_line_page (ia);
-         break;
-       case 2:
-         reset_separators_page (ia);
-         break;
-       case 3:
-         reset_formats_page (ia);
-         break;
-       }
-    }
-}
-
-/* Causes the assistant to close, returning RESPONSE for
-   interpretation by text_data_import_assistant. */
-static void
-close_assistant (struct import_assistant *ia, int response)
-{
-  ia->asst.response = response;
-  /*  Use our loop_done variable until we find out
-      why      g_main_loop_quit (ia->asst.main_loop); doesn't work.
-  */
-  ia->asst.loop_done = true;
-  gtk_widget_hide (GTK_WIDGET (ia->asst.assistant));
-}
-
diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
deleted file mode 100644 (file)
index bf09902..0000000
+++ /dev/null
@@ -1,278 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/casereader.h"
-#include "data/gnumeric-reader.h"
-#include "data/ods-reader.h"
-#include "data/spreadsheet-reader.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-#include "ui/syntax-gen.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-struct import_assistant;
-
-/* Choose a file */
-static char *choose_file (GtkWindow *parent_window, gchar **encodingp);
-
-
-
-
-/* Obtains the file to import from the user and initializes IA's
-   file substructure.  PARENT_WINDOW must be the window to use
-   as the file chooser window's parent.
-
-   Returns true if successful, false if the file name could not
-   be obtained or the file could not be read. */
-bool
-init_file (struct import_assistant *ia, GtkWindow *parent_window)
-{
-  enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
-  struct file *file = &ia->file;
-
-  file->lines = NULL;
-  file->file_name = choose_file (parent_window, &file->encoding);
-  if (file->file_name == NULL)
-    return false;
-
-  if (ia->spreadsheet == NULL)
-    ia->spreadsheet = gnumeric_probe (file->file_name, false);
-
-  if (ia->spreadsheet == NULL)
-    ia->spreadsheet = ods_probe (file->file_name, false);
-
-  if (ia->spreadsheet == NULL)
-    {
-    struct string input;
-    struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
-    if (reader == NULL)
-      {
-       msg_error (errno, _("Could not open `%s'"),
-            file->file_name);
-       return false;
-      }
-
-    ds_init_empty (&input);
-    file->lines = xnmalloc (MAX_PREVIEW_LINES, sizeof *file->lines);
-    for (; file->line_cnt < MAX_PREVIEW_LINES; file->line_cnt++)
-      {
-       ds_clear (&input);
-       if (!line_reader_read (reader, &input, MAX_LINE_LEN + 1)
-           || ds_length (&input) > MAX_LINE_LEN)
-         {
-           if (line_reader_eof (reader))
-             break;
-           else if (line_reader_error (reader))
-             msg (ME, _("Error reading `%s': %s"),
-                  file->file_name, strerror (line_reader_error (reader)));
-           else
-             msg (ME, _("Failed to read `%s', because it contains a line "
-                        "over %d bytes long and therefore appears not to be "
-                        "a text file."),
-                  file->file_name, MAX_LINE_LEN);
-           line_reader_close (reader);
-           destroy_file (ia);
-           ds_destroy (&input);
-           return false;
-         }
-
-       ds_init_cstr (&file->lines[file->line_cnt],
-                     recode_string ("UTF-8", line_reader_get_encoding (reader),
-                                    ds_cstr (&input), ds_length (&input)));
-      }
-    ds_destroy (&input);
-
-    if (file->line_cnt == 0)
-      {
-       msg (ME, _("`%s' is empty."), file->file_name);
-       line_reader_close (reader);
-       destroy_file (ia);
-       return false;
-      }
-
-
-    /* Estimate the number of lines in the file. */
-    if (file->line_cnt < MAX_PREVIEW_LINES)
-      {
-       file->total_lines = file->line_cnt;
-       file->total_is_exact = true;
-      }
-    else
-      {
-       struct stat s;
-       off_t position = line_reader_tell (reader);
-       if (fstat (line_reader_fileno (reader), &s) == 0 && position > 0)
-         {
-           file->total_lines = (double) file->line_cnt / position * s.st_size;
-           file->total_is_exact = false;
-         }
-       else
-         {
-         file->total_lines = 0;
-         file->total_is_exact = true;
-         }
-      }
-
-    line_reader_close (reader);
-  }
-
-  return true;
-}
-
-/* Frees IA's file substructure. */
-void
-destroy_file (struct import_assistant *ia)
-{
-  struct file *f = &ia->file;
-  size_t i;
-
-  if (f->lines)
-    {
-      for (i = 0; i < f->line_cnt; i++)
-       ds_destroy (&f->lines[i]);
-      free (f->lines);
-    }
-
-  g_free (f->file_name);
-  g_free (f->encoding);
-}
-
-/* Obtains the file to read from the user.  If successful, returns the name of
-   the file and stores the user's chosen encoding for the file into *ENCODINGP.
-   The caller must free each of these strings with g_free().
-
-   On failure, stores a null pointer and stores NULL in *ENCODINGP.
-
-   PARENT_WINDOW must be the window to use as the file chooser window's
-   parent. */
-static char *
-choose_file (GtkWindow *parent_window, gchar **encodingp)
-{
-  char *file_name;
-  GtkFileFilter *filter = NULL;
-
-  GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import Delimited Text Data"),
-                                        parent_window,
-                                        GTK_FILE_CHOOSER_ACTION_OPEN,
-                                       _("Cancel"), GTK_RESPONSE_CANCEL,
-                                       _("Open"), GTK_RESPONSE_ACCEPT,
-                                        NULL);
-
-  g_object_set (dialog, "local-only", FALSE, NULL);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Text Files"));
-  gtk_file_filter_add_mime_type (filter, "text/*");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Text (*.txt) Files"));
-  gtk_file_filter_add_pattern (filter, "*.txt");
-  gtk_file_filter_add_pattern (filter, "*.TXT");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Plain Text (ASCII) Files"));
-  gtk_file_filter_add_mime_type (filter, "text/plain");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Comma Separated Value Files"));
-  gtk_file_filter_add_mime_type (filter, "text/csv");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  /* I've never encountered one of these, but it's listed here:
-     http://www.iana.org/assignments/media-types/text/tab-separated-values  */
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Tab Separated Value Files"));
-  gtk_file_filter_add_mime_type (filter, "text/tab-separated-values");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Gnumeric Spreadsheet Files"));
-  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("OpenDocument Spreadsheet Files"));
-  gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("All Spreadsheet Files"));
-  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
-  gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  gtk_file_chooser_set_extra_widget (
-    GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));
-
-  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);
-
-  switch (gtk_dialog_run (GTK_DIALOG (dialog)))
-    {
-    case GTK_RESPONSE_ACCEPT:
-      file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-      *encodingp = psppire_encoding_selector_get_encoding (
-        gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog)));
-      break;
-    default:
-      file_name = NULL;
-      *encodingp = NULL;
-      break;
-    }
-  gtk_widget_destroy (dialog);
-
-  return file_name;
-}
diff --git a/src/ui/gui/page-first-line.c b/src/ui/gui/page-first-line.c
deleted file mode 100644 (file)
index 172f1c2..0000000
+++ /dev/null
@@ -1,243 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "page-first-line.h"
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/pspp-sheet-selection.h"
-#include "ui/gui/pspp-sheet-view-column.h"
-#include "ui/gui/pspp-sheet-view.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-
-
-/* The "first line" page of the assistant. */
-
-/* Page where the user chooses the first line of data. */
-struct first_line_page
-  {
-    GtkWidget *page;
-    PsppSheetView *tree_view;
-    GtkWidget *variable_names_cb;
-  };
-
-static PsppSheetView *create_lines_tree_view (GtkContainer *parent_window,
-                                              struct import_assistant *);
-static void on_first_line_change (GtkTreeSelection *,
-                                  struct import_assistant *);
-static void on_variable_names_cb_toggle (GtkToggleButton *,
-                                         struct import_assistant *);
-static void set_first_line (struct import_assistant *);
-static void get_first_line (struct import_assistant *);
-
-/* Initializes IA's first_line substructure. */
-struct first_line_page *
-first_line_page_create (struct import_assistant *ia)
-{
-  struct first_line_page *p = xzalloc (sizeof *p);
-
-  GtkBuilder *builder = ia->asst.builder;
-
-  p->page = add_page_to_assistant (ia, get_widget_assert (builder, "FirstLine"),
-                                   GTK_ASSISTANT_PAGE_CONTENT);
-
-  gtk_widget_destroy (get_widget_assert (builder, "first-line"));
-  p->tree_view = create_lines_tree_view (
-    GTK_CONTAINER (get_widget_assert (builder, "first-line-scroller")), ia);
-  p->variable_names_cb = get_widget_assert (builder, "variable-names");
-  pspp_sheet_selection_set_mode (
-    pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (p->tree_view)),
-    PSPP_SHEET_SELECTION_BROWSE);
-  pspp_sheet_view_set_rubber_banding (PSPP_SHEET_VIEW (p->tree_view), TRUE);
-  g_signal_connect (pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (p->tree_view)),
-                    "changed", G_CALLBACK (on_first_line_change), ia);
-  g_signal_connect (p->variable_names_cb, "toggled",
-                    G_CALLBACK (on_variable_names_cb_toggle), ia);
-  return p;
-}
-
-/* Resets the first_line page to its initial content. */
-void
-reset_first_line_page (struct import_assistant *ia)
-{
-  ia->skip_lines = 0;
-  ia->variable_names = false;
-  set_first_line (ia);
-}
-
-static void
-render_line (PsppSheetViewColumn *tree_column,
-             GtkCellRenderer *cell,
-             GtkTreeModel *tree_model,
-             GtkTreeIter *iter,
-             gpointer data)
-{
-  gint row = empty_list_store_iter_to_row (iter);
-  struct string *lines;
-
-  lines = g_object_get_data (G_OBJECT (tree_model), "lines");
-  g_return_if_fail (lines != NULL);
-
-  g_object_set (cell, "text", ds_cstr (&lines[row]), NULL);
-}
-
-
-/* Creates and returns a tree view that contains each of the
-   lines in IA's file as a row. */
-static PsppSheetView *
-create_lines_tree_view (GtkContainer *parent, struct import_assistant *ia)
-{
-  PsppSheetView *tree_view = NULL;
-  PsppSheetViewColumn *column;
-  size_t max_line_length;
-  gint content_width, header_width;
-  size_t i;
-  const gchar *title = _("Text");
-
-  make_tree_view (ia, 0, &tree_view);
-
-  column = pspp_sheet_view_column_new_with_attributes (
-     title, ia->asst.fixed_renderer, (void *) NULL);
-  pspp_sheet_view_column_set_cell_data_func (column, ia->asst.fixed_renderer,
-                                           render_line, NULL, NULL);
-  pspp_sheet_view_column_set_resizable (column, TRUE);
-  pspp_sheet_view_column_set_expand (column, TRUE);
-
-  max_line_length = 0;
-  for (i = 0; i < ia->file.line_cnt; i++)
-    {
-      size_t w = ds_length (&ia->file.lines[i]);
-      max_line_length = MAX (max_line_length, w);
-    }
-
-  content_width = get_monospace_width (tree_view, ia->asst.fixed_renderer,
-                                       max_line_length);
-  header_width = get_string_width (tree_view, ia->asst.prop_renderer, title);
-  pspp_sheet_view_column_set_fixed_width (column, MAX (content_width,
-                                                     header_width));
-  pspp_sheet_view_append_column (tree_view, column);
-
-  gtk_container_add (parent, GTK_WIDGET (tree_view));
-  gtk_widget_show (GTK_WIDGET (tree_view));
-
-  return tree_view;
-}
-
-/* Called when the line selected in the first_line tree view
-   changes. */
-static void
-on_first_line_change (GtkTreeSelection *selection UNUSED,
-                      struct import_assistant *ia)
-{
-  get_first_line (ia);
-}
-
-/* Called when the checkbox that indicates whether variable
-   names are in the row above the first line is toggled. */
-static void
-on_variable_names_cb_toggle (GtkToggleButton *variable_names_cb UNUSED,
-                             struct import_assistant *ia)
-{
-  get_first_line (ia);
-}
-
-/* Sets the widgets to match IA's first_line substructure. */
-static void
-set_first_line (struct import_assistant *ia)
-{
-  GtkTreePath *path;
-
-  path = gtk_tree_path_new_from_indices (ia->skip_lines, -1);
-  pspp_sheet_view_set_cursor (PSPP_SHEET_VIEW (ia->first_line->tree_view),
-                            path, NULL, false);
-  gtk_tree_path_free (path);
-
-  gtk_toggle_button_set_active (
-    GTK_TOGGLE_BUTTON (ia->first_line->variable_names_cb),
-    ia->variable_names);
-  gtk_widget_set_sensitive (ia->first_line->variable_names_cb,
-                            ia->skip_lines > 0);
-}
-
-/* Sets IA's first_line substructure to match the widgets. */
-static void
-get_first_line (struct import_assistant *ia)
-{
-  PsppSheetSelection *selection;
-  GtkTreeIter iter;
-  GtkTreeModel *model;
-
-  selection = pspp_sheet_view_get_selection (ia->first_line->tree_view);
-  if (pspp_sheet_selection_get_selected (selection, &model, &iter))
-    {
-      GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
-      int row = gtk_tree_path_get_indices (path)[0];
-      gtk_tree_path_free (path);
-
-      ia->skip_lines = row;
-      ia->variable_names =
-        (ia->skip_lines > 0
-         && gtk_toggle_button_get_active (
-           GTK_TOGGLE_BUTTON (ia->first_line->variable_names_cb)));
-    }
-  gtk_widget_set_sensitive (ia->first_line->variable_names_cb,
-                            ia->skip_lines > 0);
-}
-
-
-
-void
-first_line_append_syntax (const struct import_assistant *ia, struct string *s)
-{
-  if (ia->skip_lines > 0)
-    ds_put_format (s, "  /FIRSTCASE=%d\n", ia->skip_lines + 1);
-}
diff --git a/src/ui/gui/page-first-line.h b/src/ui/gui/page-first-line.h
deleted file mode 100644 (file)
index 70118b3..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-
-#ifndef PAGE_FIRST_LINE_H
-#define PAGE_FIRST_LINE_H
-
-struct first_line_page ;
-struct import_assistant;
-struct string;
-
-struct first_line_page *first_line_page_create (struct import_assistant *ia);
-void first_line_append_syntax (const struct import_assistant *ia, struct string *s);
-
-#endif
diff --git a/src/ui/gui/page-formats.c b/src/ui/gui/page-formats.c
deleted file mode 100644 (file)
index f5a190c..0000000
+++ /dev/null
@@ -1,290 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-/* Page where the user verifies and adjusts input formats. */
-struct formats_page
-  {
-    GtkWidget *page;
-    PsppSheetView *data_tree_view;
-    PsppireDict *psppire_dict;
-    struct variable **modified_vars;
-    size_t modified_var_cnt;
-  };
-
-/* The "formats" page of the assistant. */
-
-static void on_variable_change (PsppireDict *dict, int idx,
-                               unsigned int what,
-                               const struct variable *oldvar,
-                                struct import_assistant *);
-
-static void clear_modified_vars (struct import_assistant *);
-
-/* Initializes IA's formats substructure. */
-
-struct formats_page *
-formats_page_create (struct import_assistant *ia)
-{
-  GtkBuilder *builder = ia->asst.builder;
-  struct formats_page *p = xzalloc (sizeof *p);
-
-  p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Formats"),
-                        GTK_ASSISTANT_PAGE_CONFIRM);
-
-  p->data_tree_view = PSPP_SHEET_VIEW (get_widget_assert (builder, "data"));
-  p->modified_vars = NULL;
-  p->modified_var_cnt = 0;
-
-  return p;
-}
-
-/* Frees IA's formats substructure. */
-void
-destroy_formats_page (struct import_assistant *ia)
-{
-  struct formats_page *p = ia->formats;
-
-  if (p->psppire_dict != NULL)
-    {
-      dict_destroy (p->psppire_dict->dict);
-      g_object_unref (p->psppire_dict);
-    }
-  clear_modified_vars (ia);
-}
-
-/* Called just before the formats page of the assistant is
-   displayed. */
-void
-prepare_formats_page (struct import_assistant *ia)
-{
-  struct dictionary *dict;
-  PsppireDict *psppire_dict;
-  GtkBin *vars_scroller;
-  GtkWidget *old_var_sheet;
-  PsppireVarSheet *var_sheet;
-  struct formats_page *p = ia->formats;
-  struct fmt_guesser *fg;
-  unsigned long int number = 0;
-  size_t column_idx;
-
-  push_watch_cursor (ia);
-
-  dict = dict_create (get_default_encoding ());
-  fg = fmt_guesser_create ();
-  for (column_idx = 0; column_idx < ia->column_cnt; column_idx++)
-    {
-      struct variable *modified_var = 
-       (column_idx < p->modified_var_cnt ? p->modified_vars[column_idx] : NULL);
-      if (modified_var == NULL)
-        {
-          struct column *column = &ia->columns[column_idx];
-          struct variable *var;
-          struct fmt_spec format;
-          char *name;
-          size_t row;
-
-          /* Choose variable name. */
-          name = dict_make_unique_var_name (dict, column->name, &number);
-
-          /* Choose variable format. */
-          fmt_guesser_clear (fg);
-          for (row = ia->skip_lines; row < ia->file.line_cnt; row++)
-            fmt_guesser_add (fg, column->contents[row]);
-          fmt_guesser_guess (fg, &format);
-          fmt_fix_input (&format);
-
-          /* Create variable. */
-          var = dict_create_var_assert (dict, name, fmt_var_width (&format));
-          var_set_both_formats (var, &format);
-
-          free (name);
-        }
-      else
-        {
-          char *name;
-
-          name = dict_make_unique_var_name (dict, var_get_name (modified_var),
-                                            &number);
-          dict_clone_var_as_assert (dict, modified_var, name);
-          free (name);
-        }
-    }
-  fmt_guesser_destroy (fg);
-
-  psppire_dict = psppire_dict_new_from_dict (dict);
-  g_signal_connect (psppire_dict, "variable-changed",
-                    G_CALLBACK (on_variable_change), ia);
-  ia->dict = dict;
-  ia->formats->psppire_dict = psppire_dict;
-
-  /* XXX: PsppireVarStore doesn't hold a reference to
-     psppire_dict for now, but it should.  After it does, we
-     should g_object_ref the psppire_dict here, since we also
-     hold a reference via ia->formats->dict. */
-  var_sheet = PSPPIRE_VAR_SHEET (psppire_var_sheet_new ());
-  g_object_set (var_sheet,
-                "dictionary", psppire_dict,
-                "may-create-vars", FALSE,
-                "may-delete-vars", FALSE,
-                "format-use", FMT_FOR_INPUT,
-                "enable-grid-lines", PSPP_SHEET_VIEW_GRID_LINES_BOTH,
-                (void *) NULL);
-
-  vars_scroller = GTK_BIN (get_widget_assert (ia->asst.builder, "vars-scroller"));
-  old_var_sheet = gtk_bin_get_child (vars_scroller);
-  if (old_var_sheet != NULL)
-    gtk_widget_destroy (old_var_sheet);
-  gtk_container_add (GTK_CONTAINER (vars_scroller), GTK_WIDGET (var_sheet));
-  gtk_widget_show (GTK_WIDGET (var_sheet));
-
-  gtk_widget_destroy (GTK_WIDGET (ia->formats->data_tree_view));
-  ia->formats->data_tree_view = create_data_tree_view (
-    false,
-    GTK_CONTAINER (get_widget_assert (ia->asst.builder, "data-scroller")),
-    ia);
-
-  gtk_widget_show (ia->asst.paste_button);
-
-  pop_watch_cursor (ia);
-}
-
-/* Clears the set of user-modified variables from IA's formats
-   substructure.  This discards user modifications to variable
-   formats, thereby causing formats to revert to their
-   defaults.  */
-static void
-clear_modified_vars (struct import_assistant *ia)
-{
-  struct formats_page *p = ia->formats;
-  size_t i;
-
-  for (i = 0; i < p->modified_var_cnt; i++)
-    var_destroy (p->modified_vars[i]);
-  free (p->modified_vars);
-  p->modified_vars = NULL;
-  p->modified_var_cnt = 0;
-}
-
-/* Resets the formats page to its defaults, discarding user
-   modifications. */
-void
-reset_formats_page (struct import_assistant *ia)
-{
-  clear_modified_vars (ia);
-  prepare_formats_page (ia);
-}
-
-
-
-/* Called when the user changes one of the variables in the
-   dictionary. */
-static void
-on_variable_change (PsppireDict *dict, int dict_idx,
-                   unsigned int what, const struct variable *oldvar,
-                    struct import_assistant *ia)
-{
-  struct formats_page *p = ia->formats;
-  PsppSheetView *tv = ia->formats->data_tree_view;
-  gint column_idx = dict_idx + 1;
-
-  push_watch_cursor (ia);
-
-  /* Remove previous column and replace with new column. */
-  pspp_sheet_view_remove_column (tv, pspp_sheet_view_get_column (tv, column_idx));
-  pspp_sheet_view_insert_column (tv, make_data_column (ia, tv, false, dict_idx),
-                                 column_idx);
-
-  /* Save a copy of the modified variable in modified_vars, so
-     that its attributes will be preserved if we back up to the
-     previous page with the Prev button and then come back
-     here. */
-  if (dict_idx >= p->modified_var_cnt)
-    {
-      size_t i;
-      p->modified_vars = xnrealloc (p->modified_vars, dict_idx + 1,
-                                    sizeof *p->modified_vars);
-      for (i = 0; i <= dict_idx; i++)
-        p->modified_vars[i] = NULL;
-      p->modified_var_cnt = dict_idx + 1;
-    }
-  if (p->modified_vars[dict_idx])
-    var_destroy (p->modified_vars[dict_idx]);
-  p->modified_vars[dict_idx]
-    = var_clone (psppire_dict_get_variable (dict, dict_idx));
-
-  pop_watch_cursor (ia);
-}
-
-
-
-
-void
-formats_append_syntax (const struct import_assistant *ia, struct string *s)
-{
-  int i;
-  int var_cnt;
-  ds_put_cstr (s, "  /VARIABLES=\n");
-  
-  var_cnt = dict_get_var_cnt (ia->dict);
-  for (i = 0; i < var_cnt; i++)
-    {
-      struct variable *var = dict_get_var (ia->dict, i);
-      char format_string[FMT_STRING_LEN_MAX + 1];
-      fmt_to_string (var_get_print_format (var), format_string);
-      ds_put_format (s, "    %s %s%s\n",
-                    var_get_name (var), format_string,
-                    i == var_cnt - 1 ? "." : "");
-    }
-}
diff --git a/src/ui/gui/page-formats.h b/src/ui/gui/page-formats.h
deleted file mode 100644 (file)
index 750b6cb..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef PAGE_FORMATS_H
-#define PAGE_FORMATS_H
-
-struct formats_page;
-struct import_assistant;
-struct string;
-
-struct formats_page *formats_page_create (struct import_assistant *ia);
-void formats_append_syntax (const struct import_assistant *ia, struct string *s);
-
-
-#endif
diff --git a/src/ui/gui/page-intro.c b/src/ui/gui/page-intro.c
deleted file mode 100644 (file)
index 6db2bee..0000000
+++ /dev/null
@@ -1,196 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "page-intro.h"
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-#include "ui/syntax-gen.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-struct import_assistant;
-
-
-\f
-/* The "intro" page of the assistant. */
-
-/* The introduction page of the assistant. */
-struct intro_page
-  {
-    GtkWidget *page;
-    GtkWidget *all_cases_button;
-    GtkWidget *n_cases_button;
-    GtkWidget *n_cases_spin;
-    GtkWidget *percent_button;
-    GtkWidget *percent_spin;
-  };
-
-static void on_intro_amount_changed (struct intro_page *);
-
-/* Initializes IA's intro substructure. */
-struct intro_page *
-intro_page_create (struct import_assistant *ia)
-{
-  GtkBuilder *builder = ia->asst.builder;
-  struct string s;
-  GtkWidget *hbox_n_cases ;
-  GtkWidget *hbox_percent ;
-  GtkWidget *table ;
-
-  struct intro_page *p = xzalloc (sizeof (*p));
-
-  p->n_cases_spin = gtk_spin_button_new_with_range (0, INT_MAX, 100);
-
-  hbox_n_cases = psppire_scanf_new (_("Only the first %4d cases"), &p->n_cases_spin);
-
-  table  = get_widget_assert (builder, "button-table");
-
-  gtk_grid_attach (GTK_GRID (table), hbox_n_cases,
-                   1, 1,
-                   1, 1);
-
-  p->percent_spin = gtk_spin_button_new_with_range (0, 100, 10);
-
-  hbox_percent = psppire_scanf_new (_("Only the first %3d %% of file (approximately)"), &p->percent_spin);
-
-  gtk_grid_attach (GTK_GRID (table), hbox_percent,
-                  1, 2,
-                  1, 1);
-
-  p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Intro"),
-                                   GTK_ASSISTANT_PAGE_INTRO);
-
-  p->all_cases_button = get_widget_assert (builder, "import-all-cases");
-
-  p->n_cases_button = get_widget_assert (builder, "import-n-cases");
-
-  p->percent_button = get_widget_assert (builder, "import-percent");
-
-  g_signal_connect_swapped (p->all_cases_button, "toggled",
-                    G_CALLBACK (on_intro_amount_changed), p);
-  g_signal_connect_swapped (p->n_cases_button, "toggled",
-                    G_CALLBACK (on_intro_amount_changed), p);
-  g_signal_connect_swapped (p->percent_button, "toggled",
-                    G_CALLBACK (on_intro_amount_changed), p);
-
-  on_intro_amount_changed (p);
-
-  ds_init_empty (&s);
-  ds_put_cstr (&s, _("This assistant will guide you through the process of "
-                     "importing data into PSPP from a text file with one line "
-                     "per case,  in which fields are separated by tabs, "
-                     "commas, or other delimiters.\n\n"));
-  if (ia->file.total_is_exact)
-    ds_put_format (
-      &s, ngettext ("The selected file contains %'zu line of text.  ",
-                    "The selected file contains %'zu lines of text.  ",
-                    ia->file.line_cnt),
-      ia->file.line_cnt);
-  else if (ia->file.total_lines > 0)
-    {
-      ds_put_format (
-        &s, ngettext (
-          "The selected file contains approximately %'lu line of text.  ",
-          "The selected file contains approximately %'lu lines of text.  ",
-          ia->file.total_lines),
-        ia->file.total_lines);
-      ds_put_format (
-        &s, ngettext (
-          "Only the first %zu line of the file will be shown for "
-          "preview purposes in the following screens.  ",
-          "Only the first %zu lines of the file will be shown for "
-          "preview purposes in the following screens.  ",
-          ia->file.line_cnt),
-        ia->file.line_cnt);
-    }
-  ds_put_cstr (&s, _("You may choose below how much of the file should "
-                     "actually be imported."));
-  gtk_label_set_text (GTK_LABEL (get_widget_assert (builder, "intro-label")),
-                      ds_cstr (&s));
-  ds_destroy (&s);
-
-  return p;
-}
-
-/* Resets IA's intro page to its initial state. */
-void
-reset_intro_page (struct import_assistant *ia)
-{
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->intro->all_cases_button),
-                                true);
-}
-
-/* Called when one of the radio buttons is clicked. */
-static void
-on_intro_amount_changed (struct intro_page *p)
-{
-  gtk_widget_set_sensitive (p->n_cases_spin,
-                            gtk_toggle_button_get_active (
-                              GTK_TOGGLE_BUTTON (p->n_cases_button)));
-
-  gtk_widget_set_sensitive (p->percent_spin,
-                            gtk_toggle_button_get_active (
-                              GTK_TOGGLE_BUTTON (p->percent_button)));
-}
-
-
-void
-intro_append_syntax (const struct intro_page *p, struct string *s)
-{
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (p->n_cases_button)))
-    ds_put_format (s, "  /IMPORTCASE=FIRST %d\n",
-                  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (p->n_cases_spin)));
-  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (p->percent_button)))
-    ds_put_format (s, "  /IMPORTCASE=PERCENT %d\n",
-                  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (p->percent_spin)));
-  else
-    ds_put_cstr (s, "  /IMPORTCASE=ALL\n");
-}
diff --git a/src/ui/gui/page-intro.h b/src/ui/gui/page-intro.h
deleted file mode 100644 (file)
index 87848ab..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef PAGE_INTRO_H
-#define PAGE_INTRO_H
-
-struct intro_page;
-struct import_assistant;
-struct string;
-
-struct intro_page *intro_page_create (struct import_assistant *ia);
-void intro_append_syntax (const struct intro_page *p, struct string *s);
-
-
-#endif
diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c
deleted file mode 100644 (file)
index 6e59202..0000000
+++ /dev/null
@@ -1,592 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2015  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "page-separators.h"
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-#include "ui/syntax-gen.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-/* Page where the user chooses field separators. */
-struct separators_page
-  {
-    /* How to break lines into columns. */
-    struct string separators;   /* Field separators. */
-    struct string quotes;       /* Quote characters. */
-
-    GtkWidget *page;
-    GtkWidget *custom_cb;
-    GtkWidget *custom_entry;
-    GtkWidget *quote_cb;
-    GtkWidget *quote_combo;
-    GtkEntry *quote_entry;
-    PsppSheetView *fields_tree_view;
-  };
-
-/* The "separators" page of the assistant. */
-
-static void revise_fields_preview (struct import_assistant *ia);
-static void choose_likely_separators (struct import_assistant *ia);
-static void find_commonest_chars (unsigned long int histogram[UCHAR_MAX + 1],
-                                  const char *targets, const char *def,
-                                  struct string *result);
-static void clear_fields (struct import_assistant *ia);
-static void revise_fields_preview (struct import_assistant *);
-static void set_separators (struct import_assistant *);
-static void get_separators (struct import_assistant *);
-static void on_separators_custom_entry_notify (GObject *UNUSED,
-                                               GParamSpec *UNUSED,
-                                               struct import_assistant *);
-static void on_separators_custom_cb_toggle (GtkToggleButton *custom_cb,
-                                            struct import_assistant *);
-static void on_quote_combo_change (GtkComboBox *combo,
-                                   struct import_assistant *);
-static void on_quote_cb_toggle (GtkToggleButton *quote_cb,
-                                struct import_assistant *);
-static void on_separator_toggle (GtkToggleButton *, struct import_assistant *);
-
-/* A common field separator and its identifying name. */
-struct separator
-  {
-    const char *name;           /* Name (for use with get_widget_assert). */
-    int c;                      /* Separator character. */
-  };
-
-/* All the separators in the dialog box. */
-static const struct separator separators[] =
-  {
-    {"space", ' '},
-    {"tab", '\t'},
-    {"bang", '!'},
-    {"colon", ':'},
-    {"comma", ','},
-    {"hyphen", '-'},
-    {"pipe", '|'},
-    {"semicolon", ';'},
-    {"slash", '/'},
-  };
-#define SEPARATOR_CNT (sizeof separators / sizeof *separators)
-
-static void
-set_quote_list (GtkComboBox *cb)
-{
-  GtkListStore *list =  gtk_list_store_new (1, G_TYPE_STRING);
-  GtkTreeIter iter;
-  gint i;
-  const gchar *seperator[3] = {"'\"", "\'", "\""};
-
-  for (i = 0; i < 3; i++)
-    {
-      const gchar *s = seperator[i];
-
-      /* Add a new row to the model */
-      gtk_list_store_append (list, &iter);
-      gtk_list_store_set (list, &iter,
-                          0, s,
-                          -1);
-
-    }
-
-  gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list));
-  g_object_unref (list);
-
-  gtk_combo_box_set_entry_text_column (cb, 0);
-}
-
-/* Initializes IA's separators substructure. */
-
-struct separators_page *
-separators_page_create (struct import_assistant *ia)
-{
-  GtkBuilder *builder = ia->asst.builder;
-
-  size_t i;
-
-  struct separators_page *p = xzalloc (sizeof *p);
-
-  p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Separators"),
-                                   GTK_ASSISTANT_PAGE_CONTENT);
-
-  p->custom_cb = get_widget_assert (builder, "custom-cb");
-  p->custom_entry = get_widget_assert (builder, "custom-entry");
-  p->quote_combo = get_widget_assert (builder, "quote-combo");
-  p->quote_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (p->quote_combo)));
-  p->quote_cb = get_widget_assert (builder, "quote-cb");
-
-  set_quote_list (GTK_COMBO_BOX (p->quote_combo));
-  p->fields_tree_view = PSPP_SHEET_VIEW (get_widget_assert (builder, "fields"));
-  g_signal_connect (p->quote_combo, "changed",
-                    G_CALLBACK (on_quote_combo_change), ia);
-  g_signal_connect (p->quote_cb, "toggled",
-                    G_CALLBACK (on_quote_cb_toggle), ia);
-  g_signal_connect (p->custom_entry, "notify::text",
-                    G_CALLBACK (on_separators_custom_entry_notify), ia);
-  g_signal_connect (p->custom_cb, "toggled",
-                    G_CALLBACK (on_separators_custom_cb_toggle), ia);
-  for (i = 0; i < SEPARATOR_CNT; i++)
-    g_signal_connect (get_widget_assert (builder, separators[i].name),
-                      "toggled", G_CALLBACK (on_separator_toggle), ia);
-
-  return p;
-}
-
-/* Frees IA's separators substructure. */
-void
-destroy_separators_page (struct import_assistant *ia)
-{
-  struct separators_page *s = ia->separators;
-
-  ds_destroy (&s->separators);
-  ds_destroy (&s->quotes);
-  clear_fields (ia);
-}
-
-/* Called just before the separators page becomes visible in the
-   assistant. */
-void
-prepare_separators_page (struct import_assistant *ia)
-{
-  revise_fields_preview (ia);
-}
-
-/* Called when the Reset button is clicked on the separators
-   page, resets the separators to the defaults. */
-void
-reset_separators_page (struct import_assistant *ia)
-{
-  choose_likely_separators (ia);
-  set_separators (ia);
-}
-
-/* Frees and clears the column data in IA's separators
-   substructure. */
-static void
-clear_fields (struct import_assistant *ia)
-{
-  if (ia->column_cnt > 0)
-    {
-      struct column *col;
-      size_t row;
-
-      for (row = 0; row < ia->file.line_cnt; row++)
-        {
-          const struct string *line = &ia->file.lines[row];
-          const char *line_start = ds_data (line);
-          const char *line_end = ds_end (line);
-
-          for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
-            {
-              char *s = ss_data (col->contents[row]);
-              if (!(s >= line_start && s <= line_end))
-                ss_dealloc (&col->contents[row]);
-            }
-        }
-
-      for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
-        {
-          free (col->name);
-          free (col->contents);
-        }
-
-      free (ia->columns);
-      ia->columns = NULL;
-      ia->column_cnt = 0;
-    }
-}
-
-/* Breaks the file data in IA into columns based on the
-   separators set in IA's separators substructure. */
-static void
-split_fields (struct import_assistant *ia)
-{
-  struct separators_page *s = ia->separators;
-  size_t columns_allocated;
-  bool space_sep;
-  size_t row;
-
-  clear_fields (ia);
-
-  /* Is space in the set of separators? */
-  space_sep = ss_find_byte (ds_ss (&s->separators), ' ') != SIZE_MAX;
-
-  /* Split all the lines, not just those from
-     ia->first_line.skip_lines on, so that we split the line that
-     contains variables names if ia->first_line.variable_names is
-     true. */
-  columns_allocated = 0;
-  for (row = 0; row < ia->file.line_cnt; row++)
-    {
-      struct string *line = &ia->file.lines[row];
-      struct substring text = ds_ss (line);
-      size_t column_idx;
-
-      for (column_idx = 0; ; column_idx++)
-        {
-          struct substring field;
-          struct column *column;
-
-          if (space_sep)
-            ss_ltrim (&text, ss_cstr (" "));
-          if (ss_is_empty (text))
-            {
-              if (column_idx != 0)
-                break;
-              field = text;
-            }
-          else if (!ds_is_empty (&s->quotes)
-                   && ds_find_byte (&s->quotes, text.string[0]) != SIZE_MAX)
-            {
-              int quote = ss_get_byte (&text);
-              struct string s;
-              int c;
-
-              ds_init_empty (&s);
-              while ((c = ss_get_byte (&text)) != EOF)
-                if (c != quote)
-                  ds_put_byte (&s, c);
-                else if (ss_match_byte (&text, quote))
-                  ds_put_byte (&s, quote);
-                else
-                  break;
-              field = ds_ss (&s);
-            }
-          else
-            ss_get_bytes (&text, ss_cspan (text, ds_ss (&s->separators)),
-                          &field);
-
-          if (column_idx >= ia->column_cnt)
-            {
-              struct column *column;
-
-              if (ia->column_cnt >= columns_allocated)
-                ia->columns = x2nrealloc (ia->columns, &columns_allocated,
-                                         sizeof *ia->columns);
-              column = &ia->columns[ia->column_cnt++];
-              column->name = NULL;
-              column->width = 0;
-              column->contents = xcalloc (ia->file.line_cnt,
-                                          sizeof *column->contents);
-            }
-          column = &ia->columns[column_idx];
-          column->contents[row] = field;
-          if (ss_length (field) > column->width)
-            column->width = ss_length (field);
-
-          if (space_sep)
-            ss_ltrim (&text, ss_cstr (" "));
-          if (ss_is_empty (text))
-            break;
-          if (ss_find_byte (ds_ss (&s->separators), ss_first (text))
-              != SIZE_MAX)
-            ss_advance (&text, 1);
-        }
-    }
-}
-
-/* Chooses a name for each column on the separators page */
-static void
-choose_column_names (struct import_assistant *ia)
-{
-  struct dictionary *dict;
-  unsigned long int generated_name_count = 0;
-  struct column *col;
-  size_t name_row;
-
-  dict = dict_create (get_default_encoding ());
-  name_row = ia->variable_names && ia->skip_lines ? ia->skip_lines : 0;
-  for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
-    {
-      char *hint, *name;
-
-      hint = name_row ? ss_xstrdup (col->contents[name_row - 1]) : NULL;
-      name = dict_make_unique_var_name (dict, hint, &generated_name_count);
-      free (hint);
-
-      col->name = name;
-      dict_create_var_assert (dict, name, 0);
-    }
-  dict_destroy (dict);
-}
-
-/* Picks the most likely separator and quote characters based on
-   IA's file data. */
-static void
-choose_likely_separators (struct import_assistant *ia)
-{
-  unsigned long int histogram[UCHAR_MAX + 1] = { 0 };
-  size_t row;
-
-  /* Construct a histogram of all the characters used in the
-     file. */
-  for (row = 0; row < ia->file.line_cnt; row++)
-    {
-      struct substring line = ds_ss (&ia->file.lines[row]);
-      size_t length = ss_length (line);
-      size_t i;
-      for (i = 0; i < length; i++)
-        histogram[(unsigned char) line.string[i]]++;
-    }
-
-  find_commonest_chars (histogram, "\"'", "", &ia->separators->quotes);
-  find_commonest_chars (histogram, ",;:/|!\t-", ",", &ia->separators->separators);
-}
-
-/* Chooses the most common character among those in TARGETS,
-   based on the frequency data in HISTOGRAM, and stores it in
-   RESULT.  If there is a tie for the most common character among
-   those in TARGETS, the earliest character is chosen.  If none
-   of the TARGETS appear at all, then DEF is used as a
-   fallback. */
-static void
-find_commonest_chars (unsigned long int histogram[UCHAR_MAX + 1],
-                      const char *targets, const char *def,
-                      struct string *result)
-{
-  unsigned char max = 0;
-  unsigned long int max_count = 0;
-
-  for (; *targets != '\0'; targets++)
-    {
-      unsigned char c = *targets;
-      unsigned long int count = histogram[c];
-      if (count > max_count)
-        {
-          max = c;
-          max_count = count;
-        }
-    }
-  if (max_count > 0)
-    {
-      ds_clear (result);
-      ds_put_byte (result, max);
-    }
-  else
-    ds_assign_cstr (result, def);
-}
-
-/* Revises the contents of the fields tree view based on the
-   currently chosen set of separators. */
-static void
-revise_fields_preview (struct import_assistant *ia)
-{
-  GtkWidget *w;
-
-  push_watch_cursor (ia);
-
-  w = GTK_WIDGET (ia->separators->fields_tree_view);
-  gtk_widget_destroy (w);
-  get_separators (ia);
-  split_fields (ia);
-  choose_column_names (ia);
-  ia->separators->fields_tree_view = create_data_tree_view (
-    true,
-    GTK_CONTAINER (get_widget_assert (ia->asst.builder, "fields-scroller")),
-    ia);
-
-  pop_watch_cursor (ia);
-}
-
-/* Sets the widgets to match IA's separators substructure. */
-static void
-set_separators (struct import_assistant *ia)
-{
-  struct separators_page *s = ia->separators;
-  unsigned int seps;
-  struct string custom;
-  bool any_custom;
-  bool any_quotes;
-  size_t i;
-
-  ds_init_empty (&custom);
-  seps = 0;
-  for (i = 0; i < ds_length (&s->separators); i++)
-    {
-      unsigned char c = ds_at (&s->separators, i);
-      int j;
-
-      for (j = 0; j < SEPARATOR_CNT; j++)
-        {
-          const struct separator *s = &separators[j];
-          if (s->c == c)
-            {
-              seps += 1u << j;
-              goto next;
-            }
-        }
-
-      ds_put_byte (&custom, c);
-    next:;
-    }
-
-  for (i = 0; i < SEPARATOR_CNT; i++)
-    {
-      const struct separator *s = &separators[i];
-      GtkWidget *button = get_widget_assert (ia->asst.builder, s->name);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
-                                    (seps & (1u << i)) != 0);
-    }
-  any_custom = !ds_is_empty (&custom);
-  gtk_entry_set_text (GTK_ENTRY (s->custom_entry), ds_cstr (&custom));
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (s->custom_cb),
-                                any_custom);
-  gtk_widget_set_sensitive (s->custom_entry, any_custom);
-  ds_destroy (&custom);
-
-  any_quotes = !ds_is_empty (&s->quotes);
-
-  gtk_entry_set_text (s->quote_entry,
-                      any_quotes ? ds_cstr (&s->quotes) : "\"");
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (s->quote_cb),
-                                any_quotes);
-  gtk_widget_set_sensitive (s->quote_combo, any_quotes);
-}
-
-/* Sets IA's separators substructure to match the widgets. */
-static void
-get_separators (struct import_assistant *ia)
-{
-  struct separators_page *s = ia->separators;
-  int i;
-
-  ds_clear (&s->separators);
-  for (i = 0; i < SEPARATOR_CNT; i++)
-    {
-      const struct separator *sep = &separators[i];
-      GtkWidget *button = get_widget_assert (ia->asst.builder, sep->name);
-      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
-        ds_put_byte (&s->separators, sep->c);
-    }
-
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (s->custom_cb)))
-    ds_put_cstr (&s->separators,
-                 gtk_entry_get_text (GTK_ENTRY (s->custom_entry)));
-
-  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (s->quote_cb)))
-    {
-      const gchar *text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (s->quote_combo))));
-      ds_assign_cstr (&s->quotes, text);
-    }
-  else
-    ds_clear (&s->quotes);
-}
-
-/* Called when the user changes the entry field for custom
-   separators. */
-static void
-on_separators_custom_entry_notify (GObject *gobject UNUSED,
-                                   GParamSpec *arg1 UNUSED,
-                                   struct import_assistant *ia)
-{
-  revise_fields_preview (ia);
-}
-
-/* Called when the user toggles the checkbox that enables custom
-   separators. */
-static void
-on_separators_custom_cb_toggle (GtkToggleButton *custom_cb,
-                                struct import_assistant *ia)
-{
-  bool is_active = gtk_toggle_button_get_active (custom_cb);
-  gtk_widget_set_sensitive (ia->separators->custom_entry, is_active);
-  revise_fields_preview (ia);
-}
-
-/* Called when the user changes the selection in the combo box
-   that selects a quote character. */
-static void
-on_quote_combo_change (GtkComboBox *combo, struct import_assistant *ia)
-{
-  revise_fields_preview (ia);
-}
-
-/* Called when the user toggles the checkbox that enables
-   quoting. */
-static void
-on_quote_cb_toggle (GtkToggleButton *quote_cb, struct import_assistant *ia)
-{
-  bool is_active = gtk_toggle_button_get_active (quote_cb);
-  gtk_widget_set_sensitive (ia->separators->quote_combo, is_active);
-  revise_fields_preview (ia);
-}
-
-/* Called when the user toggles one of the separators
-   checkboxes. */
-static void
-on_separator_toggle (GtkToggleButton *toggle UNUSED,
-                     struct import_assistant *ia)
-{
-  revise_fields_preview (ia);
-}
-
-
-
-void 
-separators_append_syntax (const struct import_assistant *ia, struct string *s)
-{
-  int i;
-  ds_put_cstr (s, "  /DELIMITERS=\"");
-  if (ds_find_byte (&ia->separators->separators, '\t') != SIZE_MAX)
-    ds_put_cstr (s, "\\t");
-  if (ds_find_byte (&ia->separators->separators, '\\') != SIZE_MAX)
-    ds_put_cstr (s, "\\\\");
-  for (i = 0; i < ds_length (&ia->separators->separators); i++)
-    {
-      char c = ds_at (&ia->separators->separators, i);
-      if (c == '"')
-       ds_put_cstr (s, "\"\"");
-      else if (c != '\t' && c != '\\')
-       ds_put_byte (s, c);
-    }
-  ds_put_cstr (s, "\"\n");
-  if (!ds_is_empty (&ia->separators->quotes))
-    syntax_gen_pspp (s, "  /QUALIFIER=%sq\n", ds_cstr (&ia->separators->quotes));
-}
diff --git a/src/ui/gui/page-separators.h b/src/ui/gui/page-separators.h
deleted file mode 100644 (file)
index cbc32ee..0000000
+++ /dev/null
@@ -1,29 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. 
-*/
-
-#ifndef PAGE_SEPARATORS
-#define PAGE_SEPARATORS
-
-struct separators_page;
-struct import_assistant;
-struct string;
-
-struct separators_page *separators_page_create (struct import_assistant *ia);
-void  separators_append_syntax (const struct import_assistant *ia, struct string *s);
-
-
-#endif
diff --git a/src/ui/gui/page-sheet-spec.c b/src/ui/gui/page-sheet-spec.c
deleted file mode 100644 (file)
index 76b3ff6..0000000
+++ /dev/null
@@ -1,310 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "page-sheet-spec.h"
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "data/gnumeric-reader.h"
-#include "data/ods-reader.h"
-#include "data/spreadsheet-reader.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-#include "ui/syntax-gen.h"
-
-#include "ui/gui/psppire-spreadsheet-model.h"
-
-#include <data/casereader.h>
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-struct import_assistant;
-
-/* The "sheet-spec" page of the assistant. */
-
-/* The sheet_spec page of the assistant (only relevant for spreadsheet imports). */
-struct sheet_spec_page
-  {
-    GtkWidget *page;
-    struct casereader *reader;
-    struct dictionary *dict;
-    
-    struct spreadsheet_read_options opts;
-  };
-
-
-char *
-sheet_spec_gen_syntax (const struct import_assistant *ia)
-{
-  const struct sheet_spec_page *ssp = ia->sheet_spec;
-  GtkBuilder *builder = ia->asst.builder;
-  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
-  const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
-
-  struct string s = DS_EMPTY_INITIALIZER;
-
-  syntax_gen_pspp (&s,
-                  "GET DATA"
-                  "\n  /TYPE=%ss"
-                  "\n  /FILE=%sq"
-                  "\n  /SHEET=index %d"
-                  "\n  /READNAMES=%ss",
-                  (ia->spreadsheet->type == SPREADSHEET_GNUMERIC) ? "GNM" : "ODS",
-                  ia->file.file_name,                   
-                  ssp->opts.sheet_index,
-                  ssp->opts.read_names ? "ON" : "OFF");
-
-
-  if (range && 0 != strcmp ("", range))
-    {
-      syntax_gen_pspp (&s,
-                      "\n  /CELLRANGE=RANGE %sq", range);
-    }
-  else
-    {
-      syntax_gen_pspp (&s,
-                      "\n  /CELLRANGE=FULL");
-    }
-
-
-  syntax_gen_pspp (&s, ".");
-
-  
-  return ds_cstr (&s);
-}
-
-
-static void 
-on_sheet_combo_changed (GtkComboBox *cb, struct import_assistant *ia)
-{
-  GtkTreeIter iter;
-  gchar *range = NULL;
-  GtkTreeModel *model = gtk_combo_box_get_model (cb);
-  GtkBuilder *builder = ia->asst.builder;
-  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
-
-  gtk_combo_box_get_active_iter (cb, &iter);
-  gtk_tree_model_get (model, &iter, PSPPIRE_SPREADSHEET_MODEL_COL_RANGE, &range, -1);
-  gtk_entry_set_text (GTK_ENTRY (range_entry), range ?  range : "");
-  g_free (range);
-}
-
-/* Initializes IA's sheet_spec substructure. */
-struct sheet_spec_page *
-sheet_spec_page_create (struct import_assistant *ia)
-{
-  GtkBuilder *builder = ia->asst.builder;
-  struct sheet_spec_page *p = xzalloc (sizeof (*p));
-
-  GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");
-  GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
-  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
-  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
-                                 "text", 0,
-                                 NULL);
-
-  g_signal_connect (combo_box, "changed", G_CALLBACK (on_sheet_combo_changed), ia);
-
-  add_page_to_assistant (ia, get_widget_assert (builder, "Sheet"),
-                        GTK_ASSISTANT_PAGE_INTRO);
-
-  return p;
-}
-
-/* Prepares IA's sheet_spec page. */
-void
-prepare_sheet_spec_page (struct import_assistant *ia)
-{
-  GtkBuilder *builder = ia->asst.builder;
-  GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
-  GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
-
-  gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry), 
-                          psppire_spreadsheet_model_new (ia->spreadsheet));
-
-  gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE);
-}
-
-
-/* Resets IA's sheet_spec page to its initial state. */
-void
-reset_sheet_spec_page (struct import_assistant *ia)
-{
-  GtkBuilder *builder = ia->asst.builder;
-  GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
-  GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
-
-  gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0);
-
-  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE);
-}
-
-/* Called when the Forward button is clicked, 
-   but before displaying the new page.
-*/
-void
-post_sheet_spec_page (struct import_assistant *ia)
-{
-  int row_start = -1;
-  int row_stop = -1;
-  int col_start = -1;
-  int col_stop = -1;
-
-  GtkBuilder *builder = ia->asst.builder;
-
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-  struct casereader *creader = NULL;
-  struct dictionary *dict = NULL;
-
-  GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
-  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
-  const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
-  GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");
-
-  gint num = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box));
-  
-  ssp->opts.sheet_name = NULL;
-  ssp->opts.cell_range = NULL;
-  ssp->opts.sheet_index = num + 1;
-
-  if ( convert_cell_ref (range, &col_start, &row_start, &col_stop, &row_stop))
-    {
-      ssp->opts.cell_range = g_strdup (range);
-    }
-
-  ssp->opts.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
-  ssp->opts.asw = -1;
-
-  switch (ia->spreadsheet->type)
-    {
-    case SPREADSHEET_ODS:
-    case SPREADSHEET_GNUMERIC:
-      {
-       creader = spreadsheet_make_reader (ia->spreadsheet, &ssp->opts);
-       dict = ia->spreadsheet->dict;
-      }
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
-  ssp->dict = dict;
-  ssp->reader = creader;
-
-  if (creader && dict)
-    {
-      update_assistant (ia);
-    }
-  else
-    {
-      GtkWidget * dialog = gtk_message_dialog_new (NULL,
-                             GTK_DIALOG_MODAL,
-                             GTK_MESSAGE_ERROR,
-                             GTK_BUTTONS_CLOSE,
-                             _("An error occurred reading the spreadsheet file."));
-
-      gtk_dialog_run (GTK_DIALOG (dialog));
-      gtk_widget_destroy (dialog);
-    }
-}
-
-
-/*
-  Update IA according to the contents of DICT and CREADER.
-  CREADER will be destroyed by this function.
-*/
-void 
-update_assistant (struct import_assistant *ia)
-{
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-  int rows = 0;
-
-  if (ssp->dict)
-    {
-      struct ccase *c;
-      int col;
-
-      ia->column_cnt = dict_get_var_cnt (ssp->dict);
-      ia->columns = xcalloc (ia->column_cnt, sizeof (*ia->columns));
-      for (col = 0; col < ia->column_cnt ; ++col)
-       {
-         const struct variable *var = dict_get_var (ssp->dict, col);
-         ia->columns[col].name = xstrdup (var_get_name (var));
-         ia->columns[col].contents = NULL;
-       }
-
-      for (; (c = casereader_read (ssp->reader)) != NULL; case_unref (c))
-       {
-         rows++;
-         for (col = 0; col < ia->column_cnt ; ++col)
-           {
-             char *ss;
-             const struct variable *var = dict_get_var (ssp->dict, col);
-             
-             ia->columns[col].contents = xrealloc (ia->columns[col].contents,
-                                                   sizeof (struct substring) * rows);
-             
-             ss = data_out (case_data (c, var), dict_get_encoding (ssp->dict), 
-                            var_get_print_format (var));
-             
-             ia->columns[col].contents[rows - 1] = ss_cstr (ss);
-           }
-         
-         if (rows > MAX_PREVIEW_LINES)
-           {
-             case_unref (c);
-             break;
-           }
-       }
-    }
-  
-  ia->file.line_cnt = rows;
-}
diff --git a/src/ui/gui/page-sheet-spec.h b/src/ui/gui/page-sheet-spec.h
deleted file mode 100644 (file)
index 7a4e801..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef PAGE_SHEET_SPEC
-#define PAGE_SHEET_SPEC 1
-
-
-struct sheet_spec_page ;
-struct import_assistant;
-
-/* Initializes IA's sheet_spec substructure. */
-struct sheet_spec_page *sheet_spec_page_create (struct import_assistant *ia);
-
-char *sheet_spec_gen_syntax (const struct import_assistant *ia);
-
-
-#endif
index 73f8bbe8ba7de858ef937aa9ac6437f4be32911d..7ea037a9117d75b5423263d46dd91228e8b5cfc6 100644 (file)
@@ -31,6 +31,7 @@
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/psppire-import-assistant.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-dialog-action.h"
 #include "ui/gui/psppire-encoding-selector.h"
@@ -40,7 +41,6 @@
 #include "ui/gui/recode-dialog.h"
 #include "ui/gui/select-cases-dialog.h"
 #include "ui/gui/split-file-dialog.h"
-#include "ui/gui/text-data-import-dialog.h"
 #include "ui/gui/weight-cases-dialog.h"
 #include "ui/syntax-gen.h"
 
@@ -924,6 +924,42 @@ psppire_data_window_init (PsppireDataWindow *de)
   de->merge_id = 0;
 }
 
+static void
+file_import (PsppireDataWindow *dw)
+{
+  GtkWidget *w = psppire_import_assistant_new (GTK_WINDOW (dw));
+  PsppireImportAssistant *asst = PSPPIRE_IMPORT_ASSISTANT (w);
+  gtk_widget_show_all (w);
+  
+  asst->main_loop = g_main_loop_new (NULL, TRUE);
+  g_main_loop_run (asst->main_loop);
+  g_main_loop_unref (asst->main_loop);
+
+  if (!asst->file_name)
+    goto end;
+  
+  switch (asst->response)
+    {
+    case GTK_RESPONSE_APPLY:
+      {
+       g_debug ("HERE");
+       gchar *fn = g_path_get_basename (asst->file_name);
+       open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, psppire_import_assistant_generate_syntax (asst));
+       g_free (fn);
+      }
+      break;
+    case PSPPIRE_RESPONSE_PASTE:
+      g_debug ("THERE");
+      free (paste_syntax_to_window (psppire_import_assistant_generate_syntax (asst)));
+      break;
+    default:
+      break;
+    }
+    
+ end:  
+  gtk_widget_destroy (GTK_WIDGET (asst));
+}
+
 static void
 psppire_data_window_finish_init (PsppireDataWindow *de,
                                  struct dataset *ds)
@@ -998,7 +1034,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   enable_save (de);
 
   connect_action (de, "file_new_data", G_CALLBACK (create_data_window));
-  connect_action (de, "file_import", G_CALLBACK (text_data_import_assistant));
+  connect_action (de, "file_import", G_CALLBACK (file_import));
+
   connect_action (de, "file_save", G_CALLBACK (psppire_window_save));
   connect_action (de, "file_open", G_CALLBACK (psppire_window_open));
   connect_action (de, "file_save_as", G_CALLBACK (psppire_window_save_as));
diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
new file mode 100644 (file)
index 0000000..ad32d1f
--- /dev/null
@@ -0,0 +1,2408 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2015  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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
+#include <config.h>
+
+#include <errno.h>
+#include <fcntl.h>
+#include <gtk/gtk.h>
+#include <sys/stat.h>
+
+#include "data/casereader.h"
+#include "data/data-in.h"
+#include "data/data-out.h"
+#include "data/dictionary.h"
+#include "data/format-guesser.h"
+#include "data/format.h"
+#include "data/gnumeric-reader.h"
+#include "data/ods-reader.h"
+#include "data/spreadsheet-reader.h"
+#include "data/value-labels.h"
+
+#include "gl/intprops.h"
+
+#include "libpspp/i18n.h"
+#include "libpspp/line-reader.h"
+#include "libpspp/message.h"
+#include "libpspp/str.h"
+
+#include "builder-wrapper.h"
+#include "helper.h"
+#include "pspp-sheet-view.h"
+#include "pspp-sheet-selection.h"
+#include "psppire-import-assistant.h"
+#include "psppire-scanf.h"
+#include "psppire-dialog.h"
+#include "psppire-empty-list-store.h"
+#include "psppire-encoding-selector.h"
+#include "psppire-spreadsheet-model.h"
+#include "psppire-var-sheet.h"
+#include "ui/syntax-gen.h"
+
+#include <gettext.h>
+#define _(msgid) gettext (msgid)
+#define N_(msgid) msgid
+
+enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
+
+
+/* Sets IA's separators substructure to match the widgets. */
+static void get_separators (PsppireImportAssistant *ia);
+static void split_fields (PsppireImportAssistant *ia);
+
+/* Chooses a name for each column on the separators page */
+static void choose_column_names (PsppireImportAssistant *ia);
+
+
+/* Frees IA's file substructure. */
+static void destroy_file (PsppireImportAssistant *ia);
+
+static void clear_fields (PsppireImportAssistant *ia);
+
+
+static void intro_page_create (PsppireImportAssistant *ia);
+static void first_line_page_create (PsppireImportAssistant *ia);
+
+static gboolean process_file (PsppireImportAssistant *ia);
+
+
+static GtkWidget * create_data_tree_view (gboolean input, GtkContainer *parent,
+                                         PsppireImportAssistant *ia);
+
+static void separators_page_create (PsppireImportAssistant *ia);
+static void formats_page_create (PsppireImportAssistant *ia);
+
+static void push_watch_cursor (PsppireImportAssistant *ia);
+static void pop_watch_cursor (PsppireImportAssistant *ia);
+
+
+
+static void psppire_import_assistant_init            (PsppireImportAssistant      *act);
+static void psppire_import_assistant_class_init      (PsppireImportAssistantClass *class);
+
+G_DEFINE_TYPE (PsppireImportAssistant, psppire_import_assistant, GTK_TYPE_ASSISTANT);
+
+
+/* Properties */
+enum
+  {
+    PROP_0,
+  };
+
+static void
+psppire_import_assistant_set_property (GObject         *object,
+                                      guint            prop_id,
+                                      const GValue    *value,
+                                      GParamSpec      *pspec)
+{
+  //   PsppireImportAssistant *act = PSPPIRE_IMPORT_ASSISTANT (object);
+
+  switch (prop_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    };
+}
+
+
+static void
+psppire_import_assistant_get_property (GObject    *object,
+                                      guint            prop_id,
+                                      GValue          *value,
+                                      GParamSpec      *pspec)
+{
+  //  PsppireImportAssistant *assistant = PSPPIRE_IMPORT_ASSISTANT (object);
+
+  switch (prop_id)
+    {
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    };
+}
+
+static GObjectClass * parent_class = NULL;
+
+
+static void destroy_columns (PsppireImportAssistant *ia);
+
+static void
+psppire_import_assistant_finalize (GObject *object)
+{
+  PsppireImportAssistant *ia = PSPPIRE_IMPORT_ASSISTANT (object);
+
+
+  if (ia->spreadsheet)
+    spreadsheet_unref (ia->spreadsheet);
+
+  //  clear_fields (ia);
+  destroy_columns (ia);
+  
+  ds_destroy (&ia->separators);
+  ds_destroy (&ia->quotes);
+
+  g_object_unref (ia->builder);
+
+  destroy_file (ia);
+
+  g_object_unref (ia->prop_renderer);
+  g_object_unref (ia->fixed_renderer);
+
+  if (G_OBJECT_CLASS (parent_class)->finalize)
+    G_OBJECT_CLASS (parent_class)->finalize (object);
+}
+
+
+static void
+psppire_import_assistant_class_init (PsppireImportAssistantClass *class)
+{
+  GObjectClass *object_class = G_OBJECT_CLASS (class);
+
+  parent_class = g_type_class_peek_parent (class);
+
+  object_class->set_property = psppire_import_assistant_set_property;
+  object_class->get_property = psppire_import_assistant_get_property;
+
+  object_class->finalize = psppire_import_assistant_finalize;
+}
+
+
+/* Causes the assistant to close, returning RESPONSE for
+   interpretation by text_data_import_assistant. */
+static void
+close_assistant (PsppireImportAssistant *ia, int response)
+{
+  ia->response = response;
+  g_main_loop_quit (ia->main_loop);
+  gtk_widget_hide (GTK_WIDGET (ia));
+}
+
+
+/* Called when the Paste button on the last page of the assistant
+   is clicked. */
+static void
+on_paste (GtkButton *button, PsppireImportAssistant *ia)
+{
+  close_assistant (ia, PSPPIRE_RESPONSE_PASTE);
+}
+
+/* Revises the contents of the fields tree view based on the
+   currently chosen set of separators. */
+static void
+revise_fields_preview (PsppireImportAssistant *ia)
+{
+  push_watch_cursor (ia);
+
+  get_separators (ia);
+  split_fields (ia);
+  choose_column_names (ia);
+  ia->fields_tree_view =
+    GTK_WIDGET (create_data_tree_view (TRUE,
+                                      GTK_CONTAINER (get_widget_assert (ia->builder, "fields-scroller")),
+                                      ia));
+
+  pop_watch_cursor (ia);
+}
+
+/* Chooses the most common character among those in TARGETS,
+   based on the frequency data in HISTOGRAM, and stores it in
+   RESULT.  If there is a tie for the most common character among
+   those in TARGETS, the earliest character is chosen.  If none
+   of the TARGETS appear at all, then DEF is used as a
+   fallback. */
+static void
+find_commonest_chars (unsigned long int histogram[UCHAR_MAX + 1],
+                      const char *targets, const char *def,
+                      struct string *result)
+{
+  unsigned char max = 0;
+  unsigned long int max_count = 0;
+
+  for (; *targets != '\0'; targets++)
+    {
+      unsigned char c = *targets;
+      unsigned long int count = histogram[c];
+      if (count > max_count)
+        {
+          max = c;
+          max_count = count;
+        }
+    }
+  if (max_count > 0)
+    {
+      ds_clear (result);
+      ds_put_byte (result, max);
+    }
+  else
+    ds_assign_cstr (result, def);
+}
+
+
+/* Picks the most likely separator and quote characters based on
+   IA's file data. */
+static void
+choose_likely_separators (PsppireImportAssistant *ia)
+{
+  unsigned long int histogram[UCHAR_MAX + 1] = { 0 };
+  size_t row;
+
+  /* Construct a histogram of all the characters used in the
+     file. */
+  for (row = 0; row < ia->line_cnt; row++)
+    {
+      struct substring line = ds_ss (&ia->lines[row]);
+      size_t length = ss_length (line);
+      size_t i;
+      for (i = 0; i < length; i++)
+        histogram[(unsigned char) line.string[i]]++;
+    }
+
+  find_commonest_chars (histogram, "\"'", "", &ia->quotes);
+  find_commonest_chars (histogram, ",;:/|!\t-", ",", &ia->separators);
+}
+
+
+static void set_separators (PsppireImportAssistant *ia);
+
+/* Called just before the separators page becomes visible in the
+   assistant, and when the Reset button is clicked. */
+static void
+prepare_separators_page (PsppireImportAssistant *ia, GtkWidget *page)
+{
+  revise_fields_preview (ia);
+  choose_likely_separators (ia);
+  set_separators (ia);
+}
+
+struct separator
+{
+  const char *name;           /* Name (for use with get_widget_assert). */
+  int c;                      /* Separator character. */
+};
+
+/* All the separators in the dialog box. */
+static const struct separator separators[] =
+  {
+    {"space", ' '},
+    {"tab", '\t'},
+    {"bang", '!'},
+    {"colon", ':'},
+    {"comma", ','},
+    {"hyphen", '-'},
+    {"pipe", '|'},
+    {"semicolon", ';'},
+    {"slash", '/'},
+  };
+#define SEPARATOR_CNT (sizeof separators / sizeof *separators)
+
+
+
+/* Sets the widgets to match IA's separators substructure. */
+static void
+set_separators (PsppireImportAssistant *ia)
+{
+  unsigned int seps;
+  struct string custom;
+  bool any_custom;
+  bool any_quotes;
+  size_t i;
+
+  ds_init_empty (&custom);
+  seps = 0;
+  for (i = 0; i < ds_length (&ia->separators); i++)
+    {
+      unsigned char c = ds_at (&ia->separators, i);
+      int j;
+
+      for (j = 0; j < SEPARATOR_CNT; j++)
+        {
+          const struct separator *s = &separators[j];
+          if (s->c == c)
+            {
+              seps += 1u << j;
+              goto next;
+            }
+        }
+
+      ds_put_byte (&custom, c);
+    next:;
+    }
+
+  for (i = 0; i < SEPARATOR_CNT; i++)
+    {
+      const struct separator *s = &separators[i];
+      GtkWidget *button = get_widget_assert (ia->builder, s->name);
+      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button),
+                                    (seps & (1u << i)) != 0);
+    }
+  any_custom = !ds_is_empty (&custom);
+  gtk_entry_set_text (GTK_ENTRY (ia->custom_entry), ds_cstr (&custom));
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->custom_cb),
+                                any_custom);
+  gtk_widget_set_sensitive (ia->custom_entry, any_custom);
+  ds_destroy (&custom);
+
+  any_quotes = !ds_is_empty (&ia->quotes);
+
+  gtk_entry_set_text (ia->quote_entry,
+                      any_quotes ? ds_cstr (&ia->quotes) : "\"");
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->quote_cb),
+                                any_quotes);
+  gtk_widget_set_sensitive (ia->quote_combo, any_quotes);
+}
+
+
+/* Resets IA's intro page to its initial state. */
+static void
+reset_intro_page (PsppireImportAssistant *ia)
+{
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->all_cases_button),
+                                TRUE);
+}
+
+
+
+/* Clears the set of user-modified variables from IA's formats
+   substructure.  This discards user modifications to variable
+   formats, thereby causing formats to revert to their
+   defaults.  */
+static void
+reset_formats_page (PsppireImportAssistant *ia, GtkWidget *page)
+{
+  size_t i;
+
+  for (i = 0; i < ia->modified_var_cnt; i++)
+    var_destroy (ia->modified_vars[i]);
+  free (ia->modified_vars);
+  ia->modified_vars = NULL;
+  ia->modified_var_cnt = 0;
+}
+
+static void prepare_formats_page (PsppireImportAssistant *ia);
+
+/* Called when the Reset button is clicked. */
+static void
+on_reset (GtkButton *button, PsppireImportAssistant *ia)
+{
+  gint pn = gtk_assistant_get_current_page (GTK_ASSISTANT (ia));
+  {
+    GtkWidget *page =  gtk_assistant_get_nth_page (GTK_ASSISTANT (ia), pn);
+      
+    page_func *on_reset = g_object_get_data (G_OBJECT (page), "on-reset");
+
+    if (on_reset)
+      on_reset (ia, page);
+  }
+}
+
+
+static gint
+next_page_func (gint old_page, gpointer data)
+{
+  return old_page + 1;
+}
+
+
+/* Called just before PAGE is displayed as the current page of
+   IMPORT_ASSISTANT, this updates IA content according to the new
+   page. */
+static void
+on_prepare (GtkAssistant *assistant, GtkWidget *page, PsppireImportAssistant *ia)
+{
+  gtk_widget_show (ia->reset_button);
+  gtk_widget_hide (ia->paste_button);
+
+  gint pn = gtk_assistant_get_current_page (assistant);
+  gint previous_page_index = ia->current_page;
+
+  if (previous_page_index >= 0)
+    {
+      GtkWidget *closing_page = gtk_assistant_get_nth_page (GTK_ASSISTANT (ia), previous_page_index);
+
+      if (pn > previous_page_index)
+       {
+         page_func *on_forward = g_object_get_data (G_OBJECT (closing_page), "on-forward");
+
+         if (on_forward)
+           on_forward (ia, closing_page);
+       }
+      else
+       {
+         page_func *on_back = g_object_get_data (G_OBJECT (closing_page), "on-back");
+
+         if (on_back)
+           on_back (ia, closing_page);
+       }
+    }
+
+  {
+    GtkWidget *new_page = gtk_assistant_get_nth_page (GTK_ASSISTANT (ia), pn);
+
+    page_func *on_entering = g_object_get_data (G_OBJECT (new_page), "on-entering");
+
+    if (on_entering)
+      on_entering (ia, new_page);
+  }
+  
+#if GTK3_TRANSITION
+  if (gtk_assistant_get_page_type (assistant, page)
+      == GTK_ASSISTANT_PAGE_CONFIRM)
+    gtk_widget_grab_focus (assistant->apply);
+  else
+    gtk_widget_grab_focus (assistant->forward);
+#endif
+
+
+  ia->current_page = pn;
+}
+
+/* Called when the Cancel button in the assistant is clicked. */
+static void
+on_cancel (GtkAssistant *assistant, PsppireImportAssistant *ia)
+{
+  close_assistant (ia, GTK_RESPONSE_CANCEL);
+}
+
+/* Called when the Apply button on the last page of the assistant
+   is clicked. */
+static void
+on_close (GtkAssistant *assistant, PsppireImportAssistant *ia)
+{
+  close_assistant (ia, GTK_RESPONSE_APPLY);
+}
+
+
+/* Frees IA's file substructure. */
+static void
+destroy_file (PsppireImportAssistant *ia)
+{
+  size_t i;
+
+  for (i = 0; i < ia->line_cnt; i++)
+    ds_destroy (&ia->lines[i]);
+
+  g_free (ia->file_name);
+  ia->file_name = NULL;
+
+  g_free (ia->encoding);
+  ia->encoding = NULL;
+}
+
+
+/* Increments the "watch cursor" level, setting the cursor for
+   the assistant window to a watch face to indicate to the user
+   that the ongoing operation may take some time. */
+static void
+push_watch_cursor (PsppireImportAssistant *ia)
+{
+  if (++ia->watch_cursor == 1)
+    {
+      GtkWidget *widget = GTK_WIDGET (ia);
+      GdkDisplay *display = gtk_widget_get_display (widget);
+      GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
+      gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
+      g_object_unref (cursor);
+      gdk_display_flush (display);
+    }
+}
+
+/* Decrements the "watch cursor" level.  If the level reaches
+   zero, the cursor is reset to its default shape. */
+static void
+pop_watch_cursor (PsppireImportAssistant *ia)
+{
+  if (--ia->watch_cursor == 0)
+    {
+      GtkWidget *widget = GTK_WIDGET (ia);
+      gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
+    }
+}
+
+
+static gboolean
+process_file (PsppireImportAssistant *ia)
+{
+  struct string input;
+  struct line_reader *reader = line_reader_for_file (ia->encoding, ia->file_name, O_RDONLY);
+  if (reader == NULL)
+    {
+      msg_error (errno, _("Could not open `%s'"),
+                ia->file_name);
+      return FALSE;
+    }
+  
+  ds_init_empty (&input);
+  for (ia->line_cnt = 0; ia->line_cnt < MAX_PREVIEW_LINES; ia->line_cnt++)
+    {
+      ds_clear (&input);
+      if (!line_reader_read (reader, &input, MAX_LINE_LEN + 1)
+         || ds_length (&input) > MAX_LINE_LEN)
+       {
+         if (line_reader_eof (reader))
+           break;
+         else if (line_reader_error (reader))
+           msg (ME, _("Error reading `%s': %s"),
+                ia->file_name, strerror (line_reader_error (reader)));
+         else
+           msg (ME, _("Failed to read `%s', because it contains a line "
+                      "over %d bytes long and therefore appears not to be "
+                      "a text file."),
+                ia->file_name, MAX_LINE_LEN);
+         line_reader_close (reader);
+         destroy_file (ia);
+         ds_destroy (&input);
+         return FALSE;
+       }
+
+      char *s = recode_string ("UTF-8", line_reader_get_encoding (reader),   ds_cstr (&input), ds_length (&input));
+      ds_init_cstr (&ia->lines[ia->line_cnt], s);
+      free (s);
+    }
+  ds_destroy (&input);
+  if (ia->line_cnt == 0)
+    {
+      msg (ME, _("`%s' is empty."), ia->file_name);
+      line_reader_close (reader);
+      destroy_file (ia);
+      return FALSE;
+    }
+  
+  /* Estimate the number of lines in the file. */
+  if (ia->line_cnt < MAX_PREVIEW_LINES)
+    {
+      ia->total_lines = ia->line_cnt;
+      ia->total_is_exact = true;
+    }
+  else
+    {
+      struct stat s;
+      off_t position = line_reader_tell (reader);
+      if (fstat (line_reader_fileno (reader), &s) == 0 && position > 0)
+       {
+         ia->total_lines = (double) ia->line_cnt / position * s.st_size;
+         ia->total_is_exact = false;
+       }
+      else
+       {
+         ia->total_lines = 0;
+         ia->total_is_exact = true;
+       }
+    }
+  line_reader_close (reader);
+  return TRUE;
+}
+
+
+static void
+render_line_number (PsppSheetViewColumn *tree_column,
+                    GtkCellRenderer *cell,
+                    GtkTreeModel *tree_model,
+                    GtkTreeIter *iter,
+                    gpointer data)
+{
+  gint row = empty_list_store_iter_to_row (iter);
+  char s[INT_BUFSIZE_BOUND (int)];
+  int first_line = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_model),
+                                                      "first-line"));
+  sprintf (s, "%d", first_line + row);
+  g_object_set (cell, "text", s, NULL);
+}
+
+
+
+static gint
+get_string_width (GtkWidget *treeview, GtkCellRenderer *renderer,
+                 const char *string)
+{
+  gint width;
+  g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
+  gtk_cell_renderer_get_preferred_width (renderer, treeview,
+                                        NULL, &width);
+  return width;
+}
+
+
+static gint
+get_monospace_width (GtkWidget *treeview, GtkCellRenderer *renderer,
+                     size_t char_cnt)
+{
+  struct string s;
+  gint width;
+
+  ds_init_empty (&s);
+  ds_put_byte_multiple (&s, '0', char_cnt);
+  ds_put_byte (&s, ' ');
+  width = get_string_width (treeview, renderer, ds_cstr (&s));
+  ds_destroy (&s);
+
+  return width;
+}
+
+static void
+add_line_number_column (const PsppireImportAssistant *ia,
+                        GtkWidget *treeview)
+{
+  PsppSheetViewColumn *column =
+    pspp_sheet_view_column_new_with_attributes (_("Line"), ia->prop_renderer, (void *) NULL);
+
+  pspp_sheet_view_column_set_fixed_width (column, get_monospace_width (treeview, ia->prop_renderer, 5));
+
+  pspp_sheet_view_column_set_resizable (column, TRUE);
+
+  pspp_sheet_view_column_set_cell_data_func (column, ia->prop_renderer,
+                                             render_line_number, NULL, NULL);
+
+  pspp_sheet_view_append_column (PSPP_SHEET_VIEW (treeview), column);
+}
+
+
+static void
+set_model_on_treeview (const PsppireImportAssistant *ia, GtkWidget *tree_view, size_t first_line)
+{
+  GtkTreeModel *model = GTK_TREE_MODEL (psppire_empty_list_store_new (ia->line_cnt - first_line));
+
+  g_object_set_data (G_OBJECT (model), "lines", &ia->lines + first_line);
+  g_object_set_data (G_OBJECT (model), "first-line", GINT_TO_POINTER (first_line));
+  
+  pspp_sheet_view_set_model (PSPP_SHEET_VIEW (tree_view), model);
+  
+  g_object_unref (model);
+}
+
+
+static GtkWidget *
+make_tree_view (const PsppireImportAssistant *ia)
+{
+  GtkWidget *tree_view = pspp_sheet_view_new ();
+  pspp_sheet_view_set_grid_lines (PSPP_SHEET_VIEW (tree_view), PSPP_SHEET_VIEW_GRID_LINES_BOTH);
+
+  add_line_number_column (ia, tree_view);
+
+  return tree_view;
+}
+
+static GtkWidget *
+add_page_to_assistant (PsppireImportAssistant *ia,
+                      GtkWidget *page, GtkAssistantPageType type, const gchar *);
+
+
+static void 
+on_sheet_combo_changed (GtkComboBox *cb, PsppireImportAssistant *ia)
+{
+  GtkTreeIter iter;
+  gchar *range = NULL;
+  GtkTreeModel *model = gtk_combo_box_get_model (cb);
+  GtkBuilder *builder = ia->builder;
+  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
+
+  gtk_combo_box_get_active_iter (cb, &iter);
+  gtk_tree_model_get (model, &iter, PSPPIRE_SPREADSHEET_MODEL_COL_RANGE, &range, -1);
+  gtk_entry_set_text (GTK_ENTRY (range_entry), range ?  range : "");
+  g_free (range);
+}
+
+/* Prepares IA's sheet_spec page. */
+static void
+prepare_sheet_spec_page (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+  GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
+  GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry), 
+                          psppire_spreadsheet_model_new (ia->spreadsheet));
+
+  gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0);
+
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE);
+}
+
+
+
+/* Initializes IA's sheet_spec substructure. */
+static void
+sheet_spec_page_create (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+  GtkWidget *page = get_widget_assert (builder, "Spreadsheet-Importer");
+  
+  GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");
+  GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+  gtk_cell_layout_clear (GTK_CELL_LAYOUT (combo_box));
+  gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
+  gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
+                                 "text", 0,
+                                 NULL);
+
+  g_signal_connect (combo_box, "changed", G_CALLBACK (on_sheet_combo_changed), ia);
+
+  add_page_to_assistant (ia, page,
+                        GTK_ASSISTANT_PAGE_CONTENT, _("Importing Spreadsheet Data"));
+
+  g_object_set_data (G_OBJECT (page), "on-entering", prepare_sheet_spec_page);
+}
+
+
+static void 
+on_chosen (PsppireImportAssistant *ia, GtkWidget *page)
+{
+  GtkFileChooser *fc = GTK_FILE_CHOOSER (page);
+  gchar *f = gtk_file_chooser_get_filename (fc);
+  int i;
+
+  for(i = gtk_assistant_get_n_pages (GTK_ASSISTANT (ia)); i > 0; --i)
+    gtk_assistant_remove_page (GTK_ASSISTANT (ia), i);
+
+  gtk_assistant_set_page_complete (GTK_ASSISTANT(ia), GTK_WIDGET (fc), FALSE);
+
+  if (f && !g_file_test (f, G_FILE_TEST_IS_DIR))
+    {
+      gtk_assistant_set_page_complete (GTK_ASSISTANT(ia), GTK_WIDGET (fc), TRUE);
+      
+      if (ia->spreadsheet)
+       spreadsheet_unref (ia->spreadsheet);
+      
+      ia->spreadsheet = gnumeric_probe (f, FALSE);
+
+      if (!ia->spreadsheet)
+       ia->spreadsheet = ods_probe (f, FALSE);
+
+      if (!ia->spreadsheet)
+       {
+         intro_page_create (ia);
+         first_line_page_create (ia);
+         separators_page_create (ia);
+       }
+      else
+       {
+         sheet_spec_page_create (ia);
+       }
+      
+      formats_page_create (ia);
+    }
+
+  g_free (f);  
+}
+
+/* This has to be done on a map signal callback,
+   because GtkFileChooserWidget resets everything when it is mapped. */
+static void 
+on_map (PsppireImportAssistant *ia, GtkWidget *page)
+{
+  GtkFileChooser *fc = GTK_FILE_CHOOSER (page);
+
+  if (ia->file_name)
+    gtk_file_chooser_set_filename (fc, ia->file_name);
+
+  on_chosen (ia, page);
+}
+
+static void
+chooser_page_enter (PsppireImportAssistant *ia, GtkWidget *page)
+{
+}
+
+static void
+chooser_page_leave (PsppireImportAssistant *ia, GtkWidget *page)
+{
+
+  if (ia->file_name)
+    g_free (ia->file_name);
+  ia->file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (page));
+
+  if (ia->encoding)
+    g_free (ia->encoding);
+  ia->encoding = psppire_encoding_selector_get_encoding (ia->encoding_selector);
+
+  if (!ia->spreadsheet)
+    process_file (ia);
+}
+
+static void
+chooser_page_reset (PsppireImportAssistant *ia, GtkWidget *page)
+{
+  GtkFileChooser *fc = GTK_FILE_CHOOSER (page);
+
+  gtk_file_chooser_set_filter (fc, ia->default_filter);
+  gtk_file_chooser_unselect_all (fc);
+
+  on_chosen (ia, page);
+}
+
+static void
+chooser_page_create (PsppireImportAssistant *ia)
+{
+  GtkFileFilter *filter = NULL;
+
+  GtkWidget *chooser = gtk_file_chooser_widget_new (GTK_FILE_CHOOSER_ACTION_OPEN);
+
+  g_object_set_data (G_OBJECT (chooser), "on-forward", chooser_page_leave);
+  g_object_set_data (G_OBJECT (chooser), "on-reset",   chooser_page_reset);
+  g_object_set_data (G_OBJECT (chooser), "on-entering",chooser_page_enter);
+
+  g_object_set (chooser, "local-only", FALSE, NULL);
+
+
+  ia->default_filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (ia->default_filter, _("All Files"));
+  gtk_file_filter_add_pattern (ia->default_filter, "*");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), ia->default_filter);
+    
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Text Files"));
+  gtk_file_filter_add_mime_type (filter, "text/*");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Text (*.txt) Files"));
+  gtk_file_filter_add_pattern (filter, "*.txt");
+  gtk_file_filter_add_pattern (filter, "*.TXT");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Plain Text (ASCII) Files"));
+  gtk_file_filter_add_mime_type (filter, "text/plain");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Comma Separated Value Files"));
+  gtk_file_filter_add_mime_type (filter, "text/csv");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  /* I've never encountered one of these, but it's listed here:
+     http://www.iana.org/assignments/media-types/text/tab-separated-values  */
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Tab Separated Value Files"));
+  gtk_file_filter_add_mime_type (filter, "text/tab-separated-values");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("Gnumeric Spreadsheet Files"));
+  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("OpenDocument Spreadsheet Files"));
+  gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  filter = gtk_file_filter_new ();
+  gtk_file_filter_set_name (filter, _("All Spreadsheet Files"));
+  gtk_file_filter_add_mime_type (filter, "application/x-gnumeric");
+  gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
+  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (chooser), filter);
+
+  ia->encoding_selector = psppire_encoding_selector_new ("Auto", TRUE);
+  gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (chooser), ia->encoding_selector);
+
+  add_page_to_assistant (ia, chooser,
+                        GTK_ASSISTANT_PAGE_INTRO, _("Select File to Import"));
+
+  g_signal_connect_swapped (chooser, "selection-changed", G_CALLBACK (on_chosen), ia);
+  g_signal_connect_swapped (chooser, "map", G_CALLBACK (on_map), ia);
+}
+
+
+static void
+psppire_import_assistant_init (PsppireImportAssistant *ia)
+{
+  ia->builder = builder_new ("text-data-import.ui");
+
+  ia->current_page = -1 ; 
+  ia->column_cnt = 0;
+  ia->columns = NULL;
+
+  ia->file_name = NULL;
+  ia->encoding = NULL;
+  ia->spreadsheet = NULL;
+  ia->watch_cursor = 0;
+  
+  ia->prop_renderer = gtk_cell_renderer_text_new ();
+  g_object_ref_sink (ia->prop_renderer);
+  ia->fixed_renderer = gtk_cell_renderer_text_new ();
+  g_object_ref_sink (ia->fixed_renderer);
+  g_object_set (G_OBJECT (ia->fixed_renderer),
+                "family", "Monospace",
+                (void *) NULL);
+
+  g_signal_connect (ia, "prepare", G_CALLBACK (on_prepare), ia);
+  g_signal_connect (ia, "cancel", G_CALLBACK (on_cancel), ia);
+  g_signal_connect (ia, "close", G_CALLBACK (on_close), ia);
+  
+  ia->paste_button = gtk_button_new_with_label (_("Paste"));
+  ia->reset_button = gtk_button_new_with_label (_("Reset"));
+  
+  gtk_assistant_add_action_widget (GTK_ASSISTANT(ia), ia->paste_button);
+
+  g_signal_connect (ia->paste_button, "clicked", G_CALLBACK (on_paste), ia);
+  g_signal_connect (ia->reset_button, "clicked", G_CALLBACK (on_reset), ia);
+
+  gtk_assistant_add_action_widget (GTK_ASSISTANT(ia), ia->reset_button);
+
+  gtk_window_set_title (GTK_WINDOW (ia),
+                        _("Importing Delimited Text Data"));
+  
+  gtk_window_set_icon_name (GTK_WINDOW (ia), "pspp");
+
+  chooser_page_create (ia);
+
+  gtk_assistant_set_forward_page_func (GTK_ASSISTANT (ia), next_page_func, NULL, NULL);
+}
+
+
+/* Appends a page of the given TYPE, with PAGE as its content, to
+   the GtkAssistant encapsulated by IA.  Returns the GtkWidget
+   that represents the page. */
+static GtkWidget *
+add_page_to_assistant (PsppireImportAssistant *ia,
+                      GtkWidget *page, GtkAssistantPageType type, const gchar *title)
+{
+  GtkWidget *content = page;
+
+  gtk_assistant_append_page (GTK_ASSISTANT (ia), content);
+  gtk_assistant_set_page_type (GTK_ASSISTANT(ia), content, type);
+  gtk_assistant_set_page_title (GTK_ASSISTANT(ia), content, title);
+  gtk_assistant_set_page_complete (GTK_ASSISTANT(ia), content, TRUE);
+
+  return content;
+}
+
+
+/* Called when one of the radio buttons is clicked. */
+static void
+on_intro_amount_changed (PsppireImportAssistant *p)
+{
+  gtk_widget_set_sensitive (p->n_cases_spin,
+                            gtk_toggle_button_get_active (
+                                                         GTK_TOGGLE_BUTTON (p->n_cases_button)));
+
+  gtk_widget_set_sensitive (p->percent_spin,
+                            gtk_toggle_button_get_active (
+                                                         GTK_TOGGLE_BUTTON (p->percent_button)));
+}
+
+
+static void
+render_line (PsppSheetViewColumn *tree_column,
+             GtkCellRenderer *cell,
+             GtkTreeModel *tree_model,
+             GtkTreeIter *iter,
+             gpointer data)
+{
+  gint row = empty_list_store_iter_to_row (iter);
+  struct string *lines;
+  
+  lines = g_object_get_data (G_OBJECT (tree_model), "lines");
+  g_return_if_fail (lines != NULL);
+
+  g_object_set (cell, "text", ds_cstr (&lines[row]), NULL);
+}
+
+/* Sets the widgets to match IA's first_line substructure. */
+static void
+set_first_line (PsppireImportAssistant *ia)
+{
+  GtkTreePath *path = gtk_tree_path_new_from_indices (ia->skip_lines, -1);
+
+  
+  set_model_on_treeview (ia, ia->tree_view, 0);
+
+  pspp_sheet_view_set_cursor (PSPP_SHEET_VIEW (ia->tree_view),
+                             path, NULL, false);
+  gtk_tree_path_free (path);
+
+  gtk_toggle_button_set_active (
+                               GTK_TOGGLE_BUTTON (ia->variable_names_cb),
+                               ia->variable_names);
+  gtk_widget_set_sensitive (ia->variable_names_cb,
+                            ia->skip_lines > 0);
+}
+
+
+/* Creates and returns a tree view that contains each of the
+   lines in IA's file as a row. */
+static GtkWidget *
+create_lines_tree_view (GtkContainer *parent, PsppireImportAssistant *ia)
+{
+  size_t max_line_length;
+  gint content_width, header_width;
+  size_t i;
+  const gchar *title = _("Text");
+  GtkWidget *tree_view = make_tree_view (ia);
+  PsppSheetViewColumn *column =
+    pspp_sheet_view_column_new_with_attributes (title,
+                                               ia->fixed_renderer, (void *) NULL);
+  
+  pspp_sheet_view_column_set_cell_data_func (column, ia->fixed_renderer,
+                                            render_line, NULL, NULL);
+  pspp_sheet_view_column_set_resizable (column, TRUE);
+  pspp_sheet_view_column_set_expand (column, TRUE);
+
+  max_line_length = 0;
+  for (i = 0; i < ia->line_cnt; i++)
+    {
+      size_t w = ds_length (&ia->lines[i]);
+      max_line_length = MAX (max_line_length, w);
+    }
+
+  content_width = get_monospace_width (tree_view, ia->fixed_renderer,
+                                       max_line_length);
+  header_width = get_string_width (tree_view, ia->prop_renderer, title);
+  pspp_sheet_view_column_set_fixed_width (column, MAX (content_width,
+                                                      header_width));
+  pspp_sheet_view_append_column (PSPP_SHEET_VIEW (tree_view), column);
+
+  GtkWidget *oldtv = gtk_bin_get_child (GTK_BIN (parent));
+  if (oldtv)
+    gtk_container_remove (parent, oldtv);
+  
+  gtk_container_add (parent, tree_view);
+  gtk_widget_show (tree_view);
+
+  return tree_view;
+}
+
+
+/* Sets IA's first_line substructure to match the widgets. */
+static void
+set_first_line_options (PsppireImportAssistant *ia)
+{
+  GtkTreeIter iter;
+  GtkTreeModel *model;
+
+  PsppSheetSelection *selection = pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (ia->tree_view));
+  if (pspp_sheet_selection_get_selected (selection, &model, &iter))
+    {
+      GtkTreePath *path = gtk_tree_model_get_path (model, &iter);
+      int row = gtk_tree_path_get_indices (path)[0];
+      gtk_tree_path_free (path);
+
+      ia->skip_lines = row;
+      ia->variable_names =
+        (ia->skip_lines > 0
+         && gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ia->variable_names_cb)));
+    }
+
+  gtk_widget_set_sensitive (ia->variable_names_cb, ia->skip_lines > 0);
+}
+
+static void
+reset_first_line_page (PsppireImportAssistant *ia)
+{
+  gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ia->variable_names_cb), FALSE);
+  PsppSheetSelection *selection = pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (ia->tree_view));
+  pspp_sheet_selection_unselect_all (selection);
+  gtk_widget_set_sensitive (ia->variable_names_cb, FALSE);
+}
+
+
+/* Initializes IA's first_line substructure. */
+static void
+first_line_page_create (PsppireImportAssistant *ia)
+{
+  GtkWidget *w =  get_widget_assert (ia->builder, "FirstLine");
+
+  g_object_set_data (G_OBJECT (w), "on-entering", set_first_line);
+  
+  add_page_to_assistant (ia, w,
+                        GTK_ASSISTANT_PAGE_CONTENT, _("Select the First Line"));
+
+  ia->tree_view = GTK_WIDGET (create_lines_tree_view (
+                                                     GTK_CONTAINER (get_widget_assert (ia->builder, "first-line-scroller")), ia));
+  ia->variable_names_cb = get_widget_assert (ia->builder, "variable-names");
+  pspp_sheet_selection_set_mode (
+                                pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (ia->tree_view)),
+                                PSPP_SHEET_SELECTION_BROWSE);
+  pspp_sheet_view_set_rubber_banding (PSPP_SHEET_VIEW (ia->tree_view), TRUE);
+
+
+  g_signal_connect_swapped (pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (ia->tree_view)),
+                           "changed", G_CALLBACK (set_first_line_options), ia);
+
+  g_signal_connect_swapped (ia->variable_names_cb, "toggled",
+                           G_CALLBACK (set_first_line_options), ia);
+
+
+  g_object_set_data (G_OBJECT (w), "on-reset", reset_first_line_page);
+}
+
+
+static void
+intro_on_enter (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+  GtkWidget *table  = get_widget_assert (builder, "button-table");
+
+  struct string s;
+
+  if (ia->line_cnt > MAX_PREVIEW_LINES)
+    ia->line_cnt = MAX_PREVIEW_LINES;
+  
+  ds_init_empty (&s);
+  ds_put_cstr (&s, _("This assistant will guide you through the process of "
+                     "importing data into PSPP from a text file with one line "
+                     "per case,  in which fields are separated by tabs, "
+                     "commas, or other delimiters.\n\n"));
+
+  if (ia->total_is_exact)
+    {
+      ds_put_format (
+                    &s, ngettext ("The selected file contains %'lu line of text.  ",
+                                  "The selected file contains %'lu lines of text.  ",
+                                  ia->total_lines),
+                    ia->total_lines);
+    }
+  else if (ia->total_lines > 0)
+    {
+      ds_put_format (
+                    &s, ngettext (
+                                  "The selected file contains approximately %'lu line of text.  ",
+                                  "The selected file contains approximately %'lu lines of text.  ",
+                                  ia->total_lines),
+                    ia->total_lines);
+      ds_put_format (
+                    &s, ngettext (
+                                  "Only the first %zu line of the file will be shown for "
+                                  "preview purposes in the following screens.  ",
+                                  "Only the first %zu lines of the file will be shown for "
+                                  "preview purposes in the following screens.  ",
+                                  ia->line_cnt),
+                    ia->line_cnt);
+    }
+
+  ds_put_cstr (&s, _("You may choose below how much of the file should "
+                     "actually be imported."));
+
+  gtk_label_set_text (GTK_LABEL (get_widget_assert (builder, "intro-label")),
+                      ds_cstr (&s));
+  ds_destroy (&s);
+
+  GtkWidget *w  =  gtk_grid_get_child_at (GTK_GRID (table), 1, 1);
+  int old_value = w ? gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (ia->n_cases_spin)) : 1;
+  if (w)
+    gtk_container_remove (GTK_CONTAINER (table), w);
+
+  w  =  gtk_grid_get_child_at (GTK_GRID (table), 1, 2);
+  if (w)
+    gtk_container_remove (GTK_CONTAINER (table), w);
+
+  
+  GtkWidget *hbox_n_cases = psppire_scanf_new (_("Only the first %4d cases"), &ia->n_cases_spin);
+
+  GtkAdjustment *adj = gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (ia->n_cases_spin));
+  gtk_adjustment_set_lower (adj, 1.0);
+  if (ia->total_is_exact)
+    gtk_adjustment_set_value (adj, old_value);
+  if (ia->total_is_exact)
+    gtk_adjustment_set_upper (adj, ia->total_lines);
+  else
+    gtk_adjustment_set_upper (adj, DBL_MAX);
+
+  gtk_grid_attach (GTK_GRID (table), hbox_n_cases,
+                  1, 1,
+                  1, 1);
+
+
+  GtkWidget *hbox_percent = psppire_scanf_new (_("Only the first %3d %% of file (approximately)"),
+                                              &ia->percent_spin);
+
+  gtk_grid_attach (GTK_GRID (table), hbox_percent,
+                  1, 2,
+                  1, 1);
+
+  gtk_widget_show_all (table);
+
+  on_intro_amount_changed (ia);
+}
+
+/* Initializes IA's intro substructure. */
+static void
+intro_page_create (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+
+  GtkWidget *w =  get_widget_assert (builder, "Intro");
+
+  ia->percent_spin = gtk_spin_button_new_with_range (0, 100, 10);
+
+
+  add_page_to_assistant (ia, w,  GTK_ASSISTANT_PAGE_CONTENT, _("Select the Lines to Import"));
+
+  ia->all_cases_button = get_widget_assert (builder, "import-all-cases");
+
+  ia->n_cases_button = get_widget_assert (builder, "import-n-cases");
+
+  ia->percent_button = get_widget_assert (builder, "import-percent");
+
+  g_signal_connect_swapped (ia->all_cases_button, "toggled",
+                           G_CALLBACK (on_intro_amount_changed), ia);
+  g_signal_connect_swapped (ia->n_cases_button, "toggled",
+                           G_CALLBACK (on_intro_amount_changed), ia);
+  g_signal_connect_swapped (ia->percent_button, "toggled",
+                           G_CALLBACK (on_intro_amount_changed), ia);
+
+
+  g_object_set_data (G_OBJECT (w), "on-entering", intro_on_enter);
+  g_object_set_data (G_OBJECT (w), "on-reset", reset_intro_page);
+}
+
+
+GtkWidget *
+psppire_import_assistant_new (GtkWindow *toplevel)
+{
+  return GTK_WIDGET (g_object_new (PSPPIRE_TYPE_IMPORT_ASSISTANT,
+                                  "transient-for", toplevel,
+                                  NULL));
+}
+
+\f
+
+struct column
+{
+  /* Variable name for this column.  This is the variable name
+     used on the separators page; it can be overridden by the
+     user on the formats page. */
+  char *name;
+
+  /* Maximum length of any row in this column. */
+  size_t width;
+
+  /* Contents of this column: contents[row] is the contents for
+     the given row.
+
+     A null substring indicates a missing column for that row
+     (because the line contains an insufficient number of
+     separators).
+
+     contents[] elements may be substrings of the lines[]
+     strings that represent the whole lines of the file, to
+     save memory.  Other elements are dynamically allocated
+     with ss_alloc_substring. */
+  struct substring *contents;
+};
+
+
+static void
+destroy_columns (PsppireImportAssistant *ia)
+{
+  struct column *col;
+  for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
+    {
+      free (col->name);
+      free (col->contents);
+    }
+  
+  free (ia->columns);
+}
+
+/* Called to render one of the cells in the fields preview tree
+   view. */
+static void
+render_input_cell (PsppSheetViewColumn *tree_column, GtkCellRenderer *cell,
+                   GtkTreeModel *model, GtkTreeIter *iter,
+                   gpointer ia_)
+{
+  PsppireImportAssistant *ia = ia_;
+  struct substring field;
+  size_t row;
+  gint column;
+
+  column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_column),
+                                               "column-number"));
+  row = empty_list_store_iter_to_row (iter) + ia->skip_lines;
+  field = ia->columns[column].contents[row];
+  if (field.string != NULL)
+    {
+      GValue text = {0, };
+      g_value_init (&text, G_TYPE_STRING);
+      g_value_take_string (&text, ss_xstrdup (field));
+      g_object_set_property (G_OBJECT (cell), "text", &text);
+      g_value_unset (&text);
+      g_object_set (cell, "background-set", FALSE, (void *) NULL);
+    }
+  else
+    g_object_set (cell,
+                  "text", "",
+                  "background", "red",
+                  "background-set", TRUE,
+                  (void *) NULL);
+}
+
+
+/* Parses the contents of the field at (ROW,COLUMN) according to
+   its variable format.  If OUTPUTP is non-null, then *OUTPUTP
+   receives the formatted output for that field (which must be
+   freed with free).  If TOOLTIPP is non-null, then *TOOLTIPP
+   receives a message suitable for use in a tooltip, if one is
+   needed, or a null pointer otherwise.  Returns TRUE if a
+   tooltip message is needed, otherwise FALSE. */
+static bool
+parse_field (PsppireImportAssistant *ia,
+             size_t row, size_t column,
+             char **outputp, char **tooltipp)
+{
+  const struct fmt_spec *in;
+  struct fmt_spec out;
+  char *tooltip;
+  bool ok;
+
+  struct substring field = ia->columns[column].contents[row];
+  struct variable *var = dict_get_var (ia->dict, column);
+  union value val;
+
+  value_init (&val, var_get_width (var));
+  in = var_get_print_format (var);
+  out = fmt_for_output_from_input (in);
+  tooltip = NULL;
+  if (field.string != NULL)
+    {
+      char *error = data_in (field, "UTF-8", in->type, &val, var_get_width (var),
+                            dict_get_encoding (ia->dict));
+      if (error != NULL)
+        {
+          tooltip = xasprintf (_("Cannot parse field content `%.*s' as "
+                                 "format %s: %s"),
+                               (int) field.length, field.string,
+                               fmt_name (in->type), error);
+          free (error);
+        }
+    }
+  else
+    {
+      tooltip = xstrdup (_("This input line has too few separators "
+                           "to fill in this field."));
+      value_set_missing (&val, var_get_width (var));
+    }
+  if (outputp != NULL)
+    {
+      *outputp = data_out (&val, dict_get_encoding (ia->dict),  &out);
+    }
+  value_destroy (&val, var_get_width (var));
+
+  ok = tooltip == NULL;
+  if (tooltipp != NULL)
+    *tooltipp = tooltip;
+  else
+    free (tooltip);
+  return ok;
+}
+
+
+/* Called to render one of the cells in the data preview tree
+   view. */
+static void
+render_output_cell (PsppSheetViewColumn *tree_column,
+                    GtkCellRenderer *cell,
+                    GtkTreeModel *model,
+                    GtkTreeIter *iter,
+                    gpointer ia_)
+{
+  PsppireImportAssistant *ia = ia_;
+  char *output;
+  GValue gvalue = { 0, };
+  bool ok = parse_field (ia,
+                        (empty_list_store_iter_to_row (iter)
+                         + ia->skip_lines),
+                        GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_column),
+                                                            "column-number")),
+                        &output, NULL);
+
+  g_value_init (&gvalue, G_TYPE_STRING);
+  g_value_take_string (&gvalue, output);
+  g_object_set_property (G_OBJECT (cell), "text", &gvalue);
+  g_value_unset (&gvalue);
+
+  if (ok)
+    g_object_set (cell, "background-set", FALSE, (void *) NULL);
+  else
+    g_object_set (cell,
+                  "background", "red",
+                  "background-set", TRUE,
+                  (void *) NULL);
+}
+
+
+/* Utility functions used by multiple pages of the assistant. */
+
+static gboolean
+get_tooltip_location (GtkWidget *widget, gint wx, gint wy,
+                      const PsppireImportAssistant *ia,
+                      size_t *row, size_t *column)
+{
+  PsppSheetView *tree_view = PSPP_SHEET_VIEW (widget);
+  gint bx, by;
+  GtkTreePath *path;
+  GtkTreeIter iter;
+  PsppSheetViewColumn *tree_column;
+  GtkTreeModel *tree_model;
+  bool ok;
+
+  pspp_sheet_view_convert_widget_to_bin_window_coords (tree_view,
+                                                       wx, wy, &bx, &by);
+  if (!pspp_sheet_view_get_path_at_pos (tree_view, bx, by,
+                                       &path, &tree_column, NULL, NULL))
+    return FALSE;
+
+  *column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_column),
+                                                "column-number"));
+
+  tree_model = pspp_sheet_view_get_model (tree_view);
+  ok = gtk_tree_model_get_iter (tree_model, &iter, path);
+  gtk_tree_path_free (path);
+  if (!ok)
+    return FALSE;
+
+  *row = empty_list_store_iter_to_row (&iter) + ia->skip_lines;
+  return TRUE;
+}
+
+
+\f
+
+
+/* Called to render a tooltip on one of the cells in the fields
+   preview tree view. */
+static gboolean
+on_query_input_tooltip (GtkWidget *widget, gint wx, gint wy,
+                        gboolean keyboard_mode UNUSED,
+                        GtkTooltip *tooltip, PsppireImportAssistant *ia)
+{
+  size_t row, column;
+
+  if (!get_tooltip_location (widget, wx, wy, ia, &row, &column))
+    return FALSE;
+
+  if (ia->columns[column].contents[row].string != NULL)
+    return FALSE;
+
+  gtk_tooltip_set_text (tooltip,
+                        _("This input line has too few separators "
+                          "to fill in this field."));
+  return TRUE;
+}
+
+
+/* Called to render a tooltip for one of the cells in the data
+   preview tree view. */
+static gboolean
+on_query_output_tooltip (GtkWidget *widget, gint wx, gint wy,
+                        gboolean keyboard_mode UNUSED,
+                        GtkTooltip *tooltip, PsppireImportAssistant *ia)
+{
+  size_t row, column;
+  char *text;
+
+  if (!gtk_widget_get_mapped (widget))
+    return FALSE;
+
+  if (!get_tooltip_location (widget, wx, wy, ia, &row, &column))
+    return FALSE;
+
+  if (parse_field (ia, row, column, NULL, &text))
+    return FALSE;
+
+  gtk_tooltip_set_text (tooltip, text);
+  free (text);
+  return TRUE;
+}
+
+\f
+
+
+static void
+set_quote_list (GtkComboBox *cb)
+{
+  GtkListStore *list =  gtk_list_store_new (1, G_TYPE_STRING);
+  GtkTreeIter iter;
+  gint i;
+  const gchar *seperator[3] = {"'\"", "\'", "\""};
+
+  for (i = 0; i < 3; i++)
+    {
+      const gchar *s = seperator[i];
+
+      /* Add a new row to the model */
+      gtk_list_store_append (list, &iter);
+      gtk_list_store_set (list, &iter,
+                          0, s,
+                          -1);
+
+    }
+
+  gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list));
+  g_object_unref (list);
+
+  gtk_combo_box_set_entry_text_column (cb, 0);
+}
+
+
+
+
+/* Sets IA's separators substructure to match the widgets. */
+static void
+get_separators (PsppireImportAssistant *ia)
+{
+  int i;
+
+  ds_clear (&ia->separators);
+  for (i = 0; i < SEPARATOR_CNT; i++)
+    {
+      const struct separator *sep = &separators[i];
+      GtkWidget *button = get_widget_assert (ia->builder, sep->name);
+      if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
+        ds_put_byte (&ia->separators, sep->c);
+    }
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ia->custom_cb)))
+    ds_put_cstr (&ia->separators,
+                 gtk_entry_get_text (GTK_ENTRY (ia->custom_entry)));
+
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ia->quote_cb)))
+    {
+      const gchar *text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ia->quote_combo))));
+      ds_assign_cstr (&ia->quotes, text);
+    }
+  else
+    ds_clear (&ia->quotes);
+}
+
+
+
+
+/* Frees and clears the column data in IA's separators
+   substructure. */
+static void
+clear_fields (PsppireImportAssistant *ia)
+{
+  if (ia->column_cnt > 0)
+    {
+      struct column *col;
+      size_t row;
+
+      for (row = 0; row < ia->line_cnt; row++)
+        {
+          const struct string *line = &ia->lines[row];
+          const char *line_start = ds_data (line);
+          const char *line_end = ds_end (line);
+
+          for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
+            {
+              char *s = ss_data (col->contents[row]);
+              if (!(s >= line_start && s <= line_end))
+                ss_dealloc (&col->contents[row]);
+            }
+        }
+
+      for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
+        {
+          free (col->name);
+          free (col->contents);
+        }
+
+      free (ia->columns);
+      ia->columns = NULL;
+      ia->column_cnt = 0;
+    }
+}
+
+
+/* Breaks the file data in IA into columns based on the
+   separators set in IA's separators substructure. */
+static void
+split_fields (PsppireImportAssistant *ia)
+{
+  size_t columns_allocated;
+  bool space_sep;
+  size_t row;
+
+  clear_fields (ia);
+
+  /* Is space in the set of separators? */
+  space_sep = ss_find_byte (ds_ss (&ia->separators), ' ') != SIZE_MAX;
+
+  /* Split all the lines, not just those from
+     ia->first_line.skip_lines on, so that we split the line that
+     contains variables names if ia->first_line.variable_names is
+     TRUE. */
+  columns_allocated = 0;
+  for (row = 0; row < ia->line_cnt; row++)
+    {
+      struct string *line = &ia->lines[row];
+      struct substring text = ds_ss (line);
+      size_t column_idx;
+
+      for (column_idx = 0; ; column_idx++)
+        {
+          struct substring field = SS_EMPTY_INITIALIZER;
+          struct column *column;
+
+          if (space_sep)
+           {
+             ss_ltrim (&text, ss_cstr (" "));
+           }
+          if (ss_is_empty (text))
+            {
+              if (column_idx != 0)
+                break;
+              field = text;
+            }
+          else if (!ds_is_empty (&ia->quotes)
+                   && ds_find_byte (&ia->quotes, text.string[0]) != SIZE_MAX)
+            {
+              int quote = ss_get_byte (&text);
+              struct string s;
+              int c;
+
+              ds_init_empty (&s);
+              while ((c = ss_get_byte (&text)) != EOF)
+                if (c != quote)
+                  ds_put_byte (&s, c);
+                else if (ss_match_byte (&text, quote))
+                  ds_put_byte (&s, quote);
+                else
+                  break;
+              field = ds_ss (&s);
+            }
+          else
+           {
+             ss_get_bytes (&text, ss_cspan (text, ds_ss (&ia->separators)),
+                           &field);
+           }
+
+          if (column_idx >= ia->column_cnt)
+            {
+              struct column *column;
+
+              if (ia->column_cnt >= columns_allocated)
+               {
+                 ia->columns = x2nrealloc (ia->columns, &columns_allocated,
+                                           sizeof *ia->columns);
+               }
+              column = &ia->columns[ia->column_cnt++];
+              column->name = NULL;
+              column->width = 0;
+              column->contents = xcalloc (ia->line_cnt,
+                                          sizeof *column->contents);
+            }
+          column = &ia->columns[column_idx];
+          column->contents[row] = field;
+          if (ss_length (field) > column->width)
+            column->width = ss_length (field);
+
+          if (space_sep)
+            ss_ltrim (&text, ss_cstr (" "));
+          if (ss_is_empty (text))
+            break;
+          if (ss_find_byte (ds_ss (&ia->separators), ss_first (text))
+              != SIZE_MAX)
+            ss_advance (&text, 1);
+        }
+    }
+}
+
+static PsppSheetViewColumn *
+make_data_column (PsppireImportAssistant *ia, GtkWidget *tree_view,
+                  bool input, gint dict_idx)
+{
+  struct variable *var = NULL;
+  struct column *column = NULL;
+  size_t char_cnt;
+  gint content_width, header_width;
+  PsppSheetViewColumn *tree_column;
+  char *name;
+
+  if (input)
+    column = &ia->columns[dict_idx];
+  else
+    var = dict_get_var (ia->dict, dict_idx);
+
+  name = escape_underscores (input ? column->name : var_get_name (var));
+  char_cnt = input ? column->width : var_get_print_format (var)->w;
+  content_width = get_monospace_width (tree_view, ia->fixed_renderer,
+                                       char_cnt);
+  header_width = get_string_width (tree_view, ia->prop_renderer,
+                                   name);
+
+  tree_column = pspp_sheet_view_column_new ();
+  g_object_set_data (G_OBJECT (tree_column), "column-number",
+                     GINT_TO_POINTER (dict_idx));
+  pspp_sheet_view_column_set_title (tree_column, name);
+  pspp_sheet_view_column_pack_start (tree_column, ia->fixed_renderer,
+                                     FALSE);
+  pspp_sheet_view_column_set_cell_data_func (
+                                            tree_column, ia->fixed_renderer,
+                                            input ? render_input_cell : render_output_cell, ia, NULL);
+  pspp_sheet_view_column_set_fixed_width (tree_column, MAX (content_width,
+                                                            header_width));
+
+  free (name);
+
+  return tree_column;
+}
+
+
+static GtkWidget *
+create_data_tree_view (gboolean input, GtkContainer *parent,
+                       PsppireImportAssistant *ia)
+{
+  gint i;
+  GtkWidget *tree_view = make_tree_view (ia);
+
+  set_model_on_treeview (ia, tree_view, ia->skip_lines);
+  
+  pspp_sheet_selection_set_mode (pspp_sheet_view_get_selection (PSPP_SHEET_VIEW (tree_view)),
+                                 PSPP_SHEET_SELECTION_NONE);
+
+  for (i = 0; i < ia->column_cnt; i++)
+    {
+      PsppSheetViewColumn *w = make_data_column (ia, tree_view, input, i);
+
+      pspp_sheet_view_append_column (PSPP_SHEET_VIEW (tree_view), w);
+    }
+
+  g_object_set (G_OBJECT (tree_view), "has-tooltip", TRUE, (void *) NULL);
+  g_signal_connect (tree_view, "query-tooltip",
+                    G_CALLBACK (input ? on_query_input_tooltip
+                                : on_query_output_tooltip), ia);
+
+  GtkWidget *child = gtk_bin_get_child (GTK_BIN (parent));
+  if (child)
+    {
+      g_object_ref (child);
+      gtk_container_remove (parent, child);
+    }
+  gtk_container_add (parent, tree_view);
+  if (child)
+    g_object_unref (child);
+
+  gtk_widget_show (tree_view);
+
+  return tree_view;
+}
+
+
+/* Chooses a name for each column on the separators page */
+static void
+choose_column_names (PsppireImportAssistant *ia)
+{
+  struct dictionary *dict;
+  unsigned long int generated_name_count = 0;
+  struct column *col;
+  size_t name_row;
+
+  dict = dict_create (get_default_encoding ());
+  name_row = ia->variable_names && ia->skip_lines ? ia->skip_lines : 0;
+  for (col = ia->columns; col < &ia->columns[ia->column_cnt]; col++)
+    {
+      char *hint, *name;
+
+      hint = name_row ? ss_xstrdup (col->contents[name_row - 1]) : NULL;
+      name = dict_make_unique_var_name (dict, hint, &generated_name_count);
+      free (hint);
+
+      col->name = name;
+      dict_create_var_assert (dict, name, 0);
+    }
+  dict_destroy (dict);
+}
+
+
+
+/* Called when the user toggles one of the separators
+   checkboxes. */
+static void
+on_separator_toggle (GtkToggleButton *toggle UNUSED,
+                     PsppireImportAssistant *ia)
+{
+  revise_fields_preview (ia);
+}
+
+/* Called when the user changes the entry field for custom
+   separators. */
+static void
+on_separators_custom_entry_notify (GObject *gobject UNUSED,
+                                   GParamSpec *arg1 UNUSED,
+                                   PsppireImportAssistant *ia)
+{
+  revise_fields_preview (ia);
+}
+
+/* Called when the user toggles the checkbox that enables custom
+   separators. */
+static void
+on_separators_custom_cb_toggle (GtkToggleButton *custom_cb,
+                                PsppireImportAssistant *ia)
+{
+  bool is_active = gtk_toggle_button_get_active (custom_cb);
+  gtk_widget_set_sensitive (ia->custom_entry, is_active);
+  revise_fields_preview (ia);
+}
+
+/* Called when the user changes the selection in the combo box
+   that selects a quote character. */
+static void
+on_quote_combo_change (GtkComboBox *combo, PsppireImportAssistant *ia)
+{
+  revise_fields_preview (ia);
+}
+
+/* Called when the user toggles the checkbox that enables
+   quoting. */
+static void
+on_quote_cb_toggle (GtkToggleButton *quote_cb, PsppireImportAssistant *ia)
+{
+  bool is_active = gtk_toggle_button_get_active (quote_cb);
+  gtk_widget_set_sensitive (ia->quote_combo, is_active);
+  revise_fields_preview (ia);
+}
+
+/* Initializes IA's separators substructure. */
+static void
+separators_page_create (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+
+  size_t i;
+
+  GtkWidget *w = get_widget_assert (builder, "Separators");
+
+  g_object_set_data (G_OBJECT (w), "on-entering", prepare_separators_page);
+  g_object_set_data (G_OBJECT (w), "on-reset", prepare_separators_page);
+  
+
+  add_page_to_assistant (ia, w,   GTK_ASSISTANT_PAGE_CONTENT, _("Choose Separators"));
+
+  ia->custom_cb = get_widget_assert (builder, "custom-cb");
+  ia->custom_entry = get_widget_assert (builder, "custom-entry");
+  ia->quote_combo = get_widget_assert (builder, "quote-combo");
+  ia->quote_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (ia->quote_combo)));
+  ia->quote_cb = get_widget_assert (builder, "quote-cb");
+
+  set_quote_list (GTK_COMBO_BOX (ia->quote_combo));
+  ia->fields_tree_view = NULL; 
+
+  g_signal_connect (ia->quote_combo, "changed",
+                    G_CALLBACK (on_quote_combo_change), ia);
+  g_signal_connect (ia->quote_cb, "toggled",
+                    G_CALLBACK (on_quote_cb_toggle), ia);
+  g_signal_connect (ia->custom_entry, "notify::text",
+                    G_CALLBACK (on_separators_custom_entry_notify), ia);
+  g_signal_connect (ia->custom_cb, "toggled",
+                    G_CALLBACK (on_separators_custom_cb_toggle), ia);
+  for (i = 0; i < SEPARATOR_CNT; i++)
+    g_signal_connect (get_widget_assert (builder, separators[i].name),
+                      "toggled", G_CALLBACK (on_separator_toggle), ia);
+}
+
+
+
+\f
+/* Called when the user changes one of the variables in the
+   dictionary. */
+static void
+on_variable_change (PsppireDict *dict, int dict_idx,
+                   unsigned int what, const struct variable *oldvar,
+                    PsppireImportAssistant *ia)
+{
+  PsppSheetView *tv = PSPP_SHEET_VIEW (ia->data_tree_view);
+  gint column_idx = dict_idx + 1;
+
+  push_watch_cursor (ia);
+
+  /* Remove previous column and replace with new column. */
+  pspp_sheet_view_remove_column (tv, pspp_sheet_view_get_column (PSPP_SHEET_VIEW (ia->data_tree_view), column_idx));
+  pspp_sheet_view_insert_column (tv, PSPP_SHEET_VIEW_COLUMN (make_data_column (ia, ia->data_tree_view, FALSE, dict_idx)),
+                                 column_idx);
+
+  /* Save a copy of the modified variable in modified_vars, so
+     that its attributes will be preserved if we back up to the
+     previous page with the Prev button and then come back
+     here. */
+  if (dict_idx >= ia->modified_var_cnt)
+    {
+      size_t i;
+      ia->modified_vars = xnrealloc (ia->modified_vars, dict_idx + 1,
+                                    sizeof *ia->modified_vars);
+      for (i = 0; i <= dict_idx; i++)
+        ia->modified_vars[i] = NULL;
+      ia->modified_var_cnt = dict_idx + 1;
+    }
+  if (ia->modified_vars[dict_idx])
+    var_destroy (ia->modified_vars[dict_idx]);
+  ia->modified_vars[dict_idx]
+    = var_clone (psppire_dict_get_variable (dict, dict_idx));
+
+  pop_watch_cursor (ia);
+}
+
+
+
+
+/* Called just before the formats page of the assistant is
+   displayed. */
+static void
+prepare_formats_page (PsppireImportAssistant *ia)
+{
+  PsppireDict *psppire_dict = NULL;
+  PsppireVarSheet *var_sheet;
+  GtkBin *vars_scroller;
+  GtkWidget *old_var_sheet;
+
+  
+  push_watch_cursor (ia);
+
+  if (ia->spreadsheet == NULL)
+    {
+      struct fmt_guesser *fg;
+      unsigned long int number = 0;
+      size_t column_idx;
+
+      
+      ia->dict = dict_create (get_default_encoding ());
+      fg = fmt_guesser_create ();
+      for (column_idx = 0; column_idx < ia->column_cnt; column_idx++)
+       {
+         struct variable *modified_var = 
+           (column_idx < ia->modified_var_cnt ? ia->modified_vars[column_idx] : NULL);
+
+         if (modified_var == NULL)
+           {
+             struct column *column = &ia->columns[column_idx];
+             struct variable *var;
+             struct fmt_spec format;
+             char *name;
+             size_t row;
+
+             /* Choose variable name. */
+             name = dict_make_unique_var_name (ia->dict, column->name, &number);
+
+             /* Choose variable format. */
+             fmt_guesser_clear (fg);
+             for (row = ia->skip_lines; row < ia->line_cnt; row++)
+               fmt_guesser_add (fg, column->contents[row]);
+             fmt_guesser_guess (fg, &format);
+             fmt_fix_input (&format);
+
+             /* Create variable. */
+             var = dict_create_var_assert (ia->dict, name, fmt_var_width (&format));
+             var_set_both_formats (var, &format);
+
+             free (name);
+           }
+         else
+           {
+             char *name;
+
+             name = dict_make_unique_var_name (ia->dict, var_get_name (modified_var),
+                                               &number);
+             dict_clone_var_as_assert (ia->dict, modified_var, name);
+             free (name);
+           }
+       }
+      fmt_guesser_destroy (fg);
+    }
+  else
+    {
+      int row_start = -1;
+      int row_stop = -1;
+      int col_start = -1;
+      int col_stop = -1;
+
+      GtkBuilder *builder = ia->builder;
+
+      struct casereader *reader = NULL;
+
+      GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
+      GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
+      const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
+      GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");
+
+      gint num = gtk_combo_box_get_active (GTK_COMBO_BOX (combo_box));
+
+      struct spreadsheet_read_options sro;
+  
+      sro.sheet_name = NULL;
+      sro.cell_range = NULL;
+      sro.sheet_index = num + 1;
+
+      if ( convert_cell_ref (range, &col_start, &row_start, &col_stop, &row_stop))
+       {
+         sro.cell_range = g_strdup (range);
+       }
+
+      sro.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
+      sro.asw = -1;
+  
+      switch (ia->spreadsheet->type)
+       {
+       case SPREADSHEET_ODS:
+       case SPREADSHEET_GNUMERIC:
+         {
+           reader = spreadsheet_make_reader (ia->spreadsheet, &sro);
+           ia->dict = ia->spreadsheet->dict;
+         }
+         break;
+       default:
+         g_assert_not_reached ();
+         break;
+       }
+      g_free (sro.cell_range);
+
+      if (reader && ia->dict)
+       {
+         struct ccase *c;
+         int col;
+
+         ia->column_cnt = dict_get_var_cnt (ia->dict);
+         ia->columns = xcalloc (ia->column_cnt, sizeof (*ia->columns));
+         for (col = 0; col < ia->column_cnt ; ++col)
+           {
+             const struct variable *var = dict_get_var (ia->dict, col);
+             ia->columns[col].name = xstrdup (var_get_name (var));
+             ia->columns[col].contents = NULL;
+           }
+
+         casenumber rows = 0;
+         for (; (c = casereader_read (reader)) != NULL; case_unref (c))
+           {
+             rows++;
+             for (col = 0; col < ia->column_cnt ; ++col)
+               {
+                 char *ss;
+                 const struct variable *var = dict_get_var (ia->dict, col);
+             
+                 ia->columns[col].contents = xrealloc (ia->columns[col].contents,
+                                                       sizeof (struct substring) * rows);
+             
+                 ss = data_out (case_data (c, var), dict_get_encoding (ia->dict), 
+                                var_get_print_format (var));
+             
+                 ia->columns[col].contents[rows - 1] = ss_cstr (ss);
+               }
+         
+             if (rows > MAX_PREVIEW_LINES)
+               {
+                 case_unref (c);
+                 break;
+               }
+           }
+         casereader_destroy (reader);
+         ia->line_cnt = rows;
+       }
+      else
+       {
+         GtkWidget * dialog = gtk_message_dialog_new (NULL,
+                                                      GTK_DIALOG_MODAL,
+                                                      GTK_MESSAGE_ERROR,
+                                                      GTK_BUTTONS_CLOSE,
+                                                      _("An error occurred reading the spreadsheet file."));
+
+         gtk_dialog_run (GTK_DIALOG (dialog));
+         gtk_widget_destroy (dialog);
+       }
+    }
+
+  psppire_dict = psppire_dict_new_from_dict (ia->dict);
+  g_signal_connect (psppire_dict, "variable-changed",
+                   G_CALLBACK (on_variable_change), ia);
+  ia->psppire_dict = psppire_dict;
+
+  
+  /* XXX: PsppireVarStore doesn't hold a reference to
+     psppire_dict for now, but it should.  After it does, we
+     should g_object_ref the psppire_dict here, since we also
+     hold a reference via ia->formats->dict. */
+  var_sheet = PSPPIRE_VAR_SHEET (psppire_var_sheet_new ());
+  g_object_set (var_sheet,
+               "dictionary", psppire_dict,
+               "may-create-vars", FALSE,
+               "may-delete-vars", FALSE,
+               "format-use", FMT_FOR_INPUT,
+               "enable-grid-lines", PSPP_SHEET_VIEW_GRID_LINES_BOTH,
+               (void *) NULL);
+
+  vars_scroller = GTK_BIN (get_widget_assert (ia->builder, "vars-scroller"));
+  old_var_sheet = gtk_bin_get_child (GTK_BIN (vars_scroller));
+  if (old_var_sheet != NULL)
+    gtk_container_remove (GTK_CONTAINER (vars_scroller),  old_var_sheet);
+  gtk_container_add (GTK_CONTAINER (vars_scroller), GTK_WIDGET (var_sheet));
+  gtk_widget_show (GTK_WIDGET (var_sheet));
+
+  ia->data_tree_view =
+    GTK_WIDGET (create_data_tree_view (
+                                      FALSE,
+                                      GTK_CONTAINER (get_widget_assert (ia->builder, "data-scroller")),
+                                      ia));
+
+  gtk_widget_show (ia->paste_button);
+
+  pop_watch_cursor (ia);
+}
+
+static void
+formats_page_create (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+
+
+  GtkWidget *w = get_widget_assert (builder, "Formats");
+  g_object_set_data (G_OBJECT (w), "on-entering", prepare_formats_page);
+  g_object_set_data (G_OBJECT (w), "on-reset", reset_formats_page);
+  
+  add_page_to_assistant (ia, w,
+                        GTK_ASSISTANT_PAGE_CONFIRM, _("Adjust Variable Formats"));
+
+  ia->data_tree_view = NULL;
+  ia->modified_vars = NULL;
+  ia->modified_var_cnt = 0;
+}
+
+
+\f
+
+static void 
+separators_append_syntax (const PsppireImportAssistant *ia, struct string *s)
+{
+  int i;
+  ds_put_cstr (s, "  /DELIMITERS=\"");
+  if (ds_find_byte (&ia->separators, '\t') != SIZE_MAX)
+    ds_put_cstr (s, "\\t");
+  if (ds_find_byte (&ia->separators, '\\') != SIZE_MAX)
+    ds_put_cstr (s, "\\\\");
+  for (i = 0; i < ds_length (&ia->separators); i++)
+    {
+      char c = ds_at (&ia->separators, i);
+      if (c == '"')
+       ds_put_cstr (s, "\"\"");
+      else if (c != '\t' && c != '\\')
+       ds_put_byte (s, c);
+    }
+  ds_put_cstr (s, "\"\n");
+  if (!ds_is_empty (&ia->quotes))
+    syntax_gen_pspp (s, "  /QUALIFIER=%sq\n", ds_cstr (&ia->quotes));
+}
+
+
+static void
+formats_append_syntax (const PsppireImportAssistant *ia, struct string *s)
+{
+  int i;
+  int var_cnt;
+
+  g_return_if_fail (ia->dict);
+  
+  ds_put_cstr (s, "  /VARIABLES=\n");
+  
+  var_cnt = dict_get_var_cnt (ia->dict);
+  for (i = 0; i < var_cnt; i++)
+    {
+      struct variable *var = dict_get_var (ia->dict, i);
+      char format_string[FMT_STRING_LEN_MAX + 1];
+      fmt_to_string (var_get_print_format (var), format_string);
+      ds_put_format (s, "    %s %s%s\n",
+                    var_get_name (var), format_string,
+                    i == var_cnt - 1 ? "." : "");
+    }
+}
+
+
+static void
+first_line_append_syntax (const PsppireImportAssistant *ia, struct string *s)
+{
+  if (ia->skip_lines > 0)
+    ds_put_format (s, "  /FIRSTCASE=%d\n", ia->skip_lines + 1);
+}
+
+
+static void
+intro_append_syntax (const PsppireImportAssistant *ia, struct string *s)
+{
+  if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ia->n_cases_button)))
+    ds_put_format (s, "  /IMPORTCASE=FIRST %d\n",
+                  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (ia->n_cases_spin)));
+  else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (ia->percent_button)))
+    ds_put_format (s, "  /IMPORTCASE=PERCENT %d\n",
+                  gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (ia->percent_spin)));
+  else
+    ds_put_cstr (s, "  /IMPORTCASE=ALL\n");
+}
+
+
+/* Emits PSPP syntax to S that applies the dictionary attributes
+   (such as missing values and value labels) of the variables in
+   DICT.  */
+static void
+apply_dict (const struct dictionary *dict, struct string *s)
+{
+  size_t var_cnt = dict_get_var_cnt (dict);
+  size_t i;
+
+  for (i = 0; i < var_cnt; i++)
+    {
+      struct variable *var = dict_get_var (dict, i);
+      const char *name = var_get_name (var);
+      enum val_type type = var_get_type (var);
+      int width = var_get_width (var);
+      enum measure measure = var_get_measure (var);
+      enum var_role role = var_get_role (var);
+      enum alignment alignment = var_get_alignment (var);
+      const struct fmt_spec *format = var_get_print_format (var);
+
+      if (var_has_missing_values (var))
+        {
+          const struct missing_values *mv = var_get_missing_values (var);
+          size_t j;
+
+          syntax_gen_pspp (s, "MISSING VALUES %ss (", name);
+          for (j = 0; j < mv_n_values (mv); j++)
+            {
+              if (j)
+                ds_put_cstr (s, ", ");
+              syntax_gen_value (s, mv_get_value (mv, j), width, format);
+            }
+
+          if (mv_has_range (mv))
+            {
+              double low, high;
+              if (mv_has_value (mv))
+                ds_put_cstr (s, ", ");
+              mv_get_range (mv, &low, &high);
+              syntax_gen_num_range (s, low, high, format);
+            }
+          ds_put_cstr (s, ").\n");
+        }
+      if (var_has_value_labels (var))
+        {
+          const struct val_labs *vls = var_get_value_labels (var);
+          const struct val_lab **labels = val_labs_sorted (vls);
+          size_t n_labels = val_labs_count (vls);
+          size_t i;
+
+          syntax_gen_pspp (s, "VALUE LABELS %ss", name);
+          for (i = 0; i < n_labels; i++)
+            {
+              const struct val_lab *vl = labels[i];
+              ds_put_cstr (s, "\n  ");
+              syntax_gen_value (s, &vl->value, width, format);
+              ds_put_byte (s, ' ');
+              syntax_gen_string (s, ss_cstr (val_lab_get_escaped_label (vl)));
+            }
+          free (labels);
+          ds_put_cstr (s, ".\n");
+        }
+      if (var_has_label (var))
+        syntax_gen_pspp (s, "VARIABLE LABELS %ss %sq.\n",
+                         name, var_get_label (var));
+      if (measure != var_default_measure (type))
+        syntax_gen_pspp (s, "VARIABLE LEVEL %ss (%ss).\n",
+                         name, measure_to_syntax (measure));
+      if (role != ROLE_INPUT)
+        syntax_gen_pspp (s, "VARIABLE ROLE /%ss %ss.\n",
+                         var_role_to_syntax (role), name);
+      if (alignment != var_default_alignment (type))
+        syntax_gen_pspp (s, "VARIABLE ALIGNMENT %ss (%ss).\n",
+                         name, alignment_to_syntax (alignment));
+      if (var_get_display_width (var) != var_default_display_width (width))
+        syntax_gen_pspp (s, "VARIABLE WIDTH %ss (%d).\n",
+                         name, var_get_display_width (var));
+    }
+}
+
+
+
+static char *
+sheet_spec_gen_syntax (PsppireImportAssistant *ia)
+{
+  GtkBuilder *builder = ia->builder;
+  GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
+  GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
+  GtkWidget *rnc = get_widget_assert (builder, "readnames-checkbox");
+  const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
+  int sheet_index = 1 + gtk_combo_box_get_active (GTK_COMBO_BOX (sheet_entry));
+  gboolean read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (rnc));
+
+  struct string s = DS_EMPTY_INITIALIZER;
+
+  syntax_gen_pspp (&s,
+                  "GET DATA"
+                  "\n  /TYPE=%ss"
+                  "\n  /FILE=%sq"
+                  "\n  /SHEET=index %d"
+                  "\n  /READNAMES=%ss",
+                  (ia->spreadsheet->type == SPREADSHEET_GNUMERIC) ? "GNM" : "ODS",
+                  ia->file_name,                        
+                  sheet_index,
+                  read_names ? "ON" : "OFF");
+
+
+  if (range && 0 != strcmp ("", range))
+    {
+      syntax_gen_pspp (&s,
+                      "\n  /CELLRANGE=RANGE %sq", range);
+    }
+  else
+    {
+      syntax_gen_pspp (&s,
+                      "\n  /CELLRANGE=FULL");
+    }
+
+
+  syntax_gen_pspp (&s, ".");
+
+  
+  return ds_cstr (&s);
+}
+
+gchar *
+psppire_import_assistant_generate_syntax (PsppireImportAssistant *ia)
+{
+  struct string s = DS_EMPTY_INITIALIZER;
+
+  if (!ia->spreadsheet)
+    {
+      if (ia->file_name == NULL)
+       return NULL;
+
+      syntax_gen_pspp (&s,
+                      "GET DATA"
+                      "\n  /TYPE=TXT"
+                      "\n  /FILE=%sq\n",
+                      ia->file_name);
+      if (ia->encoding && strcmp (ia->encoding, "Auto"))
+       syntax_gen_pspp (&s, "  /ENCODING=%sq\n", ia->encoding);
+
+      intro_append_syntax (ia, &s);
+
+
+      ds_put_cstr (&s,
+                  "  /ARRANGEMENT=DELIMITED\n"
+                  "  /DELCASE=LINE\n");
+
+      first_line_append_syntax (ia, &s);
+      separators_append_syntax (ia, &s);
+
+      formats_append_syntax (ia, &s);
+      apply_dict (ia->dict, &s);
+    }
+  else
+    {
+      return sheet_spec_gen_syntax (ia);
+    }
+  
+  return ds_cstr (&s);
+}
diff --git a/src/ui/gui/psppire-import-assistant.h b/src/ui/gui/psppire-import-assistant.h
new file mode 100644 (file)
index 0000000..9d48d89
--- /dev/null
@@ -0,0 +1,171 @@
+/* PSPPIRE - a graphical user interface for PSPP.
+   Copyright (C) 2015  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
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
+
+
+#ifndef __PSPPIRE_IMPORT_ASSISTANT_H__
+#define __PSPPIRE_IMPORT_ASSISTANT_H__
+
+#include <glib-object.h>
+#include <glib.h>
+
+#include <gtk/gtk.h>
+
+#include "libpspp/str.h"
+#include "psppire-dict.h"
+#include "data/spreadsheet-reader.h"
+
+G_BEGIN_DECLS
+
+struct spreadsheet;
+
+
+#define PSPPIRE_TYPE_IMPORT_ASSISTANT (psppire_import_assistant_get_type ())
+
+#define PSPPIRE_IMPORT_ASSISTANT(obj)  \
+                     (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+                                                 PSPPIRE_TYPE_IMPORT_ASSISTANT, PsppireImportAssistant))
+
+#define PSPPIRE_IMPORT_ASSISTANT_CLASS(klass) \
+                     (G_TYPE_CHECK_CLASS_CAST ((klass), \
+                                PSPPIRE_TYPE_IMPORT_ASSISTANT, \
+                                 PsppireImportAssistantClass))
+
+#define PSPPIRE_IS_IMPORT_ASSISTANT(obj) \
+                    (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_TYPE_IMPORT_ASSISTANT))
+
+#define PSPPIRE_IS_IMPORT_ASSISTANT_CLASS(klass) \
+                     (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_TYPE_IMPORT_ASSISTANT))
+
+
+#define PSPPIRE_IMPORT_ASSISTANT_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+                                  PSPPIRE_TYPE_IMPORT_ASSISTANT, \
+                                  PsppireImportAssistantClass))
+
+typedef struct _PsppireImportAssistant       PsppireImportAssistant;
+typedef struct _PsppireImportAssistantClass  PsppireImportAssistantClass;
+
+
+struct first_line_page;
+
+typedef void page_func (PsppireImportAssistant *, GtkWidget *page);
+
+enum { MAX_PREVIEW_LINES = 1000 }; /* Max number of lines to read. */
+
+struct _PsppireImportAssistant
+{
+  GtkAssistant parent;
+
+  GtkBuilder *builder;
+
+  gint current_page;
+
+  /* START The chooser page of the assistant. */
+  GtkWidget *encoding_selector;
+  GtkFileFilter *default_filter;
+  /* END The chooser page of the assistant. */
+
+  
+  /* START The introduction page of the assistant. */
+    GtkWidget *all_cases_button;
+    GtkWidget *n_cases_button;
+    GtkWidget *n_cases_spin;
+    GtkWidget *percent_button;
+    GtkWidget *percent_spin;
+  /* END The introduction page of the assistant. */
+
+
+/* START Page where the user chooses field separators. */
+
+  /* How to break lines into columns. */
+  struct string separators;   /* Field separators. */
+  struct string quotes;       /* Quote characters. */
+
+  GtkWidget *custom_cb;
+  GtkWidget *custom_entry;
+  GtkWidget *quote_cb;
+  GtkWidget *quote_combo;
+  GtkEntry *quote_entry;
+  GtkWidget *fields_tree_view;
+
+/* END Page where the user chooses field separators. */
+
+
+/* START Page where the user verifies and adjusts input formats. */
+  GtkWidget *data_tree_view;
+  PsppireDict *psppire_dict;
+  struct variable **modified_vars;
+  size_t modified_var_cnt;
+/* END Page where the user verifies and adjusts input formats. */
+
+
+  /* START first line page */
+  GtkWidget *tree_view;
+  GtkWidget *variable_names_cb;
+  /* END first line page */
+
+  GMainLoop *main_loop;
+  GtkWidget *paste_button;
+  GtkWidget *reset_button;
+  int response;
+  int watch_cursor;
+
+  GtkCellRenderer *prop_renderer;
+  GtkCellRenderer *fixed_renderer;
+
+  // START     struct file file;
+  char *file_name;        /* File name. */
+
+  /* Relevant only for text files */
+
+  gchar *encoding;        /* Encoding. */
+  unsigned long int total_lines; /* Number of lines in file. */
+  gboolean total_is_exact;    /* Is total_lines exact (or an estimate)? */
+
+  /* The first several lines of the file. */
+  struct string lines[MAX_PREVIEW_LINES];
+  size_t line_cnt;
+
+  // END     struct file file;
+
+  struct sheet_spec_page *sheet_spec;
+  struct first_line_page *first_line;
+
+  /* The columns produced. */
+  struct column *columns;     /* Information about each column. */
+  size_t column_cnt;          /* Number of columns. */
+
+  int skip_lines;             /* Number of initial lines to skip? */
+  gboolean variable_names;        /* Variable names above first line of data? */
+  struct dictionary *dict;
+
+  struct spreadsheet *spreadsheet;
+};
+
+struct _PsppireImportAssistantClass
+{
+  GtkAssistantClass parent_class;
+};
+
+GType psppire_import_assistant_get_type (void) ;
+
+
+GtkWidget *psppire_import_assistant_new (GtkWindow *toplevel);
+
+gchar *psppire_import_assistant_generate_syntax (PsppireImportAssistant *);
+
+G_END_DECLS
+
+#endif /* __PSPPIRE_IMPORT_ASSISTANT_H__ */
diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
deleted file mode 100644 (file)
index 3412749..0000000
+++ /dev/null
@@ -1,673 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-
-#include "ui/gui/text-data-import-dialog.h"
-
-#include "page-intro.h"
-#include "page-sheet-spec.h"
-#include "page-first-line.h"
-#include "page-separators.h"
-#include "page-formats.h"
-
-#include <errno.h>
-#include <fcntl.h>
-#include <gtk/gtk.h>
-#include <limits.h>
-#include <stdlib.h>
-#include <sys/stat.h>
-
-#include "data/data-in.h"
-#include "data/data-out.h"
-#include "data/format-guesser.h"
-#include "data/value-labels.h"
-#include "language/data-io/data-parser.h"
-#include "language/lexer/lexer.h"
-#include "libpspp/assertion.h"
-#include "libpspp/i18n.h"
-#include "libpspp/line-reader.h"
-#include "libpspp/message.h"
-#include "ui/gui/dialog-common.h"
-#include "ui/gui/executor.h"
-#include "ui/gui/helper.h"
-#include "ui/gui/builder-wrapper.h"
-#include "ui/gui/pspp-sheet-selection.h"
-#include "ui/gui/pspp-sheet-view.h"
-#include "ui/gui/psppire-data-window.h"
-#include "ui/gui/psppire-dialog.h"
-#include "ui/gui/psppire-encoding-selector.h"
-#include "ui/gui/psppire-empty-list-store.h"
-#include "ui/gui/psppire-var-sheet.h"
-#include "ui/gui/psppire-scanf.h"
-#include "ui/syntax-gen.h"
-
-#include "gl/intprops.h"
-#include "gl/xalloc.h"
-
-#include "gettext.h"
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-struct import_assistant;
-
-static void apply_dict (const struct dictionary *, struct string *);
-static char *generate_syntax (const struct import_assistant *);
-
-static void add_line_number_column (const struct import_assistant *,
-                                    PsppSheetView *);
-
-/* Pops up the Text Data Import assistant. */
-void
-text_data_import_assistant (PsppireDataWindow *dw)
-{
-  GtkWindow *parent_window = GTK_WINDOW (dw);
-  struct import_assistant *ia = init_assistant (parent_window);
-  struct sheet_spec_page *ssp ;
-
-  if (!init_file (ia, parent_window))
-    {
-      free (ia);
-      return;
-    }
-
-  ssp = ia->sheet_spec;
-
-  if (ia->spreadsheet)
-    {
-      ia->sheet_spec = sheet_spec_page_create (ia);
-    }
-  else
-    {
-      ia->intro = intro_page_create (ia);
-      ia->first_line = first_line_page_create (ia);
-      ia->separators = separators_page_create (ia);
-    }
-  ia->formats = formats_page_create (ia);
-
-  gtk_widget_show_all (GTK_WIDGET (ia->asst.assistant));
-
-  ia->asst.main_loop = g_main_loop_new (NULL, false);
-
-  {  
-  /*
-    Instead of this block,
-    A simple     g_main_loop_run (ia->asst.main_loop);  should work here.  But it seems to crash.
-    I have no idea why.
-  */
-    GMainContext *ctx = g_main_loop_get_context (ia->asst.main_loop);
-    ia->asst.loop_done = false;
-    while (! ia->asst.loop_done)
-      {
-       g_main_context_iteration (ctx, TRUE);
-      }
-  }
-  g_main_loop_unref (ia->asst.main_loop);
-
-  switch (ia->asst.response)
-    {
-    case GTK_RESPONSE_APPLY:
-      {
-       gchar *fn = g_path_get_basename (ia->file.file_name);
-       open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, generate_syntax (ia));
-       g_free (fn);
-      }
-      break;
-    case PSPPIRE_RESPONSE_PASTE:
-      free (paste_syntax_to_window (generate_syntax (ia)));
-      break;
-    default:
-      break;
-    }
-
-  if (ssp) 
-    {
-      destroy_formats_page (ia);
-      destroy_separators_page (ia);
-    }
-}
-
-/* Emits PSPP syntax to S that applies the dictionary attributes
-   (such as missing values and value labels) of the variables in
-   DICT.  */
-static void
-apply_dict (const struct dictionary *dict, struct string *s)
-{
-  size_t var_cnt = dict_get_var_cnt (dict);
-  size_t i;
-
-  for (i = 0; i < var_cnt; i++)
-    {
-      struct variable *var = dict_get_var (dict, i);
-      const char *name = var_get_name (var);
-      enum val_type type = var_get_type (var);
-      int width = var_get_width (var);
-      enum measure measure = var_get_measure (var);
-      enum var_role role = var_get_role (var);
-      enum alignment alignment = var_get_alignment (var);
-      const struct fmt_spec *format = var_get_print_format (var);
-
-      if (var_has_missing_values (var))
-        {
-          const struct missing_values *mv = var_get_missing_values (var);
-          size_t j;
-
-          syntax_gen_pspp (s, "MISSING VALUES %ss (", name);
-          for (j = 0; j < mv_n_values (mv); j++)
-            {
-              if (j)
-                ds_put_cstr (s, ", ");
-              syntax_gen_value (s, mv_get_value (mv, j), width, format);
-            }
-
-          if (mv_has_range (mv))
-            {
-              double low, high;
-              if (mv_has_value (mv))
-                ds_put_cstr (s, ", ");
-              mv_get_range (mv, &low, &high);
-              syntax_gen_num_range (s, low, high, format);
-            }
-          ds_put_cstr (s, ").\n");
-        }
-      if (var_has_value_labels (var))
-        {
-          const struct val_labs *vls = var_get_value_labels (var);
-          const struct val_lab **labels = val_labs_sorted (vls);
-          size_t n_labels = val_labs_count (vls);
-          size_t i;
-
-          syntax_gen_pspp (s, "VALUE LABELS %ss", name);
-          for (i = 0; i < n_labels; i++)
-            {
-              const struct val_lab *vl = labels[i];
-              ds_put_cstr (s, "\n  ");
-              syntax_gen_value (s, &vl->value, width, format);
-              ds_put_byte (s, ' ');
-              syntax_gen_string (s, ss_cstr (val_lab_get_escaped_label (vl)));
-            }
-          free (labels);
-          ds_put_cstr (s, ".\n");
-        }
-      if (var_has_label (var))
-        syntax_gen_pspp (s, "VARIABLE LABELS %ss %sq.\n",
-                         name, var_get_label (var));
-      if (measure != var_default_measure (type))
-        syntax_gen_pspp (s, "VARIABLE LEVEL %ss (%ss).\n",
-                         name, measure_to_syntax (measure));
-      if (role != ROLE_INPUT)
-        syntax_gen_pspp (s, "VARIABLE ROLE /%ss %ss.\n",
-                         var_role_to_syntax (role), name);
-      if (alignment != var_default_alignment (type))
-        syntax_gen_pspp (s, "VARIABLE ALIGNMENT %ss (%ss).\n",
-                         name, alignment_to_syntax (alignment));
-      if (var_get_display_width (var) != var_default_display_width (width))
-        syntax_gen_pspp (s, "VARIABLE WIDTH %ss (%d).\n",
-                         name, var_get_display_width (var));
-    }
-}
-
-/* Generates and returns PSPP syntax to execute the import
-   operation described by IA.  The caller must free the syntax
-   with free(). */
-static char *
-generate_syntax (const struct import_assistant *ia)
-{
-  struct string s = DS_EMPTY_INITIALIZER;
-
-  if (ia->spreadsheet == NULL)
-    {
-      syntax_gen_pspp (&s,
-                      "GET DATA"
-                      "\n  /TYPE=TXT"
-                      "\n  /FILE=%sq\n",
-                      ia->file.file_name);
-      if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
-       syntax_gen_pspp (&s, "  /ENCODING=%sq\n", ia->file.encoding);
-
-      intro_append_syntax (ia->intro, &s);
-
-
-      ds_put_cstr (&s,
-                  "  /ARRANGEMENT=DELIMITED\n"
-                  "  /DELCASE=LINE\n");
-
-      first_line_append_syntax (ia, &s);
-      separators_append_syntax (ia, &s);
-      formats_append_syntax (ia, &s);
-      apply_dict (ia->dict, &s);
-    }
-  else
-    {
-      return sheet_spec_gen_syntax (ia);
-    }
-  
-  return ds_cstr (&s);
-}
-
-
-
-static void render_input_cell (PsppSheetViewColumn *tree_column,
-                               GtkCellRenderer *cell,
-                               GtkTreeModel *model, GtkTreeIter *iter,
-                               gpointer ia);
-
-static gboolean on_query_input_tooltip (GtkWidget *widget, gint wx, gint wy,
-                                        gboolean keyboard_mode UNUSED,
-                                        GtkTooltip *tooltip,
-                                        struct import_assistant *);
-
-
-
-/* Called to render one of the cells in the fields preview tree
-   view. */
-static void
-render_input_cell (PsppSheetViewColumn *tree_column, GtkCellRenderer *cell,
-                   GtkTreeModel *model, GtkTreeIter *iter,
-                   gpointer ia_)
-{
-  struct import_assistant *ia = ia_;
-  struct substring field;
-  size_t row;
-  gint column;
-
-  column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_column),
-                                               "column-number"));
-  row = empty_list_store_iter_to_row (iter) + ia->skip_lines;
-  field = ia->columns[column].contents[row];
-  if (field.string != NULL)
-    {
-      GValue text = {0, };
-      g_value_init (&text, G_TYPE_STRING);
-      g_value_take_string (&text, ss_xstrdup (field));
-      g_object_set_property (G_OBJECT (cell), "text", &text);
-      g_value_unset (&text);
-      g_object_set (cell, "background-set", FALSE, (void *) NULL);
-    }
-  else
-    g_object_set (cell,
-                  "text", "",
-                  "background", "red",
-                  "background-set", TRUE,
-                  (void *) NULL);
-}
-
-static gboolean
-get_tooltip_location (GtkWidget *widget, gint wx, gint wy,
-                      const struct import_assistant *ia,
-                      size_t *row, size_t *column);
-
-
-/* Called to render a tooltip on one of the cells in the fields
-   preview tree view. */
-static gboolean
-on_query_input_tooltip (GtkWidget *widget, gint wx, gint wy,
-                        gboolean keyboard_mode UNUSED,
-                        GtkTooltip *tooltip, struct import_assistant *ia)
-{
-  size_t row, column;
-
-  if (!get_tooltip_location (widget, wx, wy, ia, &row, &column))
-    return FALSE;
-
-  if (ia->columns[column].contents[row].string != NULL)
-    return FALSE;
-
-  gtk_tooltip_set_text (tooltip,
-                        _("This input line has too few separators "
-                          "to fill in this field."));
-  return TRUE;
-}
-
-
-/* Parses the contents of the field at (ROW,COLUMN) according to
-   its variable format.  If OUTPUTP is non-null, then *OUTPUTP
-   receives the formatted output for that field (which must be
-   freed with free).  If TOOLTIPP is non-null, then *TOOLTIPP
-   receives a message suitable for use in a tooltip, if one is
-   needed, or a null pointer otherwise.  Returns true if a
-   tooltip message is needed, otherwise false. */
-static bool
-parse_field (struct import_assistant *ia,
-             size_t row, size_t column,
-             char **outputp, char **tooltipp)
-{
-  const struct fmt_spec *in;
-  struct fmt_spec out;
-  char *tooltip;
-  bool ok;
-
-  struct substring field = ia->columns[column].contents[row];
-  struct variable *var = dict_get_var (ia->dict, column);
-  union value val;
-
-  value_init (&val, var_get_width (var));
-  in = var_get_print_format (var);
-  out = fmt_for_output_from_input (in);
-  tooltip = NULL;
-  if (field.string != NULL)
-    {
-      char *error;
-
-      error = data_in (field, "UTF-8", in->type, &val, var_get_width (var),
-                       dict_get_encoding (ia->dict));
-      if (error != NULL)
-        {
-          tooltip = xasprintf (_("Cannot parse field content `%.*s' as "
-                                 "format %s: %s"),
-                               (int) field.length, field.string,
-                               fmt_name (in->type), error);
-          free (error);
-        }
-    }
-  else
-    {
-      tooltip = xstrdup (_("This input line has too few separators "
-                           "to fill in this field."));
-      value_set_missing (&val, var_get_width (var));
-    }
-  if (outputp != NULL)
-    {
-      *outputp = data_out (&val, dict_get_encoding (ia->dict),  &out);
-    }
-  value_destroy (&val, var_get_width (var));
-
-  ok = tooltip == NULL;
-  if (tooltipp != NULL)
-    *tooltipp = tooltip;
-  else
-    free (tooltip);
-  return ok;
-}
-
-/* Called to render one of the cells in the data preview tree
-   view. */
-static void
-render_output_cell (PsppSheetViewColumn *tree_column,
-                    GtkCellRenderer *cell,
-                    GtkTreeModel *model,
-                    GtkTreeIter *iter,
-                    gpointer ia_)
-{
-  struct import_assistant *ia = ia_;
-  char *output;
-  GValue gvalue = { 0, };
-  bool ok;
-
-  ok = parse_field (ia,
-                    (empty_list_store_iter_to_row (iter)
-                     + ia->skip_lines),
-                    GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_column),
-                                                        "column-number")),
-                    &output, NULL);
-
-  g_value_init (&gvalue, G_TYPE_STRING);
-  g_value_take_string (&gvalue, output);
-  g_object_set_property (G_OBJECT (cell), "text", &gvalue);
-  g_value_unset (&gvalue);
-
-  if (ok)
-    g_object_set (cell, "background-set", FALSE, (void *) NULL);
-  else
-    g_object_set (cell,
-                  "background", "red",
-                  "background-set", TRUE,
-                  (void *) NULL);
-}
-
-/* Called to render a tooltip for one of the cells in the data
-   preview tree view. */
-static gboolean
-on_query_output_tooltip (GtkWidget *widget, gint wx, gint wy,
-                        gboolean keyboard_mode UNUSED,
-                        GtkTooltip *tooltip, struct import_assistant *ia)
-{
-  size_t row, column;
-  char *text;
-
-  if (!get_tooltip_location (widget, wx, wy, ia, &row, &column))
-    return FALSE;
-
-  if (parse_field (ia, row, column, NULL, &text))
-    return FALSE;
-
-  gtk_tooltip_set_text (tooltip, text);
-  free (text);
-  return TRUE;
-}
-\f
-/* Utility functions used by multiple pages of the assistant. */
-
-static gboolean
-get_tooltip_location (GtkWidget *widget, gint wx, gint wy,
-                      const struct import_assistant *ia,
-                      size_t *row, size_t *column)
-{
-  PsppSheetView *tree_view = PSPP_SHEET_VIEW (widget);
-  gint bx, by;
-  GtkTreePath *path;
-  GtkTreeIter iter;
-  PsppSheetViewColumn *tree_column;
-  GtkTreeModel *tree_model;
-  bool ok;
-
-  /* Check that WIDGET is really visible on the screen before we
-     do anything else.  This is a bug fix for a sticky situation:
-     when text_data_import_assistant() returns, it frees the data
-     necessary to compose the tool tip message, but there may be
-     a tool tip under preparation at that point (even if there is
-     no visible tool tip) that will call back into us a little
-     bit later.  Perhaps the correct solution to this problem is
-     to make the data related to the tool tips part of a GObject
-     that only gets destroyed when all references are released,
-     but this solution appears to be effective too. */
-  if (!gtk_widget_get_mapped (widget))
-    return FALSE;
-
-  pspp_sheet_view_convert_widget_to_bin_window_coords (tree_view,
-                                                       wx, wy, &bx, &by);
-  if (!pspp_sheet_view_get_path_at_pos (tree_view, bx, by,
-                                      &path, &tree_column, NULL, NULL))
-    return FALSE;
-
-  *column = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_column),
-                                                "column-number"));
-
-  tree_model = pspp_sheet_view_get_model (tree_view);
-  ok = gtk_tree_model_get_iter (tree_model, &iter, path);
-  gtk_tree_path_free (path);
-  if (!ok)
-    return FALSE;
-
-  *row = empty_list_store_iter_to_row (&iter) + ia->skip_lines;
-  return TRUE;
-}
-
-void
-make_tree_view (const struct import_assistant *ia,
-                size_t first_line,
-                PsppSheetView **tree_view)
-{
-  GtkTreeModel *model;
-
-  *tree_view = PSPP_SHEET_VIEW (pspp_sheet_view_new ());
-  pspp_sheet_view_set_grid_lines (*tree_view, PSPP_SHEET_VIEW_GRID_LINES_BOTH);
-  model = GTK_TREE_MODEL (psppire_empty_list_store_new (
-                                                       ia->file.line_cnt - first_line));
-  g_object_set_data (G_OBJECT (model), "lines", ia->file.lines + first_line);
-  g_object_set_data (G_OBJECT (model), "first-line",
-                     GINT_TO_POINTER (first_line));
-  pspp_sheet_view_set_model (*tree_view, model);
-  g_object_unref (model);
-
-  add_line_number_column (ia, *tree_view);
-}
-
-static void
-render_line_number (PsppSheetViewColumn *tree_column,
-                    GtkCellRenderer *cell,
-                    GtkTreeModel *tree_model,
-                    GtkTreeIter *iter,
-                    gpointer data)
-{
-  gint row = empty_list_store_iter_to_row (iter);
-  char s[INT_BUFSIZE_BOUND (int)];
-  int first_line;
-
-  first_line = GPOINTER_TO_INT (g_object_get_data (G_OBJECT (tree_model),
-                                                   "first-line"));
-  sprintf (s, "%d", first_line + row);
-  g_object_set (cell, "text", s, NULL);
-}
-
-static void
-add_line_number_column (const struct import_assistant *ia,
-                        PsppSheetView *treeview)
-{
-  PsppSheetViewColumn *column;
-
-  column = pspp_sheet_view_column_new_with_attributes (
-    _("Line"), ia->asst.prop_renderer, (void *) NULL);
-  pspp_sheet_view_column_set_fixed_width (
-    column, get_monospace_width (treeview, ia->asst.prop_renderer, 5));
-  pspp_sheet_view_column_set_resizable (column, TRUE);
-  pspp_sheet_view_column_set_cell_data_func (column, ia->asst.prop_renderer,
-                                             render_line_number, NULL, NULL);
-  pspp_sheet_view_append_column (treeview, column);
-}
-
-gint
-get_monospace_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
-                     size_t char_cnt)
-{
-  struct string s;
-  gint width;
-
-  ds_init_empty (&s);
-  ds_put_byte_multiple (&s, '0', char_cnt);
-  ds_put_byte (&s, ' ');
-  width = get_string_width (treeview, renderer, ds_cstr (&s));
-  ds_destroy (&s);
-
-  return width;
-}
-
-gint
-get_string_width (PsppSheetView *treeview, GtkCellRenderer *renderer,
-                  const char *string)
-{
-  gint width;
-  g_object_set (G_OBJECT (renderer), "text", string, (void *) NULL);
-  gtk_cell_renderer_get_preferred_width (renderer, GTK_WIDGET (treeview),
-                             NULL, &width);
-  return width;
-}
-
-PsppSheetViewColumn *
-make_data_column (struct import_assistant *ia, PsppSheetView *tree_view,
-                  bool input, gint dict_idx)
-{
-  struct variable *var = NULL;
-  struct column *column = NULL;
-  size_t char_cnt;
-  gint content_width, header_width;
-  PsppSheetViewColumn *tree_column;
-  char *name;
-
-  if (input)
-    column = &ia->columns[dict_idx];
-  else
-    var = dict_get_var (ia->dict, dict_idx);
-
-  name = escape_underscores (input ? column->name : var_get_name (var));
-  char_cnt = input ? column->width : var_get_print_format (var)->w;
-  content_width = get_monospace_width (tree_view, ia->asst.fixed_renderer,
-                                       char_cnt);
-  header_width = get_string_width (tree_view, ia->asst.prop_renderer,
-                                   name);
-
-  tree_column = pspp_sheet_view_column_new ();
-  g_object_set_data (G_OBJECT (tree_column), "column-number",
-                     GINT_TO_POINTER (dict_idx));
-  pspp_sheet_view_column_set_title (tree_column, name);
-  pspp_sheet_view_column_pack_start (tree_column, ia->asst.fixed_renderer,
-                                     FALSE);
-  pspp_sheet_view_column_set_cell_data_func (
-    tree_column, ia->asst.fixed_renderer,
-    input ? render_input_cell : render_output_cell, ia, NULL);
-  pspp_sheet_view_column_set_fixed_width (tree_column, MAX (content_width,
-                                                            header_width));
-
-  free (name);
-
-  return tree_column;
-}
-
-PsppSheetView *
-create_data_tree_view (bool input, GtkContainer *parent,
-                       struct import_assistant *ia)
-{
-  PsppSheetView *tree_view;
-  gint i;
-
-  make_tree_view (ia, ia->skip_lines, &tree_view);
-  pspp_sheet_selection_set_mode (pspp_sheet_view_get_selection (tree_view),
-                                 PSPP_SHEET_SELECTION_NONE);
-
-  for (i = 0; i < ia->column_cnt; i++)
-    pspp_sheet_view_append_column (tree_view,
-                                   make_data_column (ia, tree_view, input, i));
-
-  g_object_set (G_OBJECT (tree_view), "has-tooltip", TRUE, (void *) NULL);
-  g_signal_connect (tree_view, "query-tooltip",
-                    G_CALLBACK (input ? on_query_input_tooltip
-                                : on_query_output_tooltip), ia);
-
-
-  gtk_container_add (parent, GTK_WIDGET (tree_view));
-  gtk_widget_show (GTK_WIDGET (tree_view));
-
-  return tree_view;
-}
-
-/* Increments the "watch cursor" level, setting the cursor for
-   the assistant window to a watch face to indicate to the user
-   that the ongoing operation may take some time. */
-void
-push_watch_cursor (struct import_assistant *ia)
-{
-  if (++ia->asst.watch_cursor == 1)
-    {
-      GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
-      GdkDisplay *display = gtk_widget_get_display (widget);
-      GdkCursor *cursor = gdk_cursor_new_for_display (display, GDK_WATCH);
-      gdk_window_set_cursor (gtk_widget_get_window (widget), cursor);
-      g_object_unref (cursor);
-      gdk_display_flush (display);
-    }
-}
-
-/* Decrements the "watch cursor" level.  If the level reaches
-   zero, the cursor is reset to its default shape. */
-void
-pop_watch_cursor (struct import_assistant *ia)
-{
-  if (--ia->asst.watch_cursor == 0)
-    {
-      GtkWidget *widget = GTK_WIDGET (ia->asst.assistant);
-      gdk_window_set_cursor (gtk_widget_get_window (widget), NULL);
-    }
-}
diff --git a/src/ui/gui/text-data-import-dialog.h b/src/ui/gui/text-data-import-dialog.h
deleted file mode 100644 (file)
index 9e13b65..0000000
+++ /dev/null
@@ -1,162 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2010, 2011, 2013  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#ifndef TEXT_DATA_IMPORT_DIALOG_H
-#define TEXT_DATA_IMPORT_DIALOG_H
-
-#include <glib-object.h>
-#include "ui/gui/psppire-data-window.h"
-#include "data/spreadsheet-reader.h"
-
-#include "libpspp/str.h"
-
-enum { MAX_PREVIEW_LINES = 1000 }; /* Max number of lines to read. */
-
-/* The file to be imported. */
-struct file
-  {
-    char *file_name;        /* File name. */
-
-    /* Relevant only for text files */
-
-    gchar *encoding;        /* Encoding. */
-    unsigned long int total_lines; /* Number of lines in file. */
-    bool total_is_exact;    /* Is total_lines exact (or an estimate)? */
-
-    /* The first several lines of the file. */
-    struct string *lines;
-    size_t line_cnt;
-  };
-
-/* The main body of the GTK+ assistant and related data. */
-struct assistant
-  {
-    GtkBuilder *builder;
-    GtkAssistant *assistant;
-    GMainLoop *main_loop;
-    bool loop_done;
-    GtkWidget *paste_button;
-    GtkWidget *reset_button;
-    int response;
-    int watch_cursor;
-
-    GtkCellRenderer *prop_renderer;
-    GtkCellRenderer *fixed_renderer;
-  };
-
-struct import_assistant
-  {
-    struct file file;
-    struct assistant asst;
-
-    struct intro_page *intro;
-    struct sheet_spec_page *sheet_spec;
-    struct first_line_page *first_line;
-    struct separators_page *separators;
-    struct formats_page *formats;
-
-    /* The columns produced. */
-    struct column *columns;     /* Information about each column. */
-    size_t column_cnt;          /* Number of columns. */
-
-    int skip_lines;             /* Number of initial lines to skip? */
-    bool variable_names;        /* Variable names above first line of data? */
-    struct dictionary *dict;
-
-    struct spreadsheet *spreadsheet;
-  };
-
-struct column
-  {
-    /* Variable name for this column.  This is the variable name
-       used on the separators page; it can be overridden by the
-       user on the formats page. */
-    char *name;
-
-    /* Maximum length of any row in this column. */
-    size_t width;
-
-    /* Contents of this column: contents[row] is the contents for
-       the given row.
-
-       A null substring indicates a missing column for that row
-       (because the line contains an insufficient number of
-       separators).
-
-       contents[] elements may be substrings of the lines[]
-       strings that represent the whole lines of the file, to
-       save memory.  Other elements are dynamically allocated
-       with ss_alloc_substring. */
-    struct substring *contents;
-  };
-
-
-GtkWidget * add_page_to_assistant (struct import_assistant *ia,
-                                  GtkWidget *page, GtkAssistantPageType type);
-
-void text_data_import_assistant (PsppireDataWindow *);
-
-/* FIXME: Should this be private to first line page ? */
-void make_tree_view (const struct import_assistant *ia,
-                            size_t first_line,
-                            PsppSheetView **tree_view);
-
-gint get_monospace_width (PsppSheetView *, GtkCellRenderer *,
-                                 size_t char_cnt);
-gint get_string_width (PsppSheetView *, GtkCellRenderer *,
-                              const char *string);
-
-
-
-void push_watch_cursor (struct import_assistant *);
-void pop_watch_cursor (struct import_assistant *);
-
-
-PsppSheetView *create_data_tree_view (bool input, GtkContainer *parent,
-                                      struct import_assistant *);
-
-PsppSheetViewColumn *make_data_column (struct import_assistant *,
-                                       PsppSheetView *, bool input,
-                                       gint column_idx);
-
-
-void  update_assistant (struct import_assistant *ia);
-
-bool init_file (struct import_assistant *ia, GtkWindow *parent_window);
-void destroy_file (struct import_assistant *ia);
-
-void prepare_sheet_spec_page (struct import_assistant *ia);
-void reset_sheet_spec_page (struct import_assistant *);
-void post_sheet_spec_page (struct import_assistant *ia);
-
-void prepare_first_line_page (struct import_assistant *ia);
-void reset_first_line_page (struct import_assistant *);
-
-void reset_intro_page (struct import_assistant *ia);
-
-void prepare_separators_page (struct import_assistant *ia);
-void reset_separators_page (struct import_assistant *);
-void destroy_separators_page (struct import_assistant *ia);
-
-void prepare_formats_page (struct import_assistant *ia);
-void reset_formats_page (struct import_assistant *);
-void destroy_formats_page (struct import_assistant *ia);
-
-struct import_assistant * init_assistant (GtkWindow *);
-void destroy_assistant (struct import_assistant *);
-
-
-#endif
index 0fd1875d32abbf874bda8a3b261dc2c495463e7b..0ee8f9737e19c00eb7f8ff70b1351c307d89438e 100644 (file)
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.18.3 -->
 <interface>
-  <!-- interface-requires gtk+ 2.12 -->
-  <!-- interface-naming-policy project-wide -->
-  <object class="GtkWindow" id="Intro">
+  <requires lib="gtk+" version="3.0"/>
+  <object class="GtkBox" id="FirstLine">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">12</property>
-    <property name="title" translatable="yes">Importing Textual Data</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">6</property>
     <child>
-      <object class="GtkBox" id="vbox3">
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+      <object class="GtkLabel" id="label3">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Select the first line of the data file that contains data.</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkScrolledWindow" id="first-line-scroller">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkCheckButton" id="variable-names">
+        <property name="label" translatable="yes">Line above selected line contains variable names</property>
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
+        <property name="receives_default">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="xalign">0.5</property>
+        <property name="draw_indicator">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">2</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkBox" id="Formats">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkLabel" id="label12">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Check the data formats displayed below and fix any that are incorrect.  You may set other variable properties now or later.</property>
+        <property name="wrap">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">False</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkPaned" id="vpaned1">
+        <property name="visible">True</property>
+        <property name="can_focus">True</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
         <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
+        <property name="position">94</property>
         <child>
-          <object class="GtkLabel" id="intro-label">
+          <object class="GtkFrame" id="frame4">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">This assistant will guide you through the process of importing data into PSPP from a text file with one line per case,  in which fields are separated by tabs, commas, or other delimiters.
-
-           The selected file contains N lines of text.  Only the first M of these will be shown for preview purposes in the following screens.  You may choose below how much of the file should actually be imported.</property>
-            <property name="wrap">True</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkScrolledWindow" id="vars-scroller">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="margin_start">12</property>
+                <child>
+                  <placeholder/>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label10">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">&lt;b&gt;Variables&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
           </object>
           <packing>
-            <property name="position">0</property>
+            <property name="resize">False</property>
+            <property name="shrink">True</property>
           </packing>
         </child>
         <child>
-          <object class="GtkAlignment" id="alignment10">
+          <object class="GtkFrame" id="frame5">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="xscale">0</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkFrame" id="frame7">
+              <object class="GtkScrolledWindow" id="data-scroller">
                 <property name="visible">True</property>
+                <property name="can_focus">True</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment11">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkGrid" id="button-table">
-                        <property name="visible">True</property>
-                        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-                        <child>
-                          <object class="GtkRadioButton" id="import-all-cases">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="import-n-cases">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">import-all-cases</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkRadioButton" id="import-percent">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="active">True</property>
-                            <property name="draw_indicator">True</property>
-                            <property name="group">import-all-cases</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="label1">
-                            <property name="visible">True</property>
-                            <property name="xalign">0</property>
-                            <property name="label" translatable="yes">All cases</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">1</property>
-                            <property name="top-attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                        <child>
-                          <placeholder/>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label8">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Amount to Import&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+                <property name="margin_start">12</property>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="label11">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="label" translatable="yes">&lt;b&gt;Data Preview&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
               </object>
             </child>
           </object>
           <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
     </child>
   </object>
-  <object class="GtkWindow" id="FirstLine">
+  <object class="GtkBox" id="Intro">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">12</property>
-    <property name="title" translatable="yes">Select Data to Import</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
     <child>
-      <object class="GtkBox" id="vbox2">
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+      <object class="GtkLabel" id="intro-label">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">6</property>
-        <child>
-          <object class="GtkLabel" id="label3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Select the first line of the data file that contains data.</property>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
+        <property name="label" translatable="yes">This assistant will guide you through the process of importing data into PSPP from a text file with one line per case,  in which fields are separated by tabs, commas, or other delimiters.
+
+       The selected file contains N lines of text.  Only the first M of these will be shown for preview purposes in the following screens.  You may choose below how much of the file should actually be imported.</property>
+        <property name="wrap">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame7">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
         <child>
-          <object class="GtkScrolledWindow" id="first-line-scroller">
+          <object class="GtkGrid" id="button-table">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="hscrollbar_policy">automatic</property>
-            <property name="vscrollbar_policy">automatic</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">12</property>
+            <property name="orientation">vertical</property>
             <child>
-              <object class="PsppSheetView" id="first-line">
+              <object class="GtkRadioButton" id="import-all-cases">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                <property name="receives_default">False</property>
+                <property name="xalign">0</property>
+                <property name="active">True</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="import-n-cases">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">import-all-cases</property>
               </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkRadioButton" id="import-percent">
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="xalign">0</property>
+                <property name="draw_indicator">True</property>
+                <property name="group">import-all-cases</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">All cases</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
             </child>
           </object>
-          <packing>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-            <property name="position">1</property>
-          </packing>
         </child>
-        <child>
-          <object class="GtkCheckButton" id="variable-names">
-            <property name="label" translatable="yes">Line above selected line contains variable names</property>
+        <child type="label">
+          <object class="GtkLabel" id="label8">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
-            <property name="receives_default">False</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="draw_indicator">True</property>
+            <property name="label" translatable="yes">&lt;b&gt;Amount to Import&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">2</property>
-          </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
     </child>
   </object>
-  <object class="GtkWindow" id="Separators">
+  <object class="GtkBox" id="Separators">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">12</property>
-    <property name="title" translatable="yes">Choose Separators</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
     <child>
-      <object class="GtkBox" id="vbox4">
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+      <object class="GtkBox" id="hbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
-          <object class="GtkBox" id="hbox2">
-            <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
+          <object class="GtkFrame" id="foo">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="spacing">12</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkFrame" id="foo">
+              <object class="GtkGrid" id="table1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="margin_start">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment1">
+                  <object class="GtkEntry" id="custom-entry">
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkGrid" id="table1">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="row_spacing">6</property>
-                        <property name="column_spacing">6</property>
-                        <child>
-                          <object class="GtkEntry" id="custom-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">3</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="custom-cb">
-                            <property name="label" translatable="yes">C_ustom</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">3</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="slash">
-                            <property name="label" translatable="yes">Slas_h (/)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="semicolon">
-                            <property name="label" translatable="yes">Semicolo_n (;)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="pipe">
-                            <property name="label" translatable="yes">P_ipe (|)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="hyphen">
-                            <property name="label" translatable="yes">H_yphen (-)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="comma">
-                            <property name="label" translatable="yes">Co_mma (,)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="colon">
-                            <property name="label" translatable="yes">_Colon (:)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="bang">
-                            <property name="label" translatable="yes">Ban_g (!)</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">2</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="tab">
-                            <property name="label" translatable="yes">Ta_b</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="space">
-                            <property name="label" translatable="yes">_Space</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">3</property>
+                    <property name="width">2</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label5">
+                <child>
+                  <object class="GtkCheckButton" id="custom-cb">
+                    <property name="label" translatable="yes">C_ustom</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Separators&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">3</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="position">0</property>
-              </packing>
-            </child>
-            <child>
-              <object class="GtkFrame" id="frame2">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment2">
+                  <object class="GtkCheckButton" id="slash">
+                    <property name="label" translatable="yes">Slas_h (/)</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkGrid" id="table2">
-                        <property name="visible">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="column_spacing">6</property>
-                        <property name="row_spacing">6</property>
-                        <child>
-                          <object class="GtkComboBox" id="quote-combo">
-                            <property name="has-entry">True</property>
-                            <property name="visible">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="has_frame">False</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="width">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="quote-cb">
-                            <property name="label" translatable="yes">Quote separator characters with</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">2</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label7">
+                <child>
+                  <object class="GtkCheckButton" id="semicolon">
+                    <property name="label" translatable="yes">Semicolo_n (;)</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Quoting&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">2</property>
+                  </packing>
                 </child>
-              </object>
-              <packing>
-                <property name="position">1</property>
-              </packing>
-            </child>
-          </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="position">0</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkFrame" id="frame3">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label_xalign">0</property>
-            <property name="shadow_type">none</property>
-            <child>
-              <object class="GtkAlignment" id="alignment3">
-                <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="left_padding">12</property>
                 <child>
-                  <object class="GtkScrolledWindow" id="fields-scroller">
+                  <object class="GtkCheckButton" id="pipe">
+                    <property name="label" translatable="yes">P_ipe (|)</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="hscrollbar_policy">automatic</property>
-                    <property name="vscrollbar_policy">automatic</property>
-                    <child>
-                      <object class="PsppSheetView" id="fields">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                      </object>
-                    </child>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">2</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="hyphen">
+                    <property name="label" translatable="yes">H_yphen (-)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="comma">
+                    <property name="label" translatable="yes">Co_mma (,)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="colon">
+                    <property name="label" translatable="yes">_Colon (:)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="bang">
+                    <property name="label" translatable="yes">Ban_g (!)</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">2</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="tab">
+                    <property name="label" translatable="yes">Ta_b</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
+                  </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkCheckButton" id="space">
+                    <property name="label" translatable="yes">_Space</property>
+                    <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
+                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+                    <property name="use_underline">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
               </object>
             </child>
             <child type="label">
-              <object class="GtkLabel" id="label9">
+              <object class="GtkLabel" id="label5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label" translatable="yes">&lt;b&gt;Fields Preview&lt;/b&gt;</property>
+                <property name="label" translatable="yes">&lt;b&gt;Separators&lt;/b&gt;</property>
                 <property name="use_markup">True</property>
               </object>
             </child>
           </object>
-          <packing>
-            <property name="position">1</property>
-            <property name="expand">True</property>
-            <property name="fill">True</property>
-          </packing>
-        </child>
-      </object>
-    </child>
-  </object>
-  <object class="GtkWindow" id="Formats">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">12</property>
-    <property name="title" translatable="yes">Adjust Variable Formats</property>
-    <child>
-      <object class="GtkBox" id="vbox5">
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
-        <property name="visible">True</property>
-        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
-        <child>
-          <object class="GtkLabel" id="label12">
-            <property name="visible">True</property>
-            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Check the data formats displayed below and fix any that are incorrect.  You may set other variable properties now or later.</property>
-            <property name="wrap">True</property>
-          </object>
           <packing>
             <property name="expand">False</property>
-            <property name="fill">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <object class="GtkPaned" id="vpaned1">
-            <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+          <object class="GtkFrame" id="frame2">
             <property name="visible">True</property>
-            <property name="can_focus">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="position">94</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
             <child>
-              <object class="GtkFrame" id="frame4">
+              <object class="GtkGrid" id="table2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
+                <property name="margin_start">12</property>
+                <property name="row_spacing">6</property>
+                <property name="column_spacing">6</property>
                 <child>
-                  <object class="GtkAlignment" id="alignment5">
+                  <object class="GtkComboBox" id="quote-combo">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="vars-scroller">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <child>
-                          <placeholder/>
-                        </child>
+                    <property name="has_frame">False</property>
+                    <property name="has_entry">True</property>
+                    <child internal-child="entry">
+                      <object class="GtkEntry" id="combobox-entry1">
+                        <property name="can_focus">False</property>
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="left_attach">1</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label10">
+                <child>
+                  <object class="GtkCheckButton" id="quote-cb">
+                    <property name="label" translatable="yes">Quote separator characters with</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Variables&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
+                    <property name="xalign">0.5</property>
+                    <property name="draw_indicator">True</property>
                   </object>
+                  <packing>
+                    <property name="left_attach">0</property>
+                    <property name="top_attach">0</property>
+                  </packing>
                 </child>
               </object>
-              <packing>
-                <property name="resize">False</property>
-                <property name="shrink">True</property>
-              </packing>
             </child>
-            <child>
-              <object class="GtkFrame" id="frame5">
+            <child type="label">
+              <object class="GtkLabel" id="label7">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment6">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkScrolledWindow" id="data-scroller">
-                        <property name="visible">True</property>
-                        <property name="can_focus">True</property>
-                        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                        <property name="hscrollbar_policy">automatic</property>
-                        <property name="vscrollbar_policy">automatic</property>
-                        <child>
-                          <object class="PsppSheetView" id="data">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                          </object>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label11">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Data Preview&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+                <property name="label" translatable="yes">&lt;b&gt;Quoting&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
               </object>
-              <packing>
-                <property name="resize">True</property>
-                <property name="shrink">True</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="position">1</property>
-            <property name="expand">True</property>
+            <property name="expand">False</property>
             <property name="fill">True</property>
+            <property name="position">1</property>
           </packing>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
     </child>
-  </object>
-  <object class="GtkWindow" id="Sheet">
-    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-    <property name="border_width">12</property>
-    <property name="title" translatable="yes">Importing Spreadsheet Data</property>
     <child>
-      <object class="GtkBox" id="vbox1">
-        <property name="orientation">GTK_ORIENTATION_VERTICAL</property>
+      <object class="GtkFrame" id="frame3">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">12</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
         <child>
-          <object class="GtkLabel" id="intro-label1">
+          <object class="GtkScrolledWindow" id="fields-scroller">
             <property name="visible">True</property>
+            <property name="can_focus">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="label" translatable="yes">Enter below the sheet number and the cell range which you wish to import.</property>
-            <property name="wrap">True</property>
+            <property name="margin_start">12</property>
           </object>
-          <packing>
-            <property name="position">0</property>
-          </packing>
         </child>
-        <child>
-          <object class="GtkAlignment" id="alignment4">
+        <child type="label">
+          <object class="GtkLabel" id="label9">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="xscale">0</property>
+            <property name="label" translatable="yes">&lt;b&gt;Fields Preview&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
+        </child>
+      </object>
+      <packing>
+        <property name="expand">True</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
+    </child>
+  </object>
+  <object class="GtkBox" id="Spreadsheet-Importer">
+    <property name="visible">True</property>
+    <property name="can_focus">False</property>
+    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+    <property name="orientation">vertical</property>
+    <property name="spacing">12</property>
+    <child>
+      <object class="GtkLabel" id="intro-label1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label" translatable="yes">Enter below the sheet number and the cell range which you wish to import.</property>
+        <property name="wrap">True</property>
+      </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">0</property>
+      </packing>
+    </child>
+    <child>
+      <object class="GtkFrame" id="frame1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+        <property name="label_xalign">0</property>
+        <property name="shadow_type">none</property>
+        <child>
+          <object class="GtkGrid" id="table3">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="margin_start">12</property>
             <child>
-              <object class="GtkFrame" id="frame1">
+              <object class="GtkEntry" id="cell-range-entry">
                 <property name="visible">True</property>
-                <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                <property name="label_xalign">0</property>
-                <property name="shadow_type">none</property>
-                <child>
-                  <object class="GtkAlignment" id="alignment7">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="left_padding">12</property>
-                    <child>
-                      <object class="GtkGrid" id="table3">
-                        <property name="visible">True</property>
-                        <property name="can_focus">False</property>
-                        <child>
-                          <object class="GtkEntry" id="cell-range-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="invisible_char">&#x25CF;</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkComboBox" id="sheet-entry">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="active">0</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">1</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="cell-range-label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Cells: </property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">cell-range-entry</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="sheet-label">
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="xalign">1</property>
-                            <property name="label" translatable="yes">_Sheet Index: </property>
-                            <property name="use_underline">True</property>
-                            <property name="mnemonic_widget">sheet-entry</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">1</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkCheckButton" id="readnames-checkbox">
-                            <property name="label" translatable="yes">Use first row as _variable names</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_underline">True</property>
-                            <property name="xalign">0.5</property>
-                            <property name="image_position">right</property>
-                            <property name="draw_indicator">True</property>
-                          </object>
-                          <packing>
-                            <property name="left_attach">0</property>
-                            <property name="top_attach">2</property>
-                            <property name="width">2</property>
-                          </packing>
-                        </child>
-                      </object>
-                    </child>
-                  </object>
-                </child>
-                <child type="label">
-                  <object class="GtkLabel" id="label4">
-                    <property name="visible">True</property>
-                    <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-                    <property name="label" translatable="yes">&lt;b&gt;Cells to Import&lt;/b&gt;</property>
-                    <property name="use_markup">True</property>
-                  </object>
-                </child>
+                <property name="can_focus">True</property>
+                <property name="invisible_char">●</property>
+              </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="sheet-entry">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="active">0</property>
               </object>
+              <packing>
+                <property name="left_attach">1</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="cell-range-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Cells: </property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">cell-range-entry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkLabel" id="sheet-label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">1</property>
+                <property name="label" translatable="yes">_Sheet Index: </property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">sheet-entry</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkCheckButton" id="readnames-checkbox">
+                <property name="label" translatable="yes">Use first row as _variable names</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
+                <property name="use_underline">True</property>
+                <property name="xalign">0</property>
+                <property name="image_position">right</property>
+                <property name="draw_indicator">True</property>
+              </object>
+              <packing>
+                <property name="left_attach">0</property>
+                <property name="top_attach">2</property>
+                <property name="width">2</property>
+              </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">False</property>
-            <property name="fill">False</property>
-            <property name="position">1</property>
-          </packing>
+        </child>
+        <child type="label">
+          <object class="GtkLabel" id="label4">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+            <property name="label" translatable="yes">&lt;b&gt;Cells to Import&lt;/b&gt;</property>
+            <property name="use_markup">True</property>
+          </object>
         </child>
       </object>
+      <packing>
+        <property name="expand">False</property>
+        <property name="fill">True</property>
+        <property name="position">1</property>
+      </packing>
     </child>
   </object>
 </interface>