#include "psppire-dict.h"
#include "psppire-conf.h"
#include <data/format.h>
+#include <libpspp/i18n.h>
#include "helper.h"
#include <gettext.h>
static void
psppire_dict_view_finalize (GObject *object)
{
+ PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
+
+ g_object_unref (dict_view->menu);
}
/* Properties */
{
PROP_0,
PROP_MODEL,
+ PROP_DICTIONARY,
PROP_PREDICATE,
PROP_SELECTION_MODE
};
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;
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",
+ 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);
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,
static void
-psppire_dict_view_base_finalize(PsppireDictViewClass *class,
- gpointer class_data)
+psppire_dict_view_base_finalize (PsppireDictViewClass *class,
+ gpointer class_data)
{
}
)
{
*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);
- g_assert (PSPPIRE_IS_DICT (*model));
+ *model = gtk_tree_model_sort_get_model (parent_model);
+
+ if (iter)
+ gtk_tree_model_sort_convert_iter_to_child_iter (parent_model,
+ iter,
+ &parent_iter);
+ }
+ }
}
GtkTreeIter *top_iter,
gpointer data)
{
+ PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
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);
+ 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) && prefer_labels)
+ if ( var_has_label (var) && dv->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_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);
}
}
gboolean keyboard_mode,
GtkTooltip *tooltip,
gpointer user_data)
-
{
gint bx, by;
GtkTreeIter iter;
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 ;
- gboolean prefer_labels = FALSE;
+ const gchar *tip ;
+ GtkTreeModel *m;
+ PsppireDict *dict;
- PsppireConf *conf = psppire_conf_new ();
+ dv_get_base_model (tree_model, NULL, &m, NULL);
+ dict = PSPPIRE_DICT (m);
- 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);
+ if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
+ 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;
}
+static gboolean
+show_menu (PsppireDictView *dv, GdkEventButton *event, gpointer data)
+{
+ if (event->button != 3)
+ return FALSE;
+
+ gtk_menu_popup (GTK_MENU (dv->menu), NULL, NULL, NULL, NULL,
+ event->button, event->time);
+
+ return TRUE;
+}
+
+static void
+toggle_label_preference (GtkCheckMenuItem *checkbox, gpointer data)
+{
+ PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
+
+ dv->prefer_labels = gtk_check_menu_item_get_active (checkbox);
+
+ gtk_widget_queue_draw (GTK_WIDGET (dv));
+}
+
+
static void
psppire_dict_view_init (PsppireDictView *dict_view)
{
- GtkTreeViewColumn *col;
+ GtkTreeViewColumn *col = gtk_tree_view_column_new ();
- GtkCellRenderer *renderer;
+ GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new ();
+
+ dict_view->prefer_labels = TRUE;
+
+ psppire_conf_get_boolean (psppire_conf_new (),
+ G_OBJECT_TYPE_NAME (dict_view),
+ "prefer-labels",
+ &dict_view->prefer_labels);
- 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);
+ dict_view, NULL);
g_object_set (renderer, "ellipsize-set", TRUE, NULL);
g_object_set (renderer, "ellipsize", PANGO_ELLIPSIZE_MIDDLE, NULL);
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);
+
+ dict_view->menu = gtk_menu_new ();
+
+
+ {
+ GtkWidget *checkbox =
+ gtk_check_menu_item_new_with_label (_("Prefer variable labels"));
+
+ gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (checkbox),
+ dict_view->prefer_labels);
+
+ g_signal_connect (checkbox, "toggled",
+ G_CALLBACK (toggle_label_preference), dict_view);
+
+
+ gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), checkbox);
+
+ }
+
+ gtk_widget_show_all (dict_view->menu);
+
+ g_signal_connect (dict_view, "button-press-event",
+ G_CALLBACK (show_menu), NULL);
}
if (! gtk_tree_selection_get_selected (selection,
&top_model, &top_iter))
- {
- return NULL;
- }
+ return NULL;
dv_get_base_model (top_model, &top_iter, &model, &iter);
projects / pspp-builds.git / blobdiff