Added egression dialog
[pspp-builds.git] / src / ui / gui / data-editor.c
index 36150579051ef45cb9f15b8dc662a3e414c5804f..96f42cc263982657d54bbcfe490711ff8fe63b0c 100644 (file)
 
 #include "helper.h"
 #include "about.h"
+#include <data/procedure.h>
 #include "psppire-dialog.h"
 #include "psppire-selector.h"
 #include "weight-cases-dialog.h"
 #include "split-file-dialog.h"
 #include "transpose-dialog.h"
 #include "sort-cases-dialog.h"
+#include "select-cases-dialog.h"
 #include "compute-dialog.h"
 #include "goto-case-dialog.h"
+#include "find-dialog.h"
+#include "rank-dialog.h"
+#include "recode-dialog.h"
 #include "comments-dialog.h"
 #include "variable-info-dialog.h"
+#include "descriptives-dialog.h"
+#include "crosstabs-dialog.h"
+#include "frequencies-dialog.h"
+#include "examine-dialog.h"
 #include "dict-display.h"
+#include "regression-dialog.h"
+#include "clipboard.h"
+
+#include "oneway-anova-dialog.h"
+#include "t-test-independent-samples-dialog.h"
+#include "t-test-one-sample.h"
+#include "t-test-paired-samples.h"
 
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
 #include "data-editor.h"
 #include "syntax-editor.h"
 #include <language/syntax-string-source.h>
+#include <language/command.h>
 #include <libpspp/syntax-gen.h>
 #include "window-manager.h"
 
 #include "psppire-data-store.h"
 #include "psppire-var-store.h"
 
