From: Ben Pfaff <blp@gnu.org>
Date: Thu, 8 May 2008 23:58:56 +0000 (+0000)
Subject: Don't make the user wiggle the mouse to be able to click on the
X-Git-Tag: v0.6.0~19
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d23bd9d2e8d942bcf432140298947f075f6a1f7b;p=pspp-builds.git

Don't make the user wiggle the mouse to be able to click on the
Forward button twice in quick succession.
---

diff --git a/src/ui/gui/ChangeLog b/src/ui/gui/ChangeLog
index 29a54dfb..3a6202cc 100644
--- a/src/ui/gui/ChangeLog
+++ b/src/ui/gui/ChangeLog
@@ -2,14 +2,25 @@
 
 	Patch #6505.  Reviewed by John Darrington.
 
-	* text-data-import-dialog: (struct assistant) New member
+	* text-data-import-dialog.c: Don't make the user wiggle the mouse
+	to be able to click on the Forward button twice in quick
+	succession.
+	(add_page_to_assistant): Mark pages in the assistant complete
+	immediately.
+	(on_prepare): No longer mark pages complete upon first visit.
+
+2008-05-08  Ben Pfaff  <blp@gnu.org>
+
+	Patch #6505.  Reviewed by John Darrington.
+
+	* text-data-import-dialog.c: (struct assistant) New member
 	`watch_cursor'.
-	(revise_fields_preview) Change the mouse pointer to a watch to
+	(revise_fields_preview): Change the mouse pointer to a watch to
 	indicate that a long operation is ongoing.
-	(prepare_formats_page) Ditto.
-	(on_variable_change) Ditto.
-	(push_watch_cursor) New function.
-	(pop_watch_cursor) New function.
+	(prepare_formats_page): Ditto.
+	(on_variable_change): Ditto.
+	(push_watch_cursor): New function.
+	(pop_watch_cursor): New function.
 
 2008-05-08  John Darrington <john@darrington.wattle.id.au>
 
diff --git a/src/ui/gui/text-data-import-dialog.c b/src/ui/gui/text-data-import-dialog.c
index 57263f2d..1f176308 100644
--- a/src/ui/gui/text-data-import-dialog.c
+++ b/src/ui/gui/text-data-import-dialog.c
@@ -633,6 +633,7 @@ add_page_to_assistant (struct import_assistant *ia,
   gtk_assistant_append_page (ia->asst.assistant, content);
   gtk_assistant_set_page_type (ia->asst.assistant, content, type);
   gtk_assistant_set_page_title (ia->asst.assistant, content, title_copy);
+  gtk_assistant_set_page_complete (ia->asst.assistant, content, true);
 
   free (title_copy);
 
@@ -656,11 +657,6 @@ on_prepare (GtkAssistant *assistant, GtkWidget *page,
     gtk_widget_show (ia->asst.paste_button);
   else
     gtk_widget_hide (ia->asst.paste_button);
-
-  /* Make the user visit each page in the assistant once.  Seems
-     like a reasonable user interface, plus visiting the final
-     page is what constructs the dictionary. */
-  gtk_assistant_set_page_complete (assistant, page, true);
 }
 
 /* Called when the Cancel button in the assistant is clicked. */