X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=ad7e9250f7d404389aefaa0e79bf55e23d2f32d3;hb=e7913c62251710319b06c50702c5db9afb612be5;hp=1cccc20ea0a8d7d0247a892ad19e72a0d0022888;hpb=e616e74c79756510aa504b4a2885b2a9b18ed546;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 1cccc20ea0..ad7e9250f7 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, 2013, 2014, 2016 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 @@ -32,12 +33,11 @@ #include "ui/gui/helper.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/psppire-data-sheet.h" -#include "ui/gui/psppire-var-sheet.h" #include "ui/gui/windows-menu.h" #include "ui/gui/goto-case-dialog.h" #include "ui/gui/psppire.h" @@ -47,7 +47,10 @@ #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" @@ -66,6 +69,7 @@ #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" @@ -97,10 +101,6 @@ struct session *the_session; struct ll_list all_data_windows = LL_INITIALIZER (all_data_windows); -static void psppire_data_window_class_init (PsppireDataWindowClass *class); -static void psppire_data_window_init (PsppireDataWindow *data_editor); - - static void psppire_data_window_iface_init (PsppireWindowIface *iface); static void psppire_data_window_dispose (GObject *object); @@ -114,45 +114,10 @@ static void psppire_data_window_get_property (GObject *object, GValue *value, GParamSpec *pspec); -GType -psppire_data_window_get_type (void) -{ - static GType psppire_data_window_type = 0; - - if (!psppire_data_window_type) - { - static const GTypeInfo psppire_data_window_info = - { - sizeof (PsppireDataWindowClass), - NULL, - NULL, - (GClassInitFunc)psppire_data_window_class_init, - (GClassFinalizeFunc) NULL, - NULL, - sizeof (PsppireDataWindow), - 0, - (GInstanceInitFunc) psppire_data_window_init, - }; - - static const GInterfaceInfo window_interface_info = - { - (GInterfaceInitFunc) psppire_data_window_iface_init, - NULL, - NULL - }; - - psppire_data_window_type = - g_type_register_static (PSPPIRE_TYPE_WINDOW, "PsppireDataWindow", - &psppire_data_window_info, 0); - - g_type_add_interface_static (psppire_data_window_type, - PSPPIRE_TYPE_WINDOW_MODEL, - &window_interface_info); - } - - return psppire_data_window_type; -} +G_DEFINE_TYPE_WITH_CODE (PsppireDataWindow, psppire_data_window, PSPPIRE_TYPE_WINDOW, + G_IMPLEMENT_INTERFACE (PSPPIRE_TYPE_WINDOW_MODEL, + psppire_data_window_iface_init)) static GObjectClass *parent_class ; @@ -202,10 +167,10 @@ transformation_change_callback (bool transformations_pending, "transform-pending"); g_simple_action_set_enabled (G_SIMPLE_ACTION (action), - transformations_pending); + transformations_pending); } - if ( transformations_pending) + if (transformations_pending) gtk_label_set_text (GTK_LABEL (status_label), _("Transformations Pending")); else @@ -221,7 +186,7 @@ on_filter_change (GObject *o, gint filter_index, gpointer data) GtkWidget *filter_status_area = get_widget_assert (de->builder, "filter-use-status-area"); - if ( filter_index == -1 ) + if (filter_index == -1) { gtk_label_set_text (GTK_LABEL (filter_status_area), _("Filter off")); } @@ -249,12 +214,12 @@ on_split_change (PsppireDict *dict, gpointer data) { PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (data); - size_t n_split_vars = dict_get_split_cnt (dict->dict); + size_t n_split_vars = dict_get_n_splits (dict->dict); GtkWidget *split_status_area = get_widget_assert (de->builder, "split-file-status-area"); - if ( n_split_vars == 0 ) + if (n_split_vars == 0) { gtk_label_set_text (GTK_LABEL (split_status_area), _("No Split")); } @@ -267,7 +232,7 @@ on_split_change (PsppireDict *dict, gpointer data) text = g_string_new (_("Split by ")); - for (i = 0 ; i < n_split_vars - 1; ++i ) + for (i = 0 ; i < n_split_vars - 1; ++i) { g_string_append_printf (text, "%s, ", var_get_name (split_vars[i])); } @@ -291,7 +256,7 @@ on_weight_change (GObject *o, gint weight_index, gpointer data) GtkWidget *weight_status_area = get_widget_assert (de->builder, "weight-status-area"); - if ( weight_index == -1 ) + if (weight_index == -1) { gtk_label_set_text (GTK_LABEL (weight_status_area), _("Weights off")); } @@ -331,7 +296,7 @@ dump_rm (GtkRecentManager *rm) gtk_recent_info_get_mime_type (ri), gtk_recent_info_get_description (ri), gtk_recent_info_get_uri (ri) - ); + ); gtk_recent_info_unref (ri); @@ -381,15 +346,15 @@ load_file (PsppireWindow *de, const gchar *file_name, const char *encoding, { gchar *utf8_file_name; struct string filename; - + utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL); if (NULL == utf8_file_name) return FALSE; - ds_init_empty (&filename); + ds_init_empty (&filename); syntax_gen_string (&filename, ss_cstr (utf8_file_name)); - + g_free (utf8_file_name); if (encoding && encoding[0]) @@ -414,7 +379,7 @@ load_file (PsppireWindow *de, const gchar *file_name, const char *encoding, 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, encoding); } @@ -447,7 +412,7 @@ save_file (PsppireWindow *w) fnx = g_string_new (file_name); - if ( ! name_has_suffix (fnx->str)) + if (! name_has_suffix (fnx->str)) g_string_append (fnx, psppire_data_window_format_to_string (de->format)); ds_init_empty (&filename); @@ -484,7 +449,7 @@ sysfile_info (PsppireDataWindow *de) { GtkWidget *dialog = psppire_window_file_chooser_dialog (PSPPIRE_WINDOW (de)); - if ( GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) + if (GTK_RESPONSE_ACCEPT == gtk_dialog_run (GTK_DIALOG (dialog))) { struct string filename; gchar *file_name = @@ -609,7 +574,7 @@ data_pick_filename (PsppireWindow *window) g_string_new ( gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) - ); + ); GtkTreeIter iter; int format; @@ -620,7 +585,7 @@ data_pick_filename (PsppireWindow *window) -1); de->format = format; - if ( ! name_has_suffix (filename->str)) + if (! name_has_suffix (filename->str)) g_string_append (filename, psppire_data_window_format_to_string (format)); @@ -703,7 +668,7 @@ static void status_bar_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 visible = g_variant_get_boolean (state); g_action_change_state (action, g_variant_new_boolean (!visible)); @@ -745,7 +710,7 @@ on_switch_page (GtkNotebook *notebook, GtkWidget *page, guint pn, gpointer ud) 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)); @@ -757,9 +722,9 @@ on_switch_page (GtkNotebook *notebook, GtkWidget *page, guint pn, gpointer ud) 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; - } + } } @@ -789,7 +754,7 @@ fonts_activate (PsppireDataWindow *de) 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_style_context_get (style, GTK_STATE_FLAG_NORMAL, "font", ¤t_font, NULL); gtk_font_chooser_set_font_desc (GTK_FONT_CHOOSER (dialog), current_font); @@ -797,7 +762,7 @@ fonts_activate (PsppireDataWindow *de) gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel)); - if ( GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog)) ) + if (GTK_RESPONSE_OK == gtk_dialog_run (GTK_DIALOG (dialog))) { PangoFontDescription* font_desc = gtk_font_chooser_get_font_desc (GTK_FONT_CHOOSER (dialog)); @@ -821,7 +786,7 @@ value_labels_activate (GAction *action, GVariant *param, PsppireDataWindow *de 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); } @@ -914,13 +879,12 @@ on_recent_files_select (GtkMenuShell *menushell, gpointer user_data) se = psppire_syntax_window_new (encoding); - free (encoding); - - if ( psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL) ) + if (psppire_window_load (PSPPIRE_WINDOW (se), file, encoding, NULL)) gtk_widget_show (se); else gtk_widget_destroy (se); + g_free (encoding); g_free (file); } @@ -935,7 +899,7 @@ set_unsaved (gpointer w) static void enable_save (PsppireDataWindow *dw) { - gboolean enable = psppire_dict_get_var_cnt (dw->dict) > 0; + gboolean enable = psppire_dict_get_n_vars (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"); @@ -955,9 +919,11 @@ enable_save (PsppireDataWindow *dw) 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) +psppire_data_window_init (PsppireDataWindow *dw) { - de->builder = builder_new ("data-editor.ui"); + dw->dispose_has_run = FALSE; + + dw->builder = builder_new ("data-editor.ui"); } static void @@ -966,15 +932,10 @@ file_import (PsppireDataWindow *dw) GtkWidget *w = psppire_import_assistant_new (GTK_WINDOW (dw)); PsppireImportAssistant *asst = PSPPIRE_IMPORT_ASSISTANT (w); gtk_widget_show_all (w); - - asst->main_loop = g_main_loop_new (NULL, TRUE); - g_main_loop_run (asst->main_loop); - g_main_loop_unref (asst->main_loop); - - if (!asst->file_name) - goto end; - - switch (asst->response) + + int response = psppire_import_assistant_run (asst); + + switch (response) { case GTK_RESPONSE_APPLY: { @@ -989,8 +950,7 @@ file_import (PsppireDataWindow *dw) default: break; } - - end: + gtk_widget_destroy (GTK_WIDGET (asst)); } @@ -1002,7 +962,7 @@ connect_dialog_action (GType type, PsppireDataWindow *de) GAction *act = g_object_new (type, "top-level", de, NULL); - + g_action_map_add_action (G_ACTION_MAP (de), act); } @@ -1016,7 +976,7 @@ static void connect_action_to_menuitem (GActionMap *map, const gchar *action_name, GtkWidget *w, const gchar *accel) { GAction *a = g_action_map_lookup_action (map, action_name); - + if (NULL == a) g_error ("Action \"%s\" not found in map", action_name); @@ -1043,22 +1003,21 @@ connect_action_to_menuitem (GActionMap *map, const gchar *action_name, GtkWidget 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); } - + g_signal_connect_swapped (w, "activate", G_CALLBACK (g_action_activate_null), a); } static void -set_data_page (PsppireDataWindow *dw) +on_realize (PsppireDataWindow *dw) { gtk_notebook_set_current_page (GTK_NOTEBOOK (dw->data_editor), 1); - gtk_notebook_set_current_page (GTK_NOTEBOOK (dw->data_editor), 0); } @@ -1066,10 +1025,77 @@ static void on_cut (PsppireDataWindow *dw) { int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); - if (p == 0) - { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - psppire_data_sheet_edit_cut (ds); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) + { + PsppireDict *dict = NULL; + g_object_get (dw->data_editor, "dictionary", &dict, NULL); + + gint x, y; + SswSheet *sheet = SSW_SHEET (dw->data_editor->data_sheet); + SswRange sel = *sheet->selection; + + if (ssw_sheet_try_cut (sheet)) + return; + + if (sel.start_x > sel.end_x) + { + gint tmp = sel.start_x; + sel.start_x = sel.end_x; + sel.end_x = tmp; + } + if (sel.start_y > sel.end_y) + { + gint tmp = sel.start_y; + sel.start_y = sel.end_y; + sel.end_y = tmp; + } + + GtkClipboard *clip = + gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)), + GDK_SELECTION_CLIPBOARD); + + /* 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); + gboolean use_value_label = FALSE; + g_object_get (dw->data_editor, "value-labels", &use_value_label, NULL); + gchar *s = psppire_data_store_get_string (dw->data_editor->data_store, + y, var, use_value_label); + g_string_append (str, s); + if (x < sel.end_x) + g_string_append (str, "\t"); + g_free (s); + } + if (y < sel.end_y) + g_string_append (str, "\n"); + } + + gtk_clipboard_set_text (clip, str->str, str->len); + g_string_free (str, TRUE); + + /* Now fill the selected area with SYSMIS or blanks */ + for (x = sel.start_x ; x <= sel.end_x; ++x) + { + const struct variable *var = psppire_dict_get_variable (dict, x); + int width = var_get_width (var); + union value sm ; + value_init (&sm, width); + if (var_is_numeric (var)) + sm.f = SYSMIS; + else + memset (sm.s, 0, width); + for (y = sel.start_y ; y <= sel.end_y; ++y) + { + psppire_data_store_set_value (dw->data_editor->data_store, + y, + var, &sm); + } + value_destroy (&sm, width); + } } } @@ -1077,10 +1103,13 @@ static void on_copy (PsppireDataWindow *dw) { int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); - if (p == 0) + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - psppire_data_sheet_edit_copy (ds); + GtkClipboard *clip = + gtk_clipboard_get_for_display (gtk_widget_get_display (GTK_WIDGET (dw)), + GDK_SELECTION_CLIPBOARD); + + ssw_sheet_set_clip (SSW_SHEET (dw->data_editor->data_sheet), clip); } } @@ -1088,75 +1117,82 @@ static void on_paste (PsppireDataWindow *dw) { int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); - if (p == 0) + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - psppire_data_sheet_edit_paste (ds); + psppire_data_editor_paste (dw->data_editor); } } - static void on_clear_cases (PsppireDataWindow *dw) { - int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); - if (p == 0) + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - psppire_data_sheet_edit_clear_cases (ds); + SswRange *range = SSW_SHEET(de->data_sheet)->selection; + g_return_if_fail (range->start_y >= 0); + 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)); } } static void on_clear_variables (PsppireDataWindow *dw) { - int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); - if (p == 0) + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - psppire_data_sheet_edit_clear_variables (ds); + psppire_data_editor_data_delete_variables (de); } else { - psppire_var_sheet_clear_variables (PSPPIRE_VAR_SHEET (dw->data_editor->var_sheet)); + psppire_data_editor_var_delete_variables (de); } } - static void insert_variable (PsppireDataWindow *dw) { - int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (dw->data_editor)); - if (p == 0) + PsppireDataEditor *de = dw->data_editor; + int p = gtk_notebook_get_current_page (GTK_NOTEBOOK (de)); + + if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - psppire_data_sheet_insert_variable (ds); + SswRange *range = SSW_SHEET(de->data_sheet)->selection; + psppire_data_editor_insert_new_variable_at_posn (de, range->start_x); } else { - psppire_var_sheet_insert_variable (PSPPIRE_VAR_SHEET (dw->data_editor->var_sheet)); + SswRange *range = SSW_SHEET(de->var_sheet)->selection; + PsppireDict *dict = NULL; + g_object_get (de->var_sheet, "data-model", &dict, NULL); + psppire_dict_insert_variable (dict, range->start_y, NULL); + gtk_widget_queue_draw (GTK_WIDGET (de->var_sheet)); } } - static void insert_case_at_row (PsppireDataWindow *dw) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - - psppire_data_sheet_insert_case (ds); + 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); } static void goto_case (PsppireDataWindow *dw) { - PsppireDataSheet *ds = psppire_data_editor_get_active_data_sheet (dw->data_editor); - - goto_case_dialog (ds); + 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)); + } } - - static GtkWidget * create_file_menu (PsppireDataWindow *dw) { @@ -1170,38 +1206,38 @@ create_file_menu (PsppireDataWindow *dw) GtkWidget *new_menu = gtk_menu_new (); g_object_set (new, "submenu", new_menu, NULL); - + GtkWidget *syntax = gtk_menu_item_new_with_mnemonic (_("_Syntax")); connect_action_to_menuitem (G_ACTION_MAP (g_application_get_default ()), "new-syntax", syntax, 0); - + GtkWidget *data = gtk_menu_item_new_with_mnemonic (_("_Data")); connect_action_to_menuitem (G_ACTION_MAP (g_application_get_default ()), "new-data", data, 0); gtk_menu_attach (GTK_MENU (new_menu), syntax, 0, 1, 0, 1); gtk_menu_attach (GTK_MENU (new_menu), data, 0, 1, 1, 2); } - + GtkWidget *open = gtk_menu_item_new_with_mnemonic (_("_Open")); - connect_action_to_menuitem (G_ACTION_MAP (dw), "open", open, "O"); - + connect_action_to_menuitem (G_ACTION_MAP (dw), "open", open, "O"); + GtkWidget *import = gtk_menu_item_new_with_mnemonic (_("_Import Data...")); connect_action_to_menuitem (G_ACTION_MAP (dw), "file-import", import, 0); - + gtk_menu_attach (GTK_MENU (menu), open, 0, 1, 1, 2); gtk_menu_attach (GTK_MENU (menu), import, 0, 1, 2, 3); gtk_menu_attach (GTK_MENU (menu), gtk_separator_menu_item_new (), 0, 1, 3, 4); GtkWidget *save = gtk_menu_item_new_with_mnemonic (_("_Save...")); - connect_action_to_menuitem (G_ACTION_MAP (dw), "save", save, "S"); - + connect_action_to_menuitem (G_ACTION_MAP (dw), "save", save, "S"); + GtkWidget *save_as = gtk_menu_item_new_with_mnemonic (_("Save _As...")); - connect_action_to_menuitem (G_ACTION_MAP (dw), "save-as", save_as, "S"); - + connect_action_to_menuitem (G_ACTION_MAP (dw), "save-as", save_as, "S"); + GtkWidget *rename_dataset = gtk_menu_item_new_with_mnemonic (_("_Rename Dataset...")); connect_action_to_menuitem (G_ACTION_MAP (dw), "rename-dataset", rename_dataset, 0); - + 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); @@ -1215,7 +1251,7 @@ create_file_menu (PsppireDataWindow *dw) GtkWidget *dd_menu = gtk_menu_new (); g_object_set (display_data, "submenu", dd_menu, NULL); - + 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...")); @@ -1224,7 +1260,7 @@ create_file_menu (PsppireDataWindow *dw) 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); } - + gtk_menu_attach (GTK_MENU (menu), gtk_separator_menu_item_new (), 0, 1, 9, 10); { @@ -1239,13 +1275,13 @@ create_file_menu (PsppireDataWindow *dw) 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 (); @@ -1280,15 +1316,16 @@ create_file_menu (PsppireDataWindow *dw) 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"); + "quit", quit, "Q"); } - + g_object_set (menuitem, "submenu", menu, NULL); gtk_widget_show_all (menuitem); - + return menuitem; } + static GtkWidget * create_edit_menu (PsppireDataWindow *dw) { @@ -1312,13 +1349,15 @@ create_edit_menu (PsppireDataWindow *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 (); - + guint key; + GdkModifierType modifier; + 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; @@ -1327,47 +1366,57 @@ create_edit_menu (PsppireDataWindow *dw) g_signal_connect_swapped (dw->mi_cut, "activate", G_CALLBACK (on_cut), dw); gtk_window_add_accel_group (GTK_WINDOW (dw), ag); + gtk_accelerator_parse ("X", &key, &modifier); gtk_widget_add_accelerator (dw->mi_cut, "activate", ag, - 'X', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - + key, modifier, 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_accelerator_parse ("C", &key, &modifier); gtk_widget_add_accelerator (dw->mi_copy, "activate", ag, - 'C', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - + key, modifier, 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_accelerator_parse ("V", &key, &modifier); gtk_widget_add_accelerator (dw->mi_paste, "activate", ag, - 'V', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); + key, modifier, 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); + g_object_unref (ag); } - + { 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; + gtk_menu_attach (GTK_MENU (menu), dw->mi_find, 0, 1, i, i + 1); ++i; + } + + { + 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) @@ -1398,23 +1447,15 @@ psppire_data_window_finish_init (PsppireDataWindow *de, de->data_editor = PSPPIRE_DATA_EDITOR (psppire_data_editor_new (de->dict, de->data_store)); - + g_signal_connect (de, "realize", - G_CALLBACK (set_data_page), de); + G_CALLBACK (on_realize), de); g_signal_connect_swapped (de->data_store, "case-changed", G_CALLBACK (set_unsaved), de); - g_signal_connect_swapped (de->data_store, "case-inserted", - G_CALLBACK (set_unsaved), de); - - g_signal_connect_swapped (de->data_store, "cases-deleted", - 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); @@ -1434,7 +1475,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, G_CALLBACK (on_split_change), de); - g_signal_connect_swapped (de->dict, "backend-changed", + 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); @@ -1447,7 +1488,7 @@ psppire_data_window_finish_init (PsppireDataWindow *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); @@ -1456,7 +1497,7 @@ psppire_data_window_finish_init (PsppireDataWindow *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); @@ -1477,7 +1518,7 @@ psppire_data_window_finish_init (PsppireDataWindow *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); @@ -1491,13 +1532,14 @@ psppire_data_window_finish_init (PsppireDataWindow *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); { 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)); } - + { GSimpleAction *save = g_simple_action_new ("save", NULL); g_signal_connect_swapped (save, "activate", G_CALLBACK (psppire_window_save), de); @@ -1546,7 +1588,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, g_action_map_add_action (G_ACTION_MAP (de), G_ACTION (act_gridlines)); } - + { GSimpleAction *act_view_data = g_simple_action_new_stateful ("view_dv", G_VARIANT_TYPE_STRING, g_variant_new_string ("DATA")); @@ -1602,21 +1644,21 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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"); + gtk_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "pspp-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_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "pspp-file-save-data"); } gtk_toolbar_insert (GTK_TOOLBAR (hb), gtk_separator_tool_item_new (), idx++); @@ -1630,20 +1672,20 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_jump_to_variable), "pspp-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_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_jump_to_case), "pspp-edit-go-to-case"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_jump_to_case), _("Jump to a case in the data sheet")); } @@ -1655,9 +1697,9 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_find), "pspp-edit-find"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_find), _("Search for values in the data")); } @@ -1669,7 +1711,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_insert_case), "pspp-edit-insert-case"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_insert_case), _("Create a new case at the current position")); } @@ -1681,7 +1723,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_insert_variable), "pspp-edit-insert-variable"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_insert_variable), _("Create a new variable at the current position")); } @@ -1695,7 +1737,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "pspp-data-split-file"); gtk_widget_set_tooltip_text (GTK_WIDGET (ti), _("Split the active dataset")); } @@ -1707,7 +1749,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (ti), "pspp-data-weight-cases"); gtk_widget_set_tooltip_text (GTK_WIDGET (ti), _("Weight cases by variable")); } @@ -1718,7 +1760,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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_tool_button_set_icon_name (GTK_TOOL_BUTTON (de->ti_value_labels_button), "pspp-view-value-labels"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_value_labels_button), _("Show/hide value labels")); } } @@ -1741,16 +1783,17 @@ psppire_data_window_finish_init (PsppireDataWindow *de, ll_push_head (&all_data_windows, &de->ll); } + static void psppire_data_window_dispose (GObject *object) { PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (object); - if (dw->builder != NULL) - { - g_object_unref (dw->builder); - dw->builder = NULL; - } + if (dw->dispose_has_run) + return; + dw->dispose_has_run = TRUE; + + g_object_unref (dw->builder); if (dw->dict) { @@ -1764,20 +1807,9 @@ psppire_data_window_dispose (GObject *object) G_CALLBACK (on_split_change), dw); g_object_unref (dw->dict); - dw->dict = NULL; } - if (dw->data_store) - { - g_object_unref (dw->data_store); - dw->data_store = NULL; - } - - if (dw->ll.next != NULL) - { - ll_remove (&dw->ll); - dw->ll.next = NULL; - } + g_object_unref (dw->data_store); if (G_OBJECT_CLASS (parent_class)->dispose) G_OBJECT_CLASS (parent_class)->dispose (object); @@ -1800,6 +1832,12 @@ psppire_data_window_finalize (GObject *object) dataset_destroy (dataset); } + if (dw->ll.next != NULL) + { + ll_remove (&dw->ll); + dw->ll.next = NULL; + } + if (G_OBJECT_CLASS (parent_class)->finalize) G_OBJECT_CLASS (parent_class)->finalize (object); } @@ -1843,6 +1881,7 @@ psppire_data_window_get_property (GObject *object, } + GtkWidget* psppire_data_window_new (struct dataset *ds) { @@ -1872,16 +1911,19 @@ psppire_data_window_new (struct dataset *ds) 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_dict_get_var_cnt (dw->dict) == 0; + return psppire_dict_get_n_vars (dw->dict) == 0; } + static void psppire_data_window_iface_init (PsppireWindowIface *iface) { @@ -1892,6 +1934,7 @@ psppire_data_window_iface_init (PsppireWindowIface *iface) + PsppireDataWindow * psppire_default_data_window (void) { @@ -1900,6 +1943,8 @@ psppire_default_data_window (void) return ll_data (ll_head (&all_data_windows), PsppireDataWindow, ll); } + + void psppire_data_window_set_default (PsppireDataWindow *pdw) { @@ -1914,6 +1959,8 @@ psppire_data_window_undefault (PsppireDataWindow *pdw) ll_push_tail (&all_data_windows, &pdw->ll); } + + PsppireDataWindow * psppire_data_window_for_dataset (struct dataset *ds) { @@ -1944,11 +1991,11 @@ create_data_window (void) GtkWidget *w = psppire_data_window_new (NULL); gtk_widget_show (w); - + return GTK_WINDOW (w); } -void +GtkWindow * open_data_window (PsppireWindow *victim, const char *file_name, const char *encoding, gpointer hint) { @@ -1958,11 +2005,10 @@ open_data_window (PsppireWindow *victim, const char *file_name, && psppire_data_window_is_empty (PSPPIRE_DATA_WINDOW (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, encoding, hint); - gtk_widget_show_all (window); + return GTK_WINDOW (window); }