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 3f1f627dedd162cc42b974261df70b89ad26bef0..b9c6fb62148f299421bf1c8aa6f32d75a47b5dca 100644 (file)
--- a/src/ui/gui/psppire-data-editor.c
+++ b/src/ui/gui/psppire-data-editor.c
@@ -20,7 +20,6 @@
 #include "ui/gui/psppire-data-editor.h"
 
 #include <gtk/gtk.h>
-#include <gtk-contrib/gtkxpaned.h>
 
 #include "data/datasheet.h"
 #include "data/value-labels.h"
@@ -41,7 +40,7 @@
 #include "ui/gui/psppire-data-sheet.h"
 
 
-#include "ui/gui/efficient-sheet/src/jmd-sheet.h"
+#include <ssw-sheet.h>
 
 #include <gettext.h>
 #define _(msgid) gettext (msgid)
@@ -168,7 +167,16 @@ psppire_data_editor_set_property (GObject         *object,
 
       g_object_set (de->var_sheet, "data-model", de->dict, NULL);
       break;
+
     case PROP_VALUE_LABELS:
+      {
+       gboolean l = g_value_get_boolean (value);
+       g_object_set (de->data_sheet, "forward-conversion",
+                     l ?
+                     psppire_data_store_value_to_string_with_labels :
+                     psppire_data_store_value_to_string,
+                     NULL);
+      }
       break;
 
     default:
@@ -210,7 +218,6 @@ psppire_data_editor_switch_page (GtkNotebook     *notebook,
                                  guint            page_num)
 {
   GTK_NOTEBOOK_CLASS (parent_class)->switch_page (notebook, w, page_num);
-
 }
 
 static void
@@ -218,7 +225,20 @@ psppire_data_editor_set_focus_child (GtkContainer *container,
                                      GtkWidget    *widget)
 {
   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
@@ -232,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);
 
@@ -240,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",
@@ -295,19 +316,19 @@ on_var_sheet_var_double_clicked (void *var_sheet, gint dict_index,
   gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
                                  PSPPIRE_DATA_EDITOR_DATA_VIEW);
 
-  jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1);
+  ssw_sheet_scroll_to (SSW_SHEET (de->data_sheet), dict_index, -1);
 }
 
 
 static void
-on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index,
+on_data_sheet_var_double_clicked (SswSheet *data_sheet, gint dict_index,
                                  PsppireDataEditor *de)
 {
 
   gtk_notebook_set_current_page (GTK_NOTEBOOK (de),
                                  PSPPIRE_DATA_EDITOR_VARIABLE_VIEW);
 
-  jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index);
+  ssw_sheet_scroll_to (SSW_SHEET (de->var_sheet), -1, dict_index);
 }
 
 
@@ -318,7 +339,7 @@ static void
 refresh_entry (PsppireDataEditor *de)
 {
   gint row, col;
-  if (jmd_sheet_get_active_cell (JMD_SHEET (de->data_sheet), &col, &row))
+  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);
@@ -339,14 +360,34 @@ 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);
+    }
 }
 
 
 /* Called when the active cell or the selection in the data sheet changes */
 static void
