projects
/
pspp-builds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Properly display ampersand characters in dictionary view widgets
[pspp-builds.git]
/
src
/
ui
/
gui
/
psppire-dictview.c
diff --git
a/src/ui/gui/psppire-dictview.c
b/src/ui/gui/psppire-dictview.c
index 863365f9f8549696f9c0afa2fb1cbd14dba09e79..f1a168de9f39081dc4110f03a9943d54bf0531e7 100644
(file)
--- 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 <data/format.h>
#include "psppire-dict.h"
#include "psppire-conf.h"
#include <data/format.h>
+#include <libpspp/i18n.h>
#include "helper.h"
#include <gettext.h>
#include "helper.h"
#include <gettext.h>
@@
-274,11
+275,15
@@
dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
)
{
*model = top_model;
)
{
*model = top_model;
- *iter = *top_iter;
+
+ if ( iter)
+ *iter = *top_iter;
while ( ! PSPPIRE_IS_DICT (*model))
{
while ( ! PSPPIRE_IS_DICT (*model))
{
- GtkTreeIter parent_iter = *iter;
+ GtkTreeIter parent_iter;
+ if (iter)
+ parent_iter = *iter;
if ( GTK_IS_TREE_MODEL_FILTER (*model))
{
if ( GTK_IS_TREE_MODEL_FILTER (*model))
{
@@
-286,9
+291,10
@@
dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
*model = gtk_tree_model_filter_get_model (parent_model);
*model = gtk_tree_model_filter_get_model (parent_model);
- gtk_tree_model_filter_convert_iter_to_child_iter (parent_model,
- iter,
- &parent_iter);
+ if (iter)
+ gtk_tree_model_filter_convert_iter_to_child_iter (parent_model,
+ iter,
+ &parent_iter);
}
else if (GTK_IS_TREE_MODEL_SORT (*model))
{
}
else if (GTK_IS_TREE_MODEL_SORT (*model))
{
@@
-296,9
+302,10
@@
dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
*model = gtk_tree_model_sort_get_model (parent_model);
*model = gtk_tree_model_sort_get_model (parent_model);
- gtk_tree_model_sort_convert_iter_to_child_iter (parent_model,
- iter,
- &parent_iter);
+ if (iter)
+ gtk_tree_model_sort_convert_iter_to_child_iter (parent_model,
+ iter,
+ &parent_iter);
}
}
}
}
}
}
@@
-318,32
+325,27
@@
var_description_cell_data_func (GtkTreeViewColumn *col,
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
struct variable *var;
GtkTreeIter iter;
GtkTreeModel *model;
-
+ PsppireDict *dict;
dv_get_base_model (top_model, top_iter, &model, &iter);
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)
{
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
(
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
"<span stretch=\"condensed\">%s</span>",
var_get_label (var));
- char *utf8 = pspp_locale_to_utf8 (text, -1, NULL);
-
+ g_object_set (cell, "markup", text, NULL);
g_free (text);
g_free (text);
- g_object_set (cell, "markup", utf8, NULL);
- g_free (utf8);
}
else
{
}
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);
}
}
}
}
@@
-406,7
+408,6
@@
set_tooltip_for_variable (GtkTreeView *treeview,
struct variable *var = NULL;
gboolean ok;
struct variable *var = NULL;
gboolean ok;
-
gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
x, y, &bx, &by);
gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
x, y, &bx, &by);
@@
-416,7
+417,6
@@
set_tooltip_for_variable (GtkTreeView *treeview,
tree_model = gtk_tree_view_get_model (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);
gtk_tree_view_set_tooltip_row (treeview, tooltip, path);
ok = gtk_tree_model_get_iter (tree_model, &iter, path);
@@
-432,16
+432,19
@@
set_tooltip_for_variable (GtkTreeView *treeview,
return FALSE;
{
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 )
if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
- tip =
pspp_locale_to_utf8 (var_get_name (var), -1, NULL
);
+ tip =
var_get_name (var
);
else
else
- tip =
pspp_locale_to_utf8 (var_get_label (var), -1, NULL
);
+ tip =
var_get_label (var
);
gtk_tooltip_set_text (tooltip, tip);
gtk_tooltip_set_text (tooltip, tip);
-
- g_free (tip);
}
return TRUE;
}
return TRUE;
@@
-509,7
+512,10
@@
psppire_dict_view_init (PsppireDictView *dict_view)
gtk_tree_view_append_column (GTK_TREE_VIEW (dict_view), col);
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);
g_signal_connect (dict_view, "query-tooltip",
G_CALLBACK (set_tooltip_for_variable), NULL);