X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-assistant.c;h=e287516f2ae22ceb9dbef2456a6758f9158e582a;hb=681924fb9b8db641a6dc81abfac0a985799446da;hp=e10d83d0c6a817d57c24bca512d15363b35f8fc0;hpb=ffe5ba65c269e9207308608139ea2cbb4fcb761f;p=pspp

diff --git a/src/ui/gui/page-assistant.c b/src/ui/gui/page-assistant.c
index e10d83d0c6..e287516f2a 100644
--- a/src/ui/gui/page-assistant.c
+++ b/src/ui/gui/page-assistant.c
@@ -20,7 +20,6 @@
 
 #include <errno.h>
 #include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
 #include <gtk/gtk.h>
 #include <limits.h>
 #include <stdlib.h>
@@ -36,7 +35,6 @@
 #include "libpspp/i18n.h"
 #include "libpspp/line-reader.h"
 #include "libpspp/message.h"
-#include "ui/gui/checkbox-treeview.h"
 #include "ui/gui/dialog-common.h"
 #include "ui/gui/executor.h"
 #include "ui/gui/helper.h"
@@ -46,9 +44,7 @@
 #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-var-store.h"
 
-#include "gl/error.h"
 #include "gl/intprops.h"
 #include "gl/xalloc.h"
 
@@ -154,10 +150,15 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
 {
   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);
+	{
+	  prepare_sheet_spec_page (ia);
+        }
       else if (pn == 1)
 	{
 	  post_sheet_spec_page (ia);
@@ -166,10 +167,23 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     }
   else
     {
-      if (pn == 0)
-	prepare_separators_page (ia);
-      else if (pn == 3)
-	prepare_formats_page (ia);
+      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;
+	}
     }
 
 
@@ -178,14 +192,6 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     gtk_widget_grab_focus (assistant->apply);
   else
     gtk_widget_grab_focus (assistant->forward);
-
-#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. */
@@ -215,21 +221,38 @@ on_paste (GtkButton *button, struct import_assistant *ia)
 static void
 on_reset (GtkButton *button, struct import_assistant *ia)
 {
-#if 0
-  gint page_num = gtk_assistant_get_current_page (ia->asst.assistant);
-  GtkWidget *page = gtk_assistant_get_nth_page (ia->asst.assistant, page_num);
-
-  if (page == ia->intro->page)
-    reset_intro_page (ia);
-  else if (page == ia->first_line->page)
-    reset_first_line_page (ia);
-  else if (page == ia->separators->page)
-    reset_separators_page (ia);
-  else if (page == ia->formats->page)
-    reset_formats_page (ia);
-  else if (page == ia->sheet_spec->page)
-    reset_sheet_spec_page (ia);
-#endif
+  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