X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=438779675b7fe365bd4242021bf89b5e37392146;hb=bcd0f2c9c85b91c02c4a42f5db6660a068586ca2;hp=9b90930edd6cf149bf822e3fa4477d4689afc4d3;hpb=17ca35e4ca8abf4ba0c0ae82920b985fa17648cf;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 9b90930edd..438779675b 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -209,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 @@ -225,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")); } @@ -258,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")); } @@ -271,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])); } @@ -295,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")); } @@ -335,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); @@ -451,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); @@ -488,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 = @@ -613,7 +613,7 @@ data_pick_filename (PsppireWindow *window) g_string_new ( gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)) - ); + ); GtkTreeIter iter; int format; @@ -624,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)); @@ -801,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)); @@ -918,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); } @@ -959,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 @@ -1144,6 +1145,7 @@ on_clear_cases (PsppireDataWindow *dw) if (p == PSPPIRE_DATA_EDITOR_DATA_VIEW) { 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)); @@ -1179,7 +1181,10 @@ insert_variable (PsppireDataWindow *dw) else { SswRange *range = SSW_SHEET(de->var_sheet)->selection; - psppire_data_editor_insert_new_variable_at_posn (de, range->start_y); + 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)); } } @@ -1227,7 +1232,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); @@ -1238,10 +1243,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); @@ -1325,7 +1330,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); @@ -1364,6 +1369,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; @@ -1373,20 +1380,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; @@ -1395,6 +1405,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); } { @@ -1459,8 +1470,6 @@ psppire_data_window_finish_init (PsppireDataWindow *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); @@ -1656,14 +1665,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), "psppire-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), "psppire-file-save-data"); } gtk_toolbar_insert (GTK_TOOLBAR (hb), gtk_separator_tool_item_new (), idx++); @@ -1677,7 +1686,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), "psppire-edit-go-to-variable"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_jump_to_variable), _("Jump to variable")); } @@ -1690,7 +1699,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), "psppire-edit-go-to-case"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_jump_to_case), _("Jump to a case in the data sheet")); } @@ -1704,7 +1713,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), "psppire-edit-find"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_find), _("Search for values in the data")); } @@ -1716,7 +1725,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), "psppire-edit-insert-case"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_insert_case), _("Create a new case at the current position")); } @@ -1728,7 +1737,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), "psppire-edit-insert-variable"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_insert_variable), _("Create a new variable at the current position")); } @@ -1742,7 +1751,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), "psppire-data-split-file"); gtk_widget_set_tooltip_text (GTK_WIDGET (ti), _("Split the active dataset")); } @@ -1754,7 +1763,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), "psppire-data-weight-cases"); gtk_widget_set_tooltip_text (GTK_WIDGET (ti), _("Weight cases by variable")); } @@ -1765,7 +1774,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), "psppire-view-value-labels"); gtk_widget_set_tooltip_text (GTK_WIDGET (de->ti_value_labels_button), _("Show/hide value labels")); } } @@ -1794,11 +1803,11 @@ 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) { @@ -1812,20 +1821,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); @@ -1848,6 +1846,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); } @@ -2015,12 +2019,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); }