Automatically infer variables' measurement level from format and data.
[pspp] / src / ui / gui / psppire-dictview.c
index 08cb2387726b0d993b805192b3b792c74f664bb2..5e998fc6f08946a562e565c2648de1103fe0382e 100644 (file)
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2009  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 <config.h>
 
-#include <gtk/gtktreeview.h>
+#include <gtk/gtk.h>
 #include "psppire-dictview.h"
 #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"
 
+#include "psppire-dialog.h"
+#include "psppire-var-info.h"
+#include "psppire-buttonbox.h"
+
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 
-static void psppire_dict_view_base_finalize (PsppireDictViewClass *, gpointer);
-static void psppire_dict_view_base_init     (PsppireDictViewClass *class);
 static void psppire_dict_view_class_init    (PsppireDictViewClass *class);
 static void psppire_dict_view_init          (PsppireDictView      *dict_view);
 
-
-GType
-psppire_dict_view_get_type (void)
-{
-  static GType psppire_dict_view_type = 0;
-
-  if (!psppire_dict_view_type)
-    {
-      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,
-       (GClassFinalizeFunc) NULL,
-       NULL,
-        sizeof (PsppireDictView),
-       0,
-       (GInstanceInitFunc) psppire_dict_view_init,
-      };
-
-      psppire_dict_view_type =
-       g_type_register_static (GTK_TYPE_TREE_VIEW, "PsppireDictView",
-                               &psppire_dict_view_info, 0);
-    }
-
-  return psppire_dict_view_type;
-}
-
+G_DEFINE_TYPE (PsppireDictView, psppire_dict_view, GTK_TYPE_TREE_VIEW)
 
 static void
 psppire_dict_view_finalize (GObject *object)
 {
+  PsppireDictView *dict_view = PSPPIRE_DICT_VIEW (object);
+
+  gtk_widget_destroy (dict_view->menu);
 }
 
 /* Properties */
 enum
 {
   PROP_0,
-  PROP_MODEL,
+  PROP_DICTIONARY,
   PROP_PREDICATE,
   PROP_SELECTION_MODE
 };
 
 
+
 /* A GtkTreeModelFilterVisibleFunc to filter lines in the treeview */
 static gboolean
-filter_variables (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
+filter_variables (GtkTreeModel *tmodel, GtkTreeIter *titer, gpointer data)
 {
   var_predicate_func *predicate = data;
   struct variable *var;
-  PsppireDict *dict = PSPPIRE_DICT (model);
-
-  GtkTreePath *path = gtk_tree_model_get_path (model, iter);
+  GtkTreeModel *model = NULL;
+  GtkTreeIter iter ;
+  PsppireDict *dict ;
+  GtkTreePath *path ;
+  gint *idx;
 
-  gint *idx = gtk_tree_path_get_indices (path);
+  get_base_model (tmodel, titer, &model, &iter);
 
+  dict = PSPPIRE_DICT (model);
+  path = gtk_tree_model_get_path (model, &iter);
+  idx = gtk_tree_path_get_indices (path);
   var =  psppire_dict_get_variable (dict, *idx);
 
   gtk_tree_path_free (path);
@@ -96,15 +83,113 @@ filter_variables (GtkTreeModel *model, GtkTreeIter *iter, gpointer data)
   return predicate (var);
 }
 
+static gint
+unsorted (GtkTreeModel *model,
+     GtkTreeIter *a,
+     GtkTreeIter *b,
+     gpointer user_data)
+{
+  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);
+
+  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
+sort_by_name (GtkTreeModel *model,
+     GtkTreeIter *a,
+     GtkTreeIter *b,
+     gpointer user_data)
+{
+  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);
+
+  gint rval =  g_strcmp0 (var_get_name (var_a), var_get_name (var_b));
+
+  var_unref (var_a);
+  var_unref (var_b);
+
+  return rval;
+}
+
+
+static gint
+sort_by_label (GtkTreeModel *model,
+     GtkTreeIter *a,
+     GtkTreeIter *b,
+     gpointer user_data)
+{
+  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);
+
+  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 ;
+  GtkTreeModel *model = NULL;
+
+  if (dict_view->dict == NULL)
+    return;
 