+static void on_edit_copy (GtkMenuItem *, gpointer);
+static void on_edit_cut (GtkMenuItem *, gpointer);
+static void on_edit_paste (GtkAction *a, gpointer data);
+
+
+static void create_data_sheet_variable_popup_menu (struct data_editor *);
+static void create_data_sheet_cases_popup_menu (struct data_editor *);
+
+static void popup_variable_menu (GtkSheet *, gint,
+                                GdkEventButton *, gpointer data);
+
+static void popup_cases_menu (GtkSheet *, gint,
+                                GdkEventButton *, gpointer data);
 
 /* Update the data_ref_entry with the reference of the active cell */
 static gint update_data_ref_entry (const GtkSheet *sheet,
@@ -58,27 +88,24 @@ static gint update_data_ref_entry (const GtkSheet *sheet,
 static void register_data_editor_actions (struct data_editor *de);
 
 static void insert_variable (GtkAction *, gpointer data);
-
 static void insert_case (GtkAction *a, gpointer data);
+static void delete_cases (GtkAction *a, gpointer data);
+static void delete_variables (GtkAction *a, gpointer data);
 
-
+static void toggle_value_labels (GtkToggleAction *a, gpointer data);
 
 /* Switch between the VAR SHEET and the DATA SHEET */
 
 static gboolean click2column (GtkWidget *w, gint col, gpointer data);
-
 static gboolean click2row (GtkWidget *w, gint row, gpointer data);
 
 
-static void select_sheet (struct data_editor *de, guint page_num);
-
-
 /* Callback for when the dictionary changes properties*/
 static void on_weight_change (GObject *, gint, gpointer);
 static void on_filter_change (GObject *, gint, gpointer);
 static void on_split_change (PsppireDict *, gpointer);
 
-static void data_var_select (GtkNotebook *notebook,
+static void on_switch_sheet (GtkNotebook *notebook,
                            GtkNotebookPage *page,
                            guint page_num,
                            gpointer user_data);
@@ -93,39 +120,81 @@ static void variable_sheet_activate (GtkCheckMenuItem *, gpointer );
 
 static void fonts_activate (GtkMenuItem *, gpointer);
 
-static void value_labels_activate (GtkCheckMenuItem *, gpointer);
-static void value_labels_toggled (GtkToggleToolButton *, gpointer);
+static void file_quit (GtkCheckMenuItem *, gpointer );
 
+static void
+enable_delete_cases (GtkWidget *w, gint var, gpointer data)
+{
+  struct data_editor *de = data;
 
-static void file_quit (GtkCheckMenuItem *, gpointer );
+  gtk_action_set_visible (de->delete_cases, var != -1);
+}
 
-static void on_clear_activate (GtkMenuItem *, gpointer);
 
 static void
-enable_edit_clear (GtkWidget *w, gint row, gpointer data)
+enable_delete_variables (GtkWidget *w, gint var, gpointer data)
 {
   struct data_editor *de = data;
 
-  GtkWidget *menuitem = get_widget_assert (de->xml, "edit_clear");
+  gtk_action_set_visible (de->delete_variables, var != -1);
+}
+
+
+
+/* Run the EXECUTE command. */
+static void
+execute (GtkMenuItem *mi, gpointer data)
+{
+  struct getl_interface *sss = create_syntax_string_source ("EXECUTE.");
 
-  gtk_widget_set_sensitive (menuitem, TRUE);
+  execute_syntax (sss);
 }
 
-static gboolean
-disable_edit_clear (GtkWidget *w, gint x, gint y, gpointer data)
+static void
+transformation_change_callback (bool transformations_pending,
+                               gpointer data)
 {
   struct data_editor *de = data;
+  GtkWidget *menuitem =
+    get_widget_assert (de->xml, "transform_run-pending");
+  GtkWidget *status_label  =
+    get_widget_assert (de->xml, "case-counter-area");
 
-  GtkWidget *menuitem = get_widget_assert (de->xml, "edit_clear");
+  gtk_widget_set_sensitive (menuitem, transformations_pending);
 
-  gtk_widget_set_sensitive (menuitem, FALSE);
 
-  return FALSE;
+  if ( transformations_pending)
+    gtk_label_set_text (GTK_LABEL (status_label),
+                       _("Transformations Pending"));
+  else
+    gtk_label_set_text (GTK_LABEL (status_label), "");
 }
 
+
 static void open_data_file (const gchar *, struct data_editor *);
 
 
+/* Puts FILE_NAME into the recent list.
+   If it's already in the list, it moves it to the top
+*/
+static void
+add_most_recent (const char *file_name)
+{
+#if RECENT_LISTS_AVAILABLE
+
+  GtkRecentManager *manager = gtk_recent_manager_get_default();
+  gchar *uri = g_filename_to_uri (file_name, NULL, NULL);
+
+  gtk_recent_manager_remove_item (manager, uri, NULL);
+
+  if ( ! gtk_recent_manager_add_item (manager, uri))
+    g_warning ("Could not add item %s to recent list\n",uri);
+
+  g_free (uri);
+#endif
+}
+
+
 
 #if RECENT_LISTS_AVAILABLE
 
@@ -188,6 +257,98 @@ datum_entry_activate (GtkEntry *entry, gpointer data)
   psppire_data_store_set_string (store, text, row, column);
 }
 
+
+/* Update the Edit->Paste menuitem
+   If PAGE is not -1 , then it should be set to the current page of
+   the data editors notebook widget.
+   If -1, then it'll be queried.
+*/
+static void
+update_paste_menuitem (struct data_editor *de, gint page)
+{
+  GtkWidget * edit_paste = get_widget_assert (de->xml, "edit_paste");
+  GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
+  GtkSheet * data_sheet ;
+  gint row, column;
+
+  if ( page < 0 )
+    page = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
+
+
+  if ( PAGE_VAR_SHEET == page )
+    {
+      /* We don't yet support pasting to the var sheet */
+      gtk_widget_set_sensitive (edit_paste, FALSE);
+      return;
+    }
+
+  data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+
+  gtk_sheet_get_active_cell (data_sheet, &row, &column);
+
+  if ( row < 0 || column < 0 )
+      gtk_widget_set_sensitive (edit_paste, FALSE);
+  else
+      gtk_widget_set_sensitive (edit_paste, TRUE);
+}
+
+/* Update the Edit->Cut and Edit->Copy menuitems
+   If PAGE is not -1 , then it should be set to the current page of
+   the data editors notebook widget.
+   If -1, then it'll be queried.
+*/
+static void
+update_cut_copy_menuitem (struct data_editor *de, gint page)
+{
+  GtkWidget * edit_copy = get_widget_assert (de->xml, "edit_copy");
+  GtkWidget * edit_cut = get_widget_assert (de->xml, "edit_cut");
+  GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
+  GtkSheet * data_sheet ;
+  gint row, column;
+
+  if ( page < 0 )
+    page = gtk_notebook_get_current_page (GTK_NOTEBOOK(notebook));
+
+
+  if ( PAGE_VAR_SHEET == page )
+    {
+      /* We don't yet support copying from the var sheet */
+      gtk_widget_set_sensitive (edit_copy, FALSE);
+      gtk_widget_set_sensitive (edit_cut, FALSE);
+      return;
+    }
+
+  data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+
+  gtk_sheet_get_active_cell (data_sheet, &row, &column);
+
+  if ( row < 0 || column < 0 )
+    {
+      gtk_widget_set_sensitive (edit_copy, FALSE);
+      gtk_widget_set_sensitive (edit_cut, FALSE);
+      return;
+    }
+
+  gtk_widget_set_sensitive (edit_copy, TRUE);
+  gtk_widget_set_sensitive (edit_cut, TRUE);
+}
+
+
+/* Callback for when the datasheet's active cell becomes active/inactive */
+static gboolean
+on_data_sheet_activate_change (GtkSheet *sheet,
+                              gint row, gint column, gpointer data)
+{
+  struct data_editor *de = data;
+
+  update_paste_menuitem (de, -1);
+  update_cut_copy_menuitem (de, -1);
+
+  return TRUE;
+}
+
+extern struct dataset *the_dataset;
+
 /*
   Create a new data editor.
 */
@@ -207,9 +368,22 @@ new_data_editor (void)
 
   de->xml = XML_NEW ("data-editor.glade");
 
+
+  dataset_add_transform_change_callback (the_dataset,
+                                        transformation_change_callback,
+                                        de);
+
   var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
   data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
 
+
+  g_signal_connect (G_OBJECT (data_sheet), "activate",
+                   G_CALLBACK (on_data_sheet_activate_change), de);
+
+  g_signal_connect (G_OBJECT (data_sheet), "deactivate",
+                   G_CALLBACK (on_data_sheet_activate_change), de);
+
+
   vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
 
   g_assert(vs); /* Traps a possible bug in win32 build */
@@ -239,8 +413,69 @@ new_data_editor (void)
   connect_help (de->xml);
 
 
+
+  g_signal_connect (get_widget_assert (de->xml, "edit_copy"),
+                   "activate",
+                   G_CALLBACK (on_edit_copy), de);
+
+  g_signal_connect (get_widget_assert (de->xml, "edit_cut"),
+                   "activate",
+                   G_CALLBACK (on_edit_cut), de);
+
+
   register_data_editor_actions (de);
 
+  de->toggle_value_labels =
+    gtk_toggle_action_new ("toggle-value-labels",
+                          _("Labels"),
+                          _("Show/hide value labels"),
+                          "pspp-value-labels");
+
+  g_signal_connect (de->toggle_value_labels, "activate",
+                   G_CALLBACK (toggle_value_labels), de);
+
+
+  gtk_action_connect_proxy (GTK_ACTION (de->toggle_value_labels),
+                           get_widget_assert (de->xml,
+                                              "togglebutton-value-labels"));
+
+
+  gtk_action_connect_proxy (GTK_ACTION (de->toggle_value_labels),
+                           get_widget_assert (de->xml,
+                                              "view_value-labels"));
+
+  de->delete_cases =
+    gtk_action_new ("clear-cases",
+                   _("Clear"),
+                   _("Delete the cases at the selected position(s)"),
+                   "pspp-clear-cases");
+
+  g_signal_connect (de->delete_cases, "activate",
+                   G_CALLBACK (delete_cases), de);
+
+  gtk_action_connect_proxy (de->delete_cases,
+                           get_widget_assert (de->xml, "edit_clear-cases"));
+
+  g_signal_connect (get_widget_assert (de->xml, "edit_paste"), "activate",
+                   G_CALLBACK (on_edit_paste), de);
+
+  gtk_action_set_visible (de->delete_cases, FALSE);
+
+  de->delete_variables =
+    gtk_action_new ("clear-variables",
+                   _("Clear"),
+                   _("Delete the variables at the selected position(s)"),
+                   "pspp-clear-variables");
+
+  g_signal_connect (de->delete_variables, "activate",
+                   G_CALLBACK (delete_variables), de);
+
+  gtk_action_connect_proxy (de->delete_variables,
+                           get_widget_assert (de->xml, "edit_clear-variables")
+                           );
+
+  gtk_action_set_visible (de->delete_variables, FALSE);
+
   de->insert_variable =
     gtk_action_new ("insert-variable",
                    _("Insert Variable"),
@@ -256,7 +491,7 @@ new_data_editor (void)
                            );
 
   gtk_action_connect_proxy (de->insert_variable,
-                           get_widget_assert (de->xml, "data_insert-variable")
+                           get_widget_assert (de->xml, "edit_insert-variable")
                            );
 
 
@@ -276,7 +511,7 @@ new_data_editor (void)
 
 
   gtk_action_connect_proxy (de->insert_case,
-                           get_widget_assert (de->xml, "data_insert-case")
+                           get_widget_assert (de->xml, "edit_insert-case")
                            );
 
 
@@ -293,7 +528,7 @@ new_data_editor (void)
                            );
 
   gtk_action_connect_proxy (de->invoke_goto_dialog,
-                           get_widget_assert (de->xml, "data_goto-case")
+                           get_widget_assert (de->xml, "edit_goto-case")
                            );
 
 
@@ -343,6 +578,15 @@ new_data_editor (void)
   g_signal_connect (de->invoke_sort_cases_dialog, "activate",
                    G_CALLBACK (sort_cases_dialog), de);
 
+  de->invoke_select_cases_dialog =
+    gtk_action_new ("select-cases-dialog",
+                   _("Select Cases"),
+                   _("Select cases from the active file"),
+                   "pspp-select-cases");
+
+  g_signal_connect (de->invoke_select_cases_dialog, "activate",
+                   G_CALLBACK (select_cases_dialog), de);
+
 
   de->invoke_compute_dialog =
     gtk_action_new ("compute-dialog",
@@ -353,6 +597,45 @@ new_data_editor (void)
   g_signal_connect (de->invoke_compute_dialog, "activate",
                    G_CALLBACK (compute_dialog), de);
 
+  de->invoke_oneway_anova_dialog =
+    gtk_action_new ("oneway-anova",
+                   _("Oneway _ANOVA"),
+                   _("Perform one way analysis of variance"),
+                   NULL);
+
+  g_signal_connect (de->invoke_oneway_anova_dialog, "activate",
+                   G_CALLBACK (oneway_anova_dialog), de);
+
+  de->invoke_t_test_independent_samples_dialog =
+    gtk_action_new ("t-test-independent-samples",
+                   _("_Independent Samples T Test"),
+                   _("Calculate T Test for samples from independent groups"),
+                   NULL);
+
+  g_signal_connect (de->invoke_t_test_independent_samples_dialog, "activate",
+                   G_CALLBACK (t_test_independent_samples_dialog), de);
+
+
+  de->invoke_t_test_paired_samples_dialog =
+    gtk_action_new ("t-test-paired-samples",
+                   _("_Paired Samples T Test"),
+                   _("Calculate T Test for paired samples"),
+                   NULL);
+
+  g_signal_connect (de->invoke_t_test_paired_samples_dialog, "activate",
+                   G_CALLBACK (t_test_paired_samples_dialog), de);
+
+
+  de->invoke_t_test_one_sample_dialog =
+    gtk_action_new ("t-test-one-sample",
+                   _("One _Sample T Test"),
+                   _("Calculate T Test for sample from a single distribution"),
+                   NULL);
+
+  g_signal_connect (de->invoke_t_test_one_sample_dialog, "activate",
+                   G_CALLBACK (t_test_one_sample_dialog), de);
+
+
   de->invoke_comments_dialog =
     gtk_action_new ("commments-dialog",
                    _("Data File Comments"),
@@ -362,6 +645,46 @@ new_data_editor (void)
   g_signal_connect (de->invoke_comments_dialog, "activate",
                    G_CALLBACK (comments_dialog), de);
 
+  de->invoke_find_dialog  =
+    gtk_action_new ("find-dialog",
+                   _("Find"),
+                   _("Find Case"),
+                   "gtk-find");
+
+  g_signal_connect (de->invoke_find_dialog, "activate",
+                   G_CALLBACK (find_dialog), de);
+
+
+  de->invoke_rank_dialog  =
+    gtk_action_new ("rank-dialog",
+                   _("Ran_k Cases"),
+                   _("Rank Cases"),
+                   "pspp-rank-cases");
+
+  g_signal_connect (de->invoke_rank_dialog, "activate",
+                   G_CALLBACK (rank_dialog), de);
+
+
+  de->invoke_recode_same_dialog  =
+    gtk_action_new ("recode-same-dialog",
+                   _("Recode into _Same Variables"),
+                   _("Recode values into the same Variables"),
+                   "pspp-recode-same");
+
+  g_signal_connect (de->invoke_recode_same_dialog, "activate",
+                   G_CALLBACK (recode_same_dialog), de);
+
+
+  de->invoke_recode_different_dialog  =
+    gtk_action_new ("recode-different-dialog",
+                   _("Recode into _Different Variables"),
+                   _("Recode values into different Variables"),
+                   "pspp-recode-different");
+
+  g_signal_connect (de->invoke_recode_different_dialog, "activate",
+                   G_CALLBACK (recode_different_dialog), de);
+
+
   de->invoke_variable_info_dialog  =
     gtk_action_new ("variable-info-dialog",
                    _("Variables"),
@@ -371,6 +694,54 @@ new_data_editor (void)
   g_signal_connect (de->invoke_variable_info_dialog, "activate",
                    G_CALLBACK (variable_info_dialog), de);
 
+  de->invoke_descriptives_dialog =
+    gtk_action_new ("descriptives-dialog",
+                   _("_Descriptives"),
+                   _("Calculate descriptive statistics (mean, variance, ...)"),
+                   "pspp-descriptives");
+
+  g_signal_connect (de->invoke_descriptives_dialog, "activate",
+                   G_CALLBACK (descriptives_dialog), de);
+
+
+  de->invoke_frequencies_dialog =
+    gtk_action_new ("frequencies-dialog",
+                   _("_Frequencies"),
+                   _("Generate frequency statistics"),
+                   "pspp-frequencies");
+
+  g_signal_connect (de->invoke_frequencies_dialog, "activate",
+                   G_CALLBACK (frequencies_dialog), de);
+
+  de->invoke_crosstabs_dialog =
+    gtk_action_new ("crosstabs-dialog",
+                   _("_Crosstabs"),
+                   _("Generate crosstabulations"),
+                   "pspp-crosstabs");
+
+  g_signal_connect (de->invoke_crosstabs_dialog, "activate",
+                   G_CALLBACK (crosstabs_dialog), de);
+
+
+  de->invoke_examine_dialog =
+    gtk_action_new ("examine-dialog",
+                   _("_Explore"),
+                   _("Examine Data by Factors"),
+                   "pspp-examine");
+
+  g_signal_connect (de->invoke_examine_dialog, "activate",
+                   G_CALLBACK (examine_dialog), de);
+
+
+  de->invoke_regression_dialog =
+    gtk_action_new ("regression-dialog",
+                   _("Linear _Regression"),
+                   _("Estimate parameters of the linear model"),
+                   "pspp-regression");
+
+  g_signal_connect (de->invoke_regression_dialog, "activate",
+                   G_CALLBACK (regression_dialog), de);
+
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
 
   g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
@@ -383,7 +754,6 @@ new_data_editor (void)
                            G_CALLBACK (gtk_action_activate),
                            de->action_data_open);
 
-
 #if RECENT_LISTS_AVAILABLE
   {
     GtkRecentManager *rm = gtk_recent_manager_get_default ();
@@ -447,13 +817,27 @@ new_data_editor (void)
                            G_CALLBACK (gtk_action_activate),
                            de->action_data_save_as);
 
+  gtk_action_connect_proxy (de->invoke_find_dialog,
+                           get_widget_assert (de->xml, "edit_find")
+                           );
 
-  g_signal_connect (get_widget_assert (de->xml,"edit_clear"),
-                   "activate",
-                   G_CALLBACK (on_clear_activate),
-                   de);
+  gtk_action_connect_proxy (de->invoke_find_dialog,
+                           get_widget_assert (de->xml, "button-find")
+                           );
 
+  gtk_action_connect_proxy (de->invoke_rank_dialog,
+                           get_widget_assert (de->xml, "transform_rank")
+                           );
 
+  gtk_action_connect_proxy (de->invoke_recode_same_dialog,
+                           get_widget_assert (de->xml,
+                                              "transform_recode-same")
+                           );
+
+  gtk_action_connect_proxy (de->invoke_recode_different_dialog,
+                           get_widget_assert (de->xml,
+                                              "transform_recode-different")
+                           );
 
   gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
                            get_widget_assert (de->xml, "data_weight-cases")
@@ -471,10 +855,38 @@ new_data_editor (void)
                            get_widget_assert (de->xml, "data_sort-cases")
                            );
 
+  gtk_action_connect_proxy (de->invoke_select_cases_dialog,
+                           get_widget_assert (de->xml, "data_select-cases")
+                           );
+
   gtk_action_connect_proxy (de->invoke_compute_dialog,
                            get_widget_assert (de->xml, "transform_compute")
                            );
 
+  gtk_action_connect_proxy (de->invoke_t_test_independent_samples_dialog,
+                           get_widget_assert (de->xml,
+                                              "indep-t-test")
+                           );
+
+
+  gtk_action_connect_proxy (de->invoke_t_test_paired_samples_dialog,
+                           get_widget_assert (de->xml,
+                                              "paired-t-test")
+                           );
+
+
+  gtk_action_connect_proxy (de->invoke_t_test_one_sample_dialog,
+                           get_widget_assert (de->xml,
+                                              "one-sample-t-test")
+                           );
+
+
+  gtk_action_connect_proxy (de->invoke_oneway_anova_dialog,
+                           get_widget_assert (de->xml,
+                                              "oneway-anova")
+                           );
+
+
   gtk_action_connect_proxy (de->invoke_comments_dialog,
                            get_widget_assert (de->xml, "utilities_comments")
                            );
@@ -483,6 +895,27 @@ new_data_editor (void)
                            get_widget_assert (de->xml, "utilities_variables")
                            );
 
+  gtk_action_connect_proxy (de->invoke_descriptives_dialog,
+                           get_widget_assert (de->xml, "analyze_descriptives")
+                           );
+
+  gtk_action_connect_proxy (de->invoke_crosstabs_dialog,
+                           get_widget_assert (de->xml, "crosstabs")
+                           );
+
+  gtk_action_connect_proxy (de->invoke_frequencies_dialog,
+                           get_widget_assert (de->xml, "analyze_frequencies")
+                           );
+
+
+  gtk_action_connect_proxy (de->invoke_examine_dialog,
+                           get_widget_assert (de->xml, "analyze_explore")
+                           );
+
+  gtk_action_connect_proxy (de->invoke_regression_dialog,
+                           get_widget_assert (de->xml, "linear-regression")
+                           );
+
   g_signal_connect (get_widget_assert (de->xml,"help_about"),
                    "activate",
                    G_CALLBACK (about_new),
@@ -500,35 +933,29 @@ new_data_editor (void)
                    de);
 
   g_signal_connect (data_sheet,
-                   "select-row",
-                   GTK_SIGNAL_FUNC (enable_edit_clear),
+                   "select-column",
+                   G_CALLBACK (enable_delete_variables),
                    de);
 
   g_signal_connect (data_sheet,
-                   "activate",
-                   GTK_SIGNAL_FUNC (disable_edit_clear),
+                   "select-row",
+                   G_CALLBACK (enable_delete_cases),
                    de);
 
+
   g_signal_connect (var_sheet,
                    "double-click-row",
                    GTK_SIGNAL_FUNC (click2row),
                    de);
 
-  g_signal_connect (var_sheet,
+  g_signal_connect_after (var_sheet,
                    "select-row",
-                   GTK_SIGNAL_FUNC (enable_edit_clear),
+                   G_CALLBACK (enable_delete_variables),
                    de);
 
-  g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
-                   "activate",
-                   GTK_SIGNAL_FUNC (disable_edit_clear),
-                   de);
-
-
   g_signal_connect (get_widget_assert (de->xml, "notebook"),
                    "switch-page",
-                   G_CALLBACK (data_var_select), de);
-
+                   G_CALLBACK (on_switch_sheet), de);
 
 
   g_signal_connect (get_widget_assert (de->xml, "view_statusbar"),
@@ -558,14 +985,6 @@ new_data_editor (void)
 
 
 
-  g_signal_connect (get_widget_assert (de->xml, "view_valuelabels"),
-                   "activate",
-                   G_CALLBACK (value_labels_activate), de);
-
-
-  g_signal_connect (get_widget_assert (de->xml, "togglebutton-value-labels"),
-                   "toggled",
-                   G_CALLBACK (value_labels_toggled), de);
 
   gtk_action_connect_proxy (de->action_data_open,
                            get_widget_assert (de->xml, "button-open")
@@ -587,17 +1006,33 @@ new_data_editor (void)
                            get_widget_assert (de->xml, "button-split-file")
                            );
 
+  gtk_action_connect_proxy (de->invoke_select_cases_dialog,
+                           get_widget_assert (de->xml, "button-select-cases")
+                           );
+
+
   g_signal_connect (get_widget_assert (de->xml, "file_quit"),
                    "activate",
                    G_CALLBACK (file_quit), de);
 
+  g_signal_connect (get_widget_assert (de->xml, "transform_run-pending"),
+                   "activate",
+                   G_CALLBACK (execute), de);
+
 
   g_signal_connect (get_widget_assert (de->xml, "windows_minimise_all"),
                    "activate",
                    G_CALLBACK (minimise_all_windows), NULL);
 
 
-  select_sheet (de, PAGE_DATA_SHEET);
+  create_data_sheet_variable_popup_menu (de);
+  create_data_sheet_cases_popup_menu (de);
+
+  g_signal_connect (G_OBJECT (data_sheet), "button-event-column",
+                   G_CALLBACK (popup_variable_menu), de);
+
+  g_signal_connect (G_OBJECT (data_sheet), "button-event-row",
+                   G_CALLBACK (popup_cases_menu), de);
 
   return de;
 }
