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 2647bb5c256006656c13d552783e8e26796d53da..bf09902bf9e68c19cf3894f3d37ff504334a6a98 100644
(file)
--- 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 <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.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 "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"
#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-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 "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
-#include "gl/error.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
@@
-81,40
+77,26
@@
init_file (struct import_assistant *ia, GtkWindow *parent_window)
{
enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
struct file *file = &ia->file;
{
enum { MAX_LINE_LEN = 16384 }; /* Max length of an acceptable line. */
struct file *file = &ia->file;
- struct spreadsheet_read_options opts;
file->lines = NULL;
file->file_name = choose_file (parent_window, &file->encoding);
if (file->file_name == NULL)
return false;
file->lines = NULL;
file->file_name = choose_file (parent_window, &file->encoding);
if (file->file_name == NULL)
return false;
- opts.sheet_name = NULL;
- opts.cell_range = NULL;
- opts.sheet_index = 1;
-
- opts.read_names = true;
- opts.asw = -1;
-
- printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-
if (ia->spreadsheet == NULL)
ia->spreadsheet = gnumeric_probe (file->file_name, false);
if (ia->spreadsheet == NULL)
ia->spreadsheet = gnumeric_probe (file->file_name, false);
- printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-
if (ia->spreadsheet == NULL)
ia->spreadsheet = ods_probe (file->file_name, false);
if (ia->spreadsheet == NULL)
ia->spreadsheet = ods_probe (file->file_name, false);
- printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
-
if (ia->spreadsheet == NULL)
{
struct string input;
struct line_reader *reader = line_reader_for_file (file->encoding, file->file_name, O_RDONLY);
if (reader == NULL)
{
if (ia->spreadsheet == NULL)
{
struct string input;
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;
}
return false;
}
@@
-156,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);
@@
-210,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,
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 ();
NULL);
g_object_set (dialog, "local-only", FALSE, NULL);
filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Text
f
iles"));
+ gtk_file_filter_set_name (filter, _("Text
F
iles"));
gtk_file_filter_add_mime_type (filter, "text/*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_file_filter_add_mime_type (filter, "text/*");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
@@
-260,7
+252,6
@@
choose_file (GtkWindow *parent_window, gchar **encodingp)
gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
gtk_file_filter_add_mime_type (filter, "application/vnd.oasis.opendocument.spreadsheet");
gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
gtk_file_chooser_set_extra_widget (
GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));
gtk_file_chooser_set_extra_widget (
GTK_FILE_CHOOSER (dialog), psppire_encoding_selector_new ("Auto", true));