-  if ( dict_view->predicate )
+  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), 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)
     {
-      model = gtk_tree_model_filter_new (GTK_TREE_MODEL (dict_view->dict),
-                                        NULL);
+      model = gtk_tree_model_filter_new (dict_view->sorted_model,       NULL);
 
       gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (model),
                                              filter_variables,
@@ -113,10 +198,12 @@ set_model (PsppireDictView *dict_view)
     }
   else
     {
-      model = GTK_TREE_MODEL (dict_view->dict);
+      model = dict_view->sorted_model;
+      g_object_ref (model);
     }
 
   gtk_tree_view_set_model (GTK_TREE_VIEW (dict_view), model);
+  g_object_unref (model);
 }
 
 static void
@@ -129,7 +216,7 @@ psppire_dict_view_set_property (GObject         *object,
 
   switch (prop_id)
     {
-    case PROP_MODEL:
+    case PROP_DICTIONARY:
       dict_view->dict = g_value_get_object (value);
       break;
     case PROP_PREDICATE:
@@ -165,7 +252,7 @@ psppire_dict_view_get_property (GObject         *object,
 
   switch (prop_id)
     {
-    case PROP_MODEL:
+    case PROP_DICTIONARY:
       g_value_set_object (value, dict_view->dict);
       break;
     case PROP_PREDICATE:
@@ -178,6 +265,7 @@ psppire_dict_view_get_property (GObject         *object,
 
        g_value_set_enum (value, gtk_tree_selection_get_mode (selection));
       }
+      break;
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -191,35 +279,29 @@ psppire_dict_view_class_init (PsppireDictViewClass *class)
 {
   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);
+  object_class->finalize = psppire_dict_view_finalize;
 
   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,
@@ -230,49 +312,26 @@ psppire_dict_view_class_init (PsppireDictViewClass *class)
                                    selection_mode_spec);
 }
 
-
-static void
-psppire_dict_view_base_init (PsppireDictViewClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-
-  object_class->finalize = psppire_dict_view_finalize;
-}
-
-
-
-static void
-psppire_dict_view_base_finalize(PsppireDictViewClass *class,
-                               gpointer class_data)
+static gboolean
+use_labels (PsppireDictView *dv)
 {
+  gboolean disp_labels = TRUE;
 
-}
-
-
-static void
-dv_get_base_model (GtkTreeModel *top_model, GtkTreeIter *top_iter,
-               GtkTreeModel **model, GtkTreeIter *iter
-               )
-{
-  *model = top_model;
-  *iter = *top_iter;
-  while (GTK_IS_TREE_MODEL_FILTER (*model))
+  if (gtk_check_menu_item_get_inconsistent (GTK_CHECK_MENU_ITEM
+                                           (dv->override_button)))
     {
-      GtkTreeIter parent_iter = *iter;
-      GtkTreeModelFilter *parent_model = GTK_TREE_MODEL_FILTER (*model);
-
-      *model = gtk_tree_model_filter_get_model (parent_model);
-
-      gtk_tree_model_filter_convert_iter_to_child_iter (parent_model,
-                                                       iter,
-                                                       &parent_iter);
+      psppire_conf_get_boolean (psppire_conf_new (),
+                               "VariableLists", "display-labels", &disp_labels);
     }
-
-  g_assert (PSPPIRE_IS_DICT (*model));
+  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
    variable */
 static void
@@ -282,42 +341,31 @@ var_description_cell_data_func (GtkTreeViewColumn *col,
                                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);
-
-  dv_get_base_model (top_model, top_iter, &model, &iter);
-
-  g_assert (PSPPIRE_IS_DICT (model));
 
+  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) && prefer_labels)
+  if (var_has_label (var) && use_labels (dv))
     {
-      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);
     }
+
+  var_unref (var);
 }
 
 