@@ -662,10 +1097,15 @@ new_data_window (GtkMenuItem *menuitem, gpointer parent)
   window_create (WINDOW_DATA, NULL);
 }
 
-
+/* Callback for when the datasheet/varsheet is selected */
 static void
-select_sheet (struct data_editor *de, guint page_num)
+on_switch_sheet (GtkNotebook *notebook,
+               GtkNotebookPage *page,
+               guint page_num,
+               gpointer user_data)
 {
+  struct data_editor *de = user_data;
+
   GtkWidget *view_data = get_widget_assert (de->xml, "view_data");
   GtkWidget *view_variables = get_widget_assert (de->xml, "view_variables");
 
@@ -680,7 +1120,7 @@ select_sheet (struct data_editor *de, guint page_num)
       break;
     case PAGE_DATA_SHEET:
       gtk_widget_show (view_variables);
-      gtk_widget_hide (view_data);
+      gtk_widget_show (view_data);
       gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE);
       gtk_action_set_sensitive (de->insert_case, TRUE);
       break;
@@ -688,23 +1128,12 @@ select_sheet (struct data_editor *de, guint page_num)
       g_assert_not_reached ();
       break;
     }
-}
-
-
-static void
-data_var_select (GtkNotebook *notebook,
-               GtkNotebookPage *page,
-               guint page_num,
-               gpointer user_data)
-{
-  struct data_editor *de = user_data;
 
-  select_sheet (de, page_num);
+  update_paste_menuitem (de, page_num);
+  update_cut_copy_menuitem (de, page_num);
 }
 
 
