X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=87a6bb69fca2206f9b239f801ef1c49e29afc2d3;hb=698f289d1ecf1620aa5429599f2e76db23cff452;hp=64e044b0feb496f75aca7a0c12469f1f731ec391;hpb=5cc0ad44c71734d01e88e95b402ab663ee406191;p=pspp diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c index 64e044b0fe..87a6bb69fc 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,15 +27,13 @@ #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" @@ -43,7 +41,7 @@ #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" @@ -56,10 +54,7 @@ #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" @@ -67,7 +62,6 @@ #include "ui/gui/text-data-import-dialog.h" #include "ui/gui/transpose-dialog.h" #include "ui/gui/univariate-dialog.h" -#include "ui/gui/variable-info-dialog.h" #include "ui/gui/weight-cases-dialog.h" #include "ui/syntax-gen.h" @@ -590,7 +584,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); @@ -1068,8 +1062,6 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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)); @@ -1082,9 +1074,6 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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)); @@ -1103,30 +1092,15 @@ psppire_data_window_finish_init (PsppireDataWindow *de, 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, "analyze_explore", G_CALLBACK (examine_dialog)); - connect_action (de, "univariate", G_CALLBACK (univariate_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, "chi-square", G_CALLBACK (chisquare_dialog)); connect_action (de, "binomial", G_CALLBACK (binomial_dialog)); connect_action (de, "runs", G_CALLBACK (runs_dialog)); @@ -1356,7 +1330,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));