X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fvariable-info-dialog.c;h=fa9d51011e8d2fec88b14cd2439d606a65836fd3;hb=5c3291dc396b795696e94f47780308fd7ace6fc4;hp=bf770dcbaf30f009e3da1f32599f6617013457d1;hpb=a1fa03b1638263a959df0b2943478a0a4ca4b11a;p=pspp-builds.git diff --git a/src/ui/gui/variable-info-dialog.c b/src/ui/gui/variable-info-dialog.c index bf770dcb..fa9d5101 100644 --- a/src/ui/gui/variable-info-dialog.c +++ b/src/ui/gui/variable-info-dialog.c @@ -1,39 +1,35 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP - Copyright (C) 2007 Free Software Foundation +/* PSPPIRE - a graphical user interface for PSPP. + Copyright (C) 2007, 2009 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 - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. + 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 + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA - 02110-1301, USA. */ + You should have received a copy of the GNU General Public License + along with this program. If not, see . */ #include #include -#include -#include -#include "dict-display.h" #include "var-display.h" #include +#include #include -#include "data-editor.h" +#include "psppire-data-window.h" #include "psppire-dialog.h" #include "psppire-var-store.h" +#include "psppire-dictview.h" #include "helper.h" -#include #include -#include "syntax-editor.h" +#include +#include "helper.h" #include @@ -41,53 +37,58 @@ #define N_(msgid) msgid -static struct variable * -get_selected_variable (GtkTreeView *treeview) -{ - struct variable *var; - GtkTreeModel *top_model; - GtkTreeIter top_iter; +static const gchar none[] = N_("None"); - GtkTreeModel *model; - GtkTreeIter iter; - GtkTreeSelection *selection = gtk_tree_view_get_selection (treeview); +static gchar * +name_to_string (const struct variable *var, PsppireDict *dict) +{ + const char *name = var_get_name (var); + g_assert (name); - if (! gtk_tree_selection_get_selected (selection, - &top_model, &top_iter)) - { - return NULL; - } + return recode_string (UTF8, psppire_dict_encoding (dict), + name, -1); +} - get_base_model (top_model, &top_iter, &model, &iter); - g_assert (PSPPIRE_IS_DICT (model)); +static gchar * +label_to_string (const struct variable *var, PsppireDict *dict) +{ + const char *label = var_get_label (var); - gtk_tree_model_get (model, - &iter, DICT_TVM_COL_VAR, &var, -1); + if (! label) return g_strdup (none); - return var; + return recode_string (UTF8, psppire_dict_encoding (dict), + label, -1); } - static void -populate_text (GtkTreeView *treeview, gpointer data) +populate_text (PsppireDictView *treeview, gpointer data) { gchar *text = 0; GString *gstring; + PsppireDict *dict; + + GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (data)); + const struct variable *var = + psppire_dict_view_get_selected_variable (treeview); + + if ( var == NULL) + return; - GtkTextBuffer *textbuffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW(data)); - const struct variable *var = get_selected_variable (treeview); + g_object_get (treeview, + "dictionary", &dict, + NULL); gstring = g_string_sized_new (200); - text = name_to_string (var, NULL); + text = name_to_string (var, dict); g_string_assign (gstring, text); g_free (text); g_string_append (gstring, "\n"); - text = label_to_string (var, NULL); + text = label_to_string (var, dict); g_string_append_printf (gstring, _("Label: %s\n"), text); g_free (text); @@ -100,7 +101,7 @@ populate_text (GtkTreeView *treeview, gpointer data) g_string_append_printf (gstring, _("Type: %s\n"), buffer); } - text = missing_values_to_string (var, NULL); + text = missing_values_to_string (dict, var, NULL); g_string_append_printf (gstring, _("Missing Values: %s\n"), text); g_free (text); @@ -115,29 +116,31 @@ populate_text (GtkTreeView *treeview, gpointer data) /* Value Labels */ if ( var_has_value_labels (var)) { - struct val_labs_iterator *vli = 0; - struct val_lab *vl; - const struct val_labs *labs = var_get_value_labels (var); + const struct val_labs *vls = var_get_value_labels (var); + const struct val_lab **labels; + size_t n_labels; + size_t i; g_string_append (gstring, "\n"); g_string_append (gstring, _("Value Labels:\n")); -#if 1 - for (vl = val_labs_first_sorted (labs, &vli); - vl; - vl = val_labs_next (labs, &vli)) - { + labels = val_labs_sorted (vls); + n_labels = val_labs_count (vls); + for (i = 0; i < n_labels; i++) + { + const struct val_lab *vl = labels[i]; gchar *const vstr = value_to_text (vl->value, *var_get_print_format (var)); - text = pspp_locale_to_utf8 (vl->label, -1, NULL); + text = recode_string (UTF8, psppire_dict_encoding (dict), + val_lab_get_label (vl), -1); g_string_append_printf (gstring, _("%s %s\n"), vstr, text); g_free (text); g_free (vstr); } -#endif + free (labels); } gtk_text_buffer_set_text (textbuffer, gstring->str, gstring->len); @@ -145,35 +148,47 @@ populate_text (GtkTreeView *treeview, gpointer data) g_string_free (gstring, TRUE); } -static gchar * generate_syntax (GtkTreeView *treeview); +static gboolean +treeview_item_selected (gpointer data) +{ + GtkTreeView *tv = GTK_TREE_VIEW (data); + GtkTreeModel *model = gtk_tree_view_get_model (tv); + + gint n_rows = gtk_tree_model_iter_n_children (model, NULL); + + if ( n_rows == 0 ) + return FALSE; + + return TRUE; +} + + +static gchar * generate_syntax (PsppireDictView *treeview); void variable_info_dialog (GObject *o, gpointer data) { - struct data_editor *de = data; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); gint response ; - GladeXML *xml = XML_NEW ("psppire.glade"); + GtkBuilder *xml = builder_new ("variable-info-dialog.ui"); GtkWidget *dialog = get_widget_assert (xml, "variable-info-dialog"); GtkWidget *treeview = get_widget_assert (xml, "treeview2"); GtkWidget *textview = get_widget_assert (xml, "textview1"); - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); + PsppireVarStore *vs = NULL; + g_object_get (de->data_editor, "var-store", &vs, NULL); - PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet)); - - gtk_window_set_transient_for (GTK_WINDOW (dialog), de->parent.window); - - attach_dictionary_to_treeview (GTK_TREE_VIEW (treeview), - vs->dict, - GTK_SELECTION_SINGLE, - NULL ); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (de)); + g_object_set (treeview, + "dictionary", vs->dict, + "selection-mode", GTK_SELECTION_SINGLE, + NULL); g_signal_connect (treeview, "cursor-changed", G_CALLBACK (populate_text), textview); @@ -181,48 +196,31 @@ variable_info_dialog (GObject *o, gpointer data) gtk_text_view_set_indent (GTK_TEXT_VIEW (textview), -5); + psppire_dialog_set_valid_predicate (PSPPIRE_DIALOG (dialog), + treeview_item_selected, treeview); + response = psppire_dialog_run (PSPPIRE_DIALOG (dialog)); switch (response) { case PSPPIRE_RESPONSE_GOTO: { - gint row, col; - GtkNotebook *notebook = GTK_NOTEBOOK - (get_widget_assert (de->xml,"notebook")); - const struct variable *var = - get_selected_variable (GTK_TREE_VIEW (treeview)); - - - if (PAGE_VAR_SHEET == gtk_notebook_get_current_page (notebook)) - { - GtkSheet *var_sheet = - GTK_SHEET (get_widget_assert (de->xml, "variable_sheet")); - - gtk_sheet_get_active_cell (var_sheet, &row, &col); - row = var_get_dict_index (var); - gtk_sheet_set_active_cell (var_sheet, row, col); - } - else - { - GtkSheet *data_sheet = - GTK_SHEET (get_widget_assert (de->xml, "data_sheet")); - - gtk_sheet_get_active_cell (data_sheet, &row, &col); - col = var_get_dict_index (var); - gtk_sheet_set_active_cell (data_sheet, row, col); - } + psppire_dict_view_get_selected_variable (PSPPIRE_DICT_VIEW (treeview)); + + if ( NULL == var) + goto done; + + g_object_set (de->data_editor, + "current-variable", var_get_dict_index (var), + NULL); } + break; case PSPPIRE_RESPONSE_PASTE: { - gchar *syntax = generate_syntax (GTK_TREE_VIEW (treeview)); - - struct syntax_editor *se = - (struct syntax_editor *) window_create (WINDOW_SYNTAX, NULL); - - gtk_text_buffer_insert_at_cursor (se->buffer, syntax, -1); + gchar *syntax = generate_syntax (PSPPIRE_DICT_VIEW (treeview)); + paste_syntax_in_new_window (syntax); g_free (syntax); } @@ -231,14 +229,15 @@ variable_info_dialog (GObject *o, gpointer data) break; } + done: g_object_unref (xml); - } static gchar * -generate_syntax (GtkTreeView *treeview) +generate_syntax (PsppireDictView *treeview) { - const struct variable *var = get_selected_variable (treeview); + const struct variable *var = + psppire_dict_view_get_selected_variable (treeview); if ( NULL == var) return g_strdup ("");