@@ -332,37 +380,63 @@ var_icon_cell_data_func (GtkTreeViewColumn *col,
                       gpointer data)
 {
   struct variable *var;
+
   gtk_tree_model_get (model, iter, DICT_TVM_COL_VAR, &var, -1);
 
-  if ( var_is_alpha (var))
-    {
-      g_object_set (cell, "stock-id", "var-string", NULL);
-    }
-  else
+  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 *
+get_var_measurement_stock_id (enum fmt_type type, enum measure measure)
+{
+  switch (fmt_get_category (type))
     {
-      const struct fmt_spec *fs = var_get_write_format (var);
-      int cat = fmt_get_category (fs->type);
-      switch ( var_get_measure (var))
+    case FMT_CAT_STRING:
+      switch (measure)
        {
-       case MEASURE_NOMINAL:
-         g_object_set (cell, "stock-id", "var-nominal", NULL);
-         break;
-       case MEASURE_ORDINAL:
-         g_object_set (cell, "stock-id", "var-ordinal", NULL);
-         break;
-       case MEASURE_SCALE:
-         if ( ( FMT_CAT_DATE | FMT_CAT_TIME ) & cat )
-           g_object_set (cell, "stock-id", "var-date-scale", NULL);
-         else
-           g_object_set (cell, "stock-id", "var-scale", NULL);
-         break;
-       default:
-         g_assert_not_reached ();
-       };
+       case MEASURE_UNKNOWN: return "role-none";
+       case MEASURE_NOMINAL: return "measure-string-nominal";
+       case MEASURE_ORDINAL: return "measure-string-ordinal";
+       case MEASURE_SCALE:   return "role-none";
+        case n_MEASURES: break;
+       }
+      break;
+
+    case FMT_CAT_DATE:
+    case FMT_CAT_TIME:
+      switch (measure)
+        {
+        case MEASURE_UNKNOWN: return "role-none";
+        case MEASURE_NOMINAL: return "measure-date-nominal";
+        case MEASURE_ORDINAL: return "measure-date-ordinal";
+        case MEASURE_SCALE:   return "measure-date-scale";
+        case n_MEASURES: break;
+        }
+      break;
+
+    default:
+      switch (measure)
+        {
+        case MEASURE_UNKNOWN: return "role-none";
+        case MEASURE_NOMINAL: return "measure-nominal";
+        case MEASURE_ORDINAL: return "measure-ordinal";
+        case MEASURE_SCALE:   return "measure-scale";
+        case n_MEASURES: break;
+       }
+      break;
     }
+
+  g_return_val_if_reached ("");
 }
 
 
+
 /* Sets the tooltip to be the name of the variable under the cursor */
 static gboolean
 set_tooltip_for_variable (GtkTreeView  *treeview,
@@ -371,7 +445,6 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
                          gboolean    keyboard_mode,
                          GtkTooltip *tooltip,
                          gpointer    user_data)
-
 {
   gint bx, by;
   GtkTreeIter iter;
@@ -380,7 +453,6 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
   struct variable *var = NULL;
   gboolean ok;
 
-
   gtk_tree_view_convert_widget_to_bin_window_coords (treeview,
                                                      x, y, &bx, &by);
 
@@ -390,7 +462,6 @@ set_tooltip_for_variable (GtkTreeView  *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);
@@ -399,58 +470,216 @@ set_tooltip_for_variable (GtkTreeView  *treeview,
   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;
+    }
 
   {
-    gchar *tip ;
-    gboolean prefer_labels = FALSE;
-
-    PsppireConf *conf = psppire_conf_new ();
+    const gchar *tip ;
+    GtkTreeModel *m;
 
-    psppire_conf_get_boolean (conf, "dialog-boxes", "prefer-labels",
-                             &prefer_labels);
+    get_base_model (tree_model, NULL, &m, NULL);
 
-    if ( prefer_labels )
-      tip = pspp_locale_to_utf8 (var_get_name (var), -1, NULL);
+    if (use_labels (PSPPIRE_DICT_VIEW (treeview)))
+      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);
   }
 
+  var_unref (var);
   return TRUE;
 }
 
