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
/
page-assistant.c
diff --git
a/src/ui/gui/page-assistant.c
b/src/ui/gui/page-assistant.c
index 608412b03cd8db782f5fdf8dcc09bf1a92a29307..a83fbb2cd5add5204aa9e315c2336ee830f27fea 100644
(file)
--- a/
src/ui/gui/page-assistant.c
+++ b/
src/ui/gui/page-assistant.c
@@
-158,10
+158,12
@@
on_prepare (GtkAssistant *assistant, GtkWidget *page,
if ( ia->spreadsheet)
{
if (pn == 0)
if ( ia->spreadsheet)
{
if (pn == 0)
- {
- }
+ {
+ prepare_sheet_spec_page (ia);
+ }
else if (pn == 1)
{
else if (pn == 1)
{
+ post_sheet_spec_page (ia);
prepare_formats_page (ia);
}
}
prepare_formats_page (ia);
}
}
@@
-228,6
+230,8
@@
on_reset (GtkButton *button, struct import_assistant *ia)
reset_separators_page (ia);
else if (page == assist_get_page ((struct assist_page *) ia->formats))
reset_formats_page (ia);
reset_separators_page (ia);
else if (page == assist_get_page ((struct assist_page *) ia->formats))
reset_formats_page (ia);
+ else if (page == assist_get_page ((struct assist_page *) ia->sheet_spec))
+ reset_sheet_spec_page (ia);
}
/* Causes the assistant to close, returning RESPONSE for
}
/* Causes the assistant to close, returning RESPONSE for