-
-
 void
 data_editor_select_sheet (struct data_editor *de, gint page)
 {
@@ -715,6 +1144,7 @@ data_editor_select_sheet (struct data_editor *de, gint page)
 }
 
 
+
 static void
 status_bar_activate (GtkCheckMenuItem *menuitem, gpointer data)
 {
@@ -797,84 +1227,76 @@ fonts_activate (GtkMenuItem *menuitem, gpointer data)
 }
 
 
-/* The next two callbacks are mutually co-operative */
 
-/* Callback for the value labels menu item */
+/* Callback for the value labels action */
 static void
-value_labels_activate (GtkCheckMenuItem *menuitem, gpointer data)
+toggle_value_labels (GtkToggleAction *ta, gpointer data)
 {
   struct data_editor *de = data;
 
   GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
 
-  GtkToggleToolButton *tb =
-    GTK_TOGGLE_TOOL_BUTTON (get_widget_assert (de->xml,
-                                              "togglebutton-value-labels"));
-
   PsppireDataStore *ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
 
-  gboolean show_value_labels = gtk_check_menu_item_get_active (menuitem);
 
-  gtk_toggle_tool_button_set_active (tb, show_value_labels);
-
-  psppire_data_store_show_labels (ds, show_value_labels);
+  psppire_data_store_show_labels (ds,
+                                 gtk_toggle_action_get_active (ta));
 }
 
