X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-import-assistant.c;h=b88ab887cf4bdd61d4ea772b99f6fa02d5064588;hb=5b6f8f94c5f47443e7afe4cb4c38348d374b7dfa;hp=bd69629d84e803cc12e5519048e7d2e6dbb9c7d8;hpb=bde6336e802bed3c7bdb2249d02f8d190025774f;p=pspp diff --git a/src/ui/gui/psppire-import-assistant.c b/src/ui/gui/psppire-import-assistant.c index bd69629d84..b88ab887cf 100644 --- a/src/ui/gui/psppire-import-assistant.c +++ b/src/ui/gui/psppire-import-assistant.c @@ -189,16 +189,17 @@ struct separator /* All the separators in the dialog box. */ static const struct separator separators[] = { - {"space", ' '}, - {"tab", '\t'}, - {"bang", '!'}, - {"colon", ':'}, - {"comma", ','}, - {"hyphen", '-'}, - {"pipe", '|'}, + {"space", ' '}, + {"tab", '\t'}, + {"bang", '!'}, + {"colon", ':'}, + {"comma", ','}, + {"hyphen", '-'}, + {"pipe", '|'}, {"semicolon", ';'}, - {"slash", '/'}, + {"slash", '/'}, }; + #define SEPARATOR_CNT (sizeof separators / sizeof *separators) struct separator_count_node @@ -310,7 +311,8 @@ repopulate_delimiter_columns (PsppireImportAssistant *ia) gtk_tree_view_remove_column (GTK_TREE_VIEW (ia->fields_tree_view), tvc); } - gint n_fields = gtk_tree_model_get_n_columns (ia->delimiters_model); + gint n_fields = + gtk_tree_model_get_n_columns (GTK_TREE_MODEL (ia->delimiters_model)); /* ... and put them back again. */ gint f; @@ -370,9 +372,10 @@ reset_tree_view_model (PsppireImportAssistant *ia) static void prepare_separators_page (PsppireImportAssistant *ia, GtkWidget *page) { - gtk_tree_view_set_model (GTK_TREE_VIEW (ia->fields_tree_view), ia->delimiters_model); + gtk_tree_view_set_model (GTK_TREE_VIEW (ia->fields_tree_view), + GTK_TREE_MODEL (ia->delimiters_model)); - g_signal_connect_swapped (ia->delimiters_model, "notify::delimiters", + g_signal_connect_swapped (GTK_TREE_MODEL (ia->delimiters_model), "notify::delimiters", G_CALLBACK (reset_tree_view_model), ia); @@ -820,7 +823,6 @@ render_text_preview_line (GtkTreeViewColumn *tree_column, Set the text to a "insensitive" state if the row is greater than what the user declared to be the maximum. */ - PsppireImportAssistant *ia = PSPPIRE_IMPORT_ASSISTANT (data); GtkTreePath *path = gtk_tree_model_get_path (tree_model, iter); gint *ii = gtk_tree_path_get_indices (path); gint max_lines; @@ -845,6 +847,7 @@ first_line_page_create (PsppireImportAssistant *ia) if (ia->first_line_tree_view == NULL) { ia->first_line_tree_view = gtk_tree_view_new (); + g_object_set (ia->first_line_tree_view, "enable-search", FALSE, NULL); gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (ia->first_line_tree_view), TRUE); @@ -1045,8 +1048,6 @@ set_quote_list (GtkComboBox *cb) gtk_combo_box_set_entry_text_column (cb, 0); } - - /* Chooses a name for each column on the separators page */ static void choose_column_names (PsppireImportAssistant *ia) @@ -1055,7 +1056,9 @@ choose_column_names (PsppireImportAssistant *ia) unsigned long int generated_name_count = 0; dict_clear (ia->dict); - for (i = 0; i < gtk_tree_model_get_n_columns (ia->delimiters_model) - 1; ++i) + for (i = 0; + i < gtk_tree_model_get_n_columns (GTK_TREE_MODEL (ia->delimiters_model)) - 1; + ++i) { const gchar *candidate_name = NULL; @@ -1073,8 +1076,6 @@ choose_column_names (PsppireImportAssistant *ia) } } - - /* Called when the user toggles one of the separators checkboxes. */ static void @@ -1165,6 +1166,7 @@ separators_page_create (PsppireImportAssistant *ia) { GtkWidget *scroller = get_widget_assert (ia->builder, "fields-scroller"); ia->fields_tree_view = gtk_tree_view_new (); + g_object_set (ia->fields_tree_view, "enable-search", FALSE, NULL); gtk_container_add (GTK_CONTAINER (scroller), GTK_WIDGET (ia->fields_tree_view)); gtk_widget_show_all (scroller); } @@ -1247,35 +1249,6 @@ my_advance (struct casereader *reader, void *aux, casenumber cnt) g_print ("%s:%d\n", __FILE__, __LINE__); } -static void -foo (struct dictionary *dict, void *aux) -{ - PsppireImportAssistant *ia = PSPPIRE_IMPORT_ASSISTANT (aux); - g_print ("%s:%d\n", __FILE__, __LINE__); - - struct caseproto *proto = caseproto_create (); - - int i; - for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i) - { - const struct variable *var = dict_get_var (ia->dict, i); - proto = caseproto_add_width (proto, var_get_width (var)); - } - - - gint n_rows = gtk_tree_model_iter_n_children (ia->delimiters_model, NULL); - - struct casereader *reader = - casereader_create_random (proto, n_rows, &my_casereader_class, ia); - - - PsppireDataStore *store = NULL; - - g_object_get (ia->data_sheet, "data-model", &store, NULL); - - psppire_data_store_set_reader (store, reader); -} - /* Called just before the formats page of the assistant is displayed. */ static void @@ -1297,18 +1270,18 @@ prepare_formats_page (PsppireImportAssistant *ia) fg[i] = fmt_guesser_create (); } - gint n_rows = gtk_tree_model_iter_n_children (ia->delimiters_model, NULL); + gint n_rows = gtk_tree_model_iter_n_children (GTK_TREE_MODEL (ia->delimiters_model), NULL); GtkTreeIter iter; gboolean ok; - for (ok = gtk_tree_model_get_iter_first (ia->delimiters_model, &iter); + for (ok = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ia->delimiters_model), &iter); ok; - ok = gtk_tree_model_iter_next (ia->delimiters_model, &iter)) + ok = gtk_tree_model_iter_next (GTK_TREE_MODEL (ia->delimiters_model), &iter)) { for (i = 0 ; i < dict_get_var_cnt (ia->dict); ++i) { gchar *s = NULL; - gtk_tree_model_get (ia->delimiters_model, &iter, i+1, &s, -1); + gtk_tree_model_get (GTK_TREE_MODEL (ia->delimiters_model), &iter, i+1, &s, -1); if (s) fmt_guesser_add (fg[i], ss_cstr (s)); free (s); @@ -1335,8 +1308,6 @@ prepare_formats_page (PsppireImportAssistant *ia) free (fg); - // dict_set_change_callback (ia->dict, foo, ia); - struct casereader *reader = casereader_create_random (proto, n_rows, &my_casereader_class, ia);