#include "ui/gui/psppire-scanf.h"
#include "ui/syntax-gen.h"
+#include "ui/gui/psppire-spreadsheet-model.h"
+
#include <data/casereader.h>
#include "gl/error.h"
struct import_assistant;
-
-
/* The "sheet-spec" page of the assistant. */
/* The sheet_spec page of the assistant (only relevant for spreadsheet imports). */
GtkWidget *page;
struct casereader *reader;
struct dictionary *dict;
- struct spreadsheet *spreadsheet;
struct spreadsheet_read_info sri;
struct spreadsheet_read_options opts;
};
+static void
+on_sheet_combo_changed (GtkComboBox *cb, struct import_assistant *ia)
+{
+ GtkTreeIter iter;
+ gchar *range = NULL;
+ GtkTreeModel *model = gtk_combo_box_get_model (cb);
+ GtkBuilder *builder = ia->asst.builder;
+ GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
-
-
+ gtk_combo_box_get_active_iter (cb, &iter);
+ gtk_tree_model_get (model, &iter, PSPPIRE_SPREADSHEET_MODEL_COL_RANGE, &range, -1);
+ gtk_entry_set_text (GTK_ENTRY (range_entry), range);
+ g_free (range);
+}
/* Initializes IA's sheet_spec substructure. */
struct sheet_spec_page *
GtkBuilder *builder = ia->asst.builder;
struct sheet_spec_page *p = xzalloc (sizeof (*p));
- p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Sheet"),
- GTK_ASSISTANT_PAGE_INTRO);
+ GtkWidget *combo_box = get_widget_assert (builder, "sheet-entry");
+ GtkCellRenderer *renderer = gtk_cell_renderer_text_new ();
+ gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), renderer, TRUE);
+ gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (combo_box), renderer,
+ "text", 0,
+ NULL);
+
+ g_signal_connect (combo_box, "changed", G_CALLBACK (on_sheet_combo_changed), ia);
return p;
}
void
prepare_sheet_spec_page (struct import_assistant *ia)
{
- struct sheet_spec_page *p = ia->sheet_spec;
-
GtkBuilder *builder = ia->asst.builder;
GtkWidget *sheet_entry = get_widget_assert (builder, "sheet-entry");
+ printf ("%s:%d %p\n", __FILE__, __LINE__, ia->spreadsheet);
+ gtk_combo_box_set_model (GTK_COMBO_BOX (sheet_entry),
+ psppire_spreadsheet_model_new (ia->spreadsheet));
- printf ("%s %d\n", __FUNCTION__, p->spreadsheet->sheets);
-
- gtk_spin_button_set_digits (GTK_SPIN_BUTTON (sheet_entry), 0);
- gtk_spin_button_set_range (GTK_SPIN_BUTTON (sheet_entry), 1, p->spreadsheet->sheets);
+ gtk_combo_box_set_active (sheet_entry, 0);
}
GtkWidget *range_entry = get_widget_assert (builder, "cell-range-entry");
GtkWidget *readnames_checkbox = get_widget_assert (builder, "readnames-checkbox");
- gint num = gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (sheet_entry));
-
const gchar *range = gtk_entry_get_text (GTK_ENTRY (range_entry));
+ gint num = 0;
if ( num < 1 )
num = 1;
ssp->sri.read_names = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (readnames_checkbox));
ssp->sri.asw = -1;
- switch (ssp->spreadsheet->type)
+ switch (ia->spreadsheet->type)
{
case SPREADSHEET_ODS:
{
- creader = ods_make_reader (ssp->spreadsheet, &ssp->sri, &ssp->opts);
- dict = ssp->spreadsheet->dict;
+ creader = ods_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
+ dict = ia->spreadsheet->dict;
}
break;
case SPREADSHEET_GNUMERIC:
{
- creader = gnumeric_make_reader (ssp->spreadsheet, &ssp->sri, &ssp->opts);
- dict = ssp->spreadsheet->dict;
+ creader = gnumeric_make_reader (ia->spreadsheet, &ssp->sri, &ssp->opts);
+ dict = ia->spreadsheet->dict;
}
break;
default:
struct sheet_spec_page *ssp = ia->sheet_spec;
int rows = 0;
-
if (ssp->dict)
{
struct ccase *c;