X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-dictview.c;h=f1a168de9f39081dc4110f03a9943d54bf0531e7;hb=6206581792d042349f61eb2527366279ca973cc5;hp=336092f5abfaf97d20b9a07d55ed193a47dfbe03;hpb=a7f0508036b7bcc1ab15cf3565d52ed77af232c2;p=pspp-builds.git diff --git a/src/ui/gui/psppire-dictview.c b/src/ui/gui/psppire-dictview.c index 336092f5..f1a168de 100644 --- a/src/ui/gui/psppire-dictview.c +++ b/src/ui/gui/psppire-dictview.c @@ -21,6 +21,7 @@ #include "psppire-dict.h" #include "psppire-conf.h" #include +#include #include "helper.h" #include @@ -75,6 +76,7 @@ enum { PROP_0, PROP_MODEL, + PROP_DICTIONARY, PROP_PREDICATE, PROP_SELECTION_MODE }; @@ -132,9 +134,14 @@ psppire_dict_view_set_property (GObject *object, switch (prop_id) { - case PROP_MODEL: + case PROP_DICTIONARY: dict_view->dict = g_value_get_object (value); break; + case PROP_MODEL: + g_critical ("Don't set the \"model\" property on %s. " + "Use the \"dictionary\" property instead.", + G_OBJECT_TYPE_NAME (dict_view)); + break; case PROP_PREDICATE: dict_view->predicate = g_value_get_pointer (value); break; @@ -168,7 +175,7 @@ psppire_dict_view_get_property (GObject *object, switch (prop_id) { - case PROP_MODEL: + case PROP_DICTIONARY: g_value_set_object (value, dict_view->dict); break; case PROP_PREDICATE: @@ -194,9 +201,9 @@ psppire_dict_view_class_init (PsppireDictViewClass *class) { GObjectClass *object_class = G_OBJECT_CLASS (class); - GParamSpec *model_spec = - g_param_spec_object ("model", - "Model", + GParamSpec *dictionary_spec = + g_param_spec_object ("dictionary", + "Dictionary", _("The dictionary to be displayed by this widget"), PSPPIRE_TYPE_DICT, G_PARAM_READABLE | G_PARAM_WRITABLE); @@ -217,12 +224,22 @@ psppire_dict_view_class_init (PsppireDictViewClass *class) G_PARAM_CONSTRUCT | G_PARAM_READABLE | G_PARAM_WRITABLE); + GParamSpec *dummy_spec = + g_param_spec_pointer ("model", + "Model", + "Don't set the property", + G_PARAM_WRITABLE); + object_class->set_property = psppire_dict_view_set_property; object_class->get_property = psppire_dict_view_get_property; g_object_class_install_property (object_class, PROP_MODEL, - model_spec); + dummy_spec); + + g_object_class_install_property (object_class, + PROP_DICTIONARY, + dictionary_spec); g_object_class_install_property (object_class, PROP_PREDICATE, @@ -258,20 +275,39 @@ dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter, ) { *model = top_model; - *iter = *top_iter; - while (GTK_IS_TREE_MODEL_FILTER (*model)) + + if ( iter) + *iter = *top_iter; + + while ( ! PSPPIRE_IS_DICT (*model)) { - GtkTreeIter parent_iter = *iter; - GtkTreeModelFilter *parent_model = GTK_TREE_MODEL_FILTER (*model); + GtkTreeIter parent_iter; + if (iter) + parent_iter = *iter; - *model = gtk_tree_model_filter_get_model (parent_model); + if ( GTK_IS_TREE_MODEL_FILTER (*model)) + { + GtkTreeModelFilter *parent_model = GTK_TREE_MODEL_FILTER (*model); - gtk_tree_model_filter_convert_iter_to_child_iter (parent_model, - iter, - &parent_iter); - } + *model = gtk_tree_model_filter_get_model (parent_model); + + if (iter) + gtk_tree_model_filter_convert_iter_to_child_iter (parent_model, + iter, + &parent_iter); + } + else if (GTK_IS_TREE_MODEL_SORT (*model)) + { + GtkTreeModelSort *parent_model = GTK_TREE_MODEL_SORT (*model); + + *model = gtk_tree_model_sort_get_model (parent_model); - g_assert (PSPPIRE_IS_DICT (*model)); + if (iter) + gtk_tree_model_sort_convert_iter_to_child_iter (parent_model, + iter, + &parent_iter); + } + } } @@ -289,32 +325,27 @@ var_description_cell_data_func (GtkTreeViewColumn *col, struct variable *var; GtkTreeIter iter; GtkTreeModel *model; - + PsppireDict *dict; dv_get_base_model (top_model, top_iter, &model, &iter); - g_assert (PSPPIRE_IS_DICT (model)); + dict = PSPPIRE_DICT (model); gtk_tree_model_get (model, &iter, DICT_TVM_COL_VAR, &var, -1); if ( var_has_label (var) && dv->prefer_labels) { - gchar *text = g_strdup_printf ( + gchar *text = g_markup_printf_escaped ( "%s", var_get_label (var)); - char *utf8 = pspp_locale_to_utf8 (text, -1, NULL); - + g_object_set (cell, "markup", text, NULL); g_free (text); - g_object_set (cell, "markup", utf8, NULL); - g_free (utf8); } else { - char *name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL); - g_object_set (cell, "text", name, NULL); - g_free (name); + g_object_set (cell, "text", var_get_name (var), NULL); } } @@ -377,7 +408,6 @@ set_tooltip_for_variable (GtkTreeView *treeview, struct variable *var = NULL; gboolean ok; - gtk_tree_view_convert_widget_to_bin_window_coords (treeview, x, y, &bx, &by); @@ -387,7 +417,6 @@ set_tooltip_for_variable (GtkTreeView *treeview, 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); @@ -403,16 +432,19 @@ set_tooltip_for_variable (GtkTreeView *treeview, return FALSE; { - gchar *tip ; + const gchar *tip ; + GtkTreeModel *m; + PsppireDict *dict; + + dv_get_base_model (tree_model, NULL, &m, NULL); + dict = PSPPIRE_DICT (m); if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels ) - tip = pspp_locale_to_utf8 (var_get_name (var), -1, NULL); + tip = var_get_name (var); else - tip = pspp_locale_to_utf8 (var_get_label (var), -1, NULL); + tip = var_get_label (var); gtk_tooltip_set_text (tooltip, tip); - - g_free (tip); } return TRUE; @@ -440,6 +472,8 @@ toggle_label_preference (GtkCheckMenuItem *checkbox, gpointer data) gtk_widget_queue_draw (GTK_WIDGET (dv)); } + + static void psppire_dict_view_init (PsppireDictView *dict_view) { @@ -450,7 +484,8 @@ psppire_dict_view_init (PsppireDictView *dict_view) dict_view->prefer_labels = TRUE; psppire_conf_get_boolean (psppire_conf_new (), - "dialog-boxes", "prefer-labels", + G_OBJECT_TYPE_NAME (dict_view), + "prefer-labels", &dict_view->prefer_labels); gtk_tree_view_column_set_title (col, _("Variable")); @@ -477,7 +512,10 @@ psppire_dict_view_init (PsppireDictView *dict_view) gtk_tree_view_append_column (GTK_TREE_VIEW (dict_view), col); - g_object_set (dict_view, "has-tooltip", TRUE, NULL); + g_object_set (dict_view, + "has-tooltip", TRUE, + "headers-visible", FALSE, + NULL); g_signal_connect (dict_view, "query-tooltip", G_CALLBACK (set_tooltip_for_variable), NULL);