+static struct variable *
+psppire_dict_view_iter_to_var (PsppireDictView *dict_view,
+                               GtkTreeIter *top_iter)
+{
+  GtkTreeView *treeview = GTK_TREE_VIEW (dict_view);
+  GtkTreeModel *top_model = gtk_tree_view_get_model (treeview);
+
+  struct variable *var;
+  GtkTreeModel *model;
+  GtkTreeIter iter;
+
+  get_base_model (top_model, top_iter, &model, &iter);
+  g_assert (PSPPIRE_IS_DICT (model));
+
+  gtk_tree_model_get (model,
+                     &iter, DICT_TVM_COL_VAR, &var, -1);
+
+  return var;
+}
+
+static gboolean
+show_menu (PsppireDictView *dv, GdkEvent *event, gpointer data)
+{
+  GdkEventButton *button_event = (GdkEventButton *) event;
+  if (button_event->button != 3)
+    return FALSE;
+
+  dv->var_under_cursor = NULL;
+  GtkTreePath *path = NULL;
+  gboolean is_row =
+    gtk_tree_view_get_path_at_pos (GTK_TREE_VIEW (dv),
+                                   button_event->x, button_event->y,
+                                   &path, NULL, NULL, NULL);
+  if (is_row)
+    {
+      GtkTreeIter iter;
+      GtkTreeModel *top_model = gtk_tree_view_get_model (GTK_TREE_VIEW (dv));
+      gtk_tree_model_get_iter (top_model, &iter, path);
+      dv->var_under_cursor = psppire_dict_view_iter_to_var (dv, &iter);
+    }
+  gtk_tree_path_free (path);
+
+  gtk_widget_set_sensitive (GTK_WIDGET (dv->var_info_check), is_row);
+
+  gtk_menu_popup_at_pointer (GTK_MENU (dv->menu), event);
+
+  return TRUE;
+}
+
+static void
+toggle_label_preference (GtkCheckMenuItem *checkbox, gpointer data)
+{
+  PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
+
+  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));
+}
+
+
+static void
+set_sort_criteria (GtkCheckMenuItem *checkbox, PsppireDictView *dv, GtkTreeIterCompareFunc func)
+{
+  if (!gtk_check_menu_item_get_active (checkbox))
+    {
+      gtk_widget_queue_draw (GTK_WIDGET (dv));
+      return;
+    }
+
+
+  gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (dv->sorted_model), func, 0, 0);
+
+
+  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)
+{
+  PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
+  set_sort_criteria (checkbox, dv, sort_by_name);
+}
+
+
+static void
+set_sort_criteria_label (GtkCheckMenuItem *checkbox, gpointer data)
+{
+  PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
+  set_sort_criteria (checkbox, dv, sort_by_label);
+}
+
+
+static void
+set_sort_criteria_unsorted (GtkCheckMenuItem *checkbox, gpointer data)
+{
+  PsppireDictView *dv = PSPPIRE_DICT_VIEW (data);
+  set_sort_criteria (checkbox, dv, unsorted);
+}
+
+static void
+check_item_set_inactive (GtkCheckMenuItem *cmi)
+{
+  gtk_check_menu_item_set_active (cmi, FALSE);
+}
+
+static void
+pop_up_down_variable_information (GtkCheckMenuItem *cmi, PsppireDictView *dv)
+{
+  gboolean active;
+  g_object_get (cmi, "active", &active, NULL);
+
+  g_return_if_fail (dv->var_under_cursor);
+
+  if (!active)
+    return;
+
+  GtkWidget *dialog = psppire_dialog_new ();
+  g_object_set (dialog,
+                "title", _("Variable Details"),
+                "help-page", "Manipulating-Variables",
+                NULL);
+
+  GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
+  gtk_container_add (GTK_CONTAINER (dialog), box);
+
+  GtkWidget *var_info = psppire_var_info_new ();
+  g_object_set (var_info, "variable", dv->var_under_cursor, NULL);
+  gtk_box_pack_start (GTK_BOX (box), var_info, TRUE, TRUE, 5);
+
+  GtkWidget *button_box = psppire_button_box_new ();
+  g_object_set (button_box,
+                "buttons", PSPPIRE_BUTTON_CLOSE_MASK | PSPPIRE_BUTTON_HELP_MASK,
+                NULL);
+  g_object_set (button_box, "layout-style", GTK_BUTTONBOX_SPREAD, NULL);
+  gtk_box_pack_start (GTK_BOX (box), button_box, FALSE, TRUE, 5);
+
+  g_signal_connect_swapped (dialog, "unmap",
+                            G_CALLBACK (check_item_set_inactive), cmi);
+
+  gtk_widget_show_all (box);
+  gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+  psppire_dialog_run (PSPPIRE_DIALOG (dialog));
+}
 
 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_override = FALSE;
