/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009 Free Software Foundation
+ Copyright (C) 2009, 2010, 2011, 2012 Free Software Foundation
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
#include <config.h>
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
#include "psppire-dictview.h"
#include "psppire-dict.h"
#include "psppire-conf.h"
#include <data/format.h>
+#include <libpspp/i18n.h>
#include "helper.h"
#include <gettext.h>
{
PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
- g_object_unref (dict_view->menu);
+ gtk_widget_destroy (dict_view->menu);
}
/* Properties */
enum
{
PROP_0,
- PROP_MODEL,
+ PROP_DICTIONARY,
PROP_PREDICATE,
PROP_SELECTION_MODE
};
{
GtkTreeModel *model ;
- if ( dict_view->predicate )
+ if ( dict_view->dict == NULL)
+ return;
+
+ if ( dict_view->predicate )
{
model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict_view->dict),
NULL);
}
gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
+ g_object_unref (model);
}
static void
switch (prop_id)
{
- case PROP_MODEL:
+ case PROP_DICTIONARY:
dict_view->dict = g_value_get_object (value);
break;
case PROP_PREDICATE:
switch (prop_id)
{
- case PROP_MODEL:
+ case PROP_DICTIONARY:
g_value_set_object (value, dict_view->dict);
break;
case PROP_PREDICATE:
{
GObjectClass *object_class = G_OBJECT_CLASS (class);
- GParamSpec *model_spec =
- g_param_spec_object ("model",
- "Model",
- _("The dictionary to be displayed by this widget"),
- PSPPIRE_TYPE_DICT,
- G_PARAM_READABLE | G_PARAM_WRITABLE);
-
GParamSpec *predicate_spec =
g_param_spec_pointer ("predicate",
"Predicate",
- _("A predicate function"),
+ "A predicate function",
G_PARAM_READABLE | G_PARAM_WRITABLE);
GParamSpec *selection_mode_spec =
g_param_spec_enum ("selection-mode",
"Selection Mode",
- _("How many things can be selected"),
+ "How many things can be selected",
GTK_TYPE_SELECTION_MODE,
GTK_SELECTION_MULTIPLE,
G_PARAM_CONSTRUCT | G_PARAM_READABLE | 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);
+ g_object_class_override_property (object_class,
+ PROP_DICTIONARY,
+ "model");
g_object_class_install_property (object_class,
PROP_PREDICATE,
static void
dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
- GtkTreeModel **model, GtkTreeIter *iter
- )
+ GtkTreeModel **model, GtkTreeIter *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);
+ }
+ }
}
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 (
"<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_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);
}
}
}
else
{
- const struct fmt_spec *fs = var_get_write_format (var);
+ const struct fmt_spec *fs = var_get_print_format (var);
int cat = fmt_get_category (fs->type);
switch ( var_get_measure (var))
{
struct variable *var = NULL;
gboolean ok;
-
gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
x, y, &bx, &by);
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);
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;
gtk_widget_queue_draw (GTK_WIDGET (dv));
}
+
+
static void
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"));
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);
projects / pspp / blobdiff