+extern PsppireDataStore *the_data_store ;
 
-/* Callback for the value labels tooglebutton */
 static void
-value_labels_toggled (GtkToggleToolButton *toggle_tool_button,
-                     gpointer data)
+file_quit (GtkCheckMenuItem *menuitem, gpointer data)
+{
+  /* FIXME: Need to be more intelligent here.
+     Give the user the opportunity to save any unsaved data.
+  */
+  g_object_unref (the_data_store);
+  gtk_main_quit ();
+}
+
+static void
+delete_cases (GtkAction *action, gpointer data)
 {
   struct data_editor *de = data;
+  GtkSheet *data_sheet =
+    GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
 
-  GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+  GtkSheetRange range;
 
-  GtkCheckMenuItem *item =
-    GTK_CHECK_MENU_ITEM (get_widget_assert (de->xml, "view_valuelabels"));
+  PsppireDataStore *data_store = PSPPIRE_DATA_STORE
+    (gtk_sheet_get_model (data_sheet) );
 
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
 
-  gboolean show_value_labels =
-    gtk_toggle_tool_button_get_active (toggle_tool_button);
+  /* This shouldn't be able to happen, because the action
+     should be disabled */
+  g_return_if_fail (gtk_sheet_get_state (data_sheet)
+                   ==  GTK_SHEET_ROW_SELECTED );
 
-  gtk_check_menu_item_set_active (item, show_value_labels);
+  gtk_sheet_get_selected_range (data_sheet, &range);
 
-  psppire_data_store_show_labels (ds, show_value_labels);
-}
+  gtk_sheet_unselect_range (data_sheet);
 
