Regression Dialog: Convert to PsppireDialogAction object

[pspp] / src / ui / gui / psppire-data-window.c

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 1ca71f79e661ba9460d05bc0c29654252f42e561..6dc422e3404773b993ad2c1ed78b14fae19a1c85 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -34,9 +34,7 @@
 #include "ui/gui/count-dialog.h"
 #include "ui/gui/crosstabs-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"
@@ -50,14 +48,11 @@
 #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/select-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"
@@ -585,7 +580,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);
 
@@ -1060,58 +1055,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_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, "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_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, "univariate", G_CALLBACK (univariate_dialog));
-
-  connect_action (de, "factor-analysis", G_CALLBACK (factor_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));
@@ -1334,7 +1300,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));