Delete these files.
authorJohn Darrington <john@darrington.wattle.id.au>
Fri, 29 Feb 2008 09:09:00 +0000 (09:09 +0000)
committerJohn Darrington <john@darrington.wattle.id.au>
Fri, 29 Feb 2008 09:09:00 +0000 (09:09 +0000)
src/ui/gui/data-editor.c [deleted file]
src/ui/gui/var-sheet.c [deleted file]
src/ui/gui/var-sheet.h [deleted file]

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
deleted file mode 100644 (file)
index 96f42cc..0000000
+++ /dev/null
@@ -1,2154 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2006, 2007  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-#include <config.h>
-#include <stdlib.h>
-#include <gettext.h>
-
-#include <glade/glade.h>
-#include <gtk/gtk.h>
-
-#include "window-manager.h"
-#include <gtksheet/gtksheet.h>
-
-#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,
-                                  gint row, gint col, gpointer data);
-
-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);
-
-
-/* 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 on_switch_sheet (GtkNotebook *notebook,
-                           GtkNotebookPage *page,
-                           guint page_num,
-                           gpointer user_data);
-
-static void status_bar_activate (GtkCheckMenuItem *, gpointer);
-
-static void grid_lines_activate (GtkCheckMenuItem *, gpointer);
-
-static void data_sheet_activate (GtkCheckMenuItem *, gpointer);
-
-static void variable_sheet_activate (GtkCheckMenuItem *, gpointer );
-
-static void fonts_activate (GtkMenuItem *, gpointer);
-
-static void file_quit (GtkCheckMenuItem *, gpointer );
-
-static void
-enable_delete_cases (GtkWidget *w, gint var, gpointer data)
-{
-  struct data_editor *de = data;
-
-  gtk_action_set_visible (de->delete_cases, var != -1);
-}
-
-
-static void
-enable_delete_variables (GtkWidget *w, gint var, gpointer data)
-{
-  struct data_editor *de = data;
-
-  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.");
-
-  execute_syntax (sss);
-}
-
-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");
-
-  gtk_widget_set_sensitive (menuitem, transformations_pending);
-
-
-  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
-
-static void
-on_recent_data_select (GtkMenuShell *menushell,   gpointer user_data)
-{
-  gchar *file;
-  struct data_editor *de = user_data;
-
-  gchar *uri =
-    gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
-
-  file = g_filename_from_uri (uri, NULL, NULL);
-
-  g_free (uri);
-
-  open_data_file (file, de);
-
-  g_free (file);
-}
-
-static void
-on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
-{
-  gchar *file;
-
-  struct syntax_editor *se ;
-
-  gchar *uri =
-    gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
-
-  file = g_filename_from_uri (uri, NULL, NULL);
-
-  g_free (uri);
-
-  se = (struct syntax_editor *)
-    window_create (WINDOW_SYNTAX, file);
-
-  load_editor_from_file (se, file, NULL);
-
-  g_free (file);
-}
-
-#endif
-
-static void
-datum_entry_activate (GtkEntry *entry, gpointer data)
-{
-  gint row, column;
-  GtkSheet *data_sheet = GTK_SHEET (data);
-  PsppireDataStore *store = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
-
-  const char *text = gtk_entry_get_text (entry);
-
-  gtk_sheet_get_active_cell (data_sheet, &row, &column);
-
-  if ( row == -1 || column == -1)
-    return;
-
-  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.
-*/
-struct data_editor *
-new_data_editor (void)
-{
-  struct data_editor *de ;
-  struct editor_window *e;
-  GtkSheet *var_sheet ;
-  GtkSheet *data_sheet ;
-  PsppireVarStore *vs;
-  GtkWidget *datum_entry;
-
-  de = g_malloc0 (sizeof (*de));
-
-  e = (struct editor_window *) de;
-
-  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 */
-
-  g_signal_connect (G_OBJECT (data_sheet), "activate",
-                   G_CALLBACK (update_data_ref_entry),
-                   de->xml);
-
-  datum_entry = get_widget_assert (de->xml, "datum_entry");
-
-  g_signal_connect (G_OBJECT (datum_entry), "activate",
-                   G_CALLBACK (datum_entry_activate),
-                   data_sheet);
-
-  g_signal_connect (vs->dict, "weight-changed",
-                   G_CALLBACK (on_weight_change),
-                   de);
-
-  g_signal_connect (vs->dict, "filter-changed",
-                   G_CALLBACK (on_filter_change),
-                   de);
-
-  g_signal_connect (vs->dict, "split-changed",
-                   G_CALLBACK (on_split_change),
-                   de);
-
-  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"),
-                   _("Create a new variable at the current position"),
-                   "pspp-insert-variable");
-
-  g_signal_connect (de->insert_variable, "activate",
-                   G_CALLBACK (insert_variable), de);
-
-
-  gtk_action_connect_proxy (de->insert_variable,
-                           get_widget_assert (de->xml, "button-insert-variable")
-                           );
-
-  gtk_action_connect_proxy (de->insert_variable,
-                           get_widget_assert (de->xml, "edit_insert-variable")
-                           );
-
-
-  de->insert_case =
-    gtk_action_new ("insert-case",
-                   _("Insert Case"),
-                   _("Create a new case at the current position"),
-                   "pspp-insert-case");
-
-  g_signal_connect (de->insert_case, "activate",
-                   G_CALLBACK (insert_case), de);
-
-
-  gtk_action_connect_proxy (de->insert_case,
-                           get_widget_assert (de->xml, "button-insert-case")
-                           );
-
-
-  gtk_action_connect_proxy (de->insert_case,
-                           get_widget_assert (de->xml, "edit_insert-case")
-                           );
-
-
-
-  de->invoke_goto_dialog =
-    gtk_action_new ("goto-case-dialog",
-                   _("Goto Case"),
-                   _("Jump to a Case in the Data Sheet"),
-                   "gtk-jump-to");
-
-
-  gtk_action_connect_proxy (de->invoke_goto_dialog,
-                           get_widget_assert (de->xml, "button-goto-case")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_goto_dialog,
-                           get_widget_assert (de->xml, "edit_goto-case")
-                           );
-
-
-  g_signal_connect (de->invoke_goto_dialog, "activate",
-                   G_CALLBACK (goto_case_dialog), de);
-
-
-  de->invoke_weight_cases_dialog =
-    gtk_action_new ("weight-cases-dialog",
-                   _("Weights"),
-                   _("Weight cases by variable"),
-                   "pspp-weight-cases");
-
-  g_signal_connect (de->invoke_weight_cases_dialog, "activate",
-                   G_CALLBACK (weight_cases_dialog), de);
-
-
-  de->invoke_transpose_dialog =
-    gtk_action_new ("transpose-dialog",
-                   _("Transpose"),
-                   _("Transpose the cases with the variables"),
-                   NULL);
-
-
-  g_signal_connect (de->invoke_transpose_dialog, "activate",
-                   G_CALLBACK (transpose_dialog), de);
-
-
-
-  de->invoke_split_file_dialog =
-    gtk_action_new ("split-file-dialog",
-                   _("Split"),
-                   _("Split the active file"),
-                   "pspp-split-file");
-
-  g_signal_connect (de->invoke_split_file_dialog, "activate",
-                   G_CALLBACK (split_file_dialog), de);
-
-
-
-  de->invoke_sort_cases_dialog =
-    gtk_action_new ("sort-cases-dialog",
-                   _("Sort"),
-                   _("Sort cases in the active file"),
-                   "pspp-sort-cases");
-
-  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",
-                   _("Compute"),
-                   _("Compute new values for a variable"),
-                   "pspp-compute");
-
-  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"),
-                   _("Commentary text for the data file"),
-                   NULL);
-
-  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"),
-                   _("Jump to Variable"),
-                   "pspp-goto-variable");
-
-  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"),
-                           "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->action_data_new);
-
-  g_signal_connect_swapped (get_widget_assert (de->xml,"file_open_data"),
-                           "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->action_data_open);
-
-#if RECENT_LISTS_AVAILABLE
-  {
-    GtkRecentManager *rm = gtk_recent_manager_get_default ();
-    GtkWidget *recent_data = get_widget_assert (de->xml, "file_recent-data");
-    GtkWidget *recent_files = get_widget_assert (de->xml, "file_recent-files");
-    GtkWidget *recent_separator = get_widget_assert (de->xml, "file_separator1");
-
-    GtkWidget *menu = gtk_recent_chooser_menu_new_for_manager (rm);
-
-    GtkRecentFilter *filter = gtk_recent_filter_new ();
-
-    gtk_widget_show (recent_data);
-    gtk_widget_show (recent_files);
-    gtk_widget_show (recent_separator);
-
-    gtk_recent_filter_add_pattern (filter, "*.sav");
-    gtk_recent_filter_add_pattern (filter, "*.SAV");
-
-    gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
-
-    gtk_widget_set_sensitive (recent_data, TRUE);
-    g_signal_connect (menu, "selection-done",
-                     G_CALLBACK (on_recent_data_select), de);
-
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu);
-
-
-    filter = gtk_recent_filter_new ();
-    menu = gtk_recent_chooser_menu_new_for_manager (rm);
-
-    gtk_recent_filter_add_pattern (filter, "*.sps");
-    gtk_recent_filter_add_pattern (filter, "*.SPS");
-
-    gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu), filter);
-
-    gtk_widget_set_sensitive (recent_files, TRUE);
-    g_signal_connect (menu, "selection-done",
-                     G_CALLBACK (on_recent_files_select), de);
-
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu);
-  }
-#endif
-
-  g_signal_connect (get_widget_assert (de->xml,"file_new_syntax"),
-                   "activate",
-                   G_CALLBACK (new_syntax_window),
-                   e->window);
-
-  g_signal_connect (get_widget_assert (de->xml,"file_open_syntax"),
-                   "activate",
-                   G_CALLBACK (open_syntax_window),
-                   e->window);
-
-  g_signal_connect_swapped (get_widget_assert (de->xml,"file_save"),
-                           "activate",
-                           G_CALLBACK (gtk_action_activate),
-                           de->action_data_save);
-
-  g_signal_connect_swapped (get_widget_assert (de->xml,"file_save_as"),
-                           "activate",
-                           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")
-                           );
-
-  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")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_transpose_dialog,
-                           get_widget_assert (de->xml, "data_transpose")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_split_file_dialog,
-                           get_widget_assert (de->xml, "data_split-file")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_sort_cases_dialog,
-                           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")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_variable_info_dialog,
-                           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),
-                   e->window);
-
-
-  g_signal_connect (get_widget_assert (de->xml,"help_reference"),
-                   "activate",
-                   G_CALLBACK (reference_manual),
-                   e->window);
-
-  g_signal_connect (data_sheet,
-                   "double-click-column",
-                   G_CALLBACK (click2column),
-                   de);
-
-  g_signal_connect (data_sheet,
-                   "select-column",
-                   G_CALLBACK (enable_delete_variables),
-                   de);
-
-  g_signal_connect (data_sheet,
-                   "select-row",
-                   G_CALLBACK (enable_delete_cases),
-                   de);
-
-
-  g_signal_connect (var_sheet,
-                   "double-click-row",
-                   GTK_SIGNAL_FUNC (click2row),
-                   de);
-
-  g_signal_connect_after (var_sheet,
-                   "select-row",
-                   G_CALLBACK (enable_delete_variables),
-                   de);
-
-  g_signal_connect (get_widget_assert (de->xml, "notebook"),
-                   "switch-page",
-                   G_CALLBACK (on_switch_sheet), de);
-
-
-  g_signal_connect (get_widget_assert (de->xml, "view_statusbar"),
-                   "activate",
-                   G_CALLBACK (status_bar_activate), de);
-
-
-  g_signal_connect (get_widget_assert (de->xml, "view_gridlines"),
-                   "activate",
-                   G_CALLBACK (grid_lines_activate), de);
-
-
-
-  g_signal_connect (get_widget_assert (de->xml, "view_data"),
-                   "activate",
-                   G_CALLBACK (data_sheet_activate), de);
-
-  g_signal_connect (get_widget_assert (de->xml, "view_variables"),
-                   "activate",
-                   G_CALLBACK (variable_sheet_activate), de);
-
-
-
-  g_signal_connect (get_widget_assert (de->xml, "view_fonts"),
-                   "activate",
-                   G_CALLBACK (fonts_activate), de);
-
-
-
-
-  gtk_action_connect_proxy (de->action_data_open,
-                           get_widget_assert (de->xml, "button-open")
-                           );
-
-  gtk_action_connect_proxy (de->action_data_save,
-                           get_widget_assert (de->xml, "button-save")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_variable_info_dialog,
-                           get_widget_assert (de->xml, "button-goto-variable")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
-                           get_widget_assert (de->xml, "button-weight-cases")
-                           );
-
-  gtk_action_connect_proxy (de->invoke_split_file_dialog,
-                           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);
-
-
-  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;
-}
-
-
-/* Callback which occurs when the var sheet's row title
-   button is double clicked */
-static gboolean
-click2row (GtkWidget *w, gint row, gpointer data)
-{
-  struct data_editor *de = data;
-  GtkSheetRange visible_range;
-
-  gint current_row, current_column;
-
-  GtkWidget *data_sheet  = get_widget_assert (de->xml, "data_sheet");
-
-  data_editor_select_sheet (de, PAGE_DATA_SHEET);
-
-  gtk_sheet_get_active_cell (GTK_SHEET (data_sheet),
-                            &current_row, &current_column);
-
-  gtk_sheet_set_active_cell (GTK_SHEET (data_sheet), current_row, row);
-
-  gtk_sheet_get_visible_range (GTK_SHEET (data_sheet), &visible_range);
-
-  if ( row < visible_range.col0 || row > visible_range.coli)
-    {
-      gtk_sheet_moveto (GTK_SHEET (data_sheet),
-                       current_row, row, 0, 0);
-    }
-
-  return FALSE;
-}
-
-
-/* Callback which occurs when the data sheet's column title
-   is double clicked */
-static gboolean
-click2column (GtkWidget *w, gint col, gpointer data)
-{
-  struct data_editor *de = data;
-
-  gint current_row, current_column;
-
-  GtkWidget *var_sheet  = get_widget_assert (de->xml, "variable_sheet");
-
-  data_editor_select_sheet (de, PAGE_VAR_SHEET);
-
-  gtk_sheet_get_active_cell (GTK_SHEET (var_sheet),
-                            &current_row, &current_column);
-
-  gtk_sheet_set_active_cell (GTK_SHEET (var_sheet), col, current_column);
-
-  return FALSE;
-}
-
-
-void
-new_data_window (GtkMenuItem *menuitem, gpointer parent)
-{
-  window_create (WINDOW_DATA, NULL);
-}
-
-/* Callback for when the datasheet/varsheet is selected */
-static void
-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");
-
-  switch (page_num)
-    {
-    case PAGE_VAR_SHEET:
-      gtk_widget_hide (view_variables);
-      gtk_widget_show (view_data);
-      gtk_action_set_sensitive (de->insert_variable, TRUE);
-      gtk_action_set_sensitive (de->insert_case, FALSE);
-      gtk_action_set_sensitive (de->invoke_goto_dialog, FALSE);
-      break;
-    case PAGE_DATA_SHEET:
-      gtk_widget_show (view_variables);
-      gtk_widget_show (view_data);
-      gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE);
-      gtk_action_set_sensitive (de->insert_case, TRUE);
-      break;
-    default:
-      g_assert_not_reached ();
-      break;
-    }
-
-  update_paste_menuitem (de, page_num);
-  update_cut_copy_menuitem (de, page_num);
-}
-
-
-void
-data_editor_select_sheet (struct data_editor *de, gint page)
-{
-  gtk_notebook_set_current_page
-   (
-    GTK_NOTEBOOK (get_widget_assert (de->xml,"notebook")), page
-    );
-}
-
-
-
-static void
-status_bar_activate (GtkCheckMenuItem *menuitem, gpointer data)
-{
-  struct data_editor *de = data;
-  GtkWidget *statusbar = get_widget_assert (de->xml, "status-bar");
-
-  if ( gtk_check_menu_item_get_active (menuitem) )
-    gtk_widget_show (statusbar);
-  else
-    gtk_widget_hide (statusbar);
-}
-
-
-static void
-grid_lines_activate (GtkCheckMenuItem *menuitem, gpointer data)
-{
-  struct data_editor *de = data;
-  const bool grid_visible = gtk_check_menu_item_get_active (menuitem);
-
-  gtk_sheet_show_grid (GTK_SHEET (get_widget_assert (de->xml,
-                                                    "variable_sheet")),
-                      grid_visible);
-
-  gtk_sheet_show_grid (GTK_SHEET (get_widget_assert (de->xml, "data_sheet")),
-                      grid_visible);
-}
-
-
-
-static void
-data_sheet_activate (GtkCheckMenuItem *menuitem, gpointer data)
-{
-  struct data_editor *de = data;
-
-  data_editor_select_sheet (de, PAGE_DATA_SHEET);
-}
-
-
-static void
-variable_sheet_activate (GtkCheckMenuItem *menuitem, gpointer data)
-{
-  struct data_editor *de = data;
-
-  data_editor_select_sheet (de, PAGE_VAR_SHEET);
-}
-
-
-static void
-fonts_activate (GtkMenuItem *menuitem, gpointer data)
-{
-  struct data_editor *de = data;
-  GtkWidget *dialog =
-    gtk_font_selection_dialog_new (_("Font Selection"));
-
-  gtk_window_set_transient_for (GTK_WINDOW (dialog),
-                               GTK_WINDOW (get_widget_assert (de->xml,
-                                                              "data_editor")));
-  if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) )
-    {
-      GtkSheet *data_sheet =
-       GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-      GtkSheet *var_sheet =
-       GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-      PsppireDataStore *ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
-      PsppireVarStore *vs = PSPPIRE_VAR_STORE (gtk_sheet_get_model (var_sheet));
-
-      const gchar *font = gtk_font_selection_dialog_get_font_name
-       (GTK_FONT_SELECTION_DIALOG (dialog));
-
-      PangoFontDescription* font_desc =
-       pango_font_description_from_string (font);
-
-      psppire_var_store_set_font (vs, font_desc);
-      psppire_data_store_set_font (ds, font_desc);
-    }
-
-  gtk_widget_hide (dialog);
-}
-
-
-
-/* Callback for the value labels action */
-static void
-toggle_value_labels (GtkToggleAction *ta, gpointer data)
-{
-  struct data_editor *de = data;
-
-  GtkSheet *data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE (gtk_sheet_get_model (data_sheet));
-
-
-  psppire_data_store_show_labels (ds,
-                                 gtk_toggle_action_get_active (ta));
-}
-
-extern PsppireDataStore *the_data_store ;
-
-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.
-  */
-  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"));
-
-  GtkSheetRange range;
-
-  PsppireDataStore *data_store = PSPPIRE_DATA_STORE
-    (gtk_sheet_get_model (data_sheet) );
-
-
-  /* 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_sheet_get_selected_range (data_sheet, &range);
-
-  gtk_sheet_unselect_range (data_sheet);
-
-  psppire_data_store_delete_cases (data_store, range.row0,
-                                  1 + range.rowi - range.row0);
-
-}
-
-static void
-delete_variables (GtkAction *a, gpointer data)
-{
-  struct data_editor *de = data;
-  GtkSheetRange range;
-
-  GtkNotebook *notebook = GTK_NOTEBOOK (get_widget_assert (de->xml,
-                                                          "notebook"));
-
-  const gint page = gtk_notebook_get_current_page (notebook);
-
-  GtkSheet *sheet = GTK_SHEET (get_widget_assert (de->xml,
-                                                 (page == PAGE_VAR_SHEET) ?
-                                                 "variable_sheet" :
-                                                 "data_sheet"));
-
-
-  gtk_sheet_get_selected_range (sheet, &range);
-
-  switch ( page )
-    {
-    case PAGE_VAR_SHEET:
-      {
-       PsppireVarStore *vs =
-         PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
-
-       psppire_dict_delete_variables (vs->dict,
-                                      range.row0,
-                                      1 +
-                                      range.rowi -
-                                      range.row0 );
-      }
-      break;
-    case PAGE_DATA_SHEET:
-      {
-       PsppireDataStore *ds =
-         PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
-
-       psppire_dict_delete_variables (ds->dict,
-                                      range.col0,
-                                      1 +
-                                      range.coli -
-                                      range.col0 );
-      }
-      break;
-    };
-
-  gtk_sheet_unselect_range (sheet);
-}
-
-static void
-insert_case (GtkAction *action, gpointer data)
-{
-  gint current_row ;
-  struct data_editor *de = data;
-
-  GtkSheet *data_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-  PsppireDataStore *ds = PSPPIRE_DATA_STORE
-    (gtk_sheet_get_model (data_sheet) );
-
-
-  gtk_sheet_get_active_cell (data_sheet, &current_row, NULL);
-
-  if (current_row < 0) current_row = 0;
-
-  psppire_data_store_insert_new_case (ds, current_row);
-}
-
-/* Insert a new variable before the current row in the variable sheet,
-   or before the current column in the data sheet, whichever is selected */
-static void
-insert_variable (GtkAction *action, gpointer data)
-{
-  struct data_editor *de = data;
-  gint posn = -1;
-
-  GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
-
-  GtkSheet *var_sheet =
-    GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-  PsppireVarStore *vs = PSPPIRE_VAR_STORE
-    (gtk_sheet_get_model (var_sheet) );
-
-  switch ( gtk_notebook_get_current_page ( GTK_NOTEBOOK (notebook)) )
-    {
-    case PAGE_VAR_SHEET:
-      posn = var_sheet->active_cell.row;
-      break;
-    case PAGE_DATA_SHEET:
-      {
-       GtkSheet *data_sheet =
-         GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
-
-       if ( data_sheet->state == GTK_SHEET_COLUMN_SELECTED )
-         posn = data_sheet->range.col0;
-       else
-         posn = data_sheet->active_cell.col;
-      }
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  if ( posn == -1 ) posn = 0;
-
-  psppire_dict_insert_variable (vs->dict, posn, NULL);
-}
-
-/* Callback for when the dictionary changes its split variables */
-static void
-on_split_change (PsppireDict *dict, gpointer data)
-{
-  struct data_editor *de = data;
-
-  size_t n_split_vars = dict_get_split_cnt (dict->dict);
-
-  GtkWidget *split_status_area =
-    get_widget_assert (de->xml, "split-file-status-area");
-
-  if ( n_split_vars == 0 )
-    {
-      gtk_label_set_text (GTK_LABEL (split_status_area), _("No Split"));
-    }
-  else
-    {
-      gint i;
-      GString *text;
-      const struct variable *const * split_vars =
-       dict_get_split_vars (dict->dict);
-
-      text = g_string_new (_("Split by "));
-
-      for (i = 0 ; i < n_split_vars - 1; ++i )
-       {
-         g_string_append_printf (text, "%s, ", var_get_name (split_vars[i]));
-       }
-      g_string_append (text, var_get_name (split_vars[i]));
-
-      gtk_label_set_text (GTK_LABEL (split_status_area), text->str);
-
-      g_string_free (text, TRUE);
-    }
-}
-
-
-/* Callback for when the dictionary changes its filter variable */
-static void
-on_filter_change (GObject *o, gint filter_index, gpointer data)
-{
-  struct data_editor *de = data;
-  GtkWidget *filter_status_area =
-    get_widget_assert (de->xml, "filter-use-status-area");
-
-  if ( filter_index == -1 )
-    {
-      gtk_label_set_text (GTK_LABEL (filter_status_area), _("Filter off"));
-    }
-  else
-    {
-      GtkSheet *var_sheet =
-       GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-      PsppireVarStore *vs = PSPPIRE_VAR_STORE
-       (gtk_sheet_get_model (var_sheet) );
-
-      struct variable *var = psppire_dict_get_variable (vs->dict,
-                                                       filter_index);
-
-      gchar *text = g_strdup_printf (_("Filter by %s"), var_get_name (var));
-
-      gtk_label_set_text (GTK_LABEL (filter_status_area), text);
-
-      g_free (text);
-    }
-}
-
-/* Callback for when the dictionary changes its weights */
-static void
-on_weight_change (GObject *o, gint weight_index, gpointer data)
-{
-  struct data_editor *de = data;
-  GtkWidget *weight_status_area =
-    get_widget_assert (de->xml, "weight-status-area");
-
-  if ( weight_index == -1 )
-    {
-      gtk_label_set_text (GTK_LABEL (weight_status_area), _("Weights off"));
-    }
-  else
-    {
-      GtkSheet *var_sheet =
-       GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
-      PsppireVarStore *vs = PSPPIRE_VAR_STORE
-       (gtk_sheet_get_model (var_sheet) );
-
-      struct variable *var = psppire_dict_get_variable (vs->dict,
-                                                       weight_index);
-
-      gchar *text = g_strdup_printf (_("Weight by %s"), var_get_name (var));
-
-      gtk_label_set_text (GTK_LABEL (weight_status_area), text);
-
-      g_free (text);
-    }
-}
-
-
-
-\f
-static void data_save_as_dialog (GtkAction *, struct data_editor *de);
-static void new_file (GtkAction *, struct editor_window *de);
-static void open_data_dialog (GtkAction *, struct data_editor *de);
-static void data_save (GtkAction *action, struct data_editor *e);
-
-
-/* Create the GtkActions and connect to their signals */
-static void
-register_data_editor_actions (struct data_editor *de)
-{
-  de->action_data_open =
-    gtk_action_new ("data-open-dialog",
-                   _("Open"),
-                   _("Open a data file"),
-                   "gtk-open");
-
-  g_signal_connect (de->action_data_open, "activate",
-                   G_CALLBACK (open_data_dialog), de);
-
-
-  de->action_data_save = gtk_action_new ("data-save",
-                                           _("Save"),
-                                           _("Save data to file"),
-                                           "gtk-save");
-
-  g_signal_connect (de->action_data_save, "activate",
-                   G_CALLBACK (data_save), de);
-
-
-
-  de->action_data_save_as = gtk_action_new ("data-save-as-dialog",
-                                           _("Save As"),
-                                           _("Save data to file"),
-                                           "gtk-save");
-
-  g_signal_connect (de->action_data_save_as, "activate",
-                   G_CALLBACK (data_save_as_dialog), de);
-
-  de->action_data_new =
-    gtk_action_new ("data-new",
-                   _("New"),
-                   _("New data file"),
-                   NULL);
-
-  g_signal_connect (de->action_data_new, "activate",
-                   G_CALLBACK (new_file), de);
-}
-
-/* Returns true if NAME has a suffix which might denote a PSPP file */
-static gboolean
-name_has_suffix (const gchar *name)
-{
-  if ( g_str_has_suffix (name, ".sav"))
-    return TRUE;
-  if ( g_str_has_suffix (name, ".SAV"))
-    return TRUE;
-  if ( g_str_has_suffix (name, ".por"))
-    return TRUE;
-  if ( g_str_has_suffix (name, ".POR"))
-    return TRUE;
-
-  return FALSE;
-}
-
-/* Append SUFFIX to the filename of DE */
-static void
-append_filename_suffix (struct data_editor *de, const gchar *suffix)
-{
-  if ( ! name_has_suffix (de->file_name))
-    {
-      gchar *s = de->file_name;
-      de->file_name = g_strconcat (de->file_name, suffix, NULL);
-      g_free (s);
-    }
-}
-
-/* Save DE to file */
-static void
-save_file (struct data_editor *de)
-{
-  struct getl_interface *sss;
-  struct string file_name ;
-
-  g_assert (de->file_name);
-
-  ds_init_cstr (&file_name, de->file_name);
-  gen_quoted_string (&file_name);
-
-  if ( de->save_as_portable )
-    {
-      append_filename_suffix (de, ".por");
-      sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
-                                        ds_cstr (&file_name));
-    }
-  else
-    {
-      append_filename_suffix (de, ".sav");
-      sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
-                                        ds_cstr (&file_name));
-    }
-
-  ds_destroy (&file_name);
-
-  execute_syntax (sss);
-}
-
-
-/* Callback for data_save action.
-   If there's an existing file name, then just save,
-   otherwise prompt for a file name, then save */
-static void
-data_save (GtkAction *action, struct data_editor *de)
-{
-  if ( de->file_name)
-    save_file (de);
-  else
-    data_save_as_dialog (action, de);
-}
-
-
-/* Callback for data_save_as action. Prompt for a filename and save */
-static void
-data_save_as_dialog (GtkAction *action, struct data_editor *de)
-{
-  struct editor_window *e = (struct editor_window *) de;
-
-  GtkWidget *button_sys;
-  GtkWidget *dialog =
-    gtk_file_chooser_dialog_new (_("Save"),
-                                GTK_WINDOW (e->window),
-                                GTK_FILE_CHOOSER_ACTION_SAVE,
-                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
-                                NULL);
-
-  GtkFileFilter *filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
-  gtk_file_filter_add_pattern (filter, "*.sav");
-  gtk_file_filter_add_pattern (filter, "*.SAV");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("All Files"));
-  gtk_file_filter_add_pattern (filter, "*");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  {
-    GtkWidget *button_por;
-    GtkWidget *vbox = gtk_vbox_new (TRUE, 5);
-    button_sys =
-      gtk_radio_button_new_with_label (NULL, _("System File"));
-
-    button_por =
-      gtk_radio_button_new_with_label
-      (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)),
-       _("Portable File"));
-
-    gtk_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
-    gtk_box_pack_start_defaults (GTK_BOX (vbox), button_por);
-
-    gtk_widget_show_all (vbox);
-
-    gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), vbox);
-  }
-
-  switch (gtk_dialog_run (GTK_DIALOG (dialog)))
-    {
-    case GTK_RESPONSE_ACCEPT:
-      {
-       g_free (de->file_name);
-
-       de->file_name =
-         gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-
-       de->save_as_portable =
-         ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys));
-
-       save_file (de);
-
-       window_set_name_from_filename (e, de->file_name);
-      }
-      break;
-    default:
-      break;
-    }
-
-  gtk_widget_destroy (dialog);
-}
-
-
-/* Callback for data_new action.
-   Performs the NEW FILE command */
-static void
-new_file (GtkAction *action, struct editor_window *e)
-{
-  struct data_editor *de = (struct data_editor *) e;
-
-  struct getl_interface *sss =
-    create_syntax_string_source ("NEW FILE.");
-
-  execute_syntax (sss);
-
-  g_free (de->file_name);
-  de->file_name = NULL;
-
-  default_window_name (e);
-}
-
-
-static void
-open_data_file (const gchar *file_name, struct data_editor *de)
-{
-  struct getl_interface *sss;
-  struct string filename;
-
-  ds_init_cstr (&filename, file_name);
-
-  gen_quoted_string (&filename);
-
-  sss = create_syntax_string_source ("GET FILE=%s.",
-                                    ds_cstr (&filename));
-  ds_destroy (&filename);
-
-  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
-open_data_dialog (GtkAction *action, struct data_editor *de)
-{
-  struct editor_window *e = (struct editor_window *) de;
-
-  GtkWidget *dialog =
-    gtk_file_chooser_dialog_new (_("Open"),
-                                GTK_WINDOW (e->window),
-                                GTK_FILE_CHOOSER_ACTION_OPEN,
-                                GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
-                                GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
-                                NULL);
-
-  GtkFileFilter *filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
-  gtk_file_filter_add_pattern (filter, "*.sav");
-  gtk_file_filter_add_pattern (filter, "*.SAV");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-  filter = gtk_file_filter_new ();
-  gtk_file_filter_set_name (filter, _("All Files"));
-  gtk_file_filter_add_pattern (filter, "*");
-  gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
-
-  if ( de->file_name)
-    {
-      gchar *dir_name = g_path_get_dirname (de->file_name);
-      gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog),
-                                          dir_name);
-      free (dir_name);
-    }
-
-  switch (gtk_dialog_run (GTK_DIALOG (dialog)))
-    {
-    case GTK_RESPONSE_ACCEPT:
-      {
-       g_free (de->file_name);
-       de->file_name =
-         gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-
-       open_data_file (de->file_name, de);
-      }
-      break;
-    default:
-      break;
-    }
-
-  gtk_widget_destroy (dialog);
-}
-
-
-
-/* Update the data_ref_entry with the reference of the active cell */
-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 =
-    PSPPIRE_DATA_STORE (gtk_sheet_get_model (sheet));
-
-  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 =
-       psppire_dict_get_variable (data_store->dict, col);
-
-      /* The entry where the reference to the current cell is displayed */
-      GtkEntry *cell_ref_entry =
-       GTK_ENTRY (get_widget_assert (data_editor_xml,
-                                     "cell_ref_entry"));
-      if ( var )
-       {
-         gchar *text = g_strdup_printf ("%d: %s", row + FIRST_CASE_NUMBER,
-                                        var_get_name (var));
-
-         gchar *s = pspp_locale_to_utf8 (text, -1, 0);
-
-         g_free (text);
-
-         gtk_entry_set_text (cell_ref_entry, s);
-
-         g_free (s);
-       }
-      else
-       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);
-
-         free (text);
-       }
-      else
-       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);
-}
-
-
diff --git a/src/ui/gui/var-sheet.c b/src/ui/gui/var-sheet.c
deleted file mode 100644 (file)
index ac6ce92..0000000
+++ /dev/null
@@ -1,512 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2005, 2006, 2007  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-
-/* This module creates the Variable Sheet used for inputing the
-   variables in the  dictonary */
-
-#include <config.h>
-#include <gettext.h>
-#define _(msgid) gettext (msgid)
-#define N_(msgid) msgid
-
-#include <data/value-labels.h>
-
-#include <glade/glade.h>
-#include <gtk/gtk.h>
-
-#include <stdlib.h>
-#include <string.h>
-
-#include <data/value.h>
-
-#include <gtksheet/gtksheet.h>
-#include <gtksheet/gsheet-hetero-column.h>
-#include <gtksheet/gsheet-uniform-row.h>
-
-#include "localcharset.h"
-#include "xalloc.h"
-#include "psppire-var-store.h"
-#include "helper.h"
-#include "psppire-dict.h"
-#include "var-type-dialog.h"
-#include "var-sheet.h"
-#include "customentry.h"
-
-#include "val-labs-dialog.h"
-#include "missing-val-dialog.h"
-
-
-
-static const gint n_initial_rows = 40;
-
-
-
-struct column_parameters
-{
-  gchar label[20];
-  gint width ;
-};
-
-static const struct column_parameters column_def[] = {
-  { N_("Name"),    80},
-  { N_("Type"),    100},
-  { N_("Width"),   57},
-  { N_("Decimals"),91},
-  { N_("Label"),   95},
-  { N_("Values"),  103},
-  { N_("Missing"), 95},
-  { N_("Columns"), 80},
-  { N_("Align"),   69},
-  { N_("Measure"), 99},
-};
-
-
-
-const gchar *const alignments[n_ALIGNMENTS + 1]={
-  N_("Left"),
-  N_("Right"),
-  N_("Center"),
-  0
-};
-
-const gchar *const measures[n_MEASURES + 1]={
-  N_("Nominal"),
-  N_("Ordinal"),
-  N_("Scale"),
-  0
-};
-
-G_DEFINE_TYPE (PsppireVarSheet, psppire_var_sheet, GTK_TYPE_SHEET);
-
-static void
-psppire_var_sheet_class_init (PsppireVarSheetClass *class)
-{
-}
-
-static GtkListStore *
-create_label_list (const gchar *const *labels)
-{
-  const gchar *s;
-  gint i = 0;
-  GtkTreeIter iter;
-
-  GtkListStore *list_store;
-  list_store = gtk_list_store_new (1, G_TYPE_STRING);
-
-
-  while ( (s = labels[i++]))
-    {
-      gtk_list_store_append (list_store, &iter);
-      gtk_list_store_set (list_store, &iter,
-                         0, gettext (s),
-                         -1);
-    }
-
-  return list_store;
-}
-
-/* Callback for when the alignment combo box
-   item is selected */
-static void
-change_alignment (GtkComboBox *cb,
-    gpointer user_data)
-{
-  struct variable *pv = user_data;
-  gint active_item = gtk_combo_box_get_active (cb);
-
-  if ( active_item < 0 ) return ;
-
-  var_set_alignment (pv, active_item);
-}
-
-
-
-/* Callback for when the measure combo box
-   item is selected */
-static void
-change_measure (GtkComboBox *cb,
-    gpointer user_data)
-{
-  struct variable *pv = user_data;
-  gint active_item = gtk_combo_box_get_active (cb);
-
-  if ( active_item < 0 ) return ;
-
-  var_set_measure (pv, active_item);
-}
-
-
-
-static gboolean
-traverse_cell_callback (GtkSheet * sheet,
-                       gint row, gint column,
-                       gint *new_row, gint *new_column
-                       )
-{
-  PsppireVarSheet *var_sheet = PSPPIRE_VAR_SHEET (sheet);
-  PsppireVarStore *var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
-
-  gint n_vars = psppire_var_store_get_var_cnt (var_store);
-
-  if (*new_row >= n_vars && !var_sheet->may_create_vars)
-    return FALSE;
-
-  if ( row == n_vars && *new_row >= n_vars)
-    {
-      GtkEntry *entry = GTK_ENTRY (gtk_sheet_get_entry (sheet));
-
-      const gchar *name = gtk_entry_get_text (entry);
-
-      if (! psppire_dict_check_name (var_store->dict, name, TRUE))
-       return FALSE;
-
-      psppire_dict_insert_variable (var_store->dict, row, name);
-
-      return TRUE;
-    }
-
-  /* If the destination cell is outside the current  variables, then
-     automatically create variables for the new rows.
-  */
-  if ( (*new_row > n_vars) ||
-       (*new_row == n_vars && *new_column != COL_NAME) )
-    {
-      gint i;
-      for ( i = n_vars ; i <= *new_row; ++i )
-       psppire_dict_insert_variable (var_store->dict, i, NULL);
-    }
-
-  return TRUE;
-}
-
-
-
-
-/*
-   Callback whenever the cell on the var sheet is left
-*/
-static gboolean
-var_sheet_cell_entry_leave (GtkSheet * sheet, gint row, gint column,
-                           gpointer data)
-{
-  gtk_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
-  return TRUE;
-}
-
-
-
-/*
-   Callback whenever the cell on the var sheet is entered.
-*/
-static gboolean
-var_sheet_cell_entry_enter (GtkSheet * sheet, gint row, gint column,
-                           gpointer data)
-{
-  GtkSheetCellAttr attributes;
-  PsppireVarStore *var_store ;
-  struct variable *var ;
-
-  GladeXML *xml;
-
-  g_return_val_if_fail (sheet != NULL, FALSE);
-
-  var_store = PSPPIRE_VAR_STORE (gtk_sheet_get_model (sheet));
-
-  g_assert (var_store);
-
-  if ( row >= psppire_var_store_get_var_cnt (var_store))
-    return TRUE;
-
-  xml = XML_NEW ("data-editor.glade");
-
-  gtk_sheet_get_attributes (sheet, row, column, &attributes);
-
-  var = psppire_var_store_get_var (var_store, row);
-
-  switch (column)
-    {
-    case COL_ALIGN:
-      {
-       static GtkListStore *list_store = NULL;
-       GtkComboBoxEntry *cbe;
-       gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
-       cbe =
-         GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
-
-       if ( ! list_store) list_store = create_label_list (alignments);
-
-       gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
-                               GTK_TREE_MODEL (list_store));
-
-       gtk_combo_box_entry_set_text_column (cbe, 0);
-
-
-       g_signal_connect (G_OBJECT (cbe),"changed",
-                        G_CALLBACK (change_alignment), var);
-      }
-      break;
-
-    case COL_MEASURE:
-      {
-       static GtkListStore *list_store = 0;
-       GtkComboBoxEntry *cbe;
-       gtk_sheet_change_entry (sheet, GTK_TYPE_COMBO_BOX_ENTRY);
-       cbe =
-         GTK_COMBO_BOX_ENTRY (gtk_sheet_get_entry (sheet)->parent);
-
-
-       if ( ! list_store) list_store = create_label_list (measures);
-
-       gtk_combo_box_set_model (GTK_COMBO_BOX (cbe),
-                               GTK_TREE_MODEL (list_store));
-
-       gtk_combo_box_entry_set_text_column (cbe, 0);
-
-       g_signal_connect (G_OBJECT (cbe),"changed",
-                         G_CALLBACK (change_measure), var);
-      }
-      break;
-
-    case COL_VALUES:
-      {
-       static struct val_labs_dialog *val_labs_dialog = NULL;
-
-       PsppireCustomEntry *customEntry;
-
-       gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
-
-       customEntry =
-         PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
-
-       if ( var_is_long_string (var))
-         g_object_set (customEntry,
-                       "editable", FALSE,
-                       NULL);
-
-       if (!val_labs_dialog )
-           val_labs_dialog = val_labs_dialog_create (xml);
-
-       val_labs_dialog_set_target_variable (val_labs_dialog, var);
-
-       g_signal_connect_swapped (GTK_OBJECT (customEntry),
-                                "clicked",
-                                GTK_SIGNAL_FUNC (val_labs_dialog_show),
-                                val_labs_dialog);
-      }
-      break;
-
-    case COL_MISSING:
-      {
-       static struct missing_val_dialog *missing_val_dialog = 0;
-       PsppireCustomEntry *customEntry;
-
-       gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
-
-       customEntry =
-         PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
-
-       if ( var_is_long_string (var))
-         g_object_set (customEntry,
-                       "editable", FALSE,
-                       NULL);
-
-       if (!missing_val_dialog )
-           missing_val_dialog = missing_val_dialog_create (xml);
-
-       missing_val_dialog->pv = psppire_var_store_get_var (var_store, row);
-
-       g_signal_connect_swapped (GTK_OBJECT (customEntry),
-                                "clicked",
-                                GTK_SIGNAL_FUNC (missing_val_dialog_show),
-                                missing_val_dialog);
-      }
-      break;
-
-    case COL_TYPE:
-      {
-       static struct var_type_dialog *var_type_dialog = 0;
-
-       PsppireCustomEntry *customEntry;
-
-       gtk_sheet_change_entry (sheet, PSPPIRE_CUSTOM_ENTRY_TYPE);
-
-       customEntry =
-         PSPPIRE_CUSTOM_ENTRY (gtk_sheet_get_entry (sheet));
-
-
-       /* Popup the Variable Type dialog box */
-       if (!var_type_dialog )
-           var_type_dialog = var_type_dialog_create (xml);
-
-
-       var_type_dialog->pv = var;
-
-       g_signal_connect_swapped (GTK_OBJECT (customEntry),
-                                "clicked",
-                                GTK_SIGNAL_FUNC (var_type_dialog_show),
-                                var_type_dialog);
-      }
-      break;
-
-    case COL_WIDTH:
-    case COL_DECIMALS:
-    case COL_COLUMNS:
-      {
-       if ( attributes.is_editable)
-         {
-           gint r_min, r_max;
-
-           const gchar *s = gtk_sheet_cell_get_text (sheet, row, column);
-
-           if (s)
-             {
-               GtkSpinButton *spinButton ;
-               const gint current_value  = atoi (s);
-               GtkObject *adj ;
-
-               const struct fmt_spec *fmt = var_get_write_format (var);
-               switch (column)
-                 {
-                 case COL_WIDTH:
-                   r_min = MAX (fmt->d + 1, fmt_min_output_width (fmt->type));
-                   r_max = fmt_max_output_width (fmt->type);
-                   break;
-                 case COL_DECIMALS:
-                   r_min = 0 ;
-                   r_max = fmt_max_output_decimals (fmt->type, fmt->w);
-                   break;
-                 case COL_COLUMNS:
-                   r_min = 1;
-                   r_max = 255 ; /* Is this a sensible value ? */
-                   break;
-                 default:
-                   g_assert_not_reached ();
-                 }
-
-               adj = gtk_adjustment_new (current_value,
-                                        r_min, r_max,
-                                        1.0, 1.0, 1.0 /* steps */
-                                        );
-
-               gtk_sheet_change_entry (sheet, GTK_TYPE_SPIN_BUTTON);
-
-               spinButton =
-                 GTK_SPIN_BUTTON (gtk_sheet_get_entry (sheet));
-
-               gtk_spin_button_set_adjustment (spinButton, GTK_ADJUSTMENT (adj));
-               gtk_spin_button_set_digits (spinButton, 0);
-             }
-         }
-      }
-      break;
-
-    default:
-      gtk_sheet_change_entry (sheet, GTK_TYPE_ENTRY);
-      break;
-    }
-
-
-  g_object_unref (xml);
-
-  return TRUE;
-}
-
-static void
-psppire_var_sheet_init (PsppireVarSheet *self)
-{
-  self->may_create_vars = true;
-
-  g_signal_connect (self, "activate",
-                   GTK_SIGNAL_FUNC (var_sheet_cell_entry_enter),
-                   0);
-
-  g_signal_connect (self, "deactivate",
-                   GTK_SIGNAL_FUNC (var_sheet_cell_entry_leave),
-                   0);
-
-  g_signal_connect (self, "traverse",
-                   GTK_SIGNAL_FUNC (traverse_cell_callback), 0);
-}
-
-GtkWidget *
-psppire_var_sheet_new_with_var_store (PsppireVarStore *var_store)
-{
-  GtkWidget *sheet;
-
-  gint i;
-
-  GObject *geo = g_sheet_hetero_column_new (75, n_COLS);
-  g_assert (var_store);
-
-  sheet = g_object_new (PSPPIRE_TYPE_VAR_SHEET,
-                       "row-geometry", var_store,
-                       "column-geometry", geo,
-                       NULL);
-
-  gtk_sheet_set_model (GTK_SHEET (sheet), G_SHEET_MODEL (var_store));
-
-
-  for (i = 0 ; i < n_COLS ; ++i )
-    {
-      g_sheet_hetero_column_set_button_label (G_SHEET_HETERO_COLUMN (geo), i,
-                       gettext (column_def[i].label));
-
-      g_sheet_hetero_column_set_width (G_SHEET_HETERO_COLUMN (geo), i,
-                                              column_def[i].width);
-    }
-
-
-
-  return sheet;
-}
-
-/* Create the var sheet */
-G_MODULE_EXPORT GtkWidget*
-psppire_variable_sheet_create (gchar *widget_name,
-                              gchar *string1,
-                              gchar *string2,
-                              gint int1, gint int2)
-{
-  gchar *codeset;
-  GtkWidget *sheet;
-  extern PsppireVarStore *the_var_store;
-
-  /* Since this happens inside glade_xml_new, we must prevent strings from
-   * being re-encoded twice */
-  codeset = xstrdup (bind_textdomain_codeset (PACKAGE, 0));
-  bind_textdomain_codeset (PACKAGE, locale_charset ());
-
-
-  sheet = psppire_var_sheet_new_with_var_store (the_var_store);
-
-  bind_textdomain_codeset (PACKAGE, codeset);
-  free (codeset);
-
-  gtk_widget_show (sheet);
-
-  return sheet;
-}
-
-
-
-void
-psppire_var_sheet_set_may_create_vars (PsppireVarSheet *sheet,
-                                       gboolean may_create_vars)
-{
-  sheet->may_create_vars = may_create_vars;
-}
diff --git a/src/ui/gui/var-sheet.h b/src/ui/gui/var-sheet.h
deleted file mode 100644 (file)
index fa26cb9..0000000
+++ /dev/null
@@ -1,85 +0,0 @@
-/* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2004, 2005, 2006  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
-   the Free Software Foundation, either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>. */
-
-
-#ifndef VAR_SHEET_H
-#define VAR_SHEET_H
-
-#include <gtksheet/gtksheet.h>
-
-#include "psppire-dict.h"
-#include "psppire-var-store.h"
-
-#define PSPPIRE_TYPE_VAR_SHEET                  (psppire_var_sheet_get_type ())
-#define PSPPIRE_VAR_SHEET(obj)                  (G_TYPE_CHECK_INSTANCE_CAST ((obj), PSPPIRE_TYPE_VAR_SHEET, PsppireVarSheet))
-#define PSPPIRE_VAR_SHEET_CLASS(klass)          (G_TYPE_CHECK_CLASS_CAST ((klass), PSPPIRE_TYPE_VAR_SHEET, PsppireVarSheetClass))
-#define PSPPIRE_IS_VAR_SHEET(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), PSPPIRE_TYPE_VAR_SHEET))
-#define PSPPIRE_IS_VAR_SHEET_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), PSPPIRE_TYPE_VAR_SHEET))
-#define PSPPIRE_VAR_SHEET_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), PSPPIRE_TYPE_VAR_SHEET, PsppireVarSheetClass))
-
-typedef struct _PsppireVarSheet PsppireVarSheet;
-typedef struct _PsppireVarSheetClass PsppireVarSheetClass;
-
-enum {COL_NAME,
-      COL_TYPE,
-      COL_WIDTH,
-      COL_DECIMALS,
-      COL_LABEL,
-      COL_VALUES,
-      COL_MISSING,
-      COL_COLUMNS,
-      COL_ALIGN,
-      COL_MEASURE,
-      n_COLS};
-
-struct _PsppireVarSheet {
-  GtkSheet parent;
-  gboolean may_create_vars;
-};
-
-struct _PsppireVarSheetClass {
-  GtkSheetClass parent;
-};
-
-GType psppire_var_sheet_get_type (void);
-
-/* Create the var sheet */
-GtkWidget* psppire_var_sheet_new_with_var_store (PsppireVarStore *);
-
-/* Glade interface for creating a var sheet. */
-GtkWidget* psppire_variable_sheet_create (gchar *widget_name,
-                                          gchar *string1,
-                                          gchar *string2,
-                                          gint int1, gint int2);
-
-void psppire_var_sheet_range_set_editable (PsppireVarSheet *sheet,
-                                           const GtkSheetRange *urange,
-                                           gboolean editable);
-
-void psppire_var_sheet_set_may_create_vars (PsppireVarSheet *sheet,
-                                            gboolean may_create_vars);
-
-
-#define n_ALIGNMENTS 3
-
-extern const gchar *const alignments[n_ALIGNMENTS + 1];
-
-#define n_MEASURES 3
-
-extern const gchar *const measures[n_MEASURES + 1];
-
-
-#endif