+  psppire_data_store_delete_cases (data_store, range.row0,
+                                  1 + range.rowi - range.row0);
 
-static void
-file_quit (GtkCheckMenuItem *menuitem, gpointer data)
-{
-  /* FIXME: Need to be more intelligent here.
-     Give the user the opportunity to save any unsaved data.
-  */
-  gtk_main_quit ();
 }
 
-
-/* Callback for when the Clear item in the edit menu is activated */
 static void
-on_clear_activate (GtkMenuItem *menuitem, gpointer data)
+delete_variables (GtkAction *a, gpointer data)
 {
   struct data_editor *de = data;
-
-  GtkSheet *sheet  = NULL;
-  GtkSheetRange range ;
+  GtkSheetRange range;
 
   GtkNotebook *notebook = GTK_NOTEBOOK (get_widget_assert (de->xml,
                                                           "notebook"));
 
   const gint page = gtk_notebook_get_current_page (notebook);
 
-  sheet = GTK_SHEET
-    (get_widget_assert (de->xml,
-                       (page == PAGE_VAR_SHEET) ? "variable_sheet" : "data_sheet"));
-
-  /* This shouldn't be able to happen, because the menuitem
-     should be disabled */
-  g_return_if_fail (gtk_sheet_get_state (sheet) == GTK_SHEET_ROW_SELECTED );
+  GtkSheet *sheet = GTK_SHEET (get_widget_assert (de->xml,
+                                                 (page == PAGE_VAR_SHEET) ?
+                                                 "variable_sheet" :
+                                                 "data_sheet"));
 
 
   gtk_sheet_get_selected_range (sheet, &range);
@@ -883,9 +1305,8 @@ on_clear_activate (GtkMenuItem *menuitem, gpointer data)
     {
     case PAGE_VAR_SHEET:
       {
-       PsppireVarStore *vs = PSPPIRE_VAR_STORE
-         (gtk_sheet_get_model (sheet) );
-
+       PsppireVarStore *vs =
+         PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
 
        psppire_dict_delete_variables (vs->dict,
                                       range.row0,
@@ -896,23 +1317,17 @@ on_clear_activate (GtkMenuItem *menuitem, gpointer data)
       break;
     case PAGE_DATA_SHEET:
       {
-       PsppireDataStore *data_store = PSPPIRE_DATA_STORE
-         (gtk_sheet_get_model (sheet) );
-
-
-       /* This shouldn't be able to happen, because the menuitem
-          should be disabled */
-       g_return_if_fail (gtk_sheet_get_state (sheet)
-                         ==  GTK_SHEET_ROW_SELECTED );
-
+       PsppireDataStore *ds =
+         PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
 
-       psppire_data_store_delete_cases (data_store, range.row0,
-                                        1 + range.rowi - range.row0);
+       psppire_dict_delete_variables (ds->dict,
+                                      range.col0,
+                                      1 +
+                                      range.coli -
+                                      range.col0 );
       }
       break;
-    default:
-      g_assert_not_reached ();
-    }
+    };
 
   gtk_sheet_unselect_range (sheet);
 }
@@ -997,7 +1412,8 @@ on_split_change (PsppireDict *dict, gpointer data)
     {
       gint i;
       GString *text;
-      const struct variable *const * split_vars = dict_get_split_vars (dict->dict);
+      const struct variable *const * split_vars =
+       dict_get_split_vars (dict->dict);
 
       text = g_string_new (_("Split by "));
 
@@ -1306,14 +1722,17 @@ open_data_file (const gchar *file_name, struct data_editor *de)
 
   sss = create_syntax_string_source ("GET FILE=%s.",
                                     ds_cstr (&filename));
-
-  execute_syntax (sss);
   ds_destroy (&filename);
 
-  window_set_name_from_filename ((struct editor_window *) de, file_name);
+  if (execute_syntax (sss) )
+  {
+    window_set_name_from_filename ((struct editor_window *) de, file_name);
+    add_most_recent (file_name);
+  }
 }
 
 
+
 /* Callback for the data_open action.
    Prompts for a filename and opens it */
 static void
@@ -1364,19 +1783,6 @@ open_data_dialog (GtkAction *action, struct data_editor *de)
          gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
        open_data_file (de->file_name, de);
-
-#if RECENT_LISTS_AVAILABLE
-       {
-         GtkRecentManager *manager = gtk_recent_manager_get_default();
-         gchar *uri = g_filename_to_uri (de->file_name, NULL, NULL);
-
-         if ( ! gtk_recent_manager_add_item (manager, uri))
-           g_warning ("Could not add item %s to recent list\n",uri);
-
-         g_free (uri);
-       }
-#endif
-
       }
       break;
     default:
