Merge branch 'master' into import-gui

[pspp] / src / ui / gui / page-assistant.c

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index f6ca9e8d10a57dcd003b7c1e62c05133349e7dea..e10d83d0c6a817d57c24bca512d15363b35f8fc0 100644 (file)
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -65,7 +65,6 @@ 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 *);
-static void close_assistant (struct import_assistant *, int response);
 
 /* Initializes IA's asst substructure.  PARENT_WINDOW must be the
    window to use as the assistant window's parent.  */
@@ -78,13 +77,13 @@ init_assistant (GtkWindow *parent_window)
   a->builder = builder_new ("text-data-import.ui");
   a->assistant = GTK_ASSISTANT (gtk_assistant_new ());
 
-  ia->sheet_spec = sheet_spec_page_create (ia);
-  ia->intro = intro_page_create (ia);
-  ia->separators = separators_page_create (ia);
-
-  ia->first_line = xzalloc (sizeof *ia->first_line);
-  ia->formats = xzalloc (sizeof *ia->formats);
-
+  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);
@@ -100,13 +99,6 @@ init_assistant (GtkWindow *parent_window)
   gtk_window_set_transient_for (GTK_WINDOW (a->assistant), parent_window);
   gtk_window_set_icon_name (GTK_WINDOW (a->assistant), "pspp");
 
-  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);
 
   return ia;
 }
@@ -160,14 +152,26 @@ static void
 on_prepare (GtkAssistant *assistant, GtkWidget *page,
             struct import_assistant *ia)
 {
-  struct sheet_spec_page *ssp = ia->sheet_spec;
-
   int pn = gtk_assistant_get_current_page (assistant);
-  g_print ("%s:%d Page %d %p\n", __FILE__, __LINE__, pn, page);
 
-#if 0  
-  if (pn == 1 && ssp->spreadsheet)
-    post_sheet_spec_page (ia);
+  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
+    {
+      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)
@@ -175,25 +179,13 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
   else
     gtk_widget_grab_focus (assistant->forward);
 
-
-  /* Prepare .... */
-  if (page == ia->separators->page)
-    prepare_separators_page (ia);
-  else if (page == ia->formats->page)
-    prepare_formats_page (ia);
-  else if (page == ia->sheet_spec->page && ssp->spreadsheet)
-    {
-      prepare_sheet_spec_page (ia);
-    }
-
-
-#endif
-  
+#if 0
   gtk_widget_show (ia->asst.reset_button);
   if (page == ia->formats->page)
     gtk_widget_show (ia->asst.paste_button);
   else
     gtk_widget_hide (ia->asst.paste_button);
+#endif
 }
 
 /* Called when the Cancel button in the assistant is clicked. */
@@ -246,7 +238,10 @@ static void
 close_assistant (struct import_assistant *ia, int response)
 {
   ia->asst.response = response;
-  g_main_loop_quit (ia->asst.main_loop);
+  /*  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));
 }