Merge remote branch 'origin/master' into import-gui

[pspp] / src / ui / gui / text-data-import-dialog.h

diff --git a/src/ui/gui/text-data-import-dialog.h b/src/ui/gui/text-data-import-dialog.h
index 0122312300af74ff30a2e496d4bacc80d96f9693..0c026858fe04665f59331ba63ec372474773a2a5 100644 (file)
--- a/src/ui/gui/text-data-import-dialog.h
+++ b/src/ui/gui/text-data-import-dialog.h
@@ -25,6 +25,11 @@
 
 enum { MAX_PREVIEW_LINES = 1000 }; /* Max number of lines to read. */
 
+struct assist_page
+{
+  GtkWidget *page;
+};
+
 /* The file to be imported. */
 struct file
   {
@@ -47,6 +52,7 @@ struct assistant
     GtkBuilder *builder;
     GtkAssistant *assistant;
     GMainLoop *main_loop;
+    bool loop_done;
     GtkWidget *paste_button;
     GtkWidget *reset_button;
     int response;
@@ -74,6 +80,8 @@ struct import_assistant
     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
@@ -142,6 +150,8 @@ 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);