X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-file.c;h=bf09902bf9e68c19cf3894f3d37ff504334a6a98;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=84b7928a27645689afc37a04a6268edbb1de33ff;hpb=bbc9e4f23035409965750a6970f888a3dfe649c6;p=pspp

diff --git a/src/ui/gui/page-file.c b/src/ui/gui/page-file.c
index 84b7928a27..bf09902bf9 100644
--- a/src/ui/gui/page-file.c
+++ b/src/ui/gui/page-file.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>
@@ -40,7 +39,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"
@@ -50,11 +48,9 @@
 #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 "ui/gui/psppire-scanf.h"
 #include "ui/syntax-gen.h"
 
-#include "gl/error.h"
 #include "gl/intprops.h"
 #include "gl/xalloc.h"
 
@@ -99,8 +95,8 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
     struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
     if (reader == NULL)
       {
-	msg (ME, _("Could not open `%s': %s"),
-	     file->file_name, strerror (errno));
+	msg_error (errno, _("Could not open `%s'"),
+	     file->file_name);
 	return false;
       }
 
@@ -142,17 +138,27 @@ init_file (struct import_assistant *ia, GtkWindow *parent_window)
 	return false;
       }
 
+
     /* Estimate the number of lines in the file. */
     if (file->line_cnt < MAX_PREVIEW_LINES)
-      file->total_lines = file->line_cnt;
+      {
+	file->total_lines = file->line_cnt;
+	file->total_is_exact = true;
+      }
     else
       {
 	struct stat s;
 	off_t position = line_reader_tell (reader);
 	if (fstat (line_reader_fileno (reader), &s) == 0 && position > 0)
-	  file->total_lines = (double) file->line_cnt / position * s.st_size;
+	  {
+	    file->total_lines = (double) file->line_cnt / position * s.st_size;
+	    file->total_is_exact = false;
+	  }
 	else
+	  {
 	  file->total_lines = 0;
+	  file->total_is_exact = true;
+	  }
       }
 
     line_reader_close (reader);
@@ -196,14 +202,14 @@ choose_file (GtkWindow *parent_window, gchar **encodingp)
   GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Import Delimited Text Data"),
                                         parent_window,
                                         GTK_FILE_CHOOSER_ACTION_OPEN,
-                                        GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                        GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+					_("Cancel"), GTK_RESPONSE_CANCEL,
+					_("Open"), GTK_RESPONSE_ACCEPT,
                                         NULL);
 
   g_object_set (dialog, "local-only", FALSE, NULL);
 
   filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Text files"));
+  gtk_file_filter_set_name (filter, _("Text Files"));
   gtk_file_filter_add_mime_type (filter, "text/*");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);