#include <gettext.h>
#include <gtk/gtk.h>
+#include "psppire-conf.h"
#include "dict-display.h"
#include "psppire-dict.h"
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
+ gboolean prefer_labels = FALSE;
+ PsppireConf *conf = psppire_conf_new ();
+
+ psppire_conf_get_boolean (conf, "dialog-boxes", "prefer-labels",
+ &prefer_labels);
get_base_model (top_model, top_iter, &model, &iter);
gtk_tree_model_get (model,
&iter, DICT_TVM_COL_VAR, &var, -1);
- if ( var_has_label (var))
+ if ( var_has_label (var) && prefer_labels)
{
gchar *text = g_strdup_printf (
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
-
char *utf8 = pspp_locale_to_utf8 (text, -1, NULL);
g_free (text);
}
else
{
- g_object_set (cell, "text", var_get_name (var), NULL);
+ char *name = pspp_locale_to_utf8 (var_get_name (var), -1, NULL);
+ g_object_set (cell, "text", name, NULL);
+ g_free (name);
}
}
struct variable *var = NULL;
gboolean ok;
+
gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
x, y, &bx, &by);
if ( ! var_has_label (var))
return FALSE;
- gtk_tooltip_set_text (tooltip, var_get_name (var));
+ {
+ gchar *tip ;
+ gboolean prefer_labels = FALSE;
+
+ PsppireConf *conf = psppire_conf_new ();
+
+ psppire_conf_get_boolean (conf, "dialog-boxes", "prefer-labels",
+ &prefer_labels);
+
+ if ( prefer_labels )
+ tip = pspp_locale_to_utf8 (var_get_name (var), -1, NULL);
+ else
+ tip = pspp_locale_to_utf8 (var_get_label (var), -1, NULL);
+
+ gtk_tooltip_set_text (tooltip, tip);
+
+ g_free (tip);
+ }
return TRUE;
}
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
}