X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=2bdf3d6b785ede1b38549013131cc99152e4c9ce;hb=7d4150d7cba15550753a0a574685de26656c0633;hp=80bf587695598398093df776f37dcaa401497188;hpb=b8a262a5ea1c5011eeb42d72365620f53ee1a7bc;p=pspp

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 80bf587695..2bdf3d6b78 100644
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -1,5 +1,6 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2016,
+   2017 Free Software Foundation, Inc.
 
    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
@@ -25,112 +26,30 @@
 #include "data/value-labels.h"
 #include "libpspp/range-set.h"
 #include "libpspp/str.h"
+#include "ui/gui/executor.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/var-display.h"
+#include "ui/gui/val-labs-dialog.h"
+#include "ui/gui/missing-val-dialog.h"
+#include "ui/gui/var-type-dialog.h"
+#include "ui/gui/psppire-dict.h"
 #include "ui/gui/psppire-data-store.h"
+#include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-value-entry.h"
 #include "ui/gui/psppire-conf.h"
-#include "ui/gui/psppire-var-sheet-header.h"
+#include "ui/gui/psppire-variable-sheet.h"
+
+#include "value-variant.h"
+
 
 #include "ui/gui/efficient-sheet/jmd-sheet.h"
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
 
-
-static GtkCellRenderer *
-create_spin_renderer (GType type)
-{
-  GtkCellRenderer *r = gtk_cell_renderer_spin_new ();
-      
-  GtkAdjustment *adj = gtk_adjustment_new (0,
-					   0, G_MAXDOUBLE,
-					   1, 1,
-					   0);
-  g_object_set (r,
-		"adjustment", adj,
-		NULL);
-  
-  return r;
-}
-
-static GtkCellRenderer *
-create_combo_renderer (GType type)
-{
-  GtkListStore *list_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING);
-  
-  GEnumClass *ec = g_type_class_ref (type);
-  
-  const GEnumValue *ev ;
-  for (ev = ec->values; ev->value_name; ++ev)
-    {
-      GtkTreeIter iter;
-
-      gtk_list_store_append (list_store, &iter);
-
-      gtk_list_store_set (list_store, &iter,
-			  0, ev->value,
-			  1, gettext (ev->value_nick),
-			  -1);
-    }
-
-  GtkCellRenderer *r = gtk_cell_renderer_combo_new ();
-
-  g_object_set (r,
-		"model", list_store,
-		"text-column", 1,
-		"has-entry", TRUE,
-		NULL);
-
-  return r;
-}
-
-GtkCellRenderer *xx ;
-GtkCellRenderer *column_width_renderer ;
-GtkCellRenderer *measure_renderer ;
-GtkCellRenderer *alignment_renderer ;
-
-
-
-static GtkCellRenderer *
-select_renderer_func (gint col, gint row, GType type)
-{
-  if (!xx)
-    xx = create_spin_renderer (type);
-
-  if (col == DICT_TVM_COL_ROLE && !column_width_renderer)
-    column_width_renderer = create_combo_renderer (type);
-
-  if (col == DICT_TVM_COL_MEASURE && !measure_renderer)
-    measure_renderer = create_combo_renderer (type);
-
-  if (col == DICT_TVM_COL_ALIGNMENT && !alignment_renderer)
-    alignment_renderer = create_combo_renderer (type);
-
-  switch  (col)
-    {
-    case DICT_TVM_COL_WIDTH:
-    case DICT_TVM_COL_DECIMAL:
-    case DICT_TVM_COL_COLUMNS:
-      return xx;
-      
-    case DICT_TVM_COL_ALIGNMENT:
-      return alignment_renderer;
-
-    case DICT_TVM_COL_MEASURE:
-      return measure_renderer;
-      
-    case DICT_TVM_COL_ROLE:
-      return column_width_renderer;
-    }
-  
-  return NULL;
-}
-
-
 static void psppire_data_editor_class_init          (PsppireDataEditorClass *klass);
 static void psppire_data_editor_init                (PsppireDataEditor      *de);
 
