projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Whitespace changes only
[pspp]
/
src
/
ui
/
gui
/
page-file.c
diff --git
a/src/ui/gui/page-file.c
b/src/ui/gui/page-file.c
index 10453b9f37e7dcd645b34ca90f277577b9636d6b..bf09902bf9e68c19cf3894f3d37ff504334a6a98 100644
(file)
--- a/
src/ui/gui/page-file.c
+++ b/
src/ui/gui/page-file.c
@@
-138,17
+138,27
@@
init_file (struct import_assistant *ia, GtkWindow *parent_window)
return false;
}
return false;
}
+
/* Estimate the number of lines in the file. */
if (file->line_cnt < MAX_PREVIEW_LINES)
/* 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)
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
else
+ {
file->total_lines = 0;
file->total_lines = 0;
+ file->total_is_exact = true;
+ }
}
line_reader_close (reader);
}
line_reader_close (reader);
@@
-192,8
+202,8
@@
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,
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);
NULL);
g_object_set (dialog, "local-only", FALSE, NULL);