#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/psppire-empty-list-store.h"
#include "ui/gui/psppire-var-sheet.h"
-#include "gl/error.h"
#include "gl/intprops.h"
#include "gl/xalloc.h"
g_signal_connect (a->assistant, "prepare", G_CALLBACK (on_prepare), ia);
g_signal_connect (a->assistant, "cancel", G_CALLBACK (on_cancel), ia);
g_signal_connect (a->assistant, "close", G_CALLBACK (on_close), ia);
- a->paste_button = gtk_button_new_from_stock (GTK_STOCK_PASTE);
+ a->paste_button = gtk_button_new_with_label (_("Paste"));
gtk_assistant_add_action_widget (a->assistant, a->paste_button);
g_signal_connect (a->paste_button, "clicked", G_CALLBACK (on_paste), ia);
- a->reset_button = gtk_button_new_from_stock ("pspp-stock-reset");
+ a->reset_button = gtk_button_new_with_label (_("Reset"));
gtk_assistant_add_action_widget (a->assistant, a->reset_button);
g_signal_connect (a->reset_button, "clicked", G_CALLBACK (on_reset), ia);
gtk_window_set_title (GTK_WINDOW (a->assistant),
}
else
{
- if (pn == 0)
- prepare_separators_page (ia);
- else if (pn == 3)
- prepare_formats_page (ia);
+ switch (pn)
+ {
+ case 0:
+ reset_intro_page (ia);
+ break;
+ case 1:
+ reset_first_line_page (ia);
+ break;
+ case 2:
+ prepare_separators_page (ia);
+ reset_separators_page (ia);
+ break;
+ case 3:
+ prepare_formats_page (ia);
+ reset_formats_page (ia);
+ break;
+ }
}
+#if GTK3_TRANSITION
if (gtk_assistant_get_page_type (assistant, page)
== GTK_ASSISTANT_PAGE_CONFIRM)
gtk_widget_grab_focus (assistant->apply);
else
gtk_widget_grab_focus (assistant->forward);
+#endif
}
/* Called when the Cancel button in the assistant is clicked. */
close_assistant (ia, PSPPIRE_RESPONSE_PASTE);
}
-static GtkWidget *
-assist_get_page (struct assist_page *ap)
-{
- if (ap == NULL)
- return NULL;
-
- return ap->page;
-}
-
/* Called when the Reset button is clicked. */
static void
on_reset (GtkButton *button, struct import_assistant *ia)
{
- gint page_num = gtk_assistant_get_current_page (ia->asst.assistant);
- GtkWidget *page = gtk_assistant_get_nth_page (ia->asst.assistant, page_num);
-
- if (page == assist_get_page ((struct assist_page *) ia->intro))
- reset_intro_page (ia);
- else if (page == assist_get_page ((struct assist_page *) ia->first_line))
- reset_first_line_page (ia);
- else if (page == assist_get_page ((struct assist_page *) ia->separators))
- 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);
+ gint pn = gtk_assistant_get_current_page (ia->asst.assistant);
+
+ if ( ia->spreadsheet)
+ {
+ switch (pn)
+ {
+ case 0:
+ reset_sheet_spec_page (ia);
+ break;
+ case 1:
+ reset_formats_page (ia);
+ break;
+ }
+ }
+ else
+ {
+ switch (pn)
+ {
+ case 0:
+ reset_intro_page (ia);
+ break;
+ case 1:
+ reset_first_line_page (ia);
+ break;
+ case 2:
+ reset_separators_page (ia);
+ break;
+ case 3:
+ reset_formats_page (ia);
+ break;
+ }
+ }
}
/* Causes the assistant to close, returning RESPONSE for