From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 6 May 2017 06:26:23 +0000 (+0200)
Subject: Add (empty) variable sheet for import assistant
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6dbe135dc0a825499276fa2e4ade71f110e53a4f;p=pspp

Add (empty) variable sheet for import assistant
---

diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c
index c6ba5fb5d4..6441e47193 100644
--- a/src/ui/gui/psppire-import-assistant.c
+++ b/src/ui/gui/psppire-import-assistant.c
@@ -1799,6 +1799,8 @@ on_variable_change (PsppireDict *dict, int dict_idx,
 static void
 prepare_formats_page (PsppireImportAssistant *ia)
 {
+  PsppireDict *dict = psppire_dict_new_from_dict (ia->dict);
+  g_object_set (ia->var_sheet, "data-model", dict, NULL);
 }
 
 static void
@@ -1806,11 +1808,22 @@ 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);
 
+  GtkWidget *vars_scroller = get_widget_assert (builder, "vars-scroller");
+  if (ia->var_sheet == NULL)
+    {
+      ia->var_sheet = psppire_variable_sheet_new ();
+
+      gtk_container_add (GTK_CONTAINER (vars_scroller), ia->var_sheet);
+
+      ia->dict = dict_create (get_default_encoding ());
+
+      gtk_widget_show_all (vars_scroller);
+    }
+
   add_page_to_assistant (ia, w,
 			 GTK_ASSISTANT_PAGE_CONFIRM, _("Adjust Variable Formats"));
 
diff --git a/src/ui/gui/psppire-import-assistant.h b/src/ui/gui/psppire-import-assistant.h
index 44dffdc7d9..dc69277546 100644
--- a/src/ui/gui/psppire-import-assistant.h
+++ b/src/ui/gui/psppire-import-assistant.h
@@ -136,6 +136,8 @@ struct _PsppireImportAssistant
   gboolean variable_names;        /* Variable names above first line of data? */
   struct dictionary *dict;
 
+  GtkWidget *var_sheet;
+
   struct spreadsheet *spreadsheet;
 };