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=356758beeea4100c4f4f1fd3feeaae71ebeb2fb4;hpb=b72c417165e828d7fb6afc6c647f9fc123fd7847;p=pspp-builds.git diff --git a/src/ui/gui/dict-display.c b/src/ui/gui/dict-display.c index 356758be..1665d7ff 100644 --- a/src/ui/gui/dict-display.c +++ b/src/ui/gui/dict-display.c @@ -19,9 +19,11 @@ #include #include +#include "psppire-conf.h" #include "dict-display.h" #include "psppire-dict.h" +#include #include "helper.h" #include #include @@ -29,68 +31,7 @@ #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); -} - -/* A GtkTreeCellDataFunc which sets the icon appropriate to the type - of variable */ static void -var_icon_cell_data_func (GtkTreeViewColumn *col, - GtkCellRenderer *cell, - GtkTreeModel *model, - GtkTreeIter *iter, - gpointer data) -{ - struct variable *var; - gtk_tree_model_get (model, iter, DICT_TVM_COL_VAR, &var, -1); - - if ( var_is_alpha (var)) - { - g_object_set (cell, "stock-id", "var-string", NULL); - } - else - { - const struct fmt_spec *fs = var_get_write_format (var); - int cat = fmt_get_category (fs->type); - switch ( var_get_measure (var)) - { - case MEASURE_NOMINAL: - g_object_set (cell, "stock-id", "var-nominal", NULL); - break; - case MEASURE_ORDINAL: - g_object_set (cell, "stock-id", "var-ordinal", NULL); - break; - case MEASURE_SCALE: - if ( ( FMT_CAT_DATE | FMT_CAT_TIME ) & cat ) - g_object_set (cell, "stock-id", "var-date-scale", NULL); - else - g_object_set (cell, "stock-id", "var-scale", NULL); - break; - default: - g_assert_not_reached (); - }; - } -} - - -void get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter, GtkTreeModel **model, GtkTreeIter *iter ) @@ -112,170 +53,6 @@ get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter, g_assert (PSPPIRE_IS_DICT (*model)); } -/* A GtkTreeCellDataFunc which renders the name and/or label of the - variable */ -static void -var_description_cell_data_func (GtkTreeViewColumn *col, - GtkCellRenderer *cell, - GtkTreeModel *top_model, - GtkTreeIter *top_iter, - gpointer data) -{ - struct variable *var; - GtkTreeIter iter; - GtkTreeModel *model; - - - get_base_model (top_model, top_iter, &model, &iter); - - g_assert (PSPPIRE_IS_DICT (model)); - - - gtk_tree_model_get (model, - &iter, DICT_TVM_COL_VAR, &var, -1); - - if ( var_has_label (var)) - { - gchar *text = g_strdup_printf ( - "%s", - var_get_label (var)); - - - char *utf8 = pspp_locale_to_utf8 (text, -1, NULL); - - g_free (text); - g_object_set (cell, "markup", utf8, NULL); - g_free (utf8); - } - else - { - g_object_set (cell, "text", var_get_name (var), NULL); - } -} - - -#if GTK_CHECK_VERSION (2, 12, 0) -/* Sets the tooltip to be the name of the variable under the cursor */ -static gboolean -set_tooltip_for_variable (GtkTreeView *treeview, - gint x, - gint y, - gboolean keyboard_mode, - GtkTooltip *tooltip, - gpointer user_data) - -{ - gint bx, by; - GtkTreeIter iter; - GtkTreePath *path; - GtkTreeModel *tree_model; - struct variable *var = NULL; - gboolean ok; - - - gtk_tree_view_convert_widget_to_bin_window_coords (treeview, - x, y, &bx, &by); - - if (!gtk_tree_view_get_path_at_pos (treeview, bx, by, - &path, NULL, NULL, NULL)) - return FALSE; - - tree_model = gtk_tree_view_get_model (treeview); - - - gtk_tree_view_set_tooltip_row (treeview, tooltip, path); - - ok = gtk_tree_model_get_iter (tree_model, &iter, path); - - gtk_tree_path_free (path); - if (!ok) - return FALSE; - - - gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR, &var, -1); - - if ( ! var_has_label (var)) - return FALSE; - - gtk_tooltip_set_text (tooltip, var_get_name (var)); - - return TRUE; -} -#endif - - /* 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 - ) -{ - GtkTreeViewColumn *col; - - GtkTreeSelection *selection = - gtk_tree_view_get_selection (treeview); - - GtkCellRenderer *renderer; - - GtkTreeModel *model ; - - if ( predicate ) - { - 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); - - - col = gtk_tree_view_column_new (); - gtk_tree_view_column_set_title (col, _("Variable")); - - renderer = gtk_cell_renderer_pixbuf_new (); - gtk_tree_view_column_pack_start (col, renderer, FALSE); - - gtk_tree_view_column_set_cell_data_func (col, renderer, - var_icon_cell_data_func, - NULL, NULL); - - - renderer = gtk_cell_renderer_text_new (); - gtk_tree_view_column_pack_start (col, renderer, TRUE); - gtk_tree_view_column_set_cell_data_func (col, renderer, - var_description_cell_data_func, - NULL, NULL); - - g_object_set (renderer, "ellipsize-set", TRUE, NULL); - g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL); - - gtk_tree_view_column_set_sizing (col, GTK_TREE_VIEW_COLUMN_FIXED); - - /* FIXME: make this a value in terms of character widths */ - gtk_tree_view_column_set_min_width (col, 150); - - gtk_tree_view_append_column (treeview, col); - - gtk_tree_selection_set_mode (selection, mode); - - g_object_set (treeview, "has-tooltip", TRUE, NULL); - -#if GTK_CHECK_VERSION (2, 12, 0) - g_signal_connect (treeview, "query-tooltip", G_CALLBACK (set_tooltip_for_variable), NULL); -#endif -} void @@ -290,7 +67,6 @@ insert_source_row_into_entry (GtkTreeIter iter, gint *idx; struct variable *var; GtkTreeIter dict_iter; - gchar *name; g_return_if_fail (GTK_IS_ENTRY(dest)); @@ -304,9 +80,7 @@ insert_source_row_into_entry (GtkTreeIter iter, 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)); } @@ -345,14 +119,13 @@ is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter, PsppireSelector *selector) { gboolean result; - gchar *name; GtkTreeIter dict_iter; 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); @@ -366,11 +139,10 @@ is_currently_in_entry (GtkTreeModel *model, GtkTreeIter *iter, 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; } +