@@ -1392,6 +1798,7 @@ open_data_dialog (GtkAction *action, struct data_editor *de)
 static gint
 update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
 {
+  GtkEntry *datum_entry;
   GladeXML *data_editor_xml = data;
 
   PsppireDataStore *data_store =
@@ -1399,6 +1806,11 @@ update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
 
   g_return_val_if_fail (data_editor_xml, FALSE);
 
+
+  datum_entry =
+    GTK_ENTRY (get_widget_assert (data_editor_xml,
+                                 "datum_entry"));
+
   if (data_store)
     {
       const struct variable *var =
@@ -1408,10 +1820,6 @@ update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
       GtkEntry *cell_ref_entry =
        GTK_ENTRY (get_widget_assert (data_editor_xml,
                                      "cell_ref_entry"));
-      GtkEntry *datum_entry =
-       GTK_ENTRY (get_widget_assert (data_editor_xml,
-                                     "datum_entry"));
-
       if ( var )
        {
          gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
@@ -1426,14 +1834,17 @@ update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
          g_free (s);
        }
       else
-       gtk_entry_set_text (cell_ref_entry, "");
-
+       goto blank_entry;
 
       if ( var )
        {
          gchar *text =
            psppire_data_store_get_string (data_store, row,
                                           var_get_dict_index(var));
+
+         if ( ! text )
+           goto blank_entry;
+
          g_strchug (text);
 
          gtk_entry_set_text (datum_entry, text);
@@ -1441,8 +1852,303 @@ update_data_ref_entry (const GtkSheet *sheet, gint row, gint col, gpointer data)
          free (text);
        }
       else
-       gtk_entry_set_text (datum_entry, "");
+       goto blank_entry;
+
     }
 
   return FALSE;
+
+ blank_entry:
+  gtk_entry_set_text (datum_entry, "");
+
+  return FALSE;
+}
+
+
+
+
+
+static void
+do_sort (PsppireDataStore *ds, int var, gboolean descend)
+{
+  GString *string = g_string_new ("SORT CASES BY ");
+
+  const struct variable *v =
+    psppire_dict_get_variable (ds->dict, var);
+
+  g_string_append_printf (string, "%s", var_get_name (v));
+
+  if ( descend )
+    g_string_append (string, " (D)");
+
+  g_string_append (string, ".");
+
+  execute_syntax (create_syntax_string_source (string->str));
+
+  g_string_free (string, TRUE);
+}
+
+
+static void
+sort_up (GtkMenuItem *item, gpointer data)
+{
+  GtkSheet *sheet  = data;
+  GtkSheetRange range;
+  gtk_sheet_get_selected_range (sheet, &range);
+
+  do_sort (PSPPIRE_DATA_STORE (gtk_sheet_get_model(sheet)),
+          range.col0, FALSE);
+
+}
+
+static void
+sort_down (GtkMenuItem *item, gpointer data)
+{
+  GtkSheet *sheet  = data;
+  GtkSheetRange range;
+  gtk_sheet_get_selected_range (sheet, &range);
+
+  do_sort (PSPPIRE_DATA_STORE (gtk_sheet_get_model(sheet)),
+          range.col0, TRUE);
+}
+
+
+
+
+static void
+create_data_sheet_variable_popup_menu (struct data_editor *de)
+{
+  GtkSheet *sheet  = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
+  GtkWidget *menu = gtk_menu_new ();
+
+  GtkWidget *sort_ascending =
+    gtk_menu_item_new_with_label (_("Sort Ascending"));
+
+  GtkWidget *sort_descending =
+    gtk_menu_item_new_with_label (_("Sort Descending"));
+
+
+  GtkWidget *insert_variable =
+    gtk_menu_item_new_with_label (_("Insert Variable"));
+
+  GtkWidget *clear_variable =
+    gtk_menu_item_new_with_label (_("Clear"));
+
+
+  gtk_action_connect_proxy (de->insert_variable,
+                           insert_variable );
+
+
+  gtk_action_connect_proxy (de->delete_variables,
+                           clear_variable );
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_variable);
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+                        gtk_separator_menu_item_new ());
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), clear_variable);
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+                        gtk_separator_menu_item_new ());
+
+
+  g_signal_connect (G_OBJECT (sort_ascending), "activate",
+                   G_CALLBACK (sort_up), sheet);
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_ascending);
+
+
+  g_signal_connect (G_OBJECT (sort_descending), "activate",
+                   G_CALLBACK (sort_down), sheet);
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), sort_descending);
+
+  gtk_widget_show_all (menu);
+
+
+  de->data_sheet_variable_popup_menu = GTK_MENU(menu);
+}
+
+
+static void
+create_data_sheet_cases_popup_menu (struct data_editor *de)
+{
+  GtkWidget *menu = gtk_menu_new ();
+
+  GtkWidget *insert_case =
+    gtk_menu_item_new_with_label (_("Insert Case"));
+
+  GtkWidget *delete_case =
+    gtk_menu_item_new_with_label (_("Clear"));
+
+
+  gtk_action_connect_proxy (de->insert_case,
+                           insert_case);
+
+
+  gtk_action_connect_proxy (de->delete_cases,
+                           delete_case);
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), insert_case);
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu),
+                        gtk_separator_menu_item_new ());
+
+
+  gtk_menu_shell_append (GTK_MENU_SHELL (menu), delete_case);
+
+
+  gtk_widget_show_all (menu);
+
+
+  de->data_sheet_cases_popup_menu = GTK_MENU (menu);
+}
+
+
+static void
+popup_variable_menu (GtkSheet *sheet, gint column,
+                    GdkEventButton *event, gpointer data)
+{
+  struct data_editor *de = data;
+
+  PsppireDataStore *data_store =
+    PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+
+  const struct variable *v =
+    psppire_dict_get_variable (data_store->dict, column);
+
+  if ( v && event->button == 3)
+    {
+
+      gtk_sheet_select_column (sheet, column);
+
+      gtk_menu_popup (GTK_MENU (de->data_sheet_variable_popup_menu),
+                     NULL, NULL, NULL, NULL,
+                     event->button, event->time);
+    }
+}
+
+
+static void
+popup_cases_menu (GtkSheet *sheet, gint row,
+                 GdkEventButton *event, gpointer data)
+{
+  struct data_editor *de = data;
+
+  PsppireDataStore *data_store =
+    PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
+
+  if ( row <= psppire_data_store_get_case_count (data_store) &&
+       event->button == 3)
+    {
+      gtk_sheet_select_row (sheet, row);
+
+      gtk_menu_popup (GTK_MENU (de->data_sheet_cases_popup_menu),
+                     NULL, NULL, NULL, NULL,
+                     event->button, event->time);
+    }
 }
