X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=d6cf50b395bf2e6d8737f3df71de31b0a2cc8bda;hb=b810b32ac59e1dcba90b8d4a70d626c4e249bad6;hp=4d7d6b5c5deec4bbcc81d5ab409b7191777f5407;hpb=108b065bd799f003c05bc3cbf2334078b43540f3;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index 4d7d6b5c..d6cf50b3 100644
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -1,21 +1,18 @@
-/*
-    PSPPIRE --- A Graphical User Interface for PSPP
-    Copyright (C) 2006, 2007  Free Software Foundation
+/* 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 2 of the License, or
-    (at your option) any later version.
+   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.
+   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, write to the Free Software
-    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
-    02110-1301, USA. */
+   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>
@@ -32,7 +29,13 @@
 #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 "compute-dialog.h"
+#include "goto-case-dialog.h"
+#include "comments-dialog.h"
+#include "variable-info-dialog.h"
 #include "dict-display.h"
 
 #define _(msgid) gettext (msgid)
@@ -41,18 +44,26 @@
 #include "data-editor.h"
 #include "syntax-editor.h"
 #include <language/syntax-string-source.h>
+#include <libpspp/syntax-gen.h>
 #include "window-manager.h"
 
 #include "psppire-data-store.h"
 #include "psppire-var-store.h"
 
+
+/* 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 (GtkCheckMenuItem *m, gpointer data);
+static void insert_variable (GtkAction *, gpointer data);
+
+static void insert_case (GtkAction *a, gpointer data);
+
 
 
 /* Switch between the VAR SHEET and the DATA SHEET */
-enum {PAGE_DATA_SHEET = 0, PAGE_VAR_SHEET};
 
 static gboolean click2column (GtkWidget *w, gint col, gpointer data);
 
@@ -112,6 +123,70 @@ disable_edit_clear (GtkWidget *w, gint x, gint y, gpointer data)
   return FALSE;
 }
 
+static void open_data_file (const gchar *, struct data_editor *);
+
+
+
+#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);
+}
 
 /*
   Create a new data editor.
@@ -122,19 +197,33 @@ 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 = glade_xml_new (PKGDATADIR "/data-editor.glade", NULL, NULL);
-
+  de->xml = XML_NEW ("data-editor.glade");
 
   var_sheet = GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
+  data_sheet = GTK_SHEET (get_widget_assert (de->xml, "data_sheet"));
 
   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);
@@ -152,6 +241,66 @@ new_data_editor (void)
 
   register_data_editor_actions (de);
 
+  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, "data_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, "data_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, "data_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"),
@@ -173,6 +322,55 @@ new_data_editor (void)
 		    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_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_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_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);
+
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
 
   g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
@@ -185,6 +383,50 @@ new_data_editor (void)
 			    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),
@@ -212,10 +454,6 @@ new_data_editor (void)
 		    de);
 
 
-  g_signal_connect (get_widget_assert (de->xml,"data_insert-variable"),
-		    "activate",
-		    G_CALLBACK (insert_variable),
-		    de);
 
   gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
 			    get_widget_assert (de->xml, "data_weight-cases")
@@ -225,6 +463,26 @@ new_data_editor (void)
 			    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_compute_dialog,
+			    get_widget_assert (de->xml, "transform_compute")
+			    );
+
+  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")
+			    );
+
   g_signal_connect (get_widget_assert (de->xml,"help_about"),
 		    "activate",
 		    G_CALLBACK (about_new),
@@ -236,21 +494,27 @@ new_data_editor (void)
 		    G_CALLBACK (reference_manual),
 		    e->window);
 
-
-
-  g_signal_connect (get_widget_assert (de->xml,"data_sheet"),
+  g_signal_connect (data_sheet,
 		    "double-click-column",
 		    G_CALLBACK (click2column),
 		    de);
 
+  g_signal_connect (data_sheet,
+		    "select-row",
+		    GTK_SIGNAL_FUNC (enable_edit_clear),
+		    de);
 
-  g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
+  g_signal_connect (data_sheet,
+		    "activate",
+		    GTK_SIGNAL_FUNC (disable_edit_clear),
+		    de);
+
+  g_signal_connect (var_sheet,
 		    "double-click-row",
 		    GTK_SIGNAL_FUNC (click2row),
 		    de);
 
-
-  g_signal_connect (get_widget_assert (de->xml, "variable_sheet"),
+  g_signal_connect (var_sheet,
 		    "select-row",
 		    GTK_SIGNAL_FUNC (enable_edit_clear),
 		    de);
@@ -311,10 +575,18 @@ new_data_editor (void)
 			    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")
+			    );
+
   g_signal_connect (get_widget_assert (de->xml, "file_quit"),
 		    "activate",
 		    G_CALLBACK (file_quit), de);
@@ -337,6 +609,7 @@ static gboolean
 click2row (GtkWidget *w, gint row, gpointer data)
 {
   struct data_editor *de = data;
+  GtkSheetRange visible_range;
 
   gint current_row, current_column;
 
@@ -349,6 +622,14 @@ click2row (GtkWidget *w, gint row, gpointer data)
 
   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;
 }
 
@@ -385,9 +666,6 @@ new_data_window (GtkMenuItem *menuitem, gpointer parent)
 static void
 select_sheet (struct data_editor *de, guint page_num)
 {
-  GtkWidget *insert_variable = get_widget_assert (de->xml, "data_insert-variable");
-  GtkWidget *insert_cases = get_widget_assert (de->xml, "insert-cases");
-
   GtkWidget *view_data = get_widget_assert (de->xml, "view_data");
   GtkWidget *view_variables = get_widget_assert (de->xml, "view_variables");
 
@@ -396,15 +674,15 @@ select_sheet (struct data_editor *de, guint page_num)
     case PAGE_VAR_SHEET:
       gtk_widget_hide (view_variables);
       gtk_widget_show (view_data);
-      gtk_widget_set_sensitive (insert_variable, TRUE);
-      gtk_widget_set_sensitive (insert_cases, FALSE);
+      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_hide (view_data);
-#if 0
-      gtk_widget_set_sensitive (insert_cases, TRUE);
-#endif
+      gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE);
+      gtk_action_set_sensitive (de->insert_case, TRUE);
       break;
     default:
       g_assert_not_reached ();
@@ -576,52 +854,96 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data)
 }
 
 
-
 /* Callback for when the Clear item in the edit menu is activated */
 static void
 on_clear_activate (GtkMenuItem *menuitem, gpointer data)
 {
   struct data_editor *de = data;
 
+  GtkSheet *sheet  = NULL;
+  GtkSheetRange range ;
+
   GtkNotebook *notebook = GTK_NOTEBOOK (get_widget_assert (de->xml,
 							   "notebook"));
 
-  switch ( gtk_notebook_get_current_page (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 );
+
+
+  gtk_sheet_get_selected_range (sheet, &range);
+
+  switch ( page )
     {
     case PAGE_VAR_SHEET:
       {
-	GtkSheet *var_sheet =
-	  GTK_SHEET (get_widget_assert (de->xml, "variable_sheet"));
-
 	PsppireVarStore *vs = PSPPIRE_VAR_STORE
-	  (gtk_sheet_get_model (var_sheet) );
+	  (gtk_sheet_get_model (sheet) );
 
-	/* This shouldn't be able to happen, because the menuitem
-	   should be disabled */
-	g_return_if_fail (var_sheet->state  ==  GTK_SHEET_ROW_SELECTED );
 
 	psppire_dict_delete_variables (vs->dict,
-				       var_sheet->range.row0,
+				       range.row0,
 				       1 +
-				       var_sheet->range.rowi -
-				       var_sheet->range.row0 );
+				       range.rowi -
+				       range.row0 );
       }
       break;
-      case PAGE_DATA_SHEET:
-	break;
-      default:
-	g_assert_not_reached ();
+    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 );
+
+
+	psppire_data_store_delete_cases (data_store, range.row0,
+					 1 + range.rowi - range.row0);
+      }
+      break;
+    default:
+      g_assert_not_reached ();
     }
