X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-editor.c;h=d8c5cbf3a4541b0b8eec035e72535ceee198bbd8;hb=a4b0d14666d23ed908fd991b7435997436c2d79a;hp=27d2f140991eaf220dbcae2b2a4a2ae64e682fea;hpb=31f8fb281926b5b05feb67596627f0366c58d52e;p=pspp diff --git a/src/ui/gui/psppire-data-editor.c b/src/ui/gui/psppire-data-editor.c index 27d2f14099..d8c5cbf3a4 100644 --- a/src/ui/gui/psppire-data-editor.c +++ b/src/ui/gui/psppire-data-editor.c @@ -20,158 +20,34 @@ #include "ui/gui/psppire-data-editor.h" #include -#include #include "data/datasheet.h" #include "data/value-labels.h" #include "libpspp/range-set.h" #include "libpspp/str.h" -#include "ui/gui/executor.h" + #include "ui/gui/helper.h" #include "ui/gui/var-display.h" +#include "ui/gui/val-labs-dialog.h" +#include "ui/gui/missing-val-dialog.h" +#include "ui/gui/var-type-dialog.h" +#include "ui/gui/psppire-dict.h" #include "ui/gui/psppire-data-store.h" #include "ui/gui/psppire-data-window.h" #include "ui/gui/psppire-value-entry.h" #include "ui/gui/psppire-conf.h" -#include "ui/gui/psppire-var-sheet-header.h" - -#include "value-variant.h" +#include "ui/gui/psppire-variable-sheet.h" +#include "ui/gui/psppire-data-sheet.h" -#include "ui/gui/efficient-sheet/jmd-sheet.h" -#include "ui/gui/efficient-sheet/jmd-sheet-body.h" +#include #include #define _(msgid) gettext (msgid) - -static GtkCellRenderer * -create_spin_renderer (GType type) -{ - GtkCellRenderer *r = gtk_cell_renderer_spin_new (); - - GtkAdjustment *adj = gtk_adjustment_new (0, - 0, G_MAXDOUBLE, - 1, 1, - 0); - g_object_set (r, - "adjustment", adj, - NULL); - - return r; -} - -static GtkCellRenderer * -create_combo_renderer (GType type) -{ - GtkListStore *list_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING); - - GEnumClass *ec = g_type_class_ref (type); - - const GEnumValue *ev ; - for (ev = ec->values; ev->value_name; ++ev) - { - GtkTreeIter iter; - - gtk_list_store_append (list_store, &iter); - - gtk_list_store_set (list_store, &iter, - 0, ev->value, - 1, gettext (ev->value_nick), - -1); - } - - GtkCellRenderer *r = gtk_cell_renderer_combo_new (); - - g_object_set (r, - "model", list_store, - "text-column", 1, - "has-entry", TRUE, - NULL); - - return r; -} - -static gchar * -var_sheet_data_to_string (GtkTreeModel *m, gint col, gint row, const GValue *in) -{ - if (col >= n_DICT_COLS - 1) /* -1 because psppire-dict has an extra column */ - return NULL; - - const struct variable *var = psppire_dict_get_variable (PSPPIRE_DICT (m), row); - if (var == NULL) - return NULL; - - if (col == DICT_TVM_COL_TYPE) - { - const struct fmt_spec *print = var_get_print_format (var); - return strdup (fmt_gui_name (print->type)); - } - else if (col == DICT_TVM_COL_MISSING_VALUES) - return missing_values_to_string (var, NULL); - else if (col == DICT_TVM_COL_VALUE_LABELS) - { - const struct val_labs *vls = var_get_value_labels (var); - if (vls == NULL) - return strdup (_("None")); - const struct val_lab **labels = val_labs_sorted (vls); - const struct val_lab *vl = labels[0]; - gchar *vstr = value_to_text (vl->value, var); - char *text = xasprintf (_("{%s, %s}..."), vstr, - val_lab_get_escaped_label (vl)); - free (vstr); - free (labels); - return text; - } - - return jmd_sheet_default_forward_conversion (m, col, row, in); -} - -static GtkCellRenderer *spin_renderer; -static GtkCellRenderer *column_width_renderer; -static GtkCellRenderer *measure_renderer; -static GtkCellRenderer *alignment_renderer; - -static GtkCellRenderer * -select_renderer_func (gint col, gint row, GType type) -{ - if (!spin_renderer) - spin_renderer = create_spin_renderer (type); - - if (col == DICT_TVM_COL_ROLE && !column_width_renderer) - column_width_renderer = create_combo_renderer (type); - - if (col == DICT_TVM_COL_MEASURE && !measure_renderer) - measure_renderer = create_combo_renderer (type); - - if (col == DICT_TVM_COL_ALIGNMENT && !alignment_renderer) - alignment_renderer = create_combo_renderer (type); - - switch (col) - { - case DICT_TVM_COL_WIDTH: - case DICT_TVM_COL_DECIMAL: - case DICT_TVM_COL_COLUMNS: - return spin_renderer; - - case DICT_TVM_COL_ALIGNMENT: - return alignment_renderer; - - case DICT_TVM_COL_MEASURE: - return measure_renderer; - - case DICT_TVM_COL_ROLE: - return column_width_renderer; - } - - return NULL; -} - - static void psppire_data_editor_class_init (PsppireDataEditorClass *klass); static void psppire_data_editor_init (PsppireDataEditor *de); -static void disconnect_data_sheets (PsppireDataEditor *); static void refresh_entry (PsppireDataEditor *); GType @@ -208,8 +84,6 @@ psppire_data_editor_dispose (GObject *obj) { PsppireDataEditor *de = (PsppireDataEditor *) obj; - disconnect_data_sheets (de); - if (de->data_store) { g_object_unref (de->data_store); @@ -246,63 +120,6 @@ psppire_data_editor_refresh_model (PsppireDataEditor *de) { } -static void -change_var_property (PsppireDict *dict, gint col, gint row, GValue *value) -{ - /* Return the IDXth variable */ - struct variable *var = psppire_dict_get_variable (dict, row); - - if (NULL == var) - var = psppire_dict_insert_variable (dict, row, NULL); - - switch (col) - { - case DICT_TVM_COL_NAME: - { - const char *name = g_value_get_string (value); - if (psppire_dict_check_name (dict, name, FALSE)) - dict_rename_var (dict->dict, var, g_value_get_string (value)); - } - break; - case DICT_TVM_COL_LABEL: - var_set_label (var, g_value_get_string (value)); - break; - case DICT_TVM_COL_COLUMNS: - var_set_display_width (var, g_value_get_int (value)); - break; - case DICT_TVM_COL_MEASURE: - var_set_measure (var, g_value_get_enum (value)); - break; - case DICT_TVM_COL_ALIGNMENT: - var_set_alignment (var, g_value_get_enum (value)); - break; - case DICT_TVM_COL_ROLE: - var_set_role (var, g_value_get_enum (value)); - break; - default: - g_message ("Changing col %d of var sheet not yet supported", col); - break; - } -} - -static void -change_data_value (PsppireDataStore *store, gint col, gint row, GValue *value) -{ - const struct variable *var = psppire_dict_get_variable (store->dict, col); - - if (NULL == var) - return; - - union value v; - - GVariant *vrnt = g_value_get_variant (value); - - value_variant_get (&v, vrnt); - - psppire_data_store_set_value (store, row, var, &v); - - value_destroy_from_variant (&v, vrnt); -} static void psppire_data_editor_set_property (GObject *object, @@ -315,7 +132,9 @@ psppire_data_editor_set_property (GObject *object, switch (prop_id) { case PROP_SPLIT_WINDOW: - psppire_data_editor_split_window (de, g_value_get_boolean (value)); + de->split = g_value_get_boolean (value); + g_object_set (de->data_sheet, "split", de->split, NULL); + g_object_set (de->var_sheet, "split", de->split, NULL); break; case PROP_DATA_STORE: if ( de->data_store) @@ -328,13 +147,13 @@ psppire_data_editor_set_property (GObject *object, de->data_store = g_value_get_pointer (value); g_object_ref (de->data_store); - g_print ("NEW STORE\n"); g_object_set (de->data_sheet, "data-model", de->data_store, NULL); psppire_data_editor_refresh_model (de); - g_signal_connect_swapped (de->data_sheet, "value-changed", - G_CALLBACK (change_data_value), de->data_store); + g_signal_connect_swapped (de->data_sheet, "selection-changed", + G_CALLBACK (refresh_entry), + de); g_signal_connect_swapped (de->data_store, "case-changed", G_CALLBACK (refresh_entry), de); @@ -346,13 +165,18 @@ psppire_data_editor_set_property (GObject *object, de->dict = g_value_get_pointer (value); g_object_ref (de->dict); - g_object_set (de->data_sheet, "hmodel", de->dict, NULL); g_object_set (de->var_sheet, "data-model", de->dict, NULL); - g_signal_connect_swapped (de->var_sheet, "value-changed", - G_CALLBACK (change_var_property), de->dict); - 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: @@ -394,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 @@ -402,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 @@ -416,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); @@ -424,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", @@ -479,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); } @@ -501,37 +338,53 @@ on_data_sheet_var_double_clicked (JmdSheet *data_sheet, gint dict_index, static void refresh_entry (PsppireDataEditor *de) { - union value val; gint row, col; - 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); + if (var == NULL) + return; - const struct variable *var = psppire_dict_get_variable (de->dict, col); - psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), var); + psppire_value_entry_set_variable (PSPPIRE_VALUE_ENTRY (de->datum_entry), var); - int width = var_get_width (var); - if (! psppire_data_store_get_value (PSPPIRE_DATA_STORE (de->data_store), - row, var, &val)) - return; + int width = var_get_width (var); + if (! psppire_data_store_get_value (PSPPIRE_DATA_STORE (de->data_store), + row, var, &val)) + return; - psppire_value_entry_set_value (PSPPIRE_VALUE_ENTRY (de->datum_entry), - &val, width); - value_destroy (&val, width); + psppire_value_entry_set_value (PSPPIRE_VALUE_ENTRY (de->datum_entry), + &val, width); + value_destroy (&val, width); + } } 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); + } } -static void -disconnect_data_sheets (PsppireDataEditor *de) -{ -} - /* 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; @@ -575,90 +428,12 @@ on_data_selection_change (PsppireDataEditor *de, JmdRange *sel) static void set_font_recursively (GtkWidget *w, gpointer data); -gchar *myconvfunc (GtkTreeModel *m, gint col, gint row, const GValue *v); -void myreversefunc (GtkTreeModel *model, gint col, gint row, const gchar *in, GValue *out); - - -enum sort_order - { - SORT_ASCEND, - SORT_DESCEND - }; - -static void -do_sort (PsppireDataEditor *de, enum sort_order order) -{ - JmdRange *range = JMD_SHEET(de->data_sheet)->selection; - - int n_vars = 0; - int i; - - PsppireDataWindow *pdw = - psppire_data_window_for_data_store (de->data_store); - - GString *syntax = g_string_new ("SORT CASES BY"); - for (i = range->start_x ; i <= range->end_x; ++i) - { - const struct variable *var = psppire_dict_get_variable (de->dict, i); - if (var != NULL) - { - g_string_append_printf (syntax, " %s", var_get_name (var)); - n_vars++; - } - } - if (n_vars > 0) - { - if (order == SORT_DESCEND) - g_string_append (syntax, " (DOWN)"); - g_string_append_c (syntax, '.'); - execute_const_syntax_string (pdw, syntax->str); - } - g_string_free (syntax, TRUE); -} - - -static void -sort_ascending (PsppireDataEditor *de) -{ - do_sort (de, SORT_ASCEND); - - gtk_widget_queue_draw (GTK_WIDGET (de)); -} - -static void -sort_descending (PsppireDataEditor *de) -{ - do_sort (de, SORT_DESCEND); - - gtk_widget_queue_draw (GTK_WIDGET (de)); -} - -static void -delete_cases (PsppireDataEditor *de) -{ - JmdRange *range = JMD_SHEET(de->data_sheet)->selection; - - psppire_data_store_delete_cases (de->data_store, range->start_y, - range->end_y - range->start_y + 1); - - gtk_widget_queue_draw (GTK_WIDGET (de)); -} - -static void -insert_new_case (PsppireDataEditor *de) -{ - gint item = GPOINTER_TO_INT (g_object_get_data - (G_OBJECT (de->data_sheet_cases_row_popup), "item")); - - psppire_data_store_insert_new_case (de->data_store, item); - - gtk_widget_queue_draw (GTK_WIDGET (de)); -} + -static void -data_delete_variables (PsppireDataEditor *de) +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)); @@ -666,10 +441,10 @@ data_delete_variables (PsppireDataEditor *de) gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet)); } -static void -var_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)); @@ -677,236 +452,24 @@ var_delete_variables (PsppireDataEditor *de) gtk_widget_queue_draw (GTK_WIDGET (de->var_sheet)); } - -static void -insert_new_variable_data (PsppireDataEditor *de) +void +psppire_data_editor_insert_new_case_at_posn (PsppireDataEditor *de, gint posn) { - gint item = GPOINTER_TO_INT (g_object_get_data - (G_OBJECT (de->data_sheet_cases_column_popup), - "item")); - - const struct variable *v = psppire_dict_insert_variable (de->dict, item, NULL); - psppire_data_store_insert_value (de->data_store, var_get_width(v), - var_get_case_index (v)); + psppire_data_store_insert_new_case (de->data_store, posn); - gtk_widget_queue_draw (GTK_WIDGET (de)); + gtk_widget_queue_draw (GTK_WIDGET (de->data_sheet)); } -static void -insert_new_variable_var (PsppireDataEditor *de) +void +psppire_data_editor_insert_new_variable_at_posn (PsppireDataEditor *de, gint posn) { - gint item = GPOINTER_TO_INT (g_object_get_data - (G_OBJECT (de->var_sheet_row_popup), - "item")); - - const struct variable *v = psppire_dict_insert_variable (de->dict, item, NULL); + const struct variable *v = psppire_dict_insert_variable (de->dict, posn, NULL); psppire_data_store_insert_value (de->data_store, var_get_width(v), var_get_case_index (v)); gtk_widget_queue_draw (GTK_WIDGET (de)); } - -static GtkWidget * -create_var_row_header_popup_menu (PsppireDataEditor *de) -{ - GtkWidget *menu = gtk_menu_new (); - - GtkWidget *item = - gtk_menu_item_new_with_mnemonic (_("_Insert Variable")); - g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable_var), - de); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - de->var_clear_variables_menu_item = - gtk_menu_item_new_with_mnemonic (_("Cl_ear Variables")); - g_signal_connect_swapped (de->var_clear_variables_menu_item, "activate", - G_CALLBACK (var_delete_variables), de); - gtk_widget_set_sensitive (de->var_clear_variables_menu_item, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->var_clear_variables_menu_item); - - gtk_widget_show_all (menu); - return menu; -} - -static GtkWidget * -create_data_row_header_popup_menu (PsppireDataEditor *de) -{ - GtkWidget *menu = gtk_menu_new (); - - GtkWidget *item = - gtk_menu_item_new_with_mnemonic (_("_Insert Case")); - - g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_case), de); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - de->data_clear_cases_menu_item = gtk_menu_item_new_with_mnemonic (_("Cl_ear Cases")); - gtk_widget_set_sensitive (de->data_clear_cases_menu_item, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_clear_cases_menu_item); - g_signal_connect_swapped (de->data_clear_cases_menu_item, "activate", - G_CALLBACK (delete_cases), de); - - gtk_widget_show_all (menu); - return menu; -} - -static GtkWidget * -create_data_column_header_popup_menu (PsppireDataEditor *de) -{ - GtkWidget *menu = gtk_menu_new (); - - GtkWidget *item = - gtk_menu_item_new_with_mnemonic (_("_Insert Variable")); - g_signal_connect_swapped (item, "activate", G_CALLBACK (insert_new_variable_data), - de); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - de->data_clear_variables_menu_item = - gtk_menu_item_new_with_mnemonic (_("Cl_ear Variables")); - g_signal_connect_swapped (de->data_clear_variables_menu_item, "activate", - G_CALLBACK (data_delete_variables), de); - gtk_widget_set_sensitive (de->data_clear_variables_menu_item, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_clear_variables_menu_item); - - item = gtk_separator_menu_item_new (); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), item); - - de->data_sort_ascending_menu_item = - gtk_menu_item_new_with_mnemonic (_("Sort _Ascending")); - g_signal_connect_swapped (de->data_sort_ascending_menu_item, "activate", - G_CALLBACK (sort_ascending), de); - gtk_widget_set_sensitive (de->data_sort_ascending_menu_item, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_sort_ascending_menu_item); - - de->data_sort_descending_menu_item = - gtk_menu_item_new_with_mnemonic (_("Sort _Descending")); - g_signal_connect_swapped (de->data_sort_descending_menu_item, "activate", - G_CALLBACK (sort_descending), de); - gtk_widget_set_sensitive (de->data_sort_descending_menu_item, FALSE); - gtk_menu_shell_append (GTK_MENU_SHELL (menu), de->data_sort_descending_menu_item); - - gtk_widget_show_all (menu); - return menu; -} - -static void -set_var_popup_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p) -{ - - JmdRange *range = selection; - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - gint width = gtk_tree_model_get_n_columns (sheet->data_model); - - gboolean whole_row_selected = (range->start_x == 0 && - range->end_x == width - 1 - 1); - /* PsppireDict has an "extra" column: TVM_COL_VAR ^^^ */ - gtk_widget_set_sensitive (de->var_clear_variables_menu_item, whole_row_selected); -} - -static void -set_menu_items_sensitivity (JmdSheet *sheet, gpointer selection, gpointer p) -{ - JmdRange *range = selection; - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - gint width = gtk_tree_model_get_n_columns (sheet->data_model); - gint length = psppire_data_store_get_case_count (de->data_store); - - - gboolean whole_row_selected = (range->start_x == 0 && range->end_x == width - 1); - gtk_widget_set_sensitive (de->data_clear_cases_menu_item, whole_row_selected); - - - gboolean whole_column_selected = - (range->start_y == 0 && range->end_y == length - 1); - gtk_widget_set_sensitive (de->data_clear_variables_menu_item, - whole_column_selected); - gtk_widget_set_sensitive (de->data_sort_ascending_menu_item, - whole_column_selected); - gtk_widget_set_sensitive (de->data_sort_descending_menu_item, - whole_column_selected); -} - -static void -show_variables_row_popup (JmdSheet *sheet, int row, uint button, - uint state, gpointer p) -{ - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - GListModel *vmodel = NULL; - g_object_get (sheet, "vmodel", &vmodel, NULL); - if (vmodel == NULL) - return; - - guint n_items = g_list_model_get_n_items (vmodel); - - if (row >= n_items) - return; - - if (button != 3) - return; - - g_object_set_data (G_OBJECT (de->var_sheet_row_popup), "item", - GINT_TO_POINTER (row)); - - gtk_menu_popup_at_pointer (GTK_MENU (de->var_sheet_row_popup), NULL); -} - -static void -show_cases_row_popup (JmdSheet *sheet, int row, uint button, uint state, gpointer p) -{ - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - GListModel *vmodel = NULL; - g_object_get (sheet, "vmodel", &vmodel, NULL); - if (vmodel == NULL) - return; - - guint n_items = g_list_model_get_n_items (vmodel); - - if (row >= n_items) - return; - - if (button != 3) - return; - - g_object_set_data (G_OBJECT (de->data_sheet_cases_row_popup), "item", - GINT_TO_POINTER (row)); - - gtk_menu_popup_at_pointer (GTK_MENU (de->data_sheet_cases_row_popup), NULL); -} - -static void -show_cases_column_popup (JmdSheet *sheet, int column, uint button, uint state, - gpointer p) -{ - PsppireDataEditor *de = PSPPIRE_DATA_EDITOR (p); - GListModel *hmodel = NULL; - g_object_get (sheet, "hmodel", &hmodel, NULL); - if (hmodel == NULL) - return; - - guint n_items = g_list_model_get_n_items (hmodel); - - if (column >= n_items) - return; - - if (button != 3) - return; - - g_object_set_data (G_OBJECT (de->data_sheet_cases_column_popup), "item", - GINT_TO_POINTER (column)); - - gtk_menu_popup_at_pointer (GTK_MENU (de->data_sheet_cases_column_popup), NULL); -} - - static void psppire_data_editor_init (PsppireDataEditor *de) { @@ -917,7 +480,6 @@ psppire_data_editor_init (PsppireDataEditor *de) gtk_style_context_add_class (context, "psppire-data-editor"); de->font = NULL; - de->old_vbox_widget = NULL; g_object_set (de, "tab-pos", GTK_POS_BOTTOM, NULL); @@ -934,26 +496,9 @@ psppire_data_editor_init (PsppireDataEditor *de) gtk_box_pack_start (GTK_BOX (hbox), de->datum_entry, TRUE, TRUE, 0); de->split = FALSE; - de->data_sheet = jmd_sheet_new (); - - de->data_sheet_cases_column_popup = create_data_column_header_popup_menu (de); - de->data_sheet_cases_row_popup = create_data_row_header_popup_menu (de); - de->var_sheet_row_popup = create_var_row_header_popup_menu (de); + de->data_sheet = psppire_data_sheet_new (); - g_signal_connect (de->data_sheet, "row-header-pressed", - G_CALLBACK (show_cases_row_popup), de); - - g_signal_connect (de->data_sheet, "column-header-pressed", - G_CALLBACK (show_cases_column_popup), de); - - g_signal_connect (de->data_sheet, "selection-changed", - G_CALLBACK (set_menu_items_sensitivity), de); - - jmd_sheet_body_set_conversion_func - (JMD_SHEET_BODY (JMD_SHEET(de->data_sheet)->selected_body), - myconvfunc, myreversefunc); - - 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); @@ -968,26 +513,9 @@ psppire_data_editor_init (PsppireDataEditor *de) gtk_widget_show_all (de->vbox); - de->var_sheet = g_object_new (JMD_TYPE_SHEET, NULL); - - PsppireVarSheetHeader *vsh = g_object_new (PSPPIRE_TYPE_VAR_SHEET_HEADER, NULL); - - g_object_set (de->var_sheet, - "hmodel", vsh, - "select-renderer-func", select_renderer_func, - NULL); - - jmd_sheet_set_conversion_func (JMD_SHEET (de->var_sheet), - var_sheet_data_to_string, NULL); - - g_signal_connect (de->var_sheet, "row-header-pressed", - G_CALLBACK (show_variables_row_popup), de); + de->var_sheet = psppire_variable_sheet_new (); - g_signal_connect (de->var_sheet, "selection-changed", - G_CALLBACK (set_var_popup_sensitivity), de); - - - 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, @@ -1012,6 +540,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* @@ -1029,8 +558,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); } @@ -1089,20 +618,7 @@ psppire_data_editor_set_font (PsppireDataEditor *de, PangoFontDescription *font_ void psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) { - if (split == de->split) - return; - - disconnect_data_sheets (de); - - psppire_data_editor_refresh_model (de); - - gtk_widget_show_all (de->vbox); - - if (de->font) - set_font_recursively (GTK_WIDGET (de), de->font); - - de->split = split; - g_object_notify (G_OBJECT (de), "split"); + g_object_set (de, "split", split, NULL); } /* Makes the variable with dictionary index DICT_INDEX in DE's dictionary @@ -1110,4 +626,43 @@ psppire_data_editor_split_window (PsppireDataEditor *de, gboolean split) void psppire_data_editor_goto_variable (PsppireDataEditor *de, gint dict_index) { + gint page = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + + switch (page) + { + case PSPPIRE_DATA_EDITOR_DATA_VIEW: + 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: + 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; + } +} + +/* Set the datum at COL, ROW, to that contained in VALUE. + */ +static void +store_set_datum (GtkTreeModel *model, gint col, gint row, + const GValue *value) +{ + PsppireDataStore *store = PSPPIRE_DATA_STORE (model); + GVariant *v = g_value_get_variant (value); + union value uv; + value_variant_get (&uv, v); + const struct variable *var = psppire_dict_get_variable (store->dict, col); + psppire_data_store_set_value (store, row, var, &uv); + value_destroy_from_variant (&uv, v); +} + +void +psppire_data_editor_paste (PsppireDataEditor *de) +{ + SswSheet *sheet = SSW_SHEET (de->data_sheet); + GtkClipboard *clip = + gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (sheet)), + GDK_SELECTION_CLIPBOARD); + + ssw_sheet_paste (sheet, clip, store_set_datum); }