-static void disconnect_data_sheets (PsppireDataEditor *);
 static void refresh_entry (PsppireDataEditor *);
 
 GType
@@ -167,8 +86,6 @@ psppire_data_editor_dispose (GObject *obj)
 {
   PsppireDataEditor *de = (PsppireDataEditor *) obj;
 
-  disconnect_data_sheets (de);
-
   if (de->data_store)
     {
       g_object_unref (de->data_store);
@@ -205,38 +122,6 @@ psppire_data_editor_refresh_model (PsppireDataEditor *de)
 {
 }
 
-static void
-change_var_property (PsppireDict *dict, gint col, gint row, GValue *value)
-{
-  /* Return the IDXth variable */
-  struct variable *var =  psppire_dict_get_variable (dict, row);
-
-  switch (col)
-    {
-    case DICT_TVM_COL_NAME:
-      dict_rename_var (dict->dict, var, g_value_get_string (value));
-      break;
-    case DICT_TVM_COL_LABEL:
-      var_set_label (var, g_value_get_string (value));
-      break;
-    case DICT_TVM_COL_COLUMNS:
-      var_set_display_width (var, g_value_get_int (value));
-      break;
-    case DICT_TVM_COL_MEASURE:
-      var_set_measure (var, g_value_get_enum (value));
-      break;
-    case DICT_TVM_COL_ALIGNMENT:
-      var_set_alignment (var, g_value_get_enum (value));
-      break;
-    case DICT_TVM_COL_ROLE:
-      var_set_role (var, g_value_get_enum (value));
-      break;
-    default:
-      g_message ("Changing col %d of var sheet not yet supported", col);
-      break;
-    }
-}
-
 static void
 change_data_value (PsppireDataStore *store, gint col, gint row, GValue *value)
 {
@@ -246,12 +131,14 @@ change_data_value (PsppireDataStore *store, gint col, gint row, GValue *value)
     return;
 
   union value v;
-  value_init (&v, var_get_width (var));
-  v.f = g_value_get_double (value);
-  
+
+  GVariant *vrnt = g_value_get_variant (value);
+
+  value_variant_get (&v, vrnt);
+
   psppire_data_store_set_value (store, row, var, &v);
 
-  value_destroy (&v, var_get_width (var));
+  value_destroy_from_variant (&v, vrnt);
 }
 
 static void
@@ -265,7 +152,9 @@ psppire_data_editor_set_property (GObject         *object,
   switch (prop_id)
     {
     case PROP_SPLIT_WINDOW:
-      psppire_data_editor_split_window (de, g_value_get_boolean (value));
+      de->split = g_value_get_boolean (value);
+      g_object_set (de->data_sheet, "split", de->split, NULL);
+      g_object_set (de->var_sheet, "split", de->split, NULL);
       break;
     case PROP_DATA_STORE:
       if ( de->data_store)
@@ -278,14 +167,17 @@ psppire_data_editor_set_property (GObject         *object,
 
       de->data_store = g_value_get_pointer (value);
       g_object_ref (de->data_store);
-      g_print ("NEW STORE\n");
 
       g_object_set (de->data_sheet, "data-model", de->data_store, NULL);
       psppire_data_editor_refresh_model (de);
 
+      g_signal_connect_swapped (de->data_sheet, "selection-changed",
+				G_CALLBACK (refresh_entry),
+				de);
+
       g_signal_connect_swapped (de->data_sheet, "value-changed",
 				G_CALLBACK (change_data_value), de->data_store);
-      
+
       g_signal_connect_swapped (de->data_store, "case-changed",
                                 G_CALLBACK (refresh_entry), de);
 
@@ -298,9 +190,6 @@ psppire_data_editor_set_property (GObject         *object,
 
       g_object_set (de->data_sheet, "hmodel", de->dict, NULL);
       g_object_set (de->var_sheet, "data-model", de->dict, NULL);
-      g_signal_connect_swapped (de->var_sheet, "value-changed",
-				G_CALLBACK (change_var_property), de->dict);
-
       break;
     case PROP_VALUE_LABELS:
       break;
@@ -419,7 +308,6 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass)
   g_object_class_install_property (object_class,
                                    PROP_SPLIT_WINDOW,
                                    split_window_spec);
-
 }
 
 
@@ -438,7 +326,7 @@ static void
 on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index,
                                  PsppireDataEditor *de)
 {
-  
+
   gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
                                  PSPPIRE_DATA_EDITOR_VARIABLE_VIEW);
 
@@ -452,7 +340,25 @@ on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index,
 static void
 refresh_entry (PsppireDataEditor *de)
 {
-  g_print ("%s\n", __FUNCTION__);
+  gint row, col;
+  if (jmd_sheet_get_active_cell (JMD_SHEET (de->data_sheet), &col, &row))
+    {
+      union value val;
+      const struct variable *var = psppire_dict_get_variable (de->dict, col);
+      if (var == NULL)
+	return;
+
+      psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), var);
+
+      int width = var_get_width (var);
+      if (! psppire_data_store_get_value (PSPPIRE_DATA_STORE (de->data_store),
+					  row, var, &val))
+	return;
+
+      psppire_value_entry_set_value (PSPPIRE_VALUE_ENTRY (de->datum_entry),
+				     &val, width);
+      value_destroy (&val, width);
+    }
 }
 
 static void
@@ -461,11 +367,6 @@ on_datum_entry_activate (PsppireValueEntry *entry, PsppireDataEditor *de)
 }
 
 
