From: John Darrington <john@darrington.wattle.id.au>
Date: Sat, 16 Feb 2013 10:48:00 +0000 (+0100)
Subject: Made the text import dialogs sort of work again
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e29a48cd6e626fb2542d5babcbdcc7f67c071d3;p=pspp

Made the text import dialogs sort of work again
---

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index 43f6a36287..b0b616e265 100644
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -165,6 +165,14 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
 	  prepare_formats_page (ia);
 	}
     }
+  else
+    {
+      if (pn == 0)
+	prepare_separators_page (ia);
+      else if (pn == 3)
+	prepare_formats_page (ia);
+    }
+
 
   if (gtk_assistant_get_page_type (assistant, page)
       == GTK_ASSISTANT_PAGE_CONFIRM)
@@ -174,14 +182,8 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
 
 
 
-#if 0  
-  /* Prepare .... */
-  if (page == ia->separators->page)
-    prepare_separators_page (ia);
-  else if (page == ia->formats->page)
-    prepare_formats_page (ia);
-
 
+#if 0
   gtk_widget_show (ia->asst.reset_button);
   if (page == ia->formats->page)
     gtk_widget_show (ia->asst.paste_button);
diff --git a/src/ui/gui/page-first-line.c b/src/ui/gui/page-first-line.c
index d1cec2cb4e..4109f043ee 100644
--- a/src/ui/gui/page-first-line.c
+++ b/src/ui/gui/page-first-line.c
@@ -89,10 +89,9 @@ first_line_page_create (struct import_assistant *ia)
 
   GtkBuilder *builder = ia->asst.builder;
 
-#if 0
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "FirstLine"),
                                    GTK_ASSISTANT_PAGE_CONTENT);
-#endif
+
   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);
diff --git a/src/ui/gui/page-intro.c b/src/ui/gui/page-intro.c
index 6ef991c314..e0d51f537c 100644
--- a/src/ui/gui/page-intro.c
+++ b/src/ui/gui/page-intro.c
@@ -109,13 +109,9 @@ intro_page_create (struct import_assistant *ia)
 			     1, 2,
 			     2, 3);
 
-#if 0
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Intro"),
                                    GTK_ASSISTANT_PAGE_INTRO);
 
-  g_print ("%s:%d Added page %p\n", __FILE__, __LINE__, p->page);
-#endif  
-
   p->all_cases_button = get_widget_assert (builder, "import-all-cases");
 
   p->n_cases_button = get_widget_assert (builder, "import-n-cases");
diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c
index 780742bf5b..fee511e0c3 100644
--- a/src/ui/gui/page-separators.c
+++ b/src/ui/gui/page-separators.c
@@ -159,10 +159,9 @@ separators_page_create (struct import_assistant *ia)
 
   struct separators_page *p = xzalloc (sizeof *p);
 
-#if 0
   p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Separators"),
                                    GTK_ASSISTANT_PAGE_CONTENT);
-#endif
+
   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");
diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index 412af5b8f4..ab7d743b1d 100644
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -97,6 +97,8 @@ text_data_import_assistant (PsppireDataWindow *dw)
       ia->intro = intro_page_create (ia);
       ia->separators = separators_page_create (ia);
       ia->first_line = first_line_page_create (ia);
+
+      printf ("%s:%d %p\n", __FILE__, __LINE__, ia->intro);
     }
   ia->formats = formats_page_create (ia);