X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=f6bd2efbd979b1063f745bc709129c4b1c3b674c;hb=6bf4567d7fcf5f0fa5805c4de24c13c2a7cfbbc9;hp=49438d6cff14f5af7a68150455de8a741aa13410;hpb=32ee0e0402d6d56674f53a47d879ec5c07dabe09;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 49438d6cff..f6bd2efbd9 100644 --- a/src/ui/gui/psppire-data-window.c +++ b/src/ui/gui/psppire-data-window.c @@ -1,5 +1,5 @@ /* PSPPIRE - a graphical user interface for PSPP. - Copyright (C) 2008, 2009, 2010, 2011 Free Software Foundation + Copyright (C) 2008, 2009, 2010, 2011, 2012 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 @@ -27,23 +27,20 @@ #include "ui/gui/aggregate-dialog.h" #include "ui/gui/autorecode-dialog.h" #include "ui/gui/binomial-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/correlation-dialog.h" #include "ui/gui/count-dialog.h" #include "ui/gui/crosstabs-dialog.h" -#include "ui/gui/descriptives-dialog.h" #include "ui/gui/entry-dialog.h" -#include "ui/gui/examine-dialog.h" #include "ui/gui/executor.h" -#include "ui/gui/factor-dialog.h" #include "ui/gui/find-dialog.h" #include "ui/gui/frequencies-dialog.h" #include "ui/gui/goto-case-dialog.h" #include "ui/gui/help-menu.h" #include "ui/gui/helper.h" -#include "ui/gui/k-means-dialog.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" @@ -51,22 +48,16 @@ #include "ui/gui/psppire-syntax-window.h" #include "ui/gui/psppire-window.h" #include "ui/gui/psppire.h" -#include "ui/gui/rank-dialog.h" #include "ui/gui/runs-dialog.h" #include "ui/gui/ks-one-sample-dialog.h" #include "ui/gui/recode-dialog.h" -#include "ui/gui/regression-dialog.h" -#include "ui/gui/reliability-dialog.h" -#include "ui/gui/roc-dialog.h" #include "ui/gui/select-cases-dialog.h" -#include "ui/gui/sort-cases-dialog.h" #include "ui/gui/split-file-dialog.h" -#include "ui/gui/t-test-independent-samples-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/variable-info-dialog.h" +#include "ui/gui/univariate-dialog.h" #include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" @@ -88,6 +79,7 @@ static void psppire_data_window_init (PsppireDataWindow *data_edit static void psppire_data_window_iface_init (PsppireWindowIface *iface); static void psppire_data_window_dispose (GObject *object); +static void psppire_data_window_finalize (GObject *object); static void psppire_data_window_set_property (GObject *object, guint prop_id, const GValue *value, @@ -151,6 +143,7 @@ psppire_data_window_class_init (PsppireDataWindowClass *class) parent_class = g_type_class_peek_parent (class); object_class->dispose = psppire_data_window_dispose; + object_class->finalize = psppire_data_window_finalize; object_class->set_property = psppire_data_window_set_property; object_class->get_property = psppire_data_window_get_property; @@ -506,14 +499,12 @@ data_pick_filename (PsppireWindow *window) g_object_set (dialog, "local-only", FALSE, NULL); gtk_file_filter_set_name (filter, _("System Files (*.sav)")); - gtk_file_filter_add_pattern (filter, "*.sav"); - gtk_file_filter_add_pattern (filter, "*.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, _("Portable Files (*.por) ")); - gtk_file_filter_add_pattern (filter, "*.por"); - gtk_file_filter_add_pattern (filter, "*.POR"); + gtk_file_filter_add_mime_type (filter, "application/x-spss-por"); gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter); filter = gtk_file_filter_new (); @@ -591,7 +582,7 @@ confirm_delete_dataset (PsppireDataWindow *de, gtk_message_dialog_format_secondary_text ( GTK_MESSAGE_DIALOG (dialog), - _("Renaming \"%s\" to \"%s\" will delete destroy the existing " + _("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); @@ -600,7 +591,7 @@ confirm_delete_dataset (PsppireDataWindow *de, GTK_STOCK_DELETE, GTK_RESPONSE_OK, NULL); - g_object_set (dialog, "icon-name", "psppicon", NULL); + g_object_set (dialog, "icon-name", "pspp", NULL); result = gtk_dialog_run (GTK_DIALOG (dialog)); @@ -962,6 +953,7 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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); @@ -1066,71 +1058,29 @@ psppire_data_window_finish_init (PsppireDataWindow *de, connect_action (de, "data_transpose", G_CALLBACK (transpose_dialog)); - connect_action (de, "data_select-cases", G_CALLBACK (select_cases_dialog)); - - connect_action (de, "data_sort-cases", G_CALLBACK (sort_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, "utilities_variables", G_CALLBACK (variable_info_dialog)); - connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog)); - - connect_action (de, "indep-t-test", G_CALLBACK (t_test_independent_samples_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_rank", G_CALLBACK (rank_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, "analyze_descriptives", G_CALLBACK (descriptives_dialog)); - connect_action (de, "analyze_frequencies", G_CALLBACK (frequencies_dialog)); - connect_action (de, "crosstabs", G_CALLBACK (crosstabs_dialog)); - - connect_action (de, "analyze_explore", G_CALLBACK (examine_dialog)); - - connect_action (de, "linear-regression", G_CALLBACK (regression_dialog)); - - connect_action (de, "reliability", G_CALLBACK (reliability_dialog)); - - connect_action (de, "roc-curve", G_CALLBACK (roc_dialog)); - - connect_action (de, "correlation", G_CALLBACK (correlation_dialog)); - - connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog)); - - connect_action (de, "k-means", G_CALLBACK (k_means_dialog)); - + connect_action (de, "univariate", G_CALLBACK (univariate_dialog)); connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog)); connect_action (de, "binomial", G_CALLBACK (binomial_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)); - { GtkUIManager *uim = GTK_UI_MANAGER (get_object_assert (de->builder, "uimanager1", GTK_TYPE_UI_MANAGER)); @@ -1293,6 +1243,27 @@ psppire_data_window_dispose (GObject *object) G_OBJECT_CLASS (parent_class)->dispose (object); } +static void +psppire_data_window_finalize (GObject *object) +{ + PsppireDataWindow *dw = PSPPIRE_DATA_WINDOW (object); + + if (dw->dataset) + { + struct dataset *dataset = dw->dataset; + struct session *session = dataset_session (dataset); + + dw->dataset = NULL; + + dataset_set_callbacks (dataset, NULL, NULL); + session_set_active_dataset (session, NULL); + dataset_destroy (dataset); + } + + if (G_OBJECT_CLASS (parent_class)->finalize) + G_OBJECT_CLASS (parent_class)->finalize (object); +} + static void psppire_data_window_set_property (GObject *object, guint prop_id, @@ -1341,10 +1312,7 @@ psppire_data_window_new (struct dataset *ds) if (ds == NULL) { - static int n_datasets; - char *dataset_name; - - dataset_name = xasprintf ("DataSet%d", ++n_datasets); + char *dataset_name = session_generate_dataset_name (the_session); ds = dataset_create (the_session, dataset_name); free (dataset_name); } @@ -1353,7 +1321,6 @@ psppire_data_window_new (struct dataset *ds) dw = GTK_WIDGET ( g_object_new ( psppire_data_window_get_type (), - /* TRANSLATORS: This will form a filename. Please avoid whitespace. */ "description", _("Data Editor"), "dataset", ds, NULL));