X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdict-display.c;h=1665d7ff3f7a3c0a4bc8e1b4ebeb12b99cc8cfb9;hb=729b96a6bd9342c45e6f65a113fd87c70da85b0a;hp=68b7b8d4f2e6193f9b91e847a63b3b245819083a;hpb=a10cebe053263d7e936b6533a3dbf5ac2f0586a1;p=pspp-builds.git diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c index 68b7b8d4..1665d7ff 100644 --- a/src/ui/gui/dict-display.c +++ b/src/ui/gui/dict-display.c @@ -1,10 +1,9 @@ -/* - PSPPIRE --- A Graphical User Interface for PSPP +/* PSPPIRE - a graphical user interface for PSPP. Copyright (C) 2007 Free Software Foundation - This program is free software; you can redistribute it and/or modify + 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 + 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, @@ -13,141 +12,75 @@ 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. */ + along with this program. If not, see . */ #include #include #include +#include "psppire-conf.h" #include "dict-display.h" #include "psppire-dict.h" +#include #include "helper.h" #include +#include #define _(msgid) gettext (msgid) #define N_(msgid) msgid - -/* A GtkTreeModelFilterVisibleFunc to filter lines in the treeview */ -static gboolean -filter_variables (GtkTreeModel *model, GtkTreeIter *iter, gpointer data) -{ - var_predicate_func *predicate = data; - struct variable *var; - PsppireDict *dict = PSPPIRE_DICT (model); - - GtkTreePath *path = gtk_tree_model_get_path (model, iter); - - gint *idx = gtk_tree_path_get_indices (path); - - var = psppire_dict_get_variable (dict, *idx); - - gtk_tree_path_free (path); - - return predicate (var); -} - -/* Sets up TREEVIEW to display the variables of DICT. - MODE is the selection mode for TREEVIEW. - PREDICATE determines which variables should be visible, or NULL if - all are to be visible. - */ -void -attach_dictionary_to_treeview (GtkTreeView *treeview, PsppireDict *dict, - GtkSelectionMode mode, - var_predicate_func *predicate - ) +static void +get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter, + GtkTreeModel **model, GtkTreeIter *iter + ) { - GtkTreeViewColumn *col; - - GtkTreeSelection *selection = - gtk_tree_view_get_selection (treeview); - - GtkCellRenderer *renderer = gtk_cell_renderer_text_new (); - GtkTreeModel *model ; - - if ( predicate ) + *model = top_model; + *iter = *top_iter; + while (GTK_IS_TREE_MODEL_FILTER (*model)) { - model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict), - NULL); - - gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (model), - filter_variables, - predicate, - NULL); - } - else - { - model = GTK_TREE_MODEL (dict); - } - - gtk_tree_view_set_model (GTK_TREE_VIEW (treeview), model); - - + GtkTreeIter parent_iter = *iter; + GtkTreeModelFilter *parent_model = GTK_TREE_MODEL_FILTER (*model); - col = gtk_tree_view_column_new_with_attributes (_("Var"), - renderer, - "text", - 0, - NULL); + *model = gtk_tree_model_filter_get_model (parent_model); - /* FIXME: make this a value in terms of character widths */ - g_object_set (col, "min-width", 100, NULL); - - gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED); - - gtk_tree_view_append_column (treeview, col); + gtk_tree_model_filter_convert_iter_to_child_iter (parent_model, + iter, + &parent_iter); + } - gtk_tree_selection_set_mode (selection, mode); + g_assert (PSPPIRE_IS_DICT (*model)); } + void insert_source_row_into_entry (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ) { GtkTreePath *path; - PsppireDict *dict; + GtkTreeModel *dict; gint *idx; struct variable *var; GtkTreeIter dict_iter; - gchar *name; g_return_if_fail (GTK_IS_ENTRY(dest)); - - if ( GTK_IS_TREE_MODEL_FILTER (model)) - { - dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER(model))); - gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER - (model), - &dict_iter, &iter); - } - else - { - dict = PSPPIRE_DICT (model); - dict_iter = iter; - } - + get_base_model (model, &iter, &dict, &dict_iter); path = gtk_tree_model_get_path (GTK_TREE_MODEL (dict), &dict_iter); idx = gtk_tree_path_get_indices (path); - var = psppire_dict_get_variable (dict, *idx); + var = psppire_dict_get_variable (PSPPIRE_DICT (dict), *idx); gtk_tree_path_free (path); - name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL); - gtk_entry_set_text (GTK_ENTRY (dest), name); - g_free (name); + gtk_entry_set_text (GTK_ENTRY (dest), var_get_name (var)); } @@ -155,7 +88,8 @@ insert_source_row_into_entry (GtkTreeIter iter, void insert_source_row_into_tree_view (GtkTreeIter iter, GtkWidget *dest, - GtkTreeModel *model + GtkTreeModel *model, + gpointer data ) { GtkTreePath *path; @@ -164,24 +98,12 @@ insert_source_row_into_tree_view (GtkTreeIter iter, gint *row ; GtkTreeModel *destmodel = gtk_tree_view_get_model ( GTK_TREE_VIEW (dest)); - PsppireDict *dict; + GtkTreeModel *dict; - if ( GTK_IS_TREE_MODEL_FILTER (model)) - { - dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER(model))); - gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER - (model), - &dict_iter, &iter); - } - else - { - dict = PSPPIRE_DICT (model); - dict_iter = iter; - } + get_base_model (model, &iter, &dict, &dict_iter); - path = gtk_tree_model_get_path (GTK_TREE_MODEL (dict), &dict_iter); + path = gtk_tree_model_get_path (dict, &dict_iter); row = gtk_tree_path_get_indices (path); @@ -197,47 +119,30 @@ is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter, PsppireSelector *selector) { gboolean result; - gchar *name; GtkTreeIter dict_iter; - PsppireDict *dict; + GtkTreeModel *dict; struct variable *var; gint dict_index; gint *indeces; GtkTreePath *path; - const gchar *text = gtk_entry_get_text (GTK_ENTRY (selector->dest)); + const gchar *text = gtk_entry_get_text (GTK_ENTRY (selector->dest)); + get_base_model (model, iter, &dict, &dict_iter); - if ( GTK_IS_TREE_MODEL_FILTER (model)) - { - dict = PSPPIRE_DICT (gtk_tree_model_filter_get_model - (GTK_TREE_MODEL_FILTER(model))); - gtk_tree_model_filter_convert_iter_to_child_iter (GTK_TREE_MODEL_FILTER - (model), - &dict_iter, iter); - } - else - { - dict = PSPPIRE_DICT (model); - dict_iter = *iter; - } - - - path = gtk_tree_model_get_path (GTK_TREE_MODEL(dict), - &dict_iter); + path = gtk_tree_model_get_path (dict, &dict_iter); indeces = gtk_tree_path_get_indices (path); dict_index = indeces [0]; - var = psppire_dict_get_variable (dict, dict_index); + var = psppire_dict_get_variable (PSPPIRE_DICT (dict), dict_index); gtk_tree_path_free (path); - name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL); - result = ( 0 == strcmp (text, name)); - g_free (name); + result = ( 0 == strcmp (text, var_get_name (var) )); return result; } +