-on_data_selection_change (PsppireDataEditor *de, JmdRange *sel)
+on_data_selection_change (PsppireDataEditor *de, SswRange *sel)
 {
   gchar *ref_cell_text = NULL;
 
@@ -395,7 +436,7 @@ static void set_font_recursively (GtkWidget *w, gpointer data);
 void
 psppire_data_editor_data_delete_variables (PsppireDataEditor *de)
 {
-  JmdRange *range = JMD_SHEET(de->data_sheet)->selection;
+  SswRange *range = SSW_SHEET(de->data_sheet)->selection;
 
   psppire_dict_delete_variables (de->dict, range->start_x,
                                 (range->end_x - range->start_x + 1));
@@ -406,7 +447,7 @@ psppire_data_editor_data_delete_variables (PsppireDataEditor *de)
 void
 psppire_data_editor_var_delete_variables (PsppireDataEditor *de)
 {
-  JmdRange *range = JMD_SHEET(de->var_sheet)->selection;
+  SswRange *range = SSW_SHEET(de->var_sheet)->selection;
 
   psppire_dict_delete_variables (de->dict, range->start_y,
                                 (range->end_y - range->start_y + 1));
@@ -450,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);
@@ -460,7 +501,7 @@ psppire_data_editor_init (PsppireDataEditor *de)
   de->split = FALSE;
   de->data_sheet = psppire_data_sheet_new ();
 
-  GtkWidget *data_button = jmd_sheet_get_button (JMD_SHEET (de->data_sheet));
+  GtkWidget *data_button = ssw_sheet_get_button (SSW_SHEET (de->data_sheet));
   gtk_button_set_label (GTK_BUTTON (data_button), _("Case"));
   de->vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (de->vbox), hbox, FALSE, FALSE, 0);
@@ -477,7 +518,7 @@ psppire_data_editor_init (PsppireDataEditor *de)
 
   de->var_sheet = psppire_variable_sheet_new ();
 
-  GtkWidget *var_button = jmd_sheet_get_button (JMD_SHEET (de->var_sheet));
+  GtkWidget *var_button = ssw_sheet_get_button (SSW_SHEET (de->var_sheet));
   gtk_button_set_label (GTK_BUTTON (var_button), _("Variable"));
 
   gtk_notebook_append_page (GTK_NOTEBOOK (de), de->var_sheet,
@@ -502,6 +543,7 @@ psppire_data_editor_init (PsppireDataEditor *de)
       set_font_recursively (GTK_WIDGET (de), de->font);
     }
 
+  gtk_widget_add_events (GTK_WIDGET (de), GDK_KEY_PRESS_MASK);
 }
 
 GtkWidget*
@@ -519,8 +561,8 @@ psppire_data_editor_new (PsppireDict *dict,
 void
 psppire_data_editor_show_grid (PsppireDataEditor *de, gboolean grid_visible)
 {
-  g_object_set (JMD_SHEET (de->var_sheet), "gridlines", grid_visible, NULL);
-  g_object_set (JMD_SHEET (de->data_sheet), "gridlines", grid_visible, NULL);
+  g_object_set (SSW_SHEET (de->var_sheet), "gridlines", grid_visible, NULL);
+  g_object_set (SSW_SHEET (de->data_sheet), "gridlines", grid_visible, NULL);
 }
 
 
@@ -592,12 +634,12 @@ psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index)
   switch (page)
     {
       case PSPPIRE_DATA_EDITOR_DATA_VIEW:
-       jmd_sheet_scroll_to (JMD_SHEET (de->data_sheet), dict_index, -1);
-       jmd_sheet_set_active_cell (JMD_SHEET (de->data_sheet), dict_index, -1, NULL);
+       ssw_sheet_scroll_to (SSW_SHEET (de->data_sheet), dict_index, -1);
+       ssw_sheet_set_active_cell (SSW_SHEET (de->data_sheet), dict_index, -1, NULL);
        break;
       case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW:
-       jmd_sheet_scroll_to (JMD_SHEET (de->var_sheet), -1, dict_index);
-       jmd_sheet_set_active_cell (JMD_SHEET (de->var_sheet), -1, dict_index, NULL);
+       ssw_sheet_scroll_to (SSW_SHEET (de->var_sheet), -1, dict_index);
+       ssw_sheet_set_active_cell (SSW_SHEET (de->var_sheet), -1, dict_index, NULL);
        break;
     }
 }
@@ -620,10 +662,10 @@ store_set_datum (GtkTreeModel *model, gint col, gint row,
 void
 psppire_data_editor_paste (PsppireDataEditor *de)
 {
-  JmdSheet *sheet = JMD_SHEET (de->data_sheet);
+  SswSheet *sheet = SSW_SHEET (de->data_sheet);
   GtkClipboard *clip =
     gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (sheet)),
                                   GDK_SELECTION_CLIPBOARD);
 
-  jmd_sheet_paste (sheet, clip, store_set_datum);
+  ssw_sheet_paste (sheet, clip, store_set_datum);
 }