X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpage-separators.c;h=6e59202369f960c1b47b9f61c450996c9b9beb27;hb=03a7b96a587a58bda342b4eb5ce5f935880ba2b7;hp=e153a231f53a296698ccbddd08e2a1f2198abecf;hpb=b241f1232945bfc913633c3ecec68e997500e065;p=pspp diff --git a/src/ui/gui/page-separators.c b/src/ui/gui/page-separators.c index e153a231f5..6e59202369 100644 --- a/src/ui/gui/page-separators.c +++ b/src/ui/gui/page-separators.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2015 Free Software Foundation This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,11 +16,12 @@ #include +#include "page-separators.h" + #include "ui/gui/text-data-import-dialog.h" #include #include -#include #include #include #include @@ -36,7 +37,6 @@ #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" @@ -46,11 +46,9 @@ #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" -#include "gl/error.h" #include "gl/intprops.h" #include "gl/xalloc.h" @@ -64,7 +62,6 @@ struct separators_page /* How to break lines into columns. */ struct string separators; /* Field separators. */ struct string quotes; /* Quote characters. */ - bool escape; /* Doubled quotes yield a quote mark? */ GtkWidget *page; GtkWidget *custom_cb; @@ -72,8 +69,7 @@ struct separators_page GtkWidget *quote_cb; GtkWidget *quote_combo; GtkEntry *quote_entry; - GtkWidget *escape_cb; - GtkTreeView *fields_tree_view; + PsppSheetView *fields_tree_view; }; /* The "separators" page of the assistant. */ @@ -121,7 +117,7 @@ static const struct separator separators[] = #define SEPARATOR_CNT (sizeof separators / sizeof *separators) static void -set_quote_list (GtkComboBoxEntry *cb) +set_quote_list (GtkComboBox *cb) { GtkListStore *list = gtk_list_store_new (1, G_TYPE_STRING); GtkTreeIter iter; @@ -143,7 +139,7 @@ set_quote_list (GtkComboBoxEntry *cb) gtk_combo_box_set_model (GTK_COMBO_BOX (cb), GTK_TREE_MODEL (list)); g_object_unref (list); - gtk_combo_box_entry_set_text_column (cb, 0); + gtk_combo_box_set_entry_text_column (cb, 0); } /* Initializes IA's separators substructure. */ @@ -157,19 +153,17 @@ separators_page_create (struct import_assistant *ia) struct separators_page *p = xzalloc (sizeof *p); -#if 0 p->page = add_page_to_assistant (ia, get_widget_assert (builder, "Separators"), GTK_ASSISTANT_PAGE_CONTENT); -#endif + p->custom_cb = get_widget_assert (builder, "custom-cb"); p->custom_entry = get_widget_assert (builder, "custom-entry"); p->quote_combo = get_widget_assert (builder, "quote-combo"); p->quote_entry = GTK_ENTRY (gtk_bin_get_child (GTK_BIN (p->quote_combo))); p->quote_cb = get_widget_assert (builder, "quote-cb"); - p->escape_cb = get_widget_assert (builder, "escape"); - set_quote_list (GTK_COMBO_BOX_ENTRY (p->quote_combo)); - p->fields_tree_view = GTK_TREE_VIEW (get_widget_assert (builder, "fields")); + set_quote_list (GTK_COMBO_BOX (p->quote_combo)); + p->fields_tree_view = PSPP_SHEET_VIEW (get_widget_assert (builder, "fields")); g_signal_connect (p->quote_combo, "changed", G_CALLBACK (on_quote_combo_change), ia); g_signal_connect (p->quote_cb, "toggled", @@ -181,8 +175,6 @@ separators_page_create (struct import_assistant *ia) for (i = 0; i < SEPARATOR_CNT; i++) g_signal_connect (get_widget_assert (builder, separators[i].name), "toggled", G_CALLBACK (on_separator_toggle), ia); - g_signal_connect (p->escape_cb, "toggled", - G_CALLBACK (on_separator_toggle), ia); return p; } @@ -294,23 +286,18 @@ split_fields (struct import_assistant *ia) && ds_find_byte (&s->quotes, text.string[0]) != SIZE_MAX) { int quote = ss_get_byte (&text); - if (!s->escape) - ss_get_until (&text, quote, &field); - else - { - struct string s; - int c; - - ds_init_empty (&s); - while ((c = ss_get_byte (&text)) != EOF) - if (c != quote) - ds_put_byte (&s, c); - else if (ss_match_byte (&text, quote)) - ds_put_byte (&s, quote); - else - break; - field = ds_ss (&s); - } + struct string s; + int c; + + ds_init_empty (&s); + while ((c = ss_get_byte (&text)) != EOF) + if (c != quote) + ds_put_byte (&s, c); + else if (ss_match_byte (&text, quote)) + ds_put_byte (&s, quote); + else + break; + field = ds_ss (&s); } else ss_get_bytes (&text, ss_cspan (text, ds_ss (&s->separators)), @@ -391,7 +378,6 @@ choose_likely_separators (struct import_assistant *ia) find_commonest_chars (histogram, "\"'", "", &ia->separators->quotes); find_commonest_chars (histogram, ",;:/|!\t-", ",", &ia->separators->separators); - ia->separators->escape = true; } /* Chooses the most common character among those in TARGETS, @@ -501,10 +487,7 @@ set_separators (struct import_assistant *ia) any_quotes ? ds_cstr (&s->quotes) : "\""); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (s->quote_cb), any_quotes); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (s->escape_cb), - s->escape); gtk_widget_set_sensitive (s->quote_combo, any_quotes); - gtk_widget_set_sensitive (s->escape_cb, any_quotes); } /* Sets IA's separators substructure to match the widgets. */ @@ -529,14 +512,11 @@ get_separators (struct import_assistant *ia) if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (s->quote_cb))) { - gchar *text = gtk_combo_box_get_active_text ( - GTK_COMBO_BOX (s->quote_combo)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (s->quote_combo)))); ds_assign_cstr (&s->quotes, text); - g_free (text); } else ds_clear (&s->quotes); - s->escape = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (s->escape_cb)); } /* Called when the user changes the entry field for custom @@ -575,7 +555,6 @@ on_quote_cb_toggle (GtkToggleButton *quote_cb, struct import_assistant *ia) { bool is_active = gtk_toggle_button_get_active (quote_cb); gtk_widget_set_sensitive (ia->separators->quote_combo, is_active); - gtk_widget_set_sensitive (ia->separators->escape_cb, is_active); revise_fields_preview (ia); } @@ -588,3 +567,26 @@ on_separator_toggle (GtkToggleButton *toggle UNUSED, revise_fields_preview (ia); } + + +void +separators_append_syntax (const struct import_assistant *ia, struct string *s) +{ + int i; + ds_put_cstr (s, " /DELIMITERS=\""); + if (ds_find_byte (&ia->separators->separators, '\t') != SIZE_MAX) + ds_put_cstr (s, "\\t"); + if (ds_find_byte (&ia->separators->separators, '\\') != SIZE_MAX) + ds_put_cstr (s, "\\\\"); + for (i = 0; i < ds_length (&ia->separators->separators); i++) + { + char c = ds_at (&ia->separators->separators, i); + if (c == '"') + ds_put_cstr (s, "\"\""); + else if (c != '\t' && c != '\\') + ds_put_byte (s, c); + } + ds_put_cstr (s, "\"\n"); + if (!ds_is_empty (&ia->separators->quotes)) + syntax_gen_pspp (s, " /QUALIFIER=%sq\n", ds_cstr (&ia->separators->quotes)); +}