X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=db563ba3de89b7f5cb505fa4d843e4a788d4e627;hb=16aa04bddc7bdf95f1cbbebfce6ea93773391c44;hp=15fe2e9fe956616965ef5c5f98adeca2b1c37b51;hpb=bc30bc5e0a4d8bdfc56e43ccd1403c070a71dec8;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 15fe2e9fe9..db563ba3de 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,6 +47,8 @@ #include "gl/c-strcasestr.h" #include "gl/xvasprintf.h" +#include + #include "find-dialog.h" #include "options-dialog.h" #include "psppire-dialog-action-1sks.h" @@ -207,7 +209,7 @@ transformation_change_callback (bool transformations_pending, transformations_pending); } - if ( transformations_pending) + if (transformations_pending) gtk_label_set_text (GTK_LABEL (status_label), _("Transformations Pending")); else @@ -223,7 +225,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")); } @@ -256,7 +258,7 @@ on_split_change (PsppireDict *dict, gpointer data) 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")); } @@ -269,7 +271,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])); } @@ -293,7 +295,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")); } @@ -333,7 +335,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); @@ -449,7 +451,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); @@ -486,7 +488,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 = @@ -611,7 +613,7 @@ data_pick_filename (PsppireWindow *window) g_string_new ( gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) - ); + ); GtkTreeIter iter; int format; @@ -622,7 +624,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)); @@ -799,7 +801,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)); @@ -916,13 +918,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); } @@ -957,9 +958,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 @@ -969,14 +972,9 @@ file_import (PsppireDataWindow *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); + int response = psppire_import_assistant_run (asst); - if (!asst->file_name) - goto end; - - switch (asst->response) + switch (response) { case GTK_RESPONSE_APPLY: { @@ -992,7 +990,6 @@ file_import (PsppireDataWindow *dw) break; } - end: gtk_widget_destroy (GTK_WIDGET (asst)); } @@ -1057,10 +1054,9 @@ connect_action_to_menuitem (GActionMap *map, const gchar *action_name, GtkWidget 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); } @@ -1068,10 +1064,57 @@ 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_API_VERSION >= 1) + if ((ssw_sheet_get_api_version() >= 1) && ssw_sheet_try_cut (sheet)) + return; +#endif + + 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); + 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"); + } + + gtk_clipboard_set_text (clip, str->str, str->len); + g_string_free (str, TRUE); + + /* 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); + } + } + } } @@ -1079,10 +1122,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); } } @@ -1090,75 +1136,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) { @@ -1184,7 +1237,7 @@ create_file_menu (PsppireDataWindow *dw) } 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); @@ -1195,10 +1248,10 @@ create_file_menu (PsppireDataWindow *dw) 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); @@ -1282,7 +1335,7 @@ 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); @@ -1291,6 +1344,7 @@ create_file_menu (PsppireDataWindow *dw) return menuitem; } + static GtkWidget * create_edit_menu (PsppireDataWindow *dw) { @@ -1320,6 +1374,8 @@ create_edit_menu (PsppireDataWindow *dw) { 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; @@ -1329,20 +1385,23 @@ 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; @@ -1351,6 +1410,7 @@ create_edit_menu (PsppireDataWindow *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); } { @@ -1376,7 +1436,6 @@ create_edit_menu (PsppireDataWindow *dw) return menuitem; } - static void psppire_data_window_finish_init (PsppireDataWindow *de, struct dataset *ds) @@ -1409,21 +1468,13 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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); @@ -1443,7 +1494,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); @@ -1619,14 +1670,14 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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++); @@ -1640,7 +1691,7 @@ 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")); } @@ -1653,7 +1704,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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")); } @@ -1667,7 +1718,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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")); } @@ -1679,7 +1730,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")); } @@ -1691,7 +1742,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")); } @@ -1705,7 +1756,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")); } @@ -1717,7 +1768,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")); } @@ -1728,7 +1779,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")); } } @@ -1751,16 +1802,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) { @@ -1774,20 +1826,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); @@ -1810,6 +1851,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); } @@ -1853,6 +1900,7 @@ psppire_data_window_get_property (GObject *object, } + GtkWidget* psppire_data_window_new (struct dataset *ds) { @@ -1886,12 +1934,15 @@ psppire_data_window_new (struct dataset *ds) return dw; } + + bool psppire_data_window_is_empty (PsppireDataWindow *dw) { return psppire_dict_get_var_cnt (dw->dict) == 0; } + static void psppire_data_window_iface_init (PsppireWindowIface *iface) { @@ -1902,6 +1953,7 @@ psppire_data_window_iface_init (PsppireWindowIface *iface) + PsppireDataWindow * psppire_default_data_window (void) { @@ -1910,6 +1962,8 @@ psppire_default_data_window (void) return ll_data (ll_head (&all_data_windows), PsppireDataWindow, ll); } + + void psppire_data_window_set_default (PsppireDataWindow *pdw) { @@ -1924,6 +1978,8 @@ psppire_data_window_undefault (PsppireDataWindow *pdw) ll_push_tail (&all_data_windows, &pdw->ll); } + + PsppireDataWindow * psppire_data_window_for_dataset (struct dataset *ds) { @@ -1968,12 +2024,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); }