+
+
+static void
+on_edit_paste (GtkAction *a, gpointer data)
+{
+  GtkClipboard *clipboard = gtk_clipboard_get (GDK_SELECTION_CLIPBOARD);
+
+  gtk_clipboard_request_contents (clipboard,
+                                 gdk_atom_intern ("UTF8_STRING", TRUE),
+                                 data_sheet_contents_received_callback,
+                                 data);
+}
+
+
+static void
+on_edit_copy (GtkMenuItem *m, gpointer data)
+{
+  struct data_editor *de = data;
+
+  GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml,
+                                                      "data_sheet"));
+
+  data_sheet_set_clip (data_sheet);
+}
+
+
+
+static void
+on_edit_cut (GtkMenuItem *m, gpointer data)
+{
+  struct data_editor *de = data;
+  gint max_rows, max_columns;
+  gint r;
+  GtkSheetRange range;
+  PsppireDataStore *ds;
+  GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml,
+                                                      "data_sheet"));
+
+  data_sheet_set_clip (data_sheet);
+
+
+  /* Now blank all the cells */
+  gtk_sheet_get_selected_range (data_sheet, &range);
+
+  ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
+
+
+   /* If nothing selected, then use active cell */
+  if ( range.row0 < 0 || range.col0 < 0 )
+    {
+      gint row, col;
+      gtk_sheet_get_active_cell (data_sheet, &row, &col);
+
+      range.row0 = range.rowi = row;
+      range.col0 = range.coli = col;
+    }
+
+  /* The sheet range can include cells that do not include data.
+     Exclude them from the range. */
+  max_rows = psppire_data_store_get_case_count (ds);
+  if (range.rowi >= max_rows)
+    {
+      if (max_rows == 0)
+        return;
+      range.rowi = max_rows - 1;
+    }
+
+  max_columns = dict_get_var_cnt (ds->dict->dict);
+  if (range.coli >= max_columns)
+    {
+      if (max_columns == 0)
+        return;
+      range.coli = max_columns - 1;
+    }
+
+  g_return_if_fail (range.rowi >= range.row0);
+  g_return_if_fail (range.row0 >= 0);
+  g_return_if_fail (range.coli >= range.col0);
+  g_return_if_fail (range.col0 >= 0);
+
+
+  for (r = range.row0; r <= range.rowi ; ++r )
+    {
+      gint c;
+
+      for (c = range.col0 ; c <= range.coli; ++c)
+       {
+         psppire_data_store_set_string (ds, "", r, c);
+       }
+    }
+
+  /* and remove the selection */
+  gtk_sheet_unselect_range (data_sheet);
+}
+
+