+
+  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 (GtkCheckMenuItem *m, gpointer data)
+insert_variable (GtkAction *action, gpointer data)
 {
   struct data_editor *de = data;
-  gint posn;
+  gint posn = -1;
 
   GtkWidget *notebook = get_widget_assert (de->xml, "notebook");
 
@@ -651,6 +973,8 @@ insert_variable (GtkCheckMenuItem *m, gpointer data)
       g_assert_not_reached ();
     }
 
+  if ( posn == -1 ) posn = 0;
+
   psppire_dict_insert_variable (vs->dict, posn, NULL);
 }
 
@@ -673,7 +997,7 @@ on_split_change (PsppireDict *dict, gpointer data)
     {
       gint i;
       GString *text;
-      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 "));
 
@@ -836,22 +1160,28 @@ 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'.",
-					 de->file_name);
+      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'.",
-					 de->file_name);
+      sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
+					 ds_cstr (&file_name));
     }
 
+  ds_destroy (&file_name);
+
   execute_syntax (sss);
 }
 
@@ -964,6 +1294,26 @@ new_file (GtkAction *action, struct editor_window *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));
+
+  execute_syntax (sss);
+  ds_destroy (&filename);
+
+  window_set_name_from_filename ((struct editor_window *) de, file_name);
+}
+
+
 /* Callback for the data_open action.
    Prompts for a filename and opens it */
 static void
@@ -1000,16 +1350,24 @@ open_data_dialog (GtkAction *action, struct data_editor *de)
     {
     case GTK_RESPONSE_ACCEPT:
       {
-	struct getl_interface *sss;
 	g_free (de->file_name);
 	de->file_name =
 	  gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
-	sss = create_syntax_string_source ("GET FILE='%s'.", de->file_name);
+	open_data_file (de->file_name, de);
 
-	execute_syntax (sss);
+#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
 
-	window_set_name_from_filename (e, de->file_name);
       }
       break;
     default:
@@ -1021,4 +1379,61 @@ open_data_dialog (GtkAction *action, struct data_editor *de)
 
 
 
+/* 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)
+{
+  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);
+
+  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"));
+      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,
+					 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
+	gtk_entry_set_text (cell_ref_entry, "");
+
+
+      if ( var )
+	{
+	  gchar *text =
+	    psppire_data_store_get_string (data_store, row,
+					   var_get_dict_index(var));
+	  g_strchug (text);
 
+	  gtk_entry_set_text (datum_entry, text);
+
+	  free (text);
+	}
+      else
+	gtk_entry_set_text (datum_entry, "");
+    }
+
+  return FALSE;
+}