-static void
-disconnect_data_sheets (PsppireDataEditor *de)
-{
-}
-
 /* Called when the active cell or the selection in the data sheet changes */
 static void
 on_data_selection_change (PsppireDataEditor *de, JmdRange *sel)
@@ -502,24 +403,298 @@ on_data_selection_change (PsppireDataEditor *de, JmdRange *sel)
 		     n_vars);
       ref_cell_text = ds_steal_cstr (&s);
     }
-  
+
   gtk_label_set_label (GTK_LABEL (de->cell_ref_label),
 		       ref_cell_text ? ref_cell_text : "");
-  
+
   g_free (ref_cell_text);
 }
 
 
 static void set_font_recursively (GtkWidget *w, gpointer data);
 
+gboolean myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in,
+		    GValue *out);
+
+
+enum sort_order
+  {
+    SORT_ASCEND,
+    SORT_DESCEND
+  };
+
+static void
+do_sort (PsppireDataEditor *de, enum sort_order order)
+{
+  JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+
+  int n_vars = 0;
+  int i;
+
+  PsppireDataWindow *pdw =
+     psppire_data_window_for_data_store (de->data_store);
+
+  GString *syntax = g_string_new ("SORT CASES BY");
+  for (i = range->start_x ; i <= range->end_x; ++i)
+    {
+      const struct variable *var = psppire_dict_get_variable (de->dict, i);
+      if (var != NULL)
+        {
+          g_string_append_printf (syntax, " %s", var_get_name (var));
+          n_vars++;
+        }
+    }
+  if (n_vars > 0)
+    {
+      if (order == SORT_DESCEND)
+        g_string_append (syntax, " (DOWN)");
+      g_string_append_c (syntax, '.');
+      execute_const_syntax_string (pdw, syntax->str);
+    }
+  g_string_free (syntax, TRUE);
+}
+
+
+static void
+sort_ascending (PsppireDataEditor *de)
+{
+  do_sort (de, SORT_ASCEND);
+
+  gtk_widget_queue_draw (GTK_WIDGET (de));
+}
+
+static void
+sort_descending (PsppireDataEditor *de)
+{
+  do_sort (de, SORT_DESCEND);
+
+  gtk_widget_queue_draw (GTK_WIDGET (de));
+}
+
+static void
+delete_cases (PsppireDataEditor *de)
+{
+  JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+
+  psppire_data_store_delete_cases (de->data_store, range->start_y,
+				   range->end_y - range->start_y + 1);
+
+  gtk_widget_queue_draw (GTK_WIDGET (de));
+}
+
+static void
+insert_new_case (PsppireDataEditor *de)
+{
+  gint posn = GPOINTER_TO_INT (g_object_get_data
+				(G_OBJECT (de->data_sheet_cases_row_popup), "item"));
+
+  psppire_data_editor_insert_new_case_at_posn (de, posn);
+}
+
+void
+psppire_data_editor_data_delete_variables (PsppireDataEditor *de)
+{
+  JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+
+  psppire_dict_delete_variables (de->dict, range->start_x,
+				 (range->end_x - range->start_x + 1));
+
+  gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet));
+}
+
+void
+psppire_data_editor_var_delete_variables (PsppireDataEditor *de)
+{
+  JmdRange *range = JMD_SHEET(de->var_sheet)->selection;
+
+  psppire_dict_delete_variables (de->dict, range->start_y,
+				 (range->end_y - range->start_y + 1));
+
+  gtk_widget_queue_draw (GTK_WIDGET (de->var_sheet));
+}
+
+void
+psppire_data_editor_insert_new_case_at_posn  (PsppireDataEditor *de, gint posn)
+{
+  psppire_data_store_insert_new_case (de->data_store, posn);
+
+  gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet));
+}
+
+void
+psppire_data_editor_insert_new_variable_at_posn (PsppireDataEditor *de, gint posn)
+{
+  const struct variable *v = psppire_dict_insert_variable (de->dict, posn, NULL);
+  psppire_data_store_insert_value (de->data_store, var_get_width(v),
+				   var_get_case_index (v));
+
+  gtk_widget_queue_draw (GTK_WIDGET (de));
+}
+
+static GtkWidget *
+create_data_row_header_popup_menu (PsppireDataEditor *de)
+{
+  GtkWidget *menu = gtk_menu_new ();
+
+  GtkWidget *item =
+    gtk_menu_item_new_with_mnemonic  (_("_Insert Case"));
+
+  g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_case), de);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  de->data_clear_cases_menu_item = gtk_menu_item_new_with_mnemonic (_("Cl_ear Cases"));
+  gtk_widget_set_sensitive (de->data_clear_cases_menu_item, FALSE);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_clear_cases_menu_item);
+  g_signal_connect_swapped (de->data_clear_cases_menu_item, "activate",
+			    G_CALLBACK (delete_cases), de);
+
+  gtk_widget_show_all (menu);
+  return menu;
+}
+
+static void
+insert_new_variable_data (PsppireDataEditor *de)
+{
+  gint posn = GPOINTER_TO_INT (g_object_get_data
+				(G_OBJECT (de->data_sheet_cases_column_popup),
+				 "item"));
+
+  psppire_data_editor_insert_new_variable_at_posn (de, posn);
+}
+
+static GtkWidget *
+create_data_column_header_popup_menu (PsppireDataEditor *de)
+{
+  GtkWidget *menu = gtk_menu_new ();
+
+  GtkWidget *item =
+    gtk_menu_item_new_with_mnemonic  (_("_Insert Variable"));
+  g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable_data),
+			    de);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  item = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  de->data_clear_variables_menu_item =
+    gtk_menu_item_new_with_mnemonic  (_("Cl_ear Variables"));
+  g_signal_connect_swapped (de->data_clear_variables_menu_item, "activate",
+			    G_CALLBACK (psppire_data_editor_data_delete_variables),
+			    de);
+  gtk_widget_set_sensitive (de->data_clear_variables_menu_item, FALSE);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_clear_variables_menu_item);
+
+  item = gtk_separator_menu_item_new ();
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), item);
+
+  de->data_sort_ascending_menu_item =
+    gtk_menu_item_new_with_mnemonic (_("Sort _Ascending"));
+  g_signal_connect_swapped (de->data_sort_ascending_menu_item, "activate",
+			    G_CALLBACK (sort_ascending), de);
+  gtk_widget_set_sensitive (de->data_sort_ascending_menu_item, FALSE);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_sort_ascending_menu_item);
+
+  de->data_sort_descending_menu_item =
+    gtk_menu_item_new_with_mnemonic (_("Sort _Descending"));
+  g_signal_connect_swapped (de->data_sort_descending_menu_item, "activate",
+			    G_CALLBACK (sort_descending), de);
+  gtk_widget_set_sensitive (de->data_sort_descending_menu_item, FALSE);
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_sort_descending_menu_item);
+
+  gtk_widget_show_all (menu);
+  return menu;
+}
+
+static void
+set_menu_items_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p)
+{
+  JmdRange *range = selection;
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p);
+  gint width = gtk_tree_model_get_n_columns (sheet->data_model);
+  gint length = psppire_data_store_get_case_count (de->data_store);
+
+
+  gboolean whole_row_selected = (range->start_x == 0 && range->end_x == width - 1);
+  gtk_widget_set_sensitive (de->data_clear_cases_menu_item, whole_row_selected);
+
+
+  gboolean whole_column_selected =
+    (range->start_y == 0 && range->end_y == length - 1);
+  gtk_widget_set_sensitive (de->data_clear_variables_menu_item,
+			    whole_column_selected);
+  gtk_widget_set_sensitive (de->data_sort_ascending_menu_item,
+			    whole_column_selected);
+  gtk_widget_set_sensitive (de->data_sort_descending_menu_item,
+			    whole_column_selected);
+}
+
+static void
+show_cases_row_popup (JmdSheet *sheet, int row, uint button, uint state, gpointer p)
+{
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p);
+  GListModel *vmodel = NULL;
+  g_object_get (sheet, "vmodel", &vmodel, NULL);
+  if (vmodel == NULL)
+    return;
+
+  guint n_items = g_list_model_get_n_items (vmodel);
+
+  if (row >= n_items)
+    return;
+
+  if (button != 3)
+    return;
+
+  g_object_set_data (G_OBJECT (de->data_sheet_cases_row_popup), "item",
+		     GINT_TO_POINTER (row));
+
+  gtk_menu_popup_at_pointer (GTK_MENU (de->data_sheet_cases_row_popup), NULL);
+}
+
+static void
+show_cases_column_popup (JmdSheet *sheet, int column, uint button, uint state,
+			 gpointer p)
+{
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p);
+  GListModel *hmodel = NULL;
+  g_object_get (sheet, "hmodel", &hmodel, NULL);
+  if (hmodel == NULL)
+    return;
+
+  guint n_items = g_list_model_get_n_items (hmodel);
+
+  if (column >= n_items)
+    return;
+
+  if (button != 3)
+    return;
+
+  g_object_set_data (G_OBJECT (de->data_sheet_cases_column_popup), "item",
+		     GINT_TO_POINTER (column));
+
+  gtk_menu_popup_at_pointer (GTK_MENU (de->data_sheet_cases_column_popup), NULL);
+}
+
+
+static gchar *
+data_store_value_to_string (JmdSheet *data_sheet, PsppireDataStore *store, gint col, gint row, const GValue *v)
+{
+  return psppire_data_store_value_to_string (store, col, row, v);
+}
+
 static void
 psppire_data_editor_init (PsppireDataEditor *de)
 {
   GtkWidget *hbox;
   gchar *fontname = NULL;
 
+  GtkStyleContext *context = gtk_widget_get_style_context (GTK_WIDGET (de));
+  gtk_style_context_add_class (context, "psppire-data-editor");
+
   de->font = NULL;
-  de->old_vbox_widget = NULL;
 
   g_object_set (de, "tab-pos", GTK_POS_BOTTOM, NULL);
 
@@ -536,7 +711,25 @@ psppire_data_editor_init (PsppireDataEditor *de)
   gtk_box_pack_start (GTK_BOX (hbox), de->datum_entry, TRUE, TRUE, 0);
 
   de->split = FALSE;
-  de->data_sheet = g_object_new (JMD_TYPE_SHEET, NULL);
+  de->data_sheet = jmd_sheet_new ();
+
+  de->data_sheet_cases_column_popup = create_data_column_header_popup_menu (de);
+  de->data_sheet_cases_row_popup = create_data_row_header_popup_menu (de);
+
+  g_signal_connect (de->data_sheet, "row-header-pressed",
+		    G_CALLBACK (show_cases_row_popup), de);
+
+  g_signal_connect (de->data_sheet, "column-header-pressed",
+		    G_CALLBACK (show_cases_column_popup), de);
+
+  g_signal_connect (de->data_sheet, "selection-changed",
+		    G_CALLBACK (set_menu_items_sensitivity), de);
+
+  g_object_set (de->data_sheet,
+		"forward-conversion", data_store_value_to_string,
+		"reverse-conversion", myreversefunc,
+		NULL);
+
   GtkWidget *data_button = jmd_sheet_get_button (JMD_SHEET (de->data_sheet));
   gtk_button_set_label (GTK_BUTTON (data_button), _("Case"));
   de->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
@@ -546,30 +739,22 @@ psppire_data_editor_init (PsppireDataEditor *de)
 
   g_signal_connect_swapped (de->data_sheet, "selection-changed",
 		    G_CALLBACK (on_data_selection_change), de);
-  
+
   gtk_notebook_append_page (GTK_NOTEBOOK (de), de->vbox,
 			    gtk_label_new_with_mnemonic (_("Data View")));
 
   gtk_widget_show_all (de->vbox);
 
-  de->var_sheet = g_object_new (JMD_TYPE_SHEET, NULL);
+  de->var_sheet = psppire_variable_sheet_new ();
 
-  PsppireVarSheetHeader *vsh = g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL);
-  
-  g_object_set (de->var_sheet,
-		"hmodel", vsh,
-		"select-renderer-func", select_renderer_func,
-		NULL);
-
-  
   GtkWidget *var_button = jmd_sheet_get_button (JMD_SHEET (de->var_sheet));
   gtk_button_set_label (GTK_BUTTON (var_button), _("Variable"));
