#include <errno.h>
#include <fcntl.h>
-#include <gtk-contrib/psppire-sheet.h>
#include <gtk/gtk.h>
#include <limits.h>
#include <stdlib.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"
struct casereader *reader;
struct dictionary *dict;
- struct spreadsheet_read_info sri;
struct spreadsheet_read_options opts;
};
(ia->spreadsheet->type == SPREADSHEET_GNUMERIC) ? "GNM" : "ODS",
ia->file.file_name,
ssp->opts.sheet_index,
- ssp->sri.read_names ? "ON" : "OFF");
+ ssp->opts.read_names ? "ON" : "OFF");
if (range && 0 != strcmp ("", range))
{
GtkBuilder *builder = ia->asst.builder;
GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
+ GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry),
psppire_spreadsheet_model_new (ia->spreadsheet));
gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE);
}
void
reset_sheet_spec_page (struct import_assistant *ia)
{
- printf ("%s\n", __FUNCTION__);
+ GtkBuilder *builder = ia->asst.builder;
+ GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
+ GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
+
+ gtk_combo_box_set_active (GTK_COMBO_BOX (sheet_entry), 0);
+
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (readnames_checkbox), FALSE);
}
/* Called when the Forward button is clicked,
if ( convert_cell_ref (range, &col_start, &row_start, &col_stop, &row_stop))
{
- ssp->opts.cell_range = range;
+ ssp->opts.cell_range = g_strdup (range);
}
- ssp->sri.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
- ssp->sri.asw = -1;
+ ssp->opts.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
+ ssp->opts.asw = -1;
switch (ia->spreadsheet->type)
{
case SPREADSHEET_ODS:
- {
- creader = ods_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
- dict = ia->spreadsheet->dict;
- }
- break;
case SPREADSHEET_GNUMERIC:
{
- creader = gnumeric_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
+ creader = spreadsheet_make_reader (ia->spreadsheet, &ssp->opts);
dict = ia->spreadsheet->dict;
}
break;