X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=9b90930edd6cf149bf822e3fa4477d4689afc4d3;hb=e4955eebfee4b79846bbb5ba27daaa39a02ef05c;hp=500877bdd38470abdda490fb8747746cc00718f6;hpb=4c5964204338f984c093f7905ce491ad8923e910;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 500877bdd3..9b90930edd 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1,5 +1,6 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010, 2011, 2012 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013, 2014, + 2016, 2017 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 @@ -24,44 +25,75 @@ #include "language/lexer/lexer.h" #include "libpspp/message.h" #include "libpspp/str.h" -#include "ui/gui/aggregate-dialog.h" -#include "ui/gui/autorecode-dialog.h" #include "ui/gui/builder-wrapper.h" -#include "ui/gui/chi-square-dialog.h" -#include "ui/gui/comments-dialog.h" -#include "ui/gui/compute-dialog.h" -#include "ui/gui/count-dialog.h" #include "ui/gui/entry-dialog.h" #include "ui/gui/executor.h" -#include "ui/gui/find-dialog.h" -#include "ui/gui/goto-case-dialog.h" #include "ui/gui/help-menu.h" #include "ui/gui/helper.h" #include "ui/gui/helper.h" -#include "ui/gui/k-related-dialog.h" -#include "ui/gui/npar-two-sample-related.h" -#include "ui/gui/oneway-anova-dialog.h" +#include "ui/gui/psppire-import-assistant.h" #include "ui/gui/psppire-data-window.h" +#include "ui/gui/psppire-data-editor.h" +#include "ui/gui/psppire-dialog-action.h" +#include "ui/gui/psppire-encoding-selector.h" #include "ui/gui/psppire-syntax-window.h" #include "ui/gui/psppire-window.h" +#include "ui/gui/windows-menu.h" +#include "ui/gui/goto-case-dialog.h" #include "ui/gui/psppire.h" -#include "ui/gui/runs-dialog.h" -#include "ui/gui/ks-one-sample-dialog.h" -#include "ui/gui/recode-dialog.h" -#include "ui/gui/select-cases-dialog.h" -#include "ui/gui/split-file-dialog.h" -#include "ui/gui/t-test-one-sample.h" -#include "ui/gui/t-test-paired-samples.h" -#include "ui/gui/text-data-import-dialog.h" -#include "ui/gui/transpose-dialog.h" -#include "ui/gui/univariate-dialog.h" -#include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" #include "gl/c-strcase.h" #include "gl/c-strcasestr.h" #include "gl/xvasprintf.h" +#include + +#include "find-dialog.h" +#include "options-dialog.h" +#include "psppire-dialog-action-1sks.h" +#include "psppire-dialog-action-aggregate.h" +#include "psppire-dialog-action-autorecode.h" +#include "psppire-dialog-action-barchart.h" +#include "psppire-dialog-action-binomial.h" +#include "psppire-dialog-action-chisquare.h" +#include "psppire-dialog-action-comments.h" +#include "psppire-dialog-action-compute.h" +#include "psppire-dialog-action-correlation.h" +#include "psppire-dialog-action-count.h" +#include "psppire-dialog-action-crosstabs.h" +#include "psppire-dialog-action-descriptives.h" +#include "psppire-dialog-action-examine.h" +#include "psppire-dialog-action-factor.h" +#include "psppire-dialog-action-flip.h" +#include "psppire-dialog-action-frequencies.h" +#include "psppire-dialog-action-histogram.h" +#include "psppire-dialog-action-indep-samps.h" +#include "psppire-dialog-action-k-independent.h" +#include "psppire-dialog-action-k-related.h" +#include "psppire-dialog-action-kmeans.h" +#include "psppire-dialog-action-logistic.h" +#include "psppire-dialog-action-means.h" +#include "psppire-dialog-action-oneway.h" +#include "psppire-dialog-action-paired.h" +#include "psppire-dialog-action-rank.h" +#include "psppire-dialog-action-recode-same.h" +#include "psppire-dialog-action-recode-different.h" +#include "psppire-dialog-action-regression.h" +#include "psppire-dialog-action-reliability.h" +#include "psppire-dialog-action-roc.h" +#include "psppire-dialog-action-runs.h" +#include "psppire-dialog-action-scatterplot.h" +#include "psppire-dialog-action-select.h" +#include "psppire-dialog-action-sort.h" +#include "psppire-dialog-action-split.h" +#include "psppire-dialog-action-tt1s.h" +#include "psppire-dialog-action-two-sample.h" +#include "psppire-dialog-action-univariate.h" +#include "psppire-dialog-action-var-info.h" +#include "psppire-dialog-action-weight.h" + + #include #define _(msgid) gettext (msgid) #define N_(msgid) msgid @@ -129,7 +161,7 @@ psppire_data_window_get_type (void) static GObjectClass *parent_class ; enum { - PROP_DATASET = 1 + PROP_DATASET = 1 }; static void @@ -145,29 +177,13 @@ psppire_data_window_class_init (PsppireDataWindowClass *class) object_class->get_property = psppire_data_window_get_property; g_object_class_install_property ( - object_class, PROP_DATASET, - g_param_spec_pointer ("dataset", "Dataset", - "'struct datset *' represented by the window", - G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); -} - -static void -set_paste_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) -{ - GtkAction *edit_paste = get_action_assert (de->builder, "edit_paste"); - - gtk_action_set_sensitive (edit_paste, x); + object_class, PROP_DATASET, + g_param_spec_pointer ("dataset", "Dataset", + "'struct datset *' represented by the window", + G_PARAM_CONSTRUCT_ONLY | G_PARAM_READWRITE)); } -static void -set_cut_copy_menuitem_sensitivity (PsppireDataWindow *de, gboolean x) -{ - GtkAction *edit_copy = get_action_assert (de->builder, "edit_copy"); - GtkAction *edit_cut = get_action_assert (de->builder, "edit_cut"); - - gtk_action_set_sensitive (edit_copy, x); - gtk_action_set_sensitive (edit_cut, x); -} + /* Run the EXECUTE command. */ static void @@ -182,16 +198,16 @@ transformation_change_callback (bool transformations_pending, { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - - GtkWidget *menuitem = - gtk_ui_manager_get_widget (uim,"/ui/menubar/transform/transform_run-pending"); - GtkWidget *status_label = get_widget_assert (de->builder, "case-counter-area"); - gtk_widget_set_sensitive (menuitem, transformations_pending); + { + GAction *action = g_action_map_lookup_action (G_ACTION_MAP (de), + "transform-pending"); + g_simple_action_set_enabled (G_SIMPLE_ACTION (action), + transformations_pending); + } if ( transformations_pending) gtk_label_set_text (GTK_LABEL (status_label), @@ -215,13 +231,11 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) } else { - PsppireVarStore *vs = NULL; PsppireDict *dict = NULL; struct variable *var ; gchar *text ; - g_object_get (de->data_editor, "var-store", &vs, NULL); - g_object_get (vs, "dictionary", &dict, NULL); + g_object_get (de->data_editor, "dictionary", &dict, NULL); var = psppire_dict_get_variable (dict, filter_index); @@ -288,12 +302,10 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) else { struct variable *var ; - PsppireVarStore *vs = NULL; PsppireDict *dict = NULL; gchar *text; - g_object_get (de->data_editor, "var-store", &vs, NULL); - g_object_get (vs, "dictionary", &dict, NULL); + g_object_get (de->data_editor, "dictionary", &dict, NULL); var = psppire_dict_get_variable (dict, weight_index); @@ -333,18 +345,25 @@ dump_rm (GtkRecentManager *rm) } #endif +static gboolean +has_suffix (const gchar *name, const gchar *suffix) +{ + size_t name_len = strlen (name); + size_t suffix_len = strlen (suffix); + return (name_len > suffix_len + && !c_strcasecmp (&name[name_len - suffix_len], suffix)); +} + static gboolean name_has_por_suffix (const gchar *name) { - size_t length = strlen (name); - return length > 4 && !c_strcasecmp (&name[length - 4], ".por"); + return has_suffix (name, ".por"); } static gboolean name_has_sav_suffix (const gchar *name) { - size_t length = strlen (name); - return length > 4 && !c_strcasecmp (&name[length - 4], ".sav"); + return has_suffix (name, ".sav") || has_suffix (name, ".zsav"); } /* Returns true if NAME has a suffix which might denote a PSPP file */ @@ -355,38 +374,68 @@ name_has_suffix (const gchar *name) } static gboolean -load_file (PsppireWindow *de, const gchar *file_name) +load_file (PsppireWindow *de, const gchar *file_name, const char *encoding, + gpointer syn) { - struct string filename; - gchar *utf8_file_name; - const char *mime_type; - gchar *syntax; + const char *mime_type = NULL; + gchar *syntax = NULL; bool ok; - ds_init_empty (&filename); + if (syn == NULL) + { + gchar *utf8_file_name; + struct string filename; - utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); + utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); - syntax_gen_string (&filename, ss_cstr (utf8_file_name)); + if (NULL == utf8_file_name) + return FALSE; - g_free (utf8_file_name); + ds_init_empty (&filename); + syntax_gen_string (&filename, ss_cstr (utf8_file_name)); - syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename)); - ds_destroy (&filename); + g_free (utf8_file_name); + + if (encoding && encoding[0]) + syntax = g_strdup_printf ("GET FILE=%s ENCODING='%s'.", + ds_cstr (&filename), encoding); + else + syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename)); + ds_destroy (&filename); + } + else + { + syntax = syn; + } ok = execute_syntax (PSPPIRE_DATA_WINDOW (de), - lex_reader_for_string (syntax)); + lex_reader_for_string (syntax, "UTF-8")); g_free (syntax); - mime_type = (name_has_por_suffix (file_name) - ? "application/x-spss-por" - : "application/x-spss-sav"); + if (ok && syn == NULL) + { + if (name_has_por_suffix (file_name)) + mime_type = "application/x-spss-por"; + else if (name_has_sav_suffix (file_name)) + mime_type = "application/x-spss-sav"; - add_most_recent (file_name, mime_type); + add_most_recent (file_name, mime_type, encoding); + } return ok; } +static const char * +psppire_data_window_format_to_string (enum PsppireDataWindowFormat format) +{ + if (format == PSPPIRE_DATA_WINDOW_SAV) + return ".sav"; + else if (format == PSPPIRE_DATA_WINDOW_ZSAV) + return ".zsav"; + else + return ".por"; +} + /* Save DE to file */ static void save_file (PsppireWindow *w) @@ -403,12 +452,7 @@ save_file (PsppireWindow *w) fnx = g_string_new (file_name); if ( ! name_has_suffix (fnx->str)) - { - if ( de->save_as_portable) - g_string_append (fnx, ".por"); - else - g_string_append (fnx, ".sav"); - } + g_string_append (fnx, psppire_data_window_format_to_string (de->format)); ds_init_empty (&filename); @@ -419,9 +463,13 @@ save_file (PsppireWindow *w) syntax_gen_string (&filename, ss_cstr (utf8_file_name)); g_free (utf8_file_name); - syntax = g_strdup_printf ("%s OUTFILE=%s.", - de->save_as_portable ? "EXPORT" : "SAVE", - ds_cstr (&filename)); + if (de->format == PSPPIRE_DATA_WINDOW_SAV) + syntax = g_strdup_printf ("SAVE OUTFILE=%s.", ds_cstr (&filename)); + else if (de->format == PSPPIRE_DATA_WINDOW_ZSAV) + syntax = g_strdup_printf ("SAVE /ZCOMPRESSED /OUTFILE=%s.", + ds_cstr (&filename)); + else + syntax = g_strdup_printf ("EXPORT OUTFILE=%s.", ds_cstr (&filename)); ds_destroy (&filename); @@ -429,19 +477,6 @@ save_file (PsppireWindow *w) } -static void -insert_case (PsppireDataWindow *dw) -{ - psppire_data_editor_insert_case (dw->data_editor); -} - -static void -on_insert_variable (PsppireDataWindow *dw) -{ - psppire_data_editor_insert_variable (dw->data_editor); -} - - static void display_dict (PsppireDataWindow *de) { @@ -458,10 +493,12 @@ sysfile_info (PsppireDataWindow *de) struct string filename; gchar *file_name = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); - gchar *utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); + const gchar *encoding = psppire_encoding_selector_get_encoding ( + gtk_file_chooser_get_extra_widget (GTK_FILE_CHOOSER (dialog))); + gchar *syntax; ds_init_empty (&filename); @@ -470,7 +507,11 @@ sysfile_info (PsppireDataWindow *de) g_free (utf8_file_name); - syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename)); + if (encoding) + syntax = g_strdup_printf ("SYSFILE INFO %s ENCODING='%s'.", + ds_cstr (&filename), encoding); + else + syntax = g_strdup_printf ("SYSFILE INFO %s.", ds_cstr (&filename)); g_free (execute_syntax_string (de, syntax)); } @@ -482,23 +523,31 @@ sysfile_info (PsppireDataWindow *de) static void data_pick_filename (PsppireWindow *window) { + GtkListStore *list_store; + GtkWidget *combo_box; + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (window); - GtkFileFilter *filter = gtk_file_filter_new (); - GtkWidget *button_sys; + GtkFileFilter *filter; GtkWidget *dialog = gtk_file_chooser_dialog_new (_("Save"), GTK_WINDOW (de), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Save"), GTK_RESPONSE_ACCEPT, NULL); g_object_set (dialog, "local-only", FALSE, NULL); + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("System Files (*.sav)")); gtk_file_filter_add_mime_type (filter, "application/x-spss-sav"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + filter = gtk_file_filter_new (); + gtk_file_filter_set_name (filter, _("Compressed System Files (*.zsav)")); + gtk_file_filter_add_pattern (filter, "*.zsav"); + gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + filter = gtk_file_filter_new (); gtk_file_filter_set_name (filter, _("Portable Files (*.por) ")); gtk_file_filter_add_mime_type (filter, "application/x-spss-por"); @@ -508,24 +557,49 @@ data_pick_filename (PsppireWindow *window) gtk_file_filter_set_name (filter, _("All Files")); gtk_file_filter_add_pattern (filter, "*"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); + gtk_file_chooser_set_filter (GTK_FILE_CHOOSER (dialog), filter); { - GtkWidget *button_por; - GtkWidget *vbox = gtk_vbox_new (TRUE, 5); - button_sys = - gtk_radio_button_new_with_label (NULL, _("System File")); - - button_por = - gtk_radio_button_new_with_label - (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)), - _("Portable File")); - - psppire_box_pack_start_defaults (GTK_BOX (vbox), button_sys); - psppire_box_pack_start_defaults (GTK_BOX (vbox), button_por); - - gtk_widget_show_all (vbox); - - gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), vbox); + GtkCellRenderer *cell; + GtkWidget *label; + GtkTreeIter iter; + GtkWidget *hbox; + + list_store = gtk_list_store_new (2, G_TYPE_INT, G_TYPE_STRING); + combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL (list_store)); + + gtk_list_store_append (list_store, &iter); + gtk_list_store_set (list_store, &iter, + 0, PSPPIRE_DATA_WINDOW_SAV, + 1, _("System File"), + -1); + gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_box), &iter); + + gtk_list_store_append (list_store, &iter); + gtk_list_store_set (list_store, &iter, + 0, PSPPIRE_DATA_WINDOW_ZSAV, + 1, _("Compressed System File"), + -1); + + gtk_list_store_append (list_store, &iter); + gtk_list_store_set (list_store, &iter, + 0, PSPPIRE_DATA_WINDOW_POR, + 1, _("Portable File"), + -1); + + label = gtk_label_new (_("Format:")); + + cell = gtk_cell_renderer_text_new (); + gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (combo_box), cell, FALSE); + gtk_cell_layout_add_attribute (GTK_CELL_LAYOUT (combo_box), cell, + "text", 1); + + hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); + gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (hbox), combo_box, FALSE, FALSE, 0); + gtk_widget_show_all (hbox); + + gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), hbox); } gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), @@ -541,16 +615,18 @@ data_pick_filename (PsppireWindow *window) gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) ); - de->save_as_portable = - ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys)); + GtkTreeIter iter; + int format; + + gtk_combo_box_get_active_iter (GTK_COMBO_BOX (combo_box), &iter); + gtk_tree_model_get (GTK_TREE_MODEL (list_store), &iter, + 0, &format, + -1); + de->format = format; if ( ! name_has_suffix (filename->str)) - { - if ( de->save_as_portable) - g_string_append (filename, ".por"); - else - g_string_append (filename, ".sav"); - } + g_string_append (filename, + psppire_data_window_format_to_string (format)); psppire_window_set_filename (PSPPIRE_WINDOW (de), filename->str); @@ -574,18 +650,18 @@ confirm_delete_dataset (PsppireDataWindow *de, int result; dialog = gtk_message_dialog_new ( - GTK_WINDOW (de), 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", - _("Delete Existing Dataset?")); + GTK_WINDOW (de), 0, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", + _("Delete Existing Dataset?")); gtk_message_dialog_format_secondary_text ( - GTK_MESSAGE_DIALOG (dialog), - _("Renaming \"%s\" to \"%s\" will destroy the existing " - "dataset named \"%s\". Are you sure that you want to do this?"), - old_dataset, new_dataset, existing_dataset); + GTK_MESSAGE_DIALOG (dialog), + _("Renaming \"%s\" to \"%s\" will destroy the existing " + "dataset named \"%s\". Are you sure that you want to do this?"), + old_dataset, new_dataset, existing_dataset); gtk_dialog_add_buttons (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_DELETE, GTK_RESPONSE_OK, + _("Cancel"), GTK_RESPONSE_CANCEL, + _("Delete"), GTK_RESPONSE_OK, NULL); g_object_set (dialog, "icon-name", "pspp", NULL); @@ -626,88 +702,108 @@ on_rename_dataset (PsppireDataWindow *de) free (new_name); } -static void -on_edit_paste (PsppireDataWindow *de) -{ - psppire_data_editor_clip_paste (de->data_editor); -} static void -on_edit_copy (PsppireDataWindow *de) +status_bar_activate (GAction *action, GVariant *param, PsppireDataWindow *de) { - psppire_data_editor_clip_copy (de->data_editor); -} - + GtkWidget *statusbar = get_widget_assert (de->builder, "status-bar"); + GVariant *state = g_action_get_state (action); + const gboolean visible = g_variant_get_boolean (state); + g_action_change_state (action, g_variant_new_boolean (!visible)); -static void -on_edit_cut (PsppireDataWindow *de) -{ - psppire_data_editor_clip_cut (de->data_editor); + gtk_widget_set_visible (statusbar, !visible); } static void -status_bar_activate (PsppireDataWindow *de, GtkToggleAction *action) +grid_lines_activate (GAction *action, GVariant *param, PsppireDataWindow *de) { - GtkWidget *statusbar = get_widget_assert (de->builder, "status-bar"); + GVariant *state = g_action_get_state (action); + const gboolean grid_visible = g_variant_get_boolean (state); + g_action_change_state (action, g_variant_new_boolean (!grid_visible)); - if ( gtk_toggle_action_get_active (action)) - gtk_widget_show (statusbar); - else - gtk_widget_hide (statusbar); + psppire_data_editor_show_grid (de->data_editor, !grid_visible); } static void -grid_lines_activate (PsppireDataWindow *de, GtkToggleAction *action) +on_switch_page (GtkNotebook *notebook, GtkWidget *page, guint pn, gpointer ud) { - const gboolean grid_visible = gtk_toggle_action_get_active (action); + PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (ud); - psppire_data_editor_show_grid (de->data_editor, grid_visible); -} + GAction *action = g_action_map_lookup_action (G_ACTION_MAP (de), "view_dv"); -static void -data_view_activate (PsppireDataWindow *de) -{ - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); + switch (pn) + { + case 0: + g_action_change_state (action, g_variant_new_string ("DATA")); + gtk_widget_show (GTK_WIDGET (de->ti_insert_case)); + gtk_widget_show (GTK_WIDGET (de->ti_jump_to_case)); + gtk_widget_show (GTK_WIDGET (de->ti_find)); + + gtk_widget_show (GTK_WIDGET (de->mi_go_to_case)); + gtk_widget_show (GTK_WIDGET (de->mi_insert_case)); + gtk_widget_show (GTK_WIDGET (de->mi_find)); + gtk_widget_show (GTK_WIDGET (de->mi_find_separator)); + gtk_widget_show (GTK_WIDGET (de->mi_clear_cases)); + + break; + + case 1: + g_action_change_state (action, g_variant_new_string ("VARS")); + gtk_widget_hide (GTK_WIDGET (de->ti_insert_case)); + gtk_widget_hide (GTK_WIDGET (de->ti_jump_to_case)); + gtk_widget_hide (GTK_WIDGET (de->ti_find)); + + gtk_widget_hide (GTK_WIDGET (de->mi_go_to_case)); + gtk_widget_hide (GTK_WIDGET (de->mi_insert_case)); + gtk_widget_hide (GTK_WIDGET (de->mi_find)); + gtk_widget_hide (GTK_WIDGET (de->mi_find_separator)); + gtk_widget_hide (GTK_WIDGET (de->mi_clear_cases)); + + break; + } } static void -variable_view_activate (PsppireDataWindow *de) +activate_change_view (GAction *action, GVariant *param, PsppireDataWindow *de) { - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); + g_action_change_state (action, param); + GVariant *new_state = g_action_get_state (action); + + const gchar *what = g_variant_get_string (new_state, NULL); + if (0 == g_strcmp0 (what, "DATA")) + { + gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); + } + else if (0 == g_strcmp0 (what, "VARS")) + { + gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); + } } + static void fonts_activate (PsppireDataWindow *de) { GtkWidget *toplevel = gtk_widget_get_toplevel (GTK_WIDGET (de)); - PangoFontDescription *current_font; - gchar *font_name; - GtkWidget *dialog = - gtk_font_selection_dialog_new (_("Font Selection")); - - - current_font = GTK_WIDGET(de->data_editor)->style->font_desc; - font_name = pango_font_description_to_string (current_font); + GtkWidget *dialog = gtk_font_chooser_dialog_new (NULL, GTK_WINDOW (toplevel)); + GtkStyleContext *style = gtk_widget_get_style_context (GTK_WIDGET(de->data_editor)); + const PangoFontDescription *current_font ; - gtk_font_selection_dialog_set_font_name (GTK_FONT_SELECTION_DIALOG (dialog), font_name); + gtk_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", ¤t_font, NULL); - g_free (font_name); + gtk_font_chooser_set_font_desc (GTK_FONT_CHOOSER (dialog), current_font); gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) { - const gchar *font = gtk_font_selection_dialog_get_font_name - (GTK_FONT_SELECTION_DIALOG (dialog)); - - PangoFontDescription* font_desc = - pango_font_description_from_string (font); + PangoFontDescription* font_desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (dialog)); psppire_data_editor_set_font (de->data_editor, font_desc); } @@ -718,30 +814,36 @@ fonts_activate (PsppireDataWindow *de) /* Callback for the value labels action */ + static void -toggle_value_labels (PsppireDataWindow *de, GtkToggleAction *ta) +value_labels_activate (GAction *action, GVariant *param, PsppireDataWindow *de) { - g_object_set (de->data_editor, "value-labels", gtk_toggle_action_get_active (ta), NULL); + GVariant *v = g_action_get_state (action); + gboolean labels_active = g_variant_get_boolean (v); + g_action_change_state (action, g_variant_new_boolean (!labels_active)); + + GVariant *new_state = g_action_get_state (action); + labels_active = g_variant_get_boolean (new_state); + g_object_set (de->data_editor, "value-labels", labels_active, NULL); + + gtk_toggle_tool_button_set_active (GTK_TOGGLE_TOOL_BUTTON (de->ti_value_labels_button), + labels_active); } static void -toggle_split_window (PsppireDataWindow *de, GtkToggleAction *ta) +on_labels_button_toggle (GtkToggleToolButton *ttb, PsppireDataWindow *de) { - psppire_data_editor_split_window (de->data_editor, - gtk_toggle_action_get_active (ta)); -} + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), "value_labels"); + g_assert (a); + gboolean labels_active = gtk_toggle_tool_button_get_active (ttb); + g_action_change_state (a, g_variant_new_boolean (labels_active)); -static void -file_quit (PsppireDataWindow *de) -{ - /* FIXME: Need to be more intelligent here. - Give the user the opportunity to save any unsaved data. - */ - psppire_quit (); + GVariant *new_state = g_action_get_state (a); + labels_active = g_variant_get_boolean (new_state); + g_object_set (de->data_editor, "value-labels", labels_active, NULL); } - static void on_recent_data_select (GtkMenuShell *menushell, PsppireWindow *window) @@ -755,7 +857,7 @@ on_recent_data_select (GtkMenuShell *menushell, g_free (uri); - open_data_window (window, file); + open_data_window (window, file, NULL, NULL); g_free (file); } @@ -818,7 +920,7 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) free (encoding); - if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) + if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) ) gtk_widget_show (se); else gtk_widget_destroy (se); @@ -826,285 +928,353 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) g_free (file); } +static void +set_unsaved (gpointer w) +{ + psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); +} +/* Only a data file with at least one variable can be saved. */ static void -enable_delete_cases (GtkWidget *w, gint case_num, gpointer data) +enable_save (PsppireDataWindow *dw) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); + gboolean enable = psppire_dict_get_var_cnt (dw->dict) > 0; + + GAction *save_as = g_action_map_lookup_action (G_ACTION_MAP (dw), "save-as"); + GAction *save = g_action_map_lookup_action (G_ACTION_MAP (dw), "save"); + + if (save) + g_object_set (save, "enabled", enable, NULL); - gtk_action_set_visible (de->delete_cases, case_num != -1); + if (save_as) + g_object_set (save_as, "enabled", enable, NULL); } +/* Initializes as much of a PsppireDataWindow as we can and must before the + dataset has been set. + In particular, the 'menu' member is required in case the "filename" property + is set before the "dataset" property: otherwise PsppireWindow will try to + modify the menu as part of the "filename" property_set() function and end up + with a Gtk-CRITICAL since 'menu' is NULL. */ static void -enable_delete_variables (GtkWidget *w, gint var, gpointer data) +psppire_data_window_init (PsppireDataWindow *de) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - - gtk_action_set_visible (de->delete_variables, var != -1); + de->builder = builder_new ("data-editor.ui"); } -/* Callback for when the datasheet/varsheet is selected */ static void -on_switch_sheet (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - gpointer user_data) +file_import (PsppireDataWindow *dw) { - PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (user_data); - - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - - GtkWidget *view_data = - gtk_ui_manager_get_widget (uim,"/ui/menubar/view/view_data"); + GtkWidget *w = psppire_import_assistant_new (GTK_WINDOW (dw)); + PsppireImportAssistant *asst = PSPPIRE_IMPORT_ASSISTANT (w); + gtk_widget_show_all (w); - GtkWidget *view_variables = - gtk_ui_manager_get_widget (uim,"/ui/menubar/view/view_variables"); + int response = psppire_import_assistant_run (asst); - switch (page_num) + switch (response) { - case PSPPIRE_DATA_EDITOR_VARIABLE_VIEW: - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_variables), - TRUE); - 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); + case GTK_RESPONSE_APPLY: + { + gchar *fn = g_path_get_basename (asst->file_name); + open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, psppire_import_assistant_generate_syntax (asst)); + g_free (fn); + } break; - case PSPPIRE_DATA_EDITOR_DATA_VIEW: - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (view_data), TRUE); - gtk_action_set_sensitive (de->invoke_goto_dialog, TRUE); - gtk_action_set_sensitive (de->insert_case, TRUE); + case PSPPIRE_RESPONSE_PASTE: + free (paste_syntax_to_window (psppire_import_assistant_generate_syntax (asst))); break; default: - g_assert_not_reached (); break; } -#if 0 - update_paste_menuitem (de, page_num); -#endif + gtk_widget_destroy (GTK_WIDGET (asst)); } static void -set_unsaved (gpointer w) -{ - psppire_window_set_unsaved (PSPPIRE_WINDOW (w)); -} - - -/* Connects the action called ACTION_NAME to HANDLER passing DW as the auxilliary data. - Returns a pointer to the action -*/ -static GtkAction * -connect_action (PsppireDataWindow *dw, const char *action_name, - GCallback handler) +connect_dialog_action (GType type, PsppireDataWindow *de) { - GtkAction *action = get_action_assert (dw->builder, action_name); + GAction *act = g_object_new (type, + "top-level", de, + NULL); - g_signal_connect_swapped (action, "activate", handler, dw); - - return action; + g_action_map_add_action (G_ACTION_MAP (de), act); } -/* Only a data file with at least one variable can be saved. */ static void -enable_save (PsppireDataWindow *dw) +g_action_activate_null (GAction *a) { - PsppireDict *dict = dw->var_store->dictionary; - gboolean enable = psppire_dict_get_var_cnt (dict) > 0; - - gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save"), - enable); - gtk_action_set_sensitive (get_action_assert (dw->builder, "file_save_as"), - enable); + g_action_activate (a, NULL); } -/* Initializes as much of a PsppireDataWindow as we can and must before the - dataset has been set. - - In particular, the 'menu' member is required in case the "filename" property - is set before the "dataset" property: otherwise PsppireWindow will try to - modify the menu as part of the "filename" property_set() function and end up - with a Gtk-CRITICAL since 'menu' is NULL. */ static void -psppire_data_window_init (PsppireDataWindow *de) +connect_action_to_menuitem (GActionMap *map, const gchar *action_name, GtkWidget *w, const gchar *accel) { - GtkUIManager *uim; + GAction *a = g_action_map_lookup_action (map, action_name); - de->builder = builder_new ("data-editor.ui"); + if (NULL == a) + g_error ("Action \"%s\" not found in map", action_name); + + if (accel) + { + GtkApplication *app = GTK_APPLICATION (g_application_get_default()); + + /* First set the label for the accellerator so that it appears + on the menuitem */ + GtkWidget *child = gtk_bin_get_child (GTK_BIN (w)); + guint key; + GdkModifierType modifier; + gtk_accelerator_parse (accel, &key, &modifier); + gtk_accel_label_set_accel (GTK_ACCEL_LABEL (child), key, modifier); + + /* Now tell the application that it must do something when that + key combination is pressed */ + const gchar *accels[2]; + accels[0] = accel; + accels[1] = NULL; + + gchar *detailed_action_name = NULL; + if (GTK_IS_WINDOW (map)) + detailed_action_name = g_strdup_printf ("win.%s", action_name); + else if (GTK_IS_APPLICATION (map)) + detailed_action_name = g_strdup_printf ("app.%s", action_name); + + gtk_application_set_accels_for_action (app, + detailed_action_name, + accels); + free (detailed_action_name); + } - uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + g_signal_connect_swapped (w, "activate", G_CALLBACK (g_action_activate_null), a); + } - PSPPIRE_WINDOW (de)->menu = - GTK_MENU_SHELL (gtk_ui_manager_get_widget (uim,"/ui/menubar/windows/windows_minimise_all")->parent); -} static void -psppire_data_window_finish_init (PsppireDataWindow *de, - struct dataset *ds) +on_realize (PsppireDataWindow *dw) { - static const struct dataset_callbacks cbs = - { - set_unsaved, /* changed */ - transformation_change_callback, /* transformations_changed */ - }; - - PsppireDict *dict; - - GtkWidget *menubar; - GtkWidget *hb ; - GtkWidget *sb ; + gtk_notebook_set_current_page (GTK_NOTEBOOK (dw->data_editor), 1); +} - GtkWidget *box = gtk_vbox_new (FALSE, 0); - de->dataset = ds; - dict = psppire_dict_new_from_dict (dataset_dict (ds)); - de->var_store = psppire_var_store_new (dict); - g_object_unref (dict); - de->data_store = psppire_data_store_new (dict); - psppire_data_store_set_reader (de->data_store, NULL); +static void +on_cut (PsppireDataWindow *dw) +{ + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + PsppireDict *dict = NULL; + g_object_get (dw->data_editor, "dictionary", &dict, NULL); - menubar = get_widget_assert (de->builder, "menubar"); - hb = get_widget_assert (de->builder, "handlebox1"); - sb = get_widget_assert (de->builder, "status-bar"); + gint x, y; + SswSheet *sheet = SSW_SHEET (dw->data_editor->data_sheet); + SswRange sel = *sheet->selection; - de->data_editor = - PSPPIRE_DATA_EDITOR (psppire_data_editor_new (de, de->var_store, - de->data_store)); + GtkClipboard *clip = + gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)), + GDK_SELECTION_CLIPBOARD); - g_signal_connect_swapped (de->data_store, "case-changed", - G_CALLBACK (set_unsaved), de); + /* Save the selected area to a string */ + GString *str = g_string_new (""); + for (y = sel.start_y ; y <= sel.end_y; ++y) + { + for (x = sel.start_x ; x <= sel.end_x; ++x) + { + const struct variable * var = psppire_dict_get_variable (dict, x); + gchar *s = psppire_data_store_get_string (dw->data_editor->data_store, + y, var, FALSE); + g_string_append (str, s); + g_string_append (str, "\t"); + g_free (s); + } + g_string_append (str, "\n"); + } - g_signal_connect_swapped (de->data_store, "case-inserted", - G_CALLBACK (set_unsaved), de); + gtk_clipboard_set_text (clip, str->str, str->len); + g_string_free (str, TRUE); - g_signal_connect_swapped (de->data_store, "cases-deleted", - G_CALLBACK (set_unsaved), de); + /* Now fill the selected area with SYSMIS */ + union value sm ; + sm.f = SYSMIS; + for (x = sel.start_x ; x <= sel.end_x; ++x) + { + const struct variable * var = psppire_dict_get_variable (dict, x); + for (y = sel.start_y ; y <= sel.end_y; ++y) + { + psppire_data_store_set_value (dw->data_editor->data_store, + y, + var, &sm); + } + } - dataset_set_callbacks (de->dataset, &cbs, de); + } +} - connect_help (de->builder); +static void +on_copy (PsppireDataWindow *dw) +{ + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + GtkClipboard *clip = + gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)), + GDK_SELECTION_CLIPBOARD); - gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0); - gtk_box_pack_start (GTK_BOX (box), sb, FALSE, TRUE, 0); + ssw_sheet_set_clip (SSW_SHEET (dw->data_editor->data_sheet), clip); + } +} - gtk_container_add (GTK_CONTAINER (de), box); +static void +on_paste (PsppireDataWindow *dw) +{ + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + psppire_data_editor_paste (dw->data_editor); + } +} - set_cut_copy_menuitem_sensitivity (de, FALSE); +static void +on_clear_cases (PsppireDataWindow *dw) +{ + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + SswRange *range = SSW_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->data_sheet)); + } +} - g_signal_connect_swapped (de->data_editor, "data-selection-changed", - G_CALLBACK (set_cut_copy_menuitem_sensitivity), de); +static void +on_clear_variables (PsppireDataWindow *dw) +{ + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + psppire_data_editor_data_delete_variables (de); + } + else + { + psppire_data_editor_var_delete_variables (de); + } +} +static void +insert_variable (PsppireDataWindow *dw) +{ + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); - set_paste_menuitem_sensitivity (de, FALSE); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + SswRange *range = SSW_SHEET(de->data_sheet)->selection; + psppire_data_editor_insert_new_variable_at_posn (de, range->start_x); + } + else + { + SswRange *range = SSW_SHEET(de->var_sheet)->selection; + psppire_data_editor_insert_new_variable_at_posn (de, range->start_y); + } +} - g_signal_connect_swapped (de->data_editor, "data-available-changed", - G_CALLBACK (set_paste_menuitem_sensitivity), de); +static void +insert_case_at_row (PsppireDataWindow *dw) +{ + PsppireDataEditor *de = dw->data_editor; + SswRange *range = SSW_SHEET(de->data_sheet)->selection; + psppire_data_editor_insert_new_case_at_posn (de, range->start_y); +} - g_signal_connect (dict, "weight-changed", - G_CALLBACK (on_weight_change), - de); +static void +goto_case (PsppireDataWindow *dw) +{ + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + goto_case_dialog (PSPPIRE_DATA_SHEET (de->data_sheet)); + } +} - g_signal_connect (dict, "filter-changed", - G_CALLBACK (on_filter_change), - de); +static GtkWidget * +create_file_menu (PsppireDataWindow *dw) +{ + GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (_("_File")); + GtkWidget *menu = gtk_menu_new (); - g_signal_connect (dict, "split-changed", - G_CALLBACK (on_split_change), - de); + { + GtkWidget *new = gtk_menu_item_new_with_mnemonic (_("_New")); + gtk_menu_attach (GTK_MENU (menu), new, 0, 1, 0, 1); - g_signal_connect_swapped (dict, "backend-changed", - G_CALLBACK (enable_save), de); - g_signal_connect_swapped (dict, "variable-inserted", - G_CALLBACK (enable_save), de); - g_signal_connect_swapped (dict, "variable-deleted", - G_CALLBACK (enable_save), de); - enable_save (de); + GtkWidget *new_menu = gtk_menu_new (); - connect_action (de, "edit_copy", G_CALLBACK (on_edit_copy)); + g_object_set (new, "submenu", new_menu, NULL); - connect_action (de, "edit_cut", G_CALLBACK (on_edit_cut)); + GtkWidget *syntax = gtk_menu_item_new_with_mnemonic (_("_Syntax")); + connect_action_to_menuitem (G_ACTION_MAP (g_application_get_default ()), "new-syntax", syntax, 0); - connect_action (de, "file_new_data", G_CALLBACK (create_data_window)); + GtkWidget *data = gtk_menu_item_new_with_mnemonic (_("_Data")); + connect_action_to_menuitem (G_ACTION_MAP (g_application_get_default ()), "new-data", data, 0); - connect_action (de, "file_import", G_CALLBACK (text_data_import_assistant)); + gtk_menu_attach (GTK_MENU (new_menu), syntax, 0, 1, 0, 1); + gtk_menu_attach (GTK_MENU (new_menu), data, 0, 1, 1, 2); + } - connect_action (de, "file_save", G_CALLBACK (psppire_window_save)); - - connect_action (de, "file_open", G_CALLBACK (psppire_window_open)); + GtkWidget *open = gtk_menu_item_new_with_mnemonic (_("_Open")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "open", open, "O"); - connect_action (de, "file_save_as", G_CALLBACK (psppire_window_save_as)); + GtkWidget *import = gtk_menu_item_new_with_mnemonic (_("_Import Data...")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "file-import", import, 0); - connect_action (de, "rename_dataset", G_CALLBACK (on_rename_dataset)); + gtk_menu_attach (GTK_MENU (menu), open, 0, 1, 1, 2); + gtk_menu_attach (GTK_MENU (menu), import, 0, 1, 2, 3); - connect_action (de, "file_information_working-file", G_CALLBACK (display_dict)); + gtk_menu_attach (GTK_MENU (menu), gtk_separator_menu_item_new (), 0, 1, 3, 4); - connect_action (de, "file_information_external-file", G_CALLBACK (sysfile_info)); + GtkWidget *save = gtk_menu_item_new_with_mnemonic (_("_Save...")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "save", save, "S"); - connect_action (de, "edit_paste", G_CALLBACK (on_edit_paste)); + GtkWidget *save_as = gtk_menu_item_new_with_mnemonic (_("Save _As...")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "save-as", save_as, "S"); - de->insert_case = connect_action (de, "edit_insert-case", G_CALLBACK (insert_case)); + GtkWidget *rename_dataset = gtk_menu_item_new_with_mnemonic (_("_Rename Dataset...")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "rename-dataset", rename_dataset, 0); - de->insert_variable = connect_action (de, "action_insert-variable", G_CALLBACK (on_insert_variable)); - de->invoke_goto_dialog = connect_action (de, "edit_goto-case", G_CALLBACK (goto_case_dialog)); + gtk_menu_attach (GTK_MENU (menu), save, 0, 1, 4, 5); + gtk_menu_attach (GTK_MENU (menu), save_as, 0, 1, 5, 6); + gtk_menu_attach (GTK_MENU (menu), rename_dataset, 0, 1, 6, 7); - g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), de); + gtk_menu_attach (GTK_MENU (menu), gtk_separator_menu_item_new (), 0, 1, 7, 8); { - de->delete_cases = get_action_assert (de->builder, "edit_clear-cases"); + GtkWidget *display_data = gtk_menu_item_new_with_mnemonic (_("_Display Data File Information")); + gtk_menu_attach (GTK_MENU (menu), display_data, 0, 1, 8, 9); - g_signal_connect_swapped (de->delete_cases, "activate", G_CALLBACK (psppire_data_editor_delete_cases), de->data_editor); + GtkWidget *dd_menu = gtk_menu_new (); - gtk_action_set_visible (de->delete_cases, FALSE); - } - - - { - de->delete_variables = get_action_assert (de->builder, "edit_clear-variables"); + g_object_set (display_data, "submenu", dd_menu, NULL); - g_signal_connect_swapped (de->delete_variables, "activate", G_CALLBACK (psppire_data_editor_delete_variables), de->data_editor); + GtkWidget *working_file = gtk_menu_item_new_with_mnemonic (_("Working File")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "info-working", working_file, 0); + GtkWidget *external_file = gtk_menu_item_new_with_mnemonic (_("_External File...")); + connect_action_to_menuitem (G_ACTION_MAP (dw), "info-external", external_file, 0); - gtk_action_set_visible (de->delete_variables, FALSE); + gtk_menu_attach (GTK_MENU (dd_menu), working_file, 0, 1, 0, 1); + gtk_menu_attach (GTK_MENU (dd_menu), external_file, 0, 1, 1, 2); } - - connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog)); - connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); - connect_action (de, "data_aggregate", G_CALLBACK (aggregate_dialog)); - connect_action (de, "transform_compute", G_CALLBACK (compute_dialog)); - connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog)); - connect_action (de, "edit_find", G_CALLBACK (find_dialog)); - connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog)); - connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog)); - connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog)); - connect_action (de, "paired-t-test", G_CALLBACK (t_test_paired_samples_dialog)); - connect_action (de, "one-sample-t-test", G_CALLBACK (t_test_one_sample_dialog)); - connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog)); - connect_action (de, "transform_count", G_CALLBACK (count_dialog)); - connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog)); - connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog)); - connect_action (de, "univariate", G_CALLBACK (univariate_dialog)); - connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog)); - connect_action (de, "runs", G_CALLBACK (runs_dialog)); - connect_action (de, "ks-one-sample", G_CALLBACK (ks_one_sample_dialog)); - connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog)); - connect_action (de, "two-related-samples", G_CALLBACK (two_related_dialog)); + gtk_menu_attach (GTK_MENU (menu), gtk_separator_menu_item_new (), 0, 1, 9, 10); { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); - - GtkWidget *recent_data = - gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-data"); - - GtkWidget *recent_files = - gtk_ui_manager_get_widget (uim,"/ui/menubar/file/file_recent-files"); - + GtkWidget *mi_data = gtk_menu_item_new_with_mnemonic (_("_Recently Used Data")); + GtkWidget *mi_files = gtk_menu_item_new_with_mnemonic (_("Recently Used _Files")); GtkWidget *menu_data = gtk_recent_chooser_menu_new_for_manager ( gtk_recent_manager_get_default ()); @@ -1112,9 +1282,15 @@ psppire_data_window_finish_init (PsppireDataWindow *de, GtkWidget *menu_files = gtk_recent_chooser_menu_new_for_manager ( gtk_recent_manager_get_default ()); + gtk_menu_attach (GTK_MENU (menu), mi_data, 0, 1, 10, 11); + gtk_menu_attach (GTK_MENU (menu), mi_files, 0, 1, 11, 12); + g_object_set (menu_data, "show-tips", TRUE, NULL); g_object_set (menu_files, "show-tips", TRUE, NULL); + g_object_set (mi_data, "submenu", menu_data, NULL); + g_object_set (mi_files, "submenu", menu_files, NULL); + { GtkRecentFilter *filter = gtk_recent_filter_new (); @@ -1126,10 +1302,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_data), filter); } - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_data), menu_data); - - - g_signal_connect (menu_data, "selection-done", G_CALLBACK (on_recent_data_select), de); + g_signal_connect (menu_data, "selection-done", G_CALLBACK (on_recent_data_select), dw); { GtkRecentFilter *filter = gtk_recent_filter_new (); @@ -1142,88 +1315,480 @@ psppire_data_window_finish_init (PsppireDataWindow *de, gtk_recent_chooser_add_filter (GTK_RECENT_CHOOSER (menu_files), filter); } - gtk_menu_item_set_submenu (GTK_MENU_ITEM (recent_files), menu_files); + g_signal_connect (menu_files, "selection-done", G_CALLBACK (on_recent_files_select), dw); + } + + gtk_menu_attach (GTK_MENU (menu), gtk_separator_menu_item_new (), 0, 1, 12, 13); + + { + GtkWidget *quit = gtk_menu_item_new_with_mnemonic (_("_Quit")); + gtk_menu_attach (GTK_MENU (menu), quit, 0, 1, 13, 14); + + connect_action_to_menuitem (G_ACTION_MAP (g_application_get_default ()), + "quit", quit, "Q"); + } + + g_object_set (menuitem, "submenu", menu, NULL); + gtk_widget_show_all (menuitem); + + return menuitem; +} + + +static GtkWidget * +create_edit_menu (PsppireDataWindow *dw) +{ + int i = 0; + GtkWidget *menuitem = gtk_menu_item_new_with_mnemonic (_("_Edit")); + + GtkWidget *menu = gtk_menu_new (); - g_signal_connect (menu_files, "selection-done", G_CALLBACK (on_recent_files_select), de); + dw->mi_insert_var = gtk_menu_item_new_with_mnemonic (_("_Insert Variable")); + dw->mi_insert_case = gtk_menu_item_new_with_mnemonic (_("_Insert Case")); + GtkWidget *go_to_variable = gtk_menu_item_new_with_mnemonic (_("_Go To Variable...")); + dw->mi_go_to_case = gtk_menu_item_new_with_mnemonic (_("_Go To Case...")); + gtk_menu_attach (GTK_MENU (menu), dw->mi_insert_var, 0, 1, i, i + 1); ++i; + gtk_menu_attach (GTK_MENU (menu), dw->mi_insert_case, 0, 1, i, i + 1); ++i; + + g_signal_connect_swapped (dw->mi_insert_case, "activate", G_CALLBACK (insert_case_at_row), dw); + g_signal_connect_swapped (dw->mi_go_to_case, "activate", G_CALLBACK (goto_case), dw); + g_signal_connect_swapped (dw->mi_insert_var, "activate", G_CALLBACK (insert_variable), dw); + + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (dw), "PsppireDialogActionVarInfo"); + g_assert (a); + g_signal_connect_swapped (go_to_variable, "activate", G_CALLBACK (psppire_dialog_action_activate_null), a); + + gtk_menu_attach (GTK_MENU (menu), go_to_variable, 0, 1, i, i + 1); ++i; + gtk_menu_attach (GTK_MENU (menu), dw->mi_go_to_case, 0, 1, i, i + 1); ++i; + + { + GtkAccelGroup *ag = gtk_accel_group_new (); + + dw->mi_edit_separator = gtk_separator_menu_item_new (); + gtk_menu_attach (GTK_MENU (menu), dw->mi_edit_separator, 0, 1, i, i + 1); ++i; + + dw->mi_cut = gtk_menu_item_new_with_mnemonic (_("Cu_t")); + gtk_menu_attach (GTK_MENU (menu), dw->mi_cut, 0, 1, i, i + 1); ++i; + g_signal_connect_swapped (dw->mi_cut, "activate", G_CALLBACK (on_cut), dw); + + gtk_window_add_accel_group (GTK_WINDOW (dw), ag); + gtk_widget_add_accelerator (dw->mi_cut, "activate", ag, + 'X', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + + dw->mi_copy = gtk_menu_item_new_with_mnemonic (_("_Copy")); + gtk_menu_attach (GTK_MENU (menu), dw->mi_copy, 0, 1, i, i + 1); ++i; + g_signal_connect_swapped (dw->mi_copy, "activate", G_CALLBACK (on_copy), dw); + gtk_widget_add_accelerator (dw->mi_copy, "activate", ag, + 'C', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + + dw->mi_paste = gtk_menu_item_new_with_mnemonic (_("_Paste")); + gtk_menu_attach (GTK_MENU (menu), dw->mi_paste, 0, 1, i, i + 1); ++i; + g_signal_connect_swapped (dw->mi_paste, "activate", G_CALLBACK (on_paste), dw); + gtk_widget_add_accelerator (dw->mi_paste, "activate", ag, + 'V', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + + dw->mi_clear_variables = gtk_menu_item_new_with_mnemonic (_("Clear _Variables")); + gtk_menu_attach (GTK_MENU (menu), dw->mi_clear_variables, 0, 1, i, i + 1); ++i; + g_signal_connect_swapped (dw->mi_clear_variables, "activate", G_CALLBACK (on_clear_variables), dw); + + dw->mi_clear_cases = gtk_menu_item_new_with_mnemonic (_("Cl_ear Cases")); + gtk_menu_attach (GTK_MENU (menu), dw->mi_clear_cases, 0, 1, i, i + 1); ++i; + g_signal_connect_swapped (dw->mi_clear_cases, "activate", G_CALLBACK (on_clear_cases), dw); } - connect_action (de, "file_new_syntax", G_CALLBACK (create_syntax_window)); + { + dw->mi_find_separator = gtk_separator_menu_item_new (); + gtk_menu_attach (GTK_MENU (menu), dw->mi_find_separator, 0, 1, i, i + 1); ++i; + dw->mi_find = gtk_menu_item_new_with_mnemonic (_("_Find...")); + g_signal_connect_swapped (dw->mi_find, "activate", G_CALLBACK (find_dialog), dw); + gtk_menu_attach (GTK_MENU (menu), dw->mi_find, 0, 1, i, i + 1); ++i; + } - g_signal_connect (de->data_editor, - "cases-selected", - G_CALLBACK (enable_delete_cases), + { + dw->mi_options = gtk_menu_item_new_with_mnemonic (_("_Options...")); + g_signal_connect_swapped (dw->mi_options, "activate", + G_CALLBACK (options_dialog), dw); + gtk_menu_attach (GTK_MENU (menu), dw->mi_options, 0, 1, i, i + 1); ++i; + } + + g_object_set (menuitem, "submenu", menu, NULL); + + gtk_widget_show_all (menuitem); + + return menuitem; +} + +static void +psppire_data_window_finish_init (PsppireDataWindow *de, + struct dataset *ds) +{ + static const struct dataset_callbacks cbs = + { + set_unsaved, /* changed */ + transformation_change_callback, /* transformations_changed */ + }; + + GtkWidget *menubar; + GtkWidget *hb ; + GtkWidget *sb ; + + GtkWidget *box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0); + + de->dataset = ds; + de->dict = psppire_dict_new_from_dict (dataset_dict (ds)); + de->data_store = psppire_data_store_new (de->dict); + psppire_data_store_set_reader (de->data_store, NULL); + + GObject *menu = get_object_assert (de->builder, "data-editor-menu", G_TYPE_MENU); + menubar = gtk_menu_bar_new_from_model (G_MENU_MODEL (menu)); + gtk_widget_show (menubar); + + hb = gtk_toolbar_new (); + sb = get_widget_assert (de->builder, "status-bar"); + + de->data_editor = + PSPPIRE_DATA_EDITOR (psppire_data_editor_new (de->dict, de->data_store)); + + g_signal_connect (de, "realize", + G_CALLBACK (on_realize), de); + + g_signal_connect_swapped (de->data_store, "case-changed", + G_CALLBACK (set_unsaved), de); + + dataset_set_callbacks (de->dataset, &cbs, de); + + connect_help (de->builder); + + gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), hb, FALSE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), GTK_WIDGET (de->data_editor), TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), sb, FALSE, TRUE, 0); + + gtk_container_add (GTK_CONTAINER (de), box); + + g_signal_connect (de->dict, "weight-changed", + G_CALLBACK (on_weight_change), de); - g_signal_connect (de->data_editor, - "variables-selected", - G_CALLBACK (enable_delete_variables), + g_signal_connect (de->dict, "filter-changed", + G_CALLBACK (on_filter_change), de); + g_signal_connect (de->dict, "split-changed", + G_CALLBACK (on_split_change), + de); - g_signal_connect (de->data_editor, - "switch-page", - G_CALLBACK (on_switch_sheet), de); + g_signal_connect_swapped (de->dict, "items-changed", + G_CALLBACK (enable_save), de); + g_signal_connect_swapped (de->dict, "variable-inserted", + G_CALLBACK (enable_save), de); + g_signal_connect_swapped (de->dict, "variable-deleted", + G_CALLBACK (enable_save), de); + enable_save (de); - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); - gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_SORT, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_SPLIT, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_FLIP, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_AGGREGATE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_WEIGHT, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_COMPUTE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_COUNT, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_AUTORECODE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_RANK, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_SELECT, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_RECODE_SAME, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_RECODE_DIFFERENT, de); + + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_DESCRIPTIVES, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_FREQUENCIES, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_EXAMINE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_CROSSTABS, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_INDEP_SAMPS, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_PAIRED, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_MEANS, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_TT1S, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_ONEWAY, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_UNIVARIATE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_KMEANS, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_FACTOR, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_CORRELATION, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_RELIABILITY, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_REGRESSION, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_LOGISTIC, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_ROC, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_COMMENTS, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_VAR_INFO, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_BARCHART, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_SCATTERPLOT, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_HISTOGRAM, de); + + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_CHISQUARE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_BINOMIAL, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_RUNS, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_1SKS, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_TWO_SAMPLE, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_K_RELATED, de); + connect_dialog_action (PSPPIRE_TYPE_DIALOG_ACTION_K_INDEPENDENT, de); - connect_action (de, "view_statusbar", G_CALLBACK (status_bar_activate)); + { + GSimpleAction *file_import_action = g_simple_action_new ("file-import", NULL); + g_signal_connect_swapped (file_import_action, "activate", G_CALLBACK (file_import), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (file_import_action)); + } - connect_action (de, "view_gridlines", G_CALLBACK (grid_lines_activate)); + { + GSimpleAction *save = g_simple_action_new ("save", NULL); + g_signal_connect_swapped (save, "activate", G_CALLBACK (psppire_window_save), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (save)); + } + + { + GSimpleAction *open = g_simple_action_new ("open", NULL); + g_signal_connect_swapped (open, "activate", G_CALLBACK (psppire_window_open), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (open)); + } - connect_action (de, "view_data", G_CALLBACK (data_view_activate)); + { + GSimpleAction *save_as = g_simple_action_new ("save-as", NULL); + g_signal_connect_swapped (save_as, "activate", G_CALLBACK (psppire_window_save_as), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (save_as)); + } - connect_action (de, "view_variables", G_CALLBACK (variable_view_activate)); + { + GSimpleAction *rename_dataset_act = g_simple_action_new ("rename-dataset", NULL); + g_signal_connect_swapped (rename_dataset_act, "activate", + G_CALLBACK (on_rename_dataset), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (rename_dataset_act)); + } - connect_action (de, "view_fonts", G_CALLBACK (fonts_activate)); + { + GSimpleAction *info_working = g_simple_action_new ("info-working", NULL); + g_signal_connect_swapped (info_working, "activate", G_CALLBACK (display_dict), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (info_working)); + } + { + GSimpleAction *info_external = g_simple_action_new ("info-external", NULL); + g_signal_connect_swapped (info_external, "activate", G_CALLBACK (sysfile_info), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (info_external)); + } - connect_action (de, "file_quit", G_CALLBACK (file_quit)); + { + GSimpleAction *act_statusbar = g_simple_action_new_stateful ("statusbar", NULL, g_variant_new_boolean (TRUE)); + g_signal_connect (act_statusbar, "activate", G_CALLBACK (status_bar_activate), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_statusbar)); + } - connect_action (de, "transform_run-pending", G_CALLBACK (execute)); + { + GSimpleAction *act_gridlines = g_simple_action_new_stateful ("gridlines", NULL, g_variant_new_boolean (TRUE)); + g_signal_connect (act_gridlines, "activate", G_CALLBACK (grid_lines_activate), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_gridlines)); + } - connect_action (de, "windows_minimise_all", G_CALLBACK (psppire_window_minimise_all)); - g_signal_connect_swapped (get_action_assert (de->builder, "windows_split"), "toggled", G_CALLBACK (toggle_split_window), de); + { + GSimpleAction *act_view_data = g_simple_action_new_stateful ("view_dv", G_VARIANT_TYPE_STRING, + g_variant_new_string ("DATA")); + g_signal_connect (act_view_data, "activate", G_CALLBACK (activate_change_view), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_view_data)); + } { - GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); + GSimpleAction *act_fonts = g_simple_action_new ("fonts", NULL); + g_signal_connect_swapped (act_fonts, "activate", G_CALLBACK (fonts_activate), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_fonts)); + } - merge_help_menu (uim); + { + GSimpleAction *act_value_labels = + g_simple_action_new_stateful ("value_labels", NULL, + g_variant_new_boolean (FALSE)); + g_signal_connect (act_value_labels, "activate", G_CALLBACK (value_labels_activate), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_value_labels)); } { - GtkWidget *data_sheet_cases_popup_menu = get_widget_assert (de->builder, - "datasheet-cases-popup"); + GSimpleAction *act_transform_pending = g_simple_action_new ("transform-pending", NULL); + g_signal_connect_swapped (act_transform_pending, "activate", G_CALLBACK (execute), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_transform_pending)); + } - GtkWidget *var_sheet_variable_popup_menu = get_widget_assert (de->builder, - "varsheet-variable-popup"); + { + GSimpleAction *act_jump_to_variable = g_simple_action_new ("jump-to-variable", NULL); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_jump_to_variable)); + } - GtkWidget *data_sheet_variable_popup_menu = get_widget_assert (de->builder, - "datasheet-variable-popup"); + { + GSimpleAction *act_insert_variable = g_simple_action_new ("insert-variable", NULL); + g_signal_connect_swapped (act_insert_variable, "activate", G_CALLBACK (insert_variable), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_insert_variable)); + } - g_signal_connect_swapped (get_action_assert (de->builder, "sort-up"), "activate", - G_CALLBACK (psppire_data_editor_sort_ascending), - de->data_editor); + { + GSimpleAction *act_jump_to_case = g_simple_action_new ("jump-to-case", NULL); + g_signal_connect_swapped (act_jump_to_case, "activate", G_CALLBACK (goto_case), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_jump_to_case)); + } - g_signal_connect_swapped (get_action_assert (de->builder, "sort-down"), "activate", - G_CALLBACK (psppire_data_editor_sort_descending), - de->data_editor); + { + GSimpleAction *act_insert_case = g_simple_action_new ("insert-case", NULL); + g_signal_connect_swapped (act_insert_case, "activate", G_CALLBACK (insert_case_at_row), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_insert_case)); + } - g_object_set (de->data_editor, - "datasheet-column-menu", data_sheet_variable_popup_menu, - "datasheet-row-menu", data_sheet_cases_popup_menu, - "varsheet-row-menu", var_sheet_variable_popup_menu, - NULL); + { + GSimpleAction *find = g_simple_action_new ("find", NULL); + g_signal_connect_swapped (find, "activate", G_CALLBACK (find_dialog), de); + g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (find)); } + { + int idx = 0; + { + GtkToolItem *ti = gtk_tool_button_new (NULL, "Open"); + g_signal_connect_swapped (ti, "clicked", G_CALLBACK (psppire_window_open), de); + gtk_toolbar_insert (GTK_TOOLBAR (hb), ti, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "file-open-data"); + } + + { + GtkToolItem *ti = gtk_tool_button_new (NULL, "Save"); + g_signal_connect_swapped (ti, "clicked", G_CALLBACK (psppire_window_save), de); + gtk_toolbar_insert (GTK_TOOLBAR (hb), ti, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "file-save-data"); + } + + gtk_toolbar_insert (GTK_TOOLBAR (hb), gtk_separator_tool_item_new (), idx++); + + { + de->ti_jump_to_variable = gtk_tool_button_new (NULL, "Goto Var"); + + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), "PsppireDialogActionVarInfo"); + g_assert (a); + g_signal_connect_swapped (de->ti_jump_to_variable, "clicked", + G_CALLBACK (psppire_dialog_action_activate_null), a); + + gtk_toolbar_insert (GTK_TOOLBAR (hb), de->ti_jump_to_variable, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_jump_to_variable), "edit-go-to-variable"); + gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_jump_to_variable), _("Jump to variable")); + } + + { + de->ti_jump_to_case = gtk_tool_button_new (NULL, "Jump to Case"); + + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), "jump-to-case"); + g_assert (a); + g_signal_connect_swapped (de->ti_jump_to_case, "clicked", + G_CALLBACK (g_action_activate_null), a); + + gtk_toolbar_insert (GTK_TOOLBAR (hb), de->ti_jump_to_case, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_jump_to_case), "edit-go-to-case"); + gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_jump_to_case), _("Jump to a case in the data sheet")); + } + + { + de->ti_find = gtk_tool_button_new (NULL, "Find"); + + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), "find"); + g_assert (a); + g_signal_connect_swapped (de->ti_find, "clicked", + G_CALLBACK (g_action_activate_null), a); + + + gtk_toolbar_insert (GTK_TOOLBAR (hb), de->ti_find, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_find), "edit-find"); + gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_find), _("Search for values in the data")); + } + + { + de->ti_insert_case = gtk_tool_button_new (NULL, "Create Case"); + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), "insert-case"); + g_assert (a); + g_signal_connect_swapped (de->ti_insert_case, "clicked", + G_CALLBACK (g_action_activate_null), a); + + gtk_toolbar_insert (GTK_TOOLBAR (hb), de->ti_insert_case, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_insert_case), "edit-insert-case"); + gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_insert_case), _("Create a new case at the current position")); + } + + { + de->ti_insert_variable = gtk_tool_button_new (NULL, "Create Variable"); + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), "insert-variable"); + g_assert (a); + g_signal_connect_swapped (de->ti_insert_variable, "clicked", + G_CALLBACK (g_action_activate_null), a); + + gtk_toolbar_insert (GTK_TOOLBAR (hb), de->ti_insert_variable, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_insert_variable), "edit-insert-variable"); + gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_insert_variable), _("Create a new variable at the current position")); + } + + gtk_toolbar_insert (GTK_TOOLBAR (hb), gtk_separator_tool_item_new (), idx++); + + { + GtkToolItem *ti = gtk_tool_button_new (NULL, "Split"); + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), + "PsppireDialogActionSplit"); + g_assert (a); + g_signal_connect_swapped (ti, "clicked", + G_CALLBACK (psppire_dialog_action_activate_null), a); + gtk_toolbar_insert (GTK_TOOLBAR (hb), ti, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "data-split-file"); + gtk_widget_set_tooltip_text (GTK_WIDGET (ti), _("Split the active dataset")); + } + + { + GtkToolItem *ti = gtk_tool_button_new (NULL, "Weight"); + GAction *a = g_action_map_lookup_action (G_ACTION_MAP (de), + "PsppireDialogActionWeight"); + g_assert (a); + g_signal_connect_swapped (ti, "clicked", + G_CALLBACK (psppire_dialog_action_activate_null), a); + gtk_toolbar_insert (GTK_TOOLBAR (hb), ti, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "data-weight-cases"); + gtk_widget_set_tooltip_text (GTK_WIDGET (ti), _("Weight cases by variable")); + } + + { + de->ti_value_labels_button = gtk_toggle_tool_button_new (); + gtk_tool_button_set_label (GTK_TOOL_BUTTON (de->ti_value_labels_button), + "Value Labels"); + g_signal_connect (de->ti_value_labels_button, "toggled", + G_CALLBACK (on_labels_button_toggle), de); + gtk_toolbar_insert (GTK_TOOLBAR (hb), de->ti_value_labels_button, idx++); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_value_labels_button), "view-value-labels"); + gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_value_labels_button), _("Show/hide value labels")); + } + } + + + gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_VARIABLE_VIEW); + gtk_notebook_set_current_page (GTK_NOTEBOOK (de->data_editor), PSPPIRE_DATA_EDITOR_DATA_VIEW); + + gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), create_file_menu (de), 0); + gtk_menu_shell_insert (GTK_MENU_SHELL (menubar), create_edit_menu (de), 1); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_windows_menu (GTK_WINDOW (de))); + gtk_menu_shell_append (GTK_MENU_SHELL (menubar), create_help_menu (GTK_WINDOW (de))); + + g_signal_connect (de->data_editor, "switch-page", + G_CALLBACK (on_switch_page), de); + gtk_widget_show (GTK_WIDGET (de->data_editor)); - gtk_widget_show (box); + gtk_widget_show_all (box); ll_push_head (&all_data_windows, &de->ll); } + static void psppire_data_window_dispose (GObject *object) { @@ -1235,10 +1800,19 @@ psppire_data_window_dispose (GObject *object) dw->builder = NULL; } - if (dw->var_store) + if (dw->dict) { - g_object_unref (dw->var_store); - dw->var_store = NULL; + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (enable_save), dw); + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (on_weight_change), dw); + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (on_filter_change), dw); + g_signal_handlers_disconnect_by_func (dw->dict, + G_CALLBACK (on_split_change), dw); + + g_object_unref (dw->dict); + dw->dict = NULL; } if (dw->data_store) @@ -1316,13 +1890,15 @@ psppire_data_window_get_property (GObject *object, }; } + + GtkWidget* psppire_data_window_new (struct dataset *ds) { GtkWidget *dw; if (the_session == NULL) - the_session = session_create (); + the_session = session_create (NULL); if (ds == NULL) { @@ -1333,24 +1909,31 @@ psppire_data_window_new (struct dataset *ds) assert (dataset_session (ds) == the_session); dw = GTK_WIDGET ( - g_object_new ( - psppire_data_window_get_type (), - "description", _("Data Editor"), - "dataset", ds, - NULL)); + g_object_new ( + psppire_data_window_get_type (), + "description", _("Data Editor"), + "dataset", ds, + NULL)); if (dataset_name (ds) != NULL) g_object_set (dw, "id", dataset_name (ds), (void *) NULL); + + GApplication *app = g_application_get_default (); + gtk_application_add_window (GTK_APPLICATION (app), GTK_WINDOW (dw)); + return dw; } + + bool psppire_data_window_is_empty (PsppireDataWindow *dw) { - return psppire_var_store_get_var_cnt (dw->var_store) == 0; + return psppire_dict_get_var_cnt (dw->dict) == 0; } + static void psppire_data_window_iface_init (PsppireWindowIface *iface) { @@ -1358,7 +1941,10 @@ psppire_data_window_iface_init (PsppireWindowIface *iface) iface->pick_filename = data_pick_filename; iface->load = load_file; } + + + PsppireDataWindow * psppire_default_data_window (void) { @@ -1367,6 +1953,8 @@ psppire_default_data_window (void) return ll_data (ll_head (&all_data_windows), PsppireDataWindow, ll); } + + void psppire_data_window_set_default (PsppireDataWindow *pdw) { @@ -1381,6 +1969,8 @@ psppire_data_window_undefault (PsppireDataWindow *pdw) ll_push_tail (&all_data_windows, &pdw->ll); } + + PsppireDataWindow * psppire_data_window_for_dataset (struct dataset *ds) { @@ -1393,23 +1983,44 @@ psppire_data_window_for_dataset (struct dataset *ds) return NULL; } -void +PsppireDataWindow * +psppire_data_window_for_data_store (PsppireDataStore *data_store) +{ + PsppireDataWindow *pdw; + + ll_for_each (pdw, PsppireDataWindow, ll, &all_data_windows) + if (pdw->data_store == data_store) + return pdw; + + return NULL; +} + +GtkWindow * create_data_window (void) { - gtk_widget_show (psppire_data_window_new (NULL)); + GtkWidget *w = psppire_data_window_new (NULL); + + gtk_widget_show (w); + + return GTK_WINDOW (w); } -void -open_data_window (PsppireWindow *victim, const char *file_name) +GtkWindow * +open_data_window (PsppireWindow *victim, const char *file_name, + const char *encoding, gpointer hint) { GtkWidget *window; if (PSPPIRE_IS_DATA_WINDOW (victim) && psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (victim))) - window = GTK_WIDGET (victim); + { + window = GTK_WIDGET (victim); + gtk_widget_hide (GTK_WIDGET (PSPPIRE_DATA_WINDOW (window)->data_editor)); + } else window = psppire_data_window_new (NULL); - psppire_window_load (PSPPIRE_WINDOW (window), file_name); - gtk_widget_show (window); + psppire_window_load (PSPPIRE_WINDOW (window), file_name, encoding, hint); + gtk_widget_show_all (window); + return GTK_WINDOW (window); }