/* PSPPIRE - a graphical user interface for PSPP.
- Copyright (C) 2009, 2010, 2011, 2012, 2013 Free Software Foundation
+ Copyright (C) 2009, 2010, 2011, 2012, 2013, 2017,
+ 2020 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 "psppire-dict.h"
#include "dict-display.h"
#include "psppire-conf.h"
+#include "options-dialog.h"
#include <data/format.h>
#include <libpspp/i18n.h>
#include "helper.h"
static const GTypeInfo psppire_dict_view_info =
{
sizeof (PsppireDictViewClass),
- (GBaseInitFunc) psppire_dict_view_base_init,
- (GBaseFinalizeFunc) psppire_dict_view_base_finalize,
- (GClassInitFunc)psppire_dict_view_class_init,
+ (GBaseInitFunc) (void (*)(void)) psppire_dict_view_base_init,
+ (GBaseFinalizeFunc) (void (*)(void)) psppire_dict_view_base_finalize,
+ (GClassInitFunc) (void (*)(void)) psppire_dict_view_class_init,
(GClassFinalizeFunc) NULL,
NULL,
sizeof (PsppireDictView),
0,
- (GInstanceInitFunc) psppire_dict_view_init,
+ (GInstanceInitFunc) (void (*)(void)) psppire_dict_view_init,
+ NULL /* value_table */
};
psppire_dict_view_type =
return predicate (var);
}
-
static gint
unsorted (GtkTreeModel *model,
GtkTreeIter *a,
GtkTreeIter *b,
gpointer user_data)
{
- const struct variable *var_a;
- const struct variable *var_b;
-
+ struct variable *var_a;
+ struct variable *var_b;
gtk_tree_model_get (model, a, DICT_TVM_COL_VAR, &var_a, -1);
gtk_tree_model_get (model, b, DICT_TVM_COL_VAR, &var_b, -1);
- return compare_var_ptrs_by_dict_index (&var_a, &var_b, NULL);
+ gint rval = compare_var_ptrs_by_dict_index (&var_a, &var_b, NULL);
+
+ var_unref (var_a);
+ var_unref (var_b);
+
+ return rval;
}
static gint
GtkTreeIter *b,
gpointer user_data)
{
- const struct variable *var_a;
- const struct variable *var_b;
+ struct variable *var_a;
+ struct variable *var_b;
gtk_tree_model_get (model, a, DICT_TVM_COL_VAR, &var_a, -1);
gtk_tree_model_get (model, b, DICT_TVM_COL_VAR, &var_b, -1);
- return g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+ gint rval = g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+
+ var_unref (var_a);
+ var_unref (var_b);
+
+ return rval;
}
GtkTreeIter *b,
gpointer user_data)
{
- const struct variable *var_a;
- const struct variable *var_b;
+ struct variable *var_a;
+ struct variable *var_b;
gtk_tree_model_get (model, a, DICT_TVM_COL_VAR, &var_a, -1);
gtk_tree_model_get (model, b, DICT_TVM_COL_VAR, &var_b, -1);
- return g_strcmp0 (var_get_label (var_a), var_get_label (var_b));
+ gint rval = g_strcmp0 (var_get_label (var_a), var_get_label (var_b));
+
+ var_unref (var_a);
+ var_unref (var_b);
+
+ return rval;
}
+
+static gint
+default_sort (GtkTreeModel *model,
+ GtkTreeIter *a,
+ GtkTreeIter *b,
+ gpointer user_data)
+{
+ int what = -1;
+ psppire_conf_get_enum (psppire_conf_new (), "VariableLists", "sort-order",
+ PSPP_TYPE_OPTIONS_VAR_ORDER, &what);
+
+ switch (what)
+ {
+ default:
+ return unsorted (model, a, b, user_data);
+ break;
+ case PSPP_OPTIONS_VAR_ORDER_NAME:
+ return sort_by_name (model, a, b, user_data);
+ break;
+ case PSPP_OPTIONS_VAR_ORDER_LABEL:
+ return sort_by_label (model, a, b, user_data);
+ break;
+ }
+
+ g_assert_not_reached ();
+}
+
+
+
+
static void
set_model (PsppireDictView *dict_view)
{
GtkTreeModel *model = NULL;
- if ( dict_view->dict == NULL)
+ if (dict_view->dict == NULL)
return;
dict_view->sorted_model = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (dict_view->dict));
- gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (dict_view->sorted_model), unsorted, dict_view, 0);
- gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model),
+ gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (dict_view->sorted_model), default_sort, dict_view, 0);
+ gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (dict_view->sorted_model),
GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, GTK_SORT_ASCENDING);
- if ( dict_view->predicate )
+ if (dict_view->predicate)
{
model = gtk_tree_model_filter_new (dict_view->sorted_model, NULL);
g_value_set_enum (value, gtk_tree_selection_get_mode (selection));
}
+ break;
default:
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
+static gboolean
+use_labels (PsppireDictView *dv)
+{
+ gboolean disp_labels = TRUE;
+ if (gtk_check_menu_item_get_inconsistent (GTK_CHECK_MENU_ITEM
+ (dv->override_button)))
+ {
+ psppire_conf_get_boolean (psppire_conf_new (),
+ "VariableLists", "display-labels", &disp_labels);
+ }
+ else
+ {
+ disp_labels = gtk_check_menu_item_get_active (GTK_CHECK_MENU_ITEM
+ (dv->override_button));
+ }
+ return disp_labels;
+}
/* A GtkTreeCellDataFunc which renders the name and/or label of the
gtk_tree_model_get (model,
&iter, DICT_TVM_COL_VAR, &var, -1);
- if ( var_has_label (var) && dv->prefer_labels)
+ if (var_has_label (var) && use_labels (dv))
{
gchar *text = g_markup_printf_escaped (
"<span stretch=\"condensed\">%s</span>",
{
g_object_set (cell, "text", var_get_name (var), NULL);
}
+
+ var_unref (var);
}
gtk_tree_model_get (model, iter, DICT_TVM_COL_VAR, &var, -1);
- g_object_set (cell, "stock_id",
- get_var_measurement_stock_id (var_get_print_format (var)->type,
- var_get_measure (var)),
+ g_object_set (cell,
+ "stock-size", GTK_ICON_SIZE_MENU,
+ "icon-name", get_var_measurement_stock_id (var_get_print_format (var)->type,
+ var_get_measure (var)),
NULL);
+
+ var_unref (var);
}
const char *
if (!ok)
return FALSE;
-
gtk_tree_model_get (tree_model, &iter, DICT_TVM_COL_VAR, &var, -1);
- if ( ! var_has_label (var))
- return FALSE;
+ if (! var_has_label (var))
+ {
+ var_unref (var);
+ return FALSE;
+ }
{
const gchar *tip ;
get_base_model (tree_model, NULL, &m, NULL);
- if ( PSPPIRE_DICT_VIEW (treeview)->prefer_labels )
+ if (use_labels (PSPPIRE_DICT_VIEW (treeview)))
tip = var_get_name (var);
else
tip = var_get_label (var);
gtk_tooltip_set_text (tooltip, tip);
}
+ var_unref (var);
return TRUE;
}
static gboolean
-show_menu (PsppireDictView *dv, GdkEventButton *event, gpointer data)
+show_menu (PsppireDictView *dv, GdkEvent *event, gpointer data)
{
- if (event->button != 3)
+ if (((GdkEventButton *) event)->button != 3)
return FALSE;
- gtk_menu_popup (GTK_MENU (dv->menu), NULL, NULL, NULL, NULL,
- event->button, event->time);
+ gtk_menu_popup_at_pointer (GTK_MENU (dv->menu), event);
return TRUE;
}
{
PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
- dv->prefer_labels = gtk_check_menu_item_get_active (checkbox);
+ gboolean global_setting = TRUE;
+ psppire_conf_get_boolean (psppire_conf_new (),
+ "VariableLists", "display-labels", &global_setting);
+
+ if (gtk_check_menu_item_get_inconsistent (checkbox))
+ gtk_check_menu_item_set_active (checkbox, !global_setting);
+
+ gtk_check_menu_item_set_inconsistent (checkbox, FALSE);
gtk_widget_queue_draw (GTK_WIDGET (dv));
}
gtk_widget_queue_draw (GTK_WIDGET (dv));
}
+static void
+set_sort_criteria_default (GtkCheckMenuItem *checkbox, gpointer data)
+{
+ PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
+ set_sort_criteria (checkbox, dv, default_sort);
+}
+
+
static void
set_sort_criteria_name (GtkCheckMenuItem *checkbox, gpointer data)
{
GtkCellRenderer *renderer = gtk_cell_renderer_pixbuf_new ();
- dict_view->prefer_labels = TRUE;
+ dict_view->prefer_labels_override = FALSE;
dict_view->sorted_model = NULL;
- psppire_conf_get_boolean (psppire_conf_new (),
- G_OBJECT_TYPE_NAME (dict_view),
- "prefer-labels",
- &dict_view->prefer_labels);
-
gtk_tree_view_column_set_title (col, _("Variable"));
gtk_tree_view_column_pack_start (col, renderer, FALSE);
dict_view->menu = gtk_menu_new ();
-
{
GSList *group = NULL;
GtkWidget *item =
gtk_check_menu_item_new_with_label (_("Prefer variable labels"));
- gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item),
- dict_view->prefer_labels);
+ dict_view->override_button = item;
+ gtk_check_menu_item_set_inconsistent (GTK_CHECK_MENU_ITEM (item),
+ TRUE);
g_signal_connect (item, "toggled",
G_CALLBACK (toggle_label_preference), dict_view);
item = gtk_separator_menu_item_new ();
gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), item);
- item = gtk_radio_menu_item_new_with_label (group, _("Unsorted (dictionary order)"));
+ item = gtk_radio_menu_item_new_with_label (group, _("Default sort order"));
group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (item), TRUE);
gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), item);
+ g_signal_connect (item, "toggled", G_CALLBACK (set_sort_criteria_default), dict_view);
+
+ item = gtk_radio_menu_item_new_with_label (group, _("Unsorted (dictionary order)"));
+ group = gtk_radio_menu_item_get_group (GTK_RADIO_MENU_ITEM (item));
+ gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), item);
g_signal_connect (item, "toggled", G_CALLBACK (set_sort_criteria_unsorted), dict_view);
item = gtk_radio_menu_item_new_with_label (group, _("Sort by name"));
else
return NULL;
}
-
-
projects / pspp / blobdiff