projects
/
pspp
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into import-gui
[pspp]
/
src
/
ui
/
gui
/
text-data-import-dialog.c
diff --git
a/src/ui/gui/text-data-import-dialog.c
b/src/ui/gui/text-data-import-dialog.c
index d535734d08d78af2085f6ec1e556bac5d2791eb0..d24a23242d7a03810de1fff1545cbd679d82767d 100644
(file)
--- a/
src/ui/gui/text-data-import-dialog.c
+++ b/
src/ui/gui/text-data-import-dialog.c
@@
-19,6
+19,7
@@
#include "ui/gui/text-data-import-dialog.h"
#include "page-intro.h"
#include "ui/gui/text-data-import-dialog.h"
#include "page-intro.h"
+#include "page-sheet-spec.h"
#include "page-first-line.h"
#include "page-separators.h"
#include "page-formats.h"
#include "page-first-line.h"
#include "page-separators.h"
#include "page-formats.h"
@@
-77,6
+78,7
@@
text_data_import_assistant (PsppireDataWindow *dw)
{
GtkWindow *parent_window = GTK_WINDOW (dw);
struct import_assistant *ia = init_assistant (parent_window);
{
GtkWindow *parent_window = GTK_WINDOW (dw);
struct import_assistant *ia = init_assistant (parent_window);
+ struct sheet_spec_page *ssp ;
if (!init_file (ia, parent_window))
{
if (!init_file (ia, parent_window))
{
@@
-84,11
+86,17
@@
text_data_import_assistant (PsppireDataWindow *dw)
return;
}
return;
}
+ ssp = ia->sheet_spec;
+ if (ia->spreadsheet)
+ {
+ ia->sheet_spec = sheet_spec_page_create (ia);
+ }
+ else
{
ia->intro = intro_page_create (ia);
{
ia->intro = intro_page_create (ia);
- ia->separators = separators_page_create (ia);
ia->first_line = first_line_page_create (ia);
ia->first_line = first_line_page_create (ia);
+ ia->separators = separators_page_create (ia);
}
ia->formats = formats_page_create (ia);
}
ia->formats = formats_page_create (ia);
@@
-123,6
+131,7
@@
text_data_import_assistant (PsppireDataWindow *dw)
break;
}
break;
}
+ if (ssp)
{
destroy_formats_page (ia);
destroy_separators_page (ia);
{
destroy_formats_page (ia);
destroy_separators_page (ia);
@@
-223,6
+232,7
@@
generate_syntax (const struct import_assistant *ia)
{
struct string s = DS_EMPTY_INITIALIZER;
{
struct string s = DS_EMPTY_INITIALIZER;
+ if (ia->spreadsheet == NULL)
{
syntax_gen_pspp (&s,
"GET DATA"
{
syntax_gen_pspp (&s,
"GET DATA"
@@
-232,7
+242,6
@@
generate_syntax (const struct import_assistant *ia)
if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
syntax_gen_pspp (&s, " /ENCODING=%sq\n", ia->file.encoding);
if (ia->file.encoding && strcmp (ia->file.encoding, "Auto"))
syntax_gen_pspp (&s, " /ENCODING=%sq\n", ia->file.encoding);
-
intro_append_syntax (ia->intro, &s);
intro_append_syntax (ia->intro, &s);
@@
-245,7
+254,11
@@
generate_syntax (const struct import_assistant *ia)
formats_append_syntax (ia, &s);
apply_dict (ia->dict, &s);
}
formats_append_syntax (ia, &s);
apply_dict (ia->dict, &s);
}
-
+ else
+ {
+ return sheet_spec_gen_syntax (ia);
+ }
+
return ds_cstr (&s);
}
return ds_cstr (&s);
}