Focus the sheet when the user hits enter in the datum entry

[pspp] / src / ui / gui / psppire-data-editor.c

diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c
index 27a4b63ab30a0e8c81b88adb29edc2c1ed909b9e..b9c6fb62148f299421bf1c8aa6f32d75a47b5dca 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -227,6 +227,20 @@ psppire_data_editor_set_focus_child (GtkContainer *container,
   GTK_CONTAINER_CLASS (parent_class)->set_focus_child (container, widget);
 }
 
+
+static gboolean
+on_key_press (GtkWidget *w, GdkEventKey *e)
+{
+  PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (w);
+  if (e->keyval == GDK_KEY_F2 &&
+      PSPPIRE_DATA_EDITOR_DATA_VIEW == gtk_notebook_get_current_page (GTK_NOTEBOOK (de)))
+    {
+      gtk_widget_grab_focus (de->datum_entry);
+    }
+
+  return FALSE;
+}
+
 static void
 psppire_data_editor_class_init (PsppireDataEditorClass *klass)
 {
@@ -238,6 +252,7 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass)
   GObjectClass *object_class = G_OBJECT_CLASS (klass);
   GtkContainerClass *container_class = GTK_CONTAINER_CLASS (klass);
   GtkNotebookClass *notebook_class = GTK_NOTEBOOK_CLASS (klass);
+  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
 
   parent_class = g_type_class_peek_parent (klass);
 
@@ -246,8 +261,8 @@ psppire_data_editor_class_init (PsppireDataEditorClass *klass)
   object_class->get_property = psppire_data_editor_get_property;
 
   container_class->set_focus_child = psppire_data_editor_set_focus_child;
-
   notebook_class->switch_page = psppire_data_editor_switch_page;
+  widget_class->key_press_event = on_key_press;
 
   data_store_spec =
     g_param_spec_pointer ("data-store",
@@ -345,8 +360,28 @@ refresh_entry (PsppireDataEditor *de)
 }
 
 static void
-on_datum_entry_activate (PsppireValueEntry *entry, PsppireDataEditor *de)
+on_datum_entry_activate (GtkEntry *entry, PsppireDataEditor *de)
 {
+  gint row, col;
+  if (ssw_sheet_get_active_cell (SSW_SHEET (de->data_sheet), &col, &row))
+    {
+      union value val;
+      const struct variable *var = psppire_dict_get_variable (de->dict, col);
+      if (var == NULL)
+       return;
+
+      int width = var_get_width (var);
+      value_init (&val, width);
+      if (psppire_value_entry_get_value (PSPPIRE_VALUE_ENTRY (de->datum_entry),
+                                        &val, width))
+       {
+         psppire_data_store_set_value (de->data_store, row, var, &val);
+       }
+      value_destroy (&val, width);
+
+      gtk_widget_grab_focus (de->data_sheet);
+      ssw_sheet_set_active_cell (de->data_sheet, col, row, NULL);
+    }
 }
 
 
@@ -456,8 +491,8 @@ psppire_data_editor_init (PsppireDataEditor *de)
   gtk_widget_set_valign (de->cell_ref_label, GTK_ALIGN_CENTER);
 
   de->datum_entry = psppire_value_entry_new ();
-  g_signal_connect (GTK_ENTRY (gtk_bin_get_child (GTK_BIN (de->datum_entry))),
-                    "activate", G_CALLBACK (on_datum_entry_activate), de);
+  g_signal_connect (de->datum_entry, "edit-done",
+                   G_CALLBACK (on_datum_entry_activate), de);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_box_pack_start (GTK_BOX (hbox), de->cell_ref_label, FALSE, FALSE, 0);
@@ -507,6 +542,8 @@ psppire_data_editor_init (PsppireDataEditor *de)
       g_free (fontname);
       set_font_recursively (GTK_WIDGET (de), de->font);
     }
+
+  gtk_widget_add_events (GTK_WIDGET (de), GDK_KEY_PRESS_MASK);
 }
 
 GtkWidget*