gint current_page;
+ gchar *file_name;
+
/* START The chooser page of the assistant. */
GtkWidget *encoding_selector;
GtkFileFilter *default_filter;
/* START Page where the user chooses field separators. */
/* How to break lines into columns. */
- struct string separators; /* Field separators. */
+ // struct string separators; /* Field separators. */
struct string quotes; /* Quote characters. */
GtkWidget *custom_cb;
GtkWidget *custom_entry;
GtkWidget *quote_cb;
GtkWidget *quote_combo;
+
GtkEntry *quote_entry;
GtkWidget *fields_tree_view;
/* START Page where the user verifies and adjusts input formats. */
- GtkWidget *data_tree_view;
- PsppireDict *psppire_dict;
- struct variable **modified_vars;
- size_t modified_var_cnt;
+ struct variable **modified_vars;
+ size_t modified_var_cnt;
/* END Page where the user verifies and adjusts input formats. */
PsppireTextFile *text_file;
GtkTreeModel *delimiters_model;
-
+
struct sheet_spec_page *sheet_spec;
+#if MERGE_SHEET
/* The columns produced. */
struct column *columns; /* Information about each column. */
size_t column_cnt; /* Number of columns. */
int skip_lines; /* Number of initial lines to skip? */
gboolean variable_names; /* Variable names above first line of data? */
+#endif
+
struct dictionary *dict;
GtkWidget *var_sheet;