+  dict_view->sorted_model = NULL;
+  dict_view->var_under_cursor = NULL;
 
-  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);
@@ -462,48 +691,117 @@ psppire_dict_view_init (PsppireDictView *dict_view)
 
   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);
-}
-
 
-GtkWidget*
-psppire_dict_view_new (void)
-{
-  return GTK_WIDGET (g_object_new (psppire_dict_view_get_type (), NULL));
-}
+  dict_view->menu = gtk_menu_new ();
 
+  {
+    GSList *group = NULL;
+    GtkWidget *item =
+      gtk_check_menu_item_new_with_label  (_("Prefer variable 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);
+
+    gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), item);
+
+    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, _("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"));
+    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_name), dict_view);
+
+    item = gtk_radio_menu_item_new_with_label (group, _("Sort by label"));
+    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_label), dict_view);
+
+    item = gtk_separator_menu_item_new ();
+    gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), item);
+
+    item = gtk_check_menu_item_new_with_label (_("Variable Information"));
+    dict_view->var_info_check = item;
+    gtk_menu_shell_append (GTK_MENU_SHELL (dict_view->menu), item);
+    g_signal_connect (item, "toggled", G_CALLBACK (pop_up_down_variable_information), dict_view);
+  }
 
+  gtk_widget_show_all (dict_view->menu);
 
-struct variable *
-psppire_dict_view_get_selected_variable (PsppireDictView *treeview)
-{
-  struct variable *var;
-  GtkTreeModel *top_model;
-  GtkTreeIter top_iter;
+  g_signal_connect (dict_view, "button-press-event",
+                   G_CALLBACK (show_menu), NULL);
+}
 
-  GtkTreeModel *model;
-  GtkTreeIter iter;
+struct get_vars_aux
+  {
+    PsppireDictView *dict_view;
+    struct variable **vars;
+    size_t idx;
+  };
 
-  GtkTreeSelection *selection =
-    gtk_tree_view_get_selection (GTK_TREE_VIEW (treeview));
+static void
+get_vars_cb (GtkTreeModel *model, GtkTreePath *path, GtkTreeIter *iter,
+             gpointer data)
+{
+  struct get_vars_aux *aux = data;
+  struct variable *var = psppire_dict_view_iter_to_var (aux->dict_view, iter);
 
-  if (! gtk_tree_selection_get_selected (selection,
-                                        &top_model, &top_iter))
-    {
-      return NULL;
-    }
+  g_return_if_fail (var != NULL);
+  aux->vars[aux->idx++] = var;
+}
 
-  dv_get_base_model (top_model, &top_iter, &model, &iter);
+void
+psppire_dict_view_get_selected_variables (PsppireDictView *dict_view,
+                                          struct variable ***vars,
+                                          size_t *n_varsp)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (dict_view);
+  GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
+  gint n_vars = gtk_tree_selection_count_selected_rows (selection);
+  struct get_vars_aux aux;
 
-  g_assert (PSPPIRE_IS_DICT (model));
+  *vars = g_malloc_n (n_vars, sizeof **vars);
 
-  gtk_tree_model_get (model,
-                     &iter, DICT_TVM_COL_VAR, &var, -1);
+  aux.dict_view = dict_view;
+  aux.vars = *vars;
+  aux.idx = 0;
+  gtk_tree_selection_selected_foreach (selection, get_vars_cb, &aux);
 
-  return var;
+  *n_varsp = aux.idx;
+  g_return_if_fail (aux.idx >= n_vars);
 }
 
+struct variable *
+psppire_dict_view_get_selected_variable (PsppireDictView *dict_view)
+{
+  GtkTreeView *tree_view = GTK_TREE_VIEW (dict_view);
+  GtkTreeSelection *selection = gtk_tree_view_get_selection (tree_view);
+  GtkTreeIter iter;
 
+  if (gtk_tree_selection_get_selected (selection, NULL, &iter))
+    return psppire_dict_view_iter_to_var (dict_view, &iter);
+  else
+    return NULL;
+}