-  
+
   gtk_notebook_append_page (GTK_NOTEBOOK (de), de->var_sheet,
 			    gtk_label_new_with_mnemonic (_("Variable View")));
 
   gtk_widget_show_all (de->var_sheet);
-  
+
   g_signal_connect (de->var_sheet, "row-header-double-clicked",
                     G_CALLBACK (on_var_sheet_var_double_clicked), de);
 
@@ -614,7 +799,28 @@ set_font_recursively (GtkWidget *w, gpointer data)
 {
   PangoFontDescription *font_desc = data;
 
-  gtk_widget_override_font (w, font_desc);
+  GtkStyleContext *style = gtk_widget_get_style_context (w);
+  GtkCssProvider *cssp = gtk_css_provider_new ();
+
+  gchar *str = pango_font_description_to_string (font_desc);
+  gchar *css =
+    g_strdup_printf ("* {font: %s}", str);
+  g_free (str);
+
+  GError *err = NULL;
+  gtk_css_provider_load_from_data (cssp, css, -1, &err);
+  if (err)
+    {
+      g_warning ("Failed to load font css \"%s\": %s", css, err->message);
+      g_error_free (err);
+    }
+  g_free (css);
+
+  gtk_style_context_add_provider (style,
+				  GTK_STYLE_PROVIDER (cssp),
+				  GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+  g_object_unref (cssp);
+
 
   if ( GTK_IS_CONTAINER (w))
     gtk_container_foreach (GTK_CONTAINER (w), set_font_recursively, font_desc);
@@ -635,7 +841,7 @@ psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_
   psppire_conf_set_string (psppire_conf_new (),
 			   "Data Editor", "font",
 			   font_name);
-
+  g_free (font_name);
 }
 
 /* If SPLIT is TRUE, splits DE's data sheet into four panes.
@@ -643,20 +849,7 @@ psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_
 void
 psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split)
 {
-  if (split == de->split)
-    return;
-
-  disconnect_data_sheets (de);
-
-  psppire_data_editor_refresh_model (de);
-
-  gtk_widget_show_all (de->vbox);
-
-  if (de->font)
-    set_font_recursively (GTK_WIDGET (de), de->font);
-
-  de->split = split;
-  g_object_notify (G_OBJECT (de), "split");
+  g_object_set (de, "split", split, NULL);
 }
 
 /* Makes the variable with dictionary index DICT_INDEX in DE's dictionary
@@ -664,42 +857,43 @@ psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split)
 void
 psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index)
 {
+  gint page = gtk_notebook_get_current_page (GTK_NOTEBOOK (de));
+
+  switch (page)
+    {
+      case PSPPIRE_DATA_EDITOR_DATA_VIEW:
+	jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1);
+	jmd_sheet_set_active_cell (JMD_SHEET (de->data_sheet), dict_index, -1, NULL);
+	break;
+      case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
+	jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index);
+	jmd_sheet_set_active_cell (JMD_SHEET (de->var_sheet), -1, dict_index, NULL);
+	break;
+    }
 }
 
-#if SHEET_MERGE
-/* Returns the "active" data sheet in DE.  If DE is in single-paned mode, this
-   is the only data sheet.  If DE is in split mode (showing four data sheets),
-   this is the focused data sheet or, if none is focused, the data sheet with
-   selected cells or, if none has selected cells, the upper-left data sheet. */
-PsppireDataSheet *
-psppire_data_editor_get_active_data_sheet (PsppireDataEditor *de)
+/* Set the datum at COL, ROW, to that contained in VALUE.
+ */
+static void
+store_set_datum (GtkTreeModel *model, gint col, gint row,
+			 const GValue *value)
 {
-  if (de->split)
-    {
-      PsppireDataSheet *data_sheet;
-      GtkWidget *scroller;
-      int i;
-
-      /* If one of the datasheet's scrollers is focused, choose that one. */
-      scroller = gtk_container_get_focus_child (
-        GTK_CONTAINER (de->datasheet_vbox_widget));
-      if (scroller != NULL)
-        return PSPPIRE_DATA_SHEET (gtk_bin_get_child (GTK_BIN (scroller)));
-
-      /* Otherwise if there's a nonempty selection in some data sheet, choose
-         that one. */
-      FOR_EACH_DATA_SHEET (data_sheet, i, de)
-        {
-          PsppSheetSelection *selection;
+  PsppireDataStore *store = PSPPIRE_DATA_STORE (model);
+  GVariant *v = g_value_get_variant (value);
+  union value uv;
+  value_variant_get (&uv, v);
+  const struct variable *var = psppire_dict_get_variable (store->dict, col);
+  psppire_data_store_set_value (store, row, var, &uv);
+  value_destroy_from_variant (&uv, v);
+}
 
-          selection = pspp_sheet_view_get_selection (
-            PSPP_SHEET_VIEW (data_sheet));
-          if (pspp_sheet_selection_count_selected_rows (selection)
-              && pspp_sheet_selection_count_selected_columns (selection))
-            return data_sheet;
-        }
-    }
+void
+psppire_data_editor_paste (PsppireDataEditor *de)
+{
+  JmdSheet *sheet = JMD_SHEET (de->data_sheet);
+  GtkClipboard *clip =
+    gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (sheet)),
+				   GDK_SELECTION_CLIPBOARD);
 
-  return PSPPIRE_DATA_SHEET (de->data_sheets[0]);
+  jmd_sheet_paste (sheet, clip, store_set_datum);
 }
-#endif