X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=0efd8ce835186de958d58e28f704b1ff9c38e83d;hb=4ad4fcab6c886b1a6f29769a374b67b2f60173a9;hp=2b654f76bf83a3cabd5945a26857946dfbd15525;hpb=f7a3ebdcf1f308496cbf94d7e102d89f5648e9d7;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 2b654f76bf..0efd8ce835 100644 --- 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 -#include #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/jmd-sheet.h" +#include #include #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,6 @@ psppire_data_editor_set_focus_child (GtkContainer *container, GtkWidget *widget) { GTK_CONTAINER_CLASS (parent_class)->set_focus_child (container, widget); - } static void @@ -295,19 +301,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 +324,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 +345,29 @@ 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; + + value_init (&val, var_get_width (var)); + + if (psppire_value_entry_get_value (de->datum_entry, &val, var_get_width (var))) + { + psppire_data_store_set_value (de->data_store, row, var, &val); + } + } } /* 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 +416,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 +427,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)); @@ -460,7 +481,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 +498,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, @@ -501,7 +522,6 @@ psppire_data_editor_init (PsppireDataEditor *de) g_free (fontname); set_font_recursively (GTK_WIDGET (de), de->font); } - } GtkWidget* @@ -519,8 +539,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 +612,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 +640,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); }