X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fdata-editor.c;h=2007c7bbc01c3ba5a06325cda1410b410a33e45b;hb=1c08d9ea96f931ed4330ad2b432cdf950d5b75bf;hp=f1848621b45e68c6af4a670fc82cce0f2e417483;hpb=c65449a628d13f4683e7dc7125874608c7152017;p=pspp-builds.git

diff --git a/src/ui/gui/data-editor.c b/src/ui/gui/data-editor.c
index f1848621..2007c7bb 100644
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -42,12 +42,15 @@
 #include "comments-dialog.h"
 #include "variable-info-dialog.h"
 #include "descriptives-dialog.h"
+#include "crosstabs-dialog.h"
+#include "frequencies-dialog.h"
 #include "dict-display.h"
 #include "clipboard.h"
 
-
 #include "oneway-anova-dialog.h"
 #include "t-test-independent-samples-dialog.h"
+#include "t-test-one-sample.h"
+#include "t-test-paired-samples.h"
 
 #define _(msgid) gettext (msgid)
 #define N_(msgid) msgid
@@ -611,6 +614,26 @@ new_data_editor (void)
 		    G_CALLBACK (t_test_independent_samples_dialog), de);
 
 
+  de->invoke_t_test_paired_samples_dialog =
+    gtk_action_new ("t-test-paired-samples",
+		    _("_Paired Samples T Test"),
+		    _("Calculate T Test for paired samples"),
+		    NULL);
+
+  g_signal_connect (de->invoke_t_test_paired_samples_dialog, "activate",
+		    G_CALLBACK (t_test_paired_samples_dialog), de);
+
+
+  de->invoke_t_test_one_sample_dialog =
+    gtk_action_new ("t-test-one-sample",
+		    _("One _Sample T Test"),
+		    _("Calculate T Test for sample from a single distribution"),
+		    NULL);
+
+  g_signal_connect (de->invoke_t_test_one_sample_dialog, "activate",
+		    G_CALLBACK (t_test_one_sample_dialog), de);
+
+
   de->invoke_comments_dialog =
     gtk_action_new ("commments-dialog",
 		    _("Data File Comments"),
@@ -678,6 +701,26 @@ new_data_editor (void)
   g_signal_connect (de->invoke_descriptives_dialog, "activate",
 		    G_CALLBACK (descriptives_dialog), de);
 
+
+  de->invoke_frequencies_dialog =
+    gtk_action_new ("frequencies-dialog",
+		    _("_Frequencies"),
+		    _("Generate frequency statistics"),
+		    "pspp-frequencies");
+
+  g_signal_connect (de->invoke_frequencies_dialog, "activate",
+		    G_CALLBACK (frequencies_dialog), de);
+
+  de->invoke_crosstabs_dialog =
+    gtk_action_new ("crosstabs-dialog",
+		    _("_Crosstabs"),
+		    _("Generate crosstabulations"),
+		    "pspp-crosstabs");
+
+  g_signal_connect (de->invoke_crosstabs_dialog, "activate",
+		    G_CALLBACK (crosstabs_dialog), de);
+
+
   e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
 
   g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
@@ -690,7 +733,6 @@ new_data_editor (void)
 			    G_CALLBACK (gtk_action_activate),
 			    de->action_data_open);
 
-
 #if RECENT_LISTS_AVAILABLE
   {
     GtkRecentManager *rm = gtk_recent_manager_get_default ();
@@ -806,6 +848,18 @@ new_data_editor (void)
 			    );
 
 
+  gtk_action_connect_proxy (de->invoke_t_test_paired_samples_dialog,
+			    get_widget_assert (de->xml,
+					       "paired-t-test")
+			    );
+
+
+  gtk_action_connect_proxy (de->invoke_t_test_one_sample_dialog,
+			    get_widget_assert (de->xml,
+					       "one-sample-t-test")
+			    );
+
+
   gtk_action_connect_proxy (de->invoke_oneway_anova_dialog,
 			    get_widget_assert (de->xml,
 					       "oneway-anova")
@@ -824,6 +878,14 @@ new_data_editor (void)
 			    get_widget_assert (de->xml, "analyze_descriptives")
 			    );
 
+  gtk_action_connect_proxy (de->invoke_crosstabs_dialog,
+			    get_widget_assert (de->xml, "crosstabs")
+			    );
+
+  gtk_action_connect_proxy (de->invoke_frequencies_dialog,
+			    get_widget_assert (de->xml, "analyze_frequencies")
+			    );
+
   g_signal_connect (get_widget_assert (de->xml,"help_about"),
 		    "activate",
 		    G_CALLBACK (about_new),
@@ -1151,6 +1213,7 @@ toggle_value_labels (GtkToggleAction *ta, gpointer data)
 				  gtk_toggle_action_get_active (ta));
 }
 
+extern PsppireDataStore *the_data_store ;
 
 static void
 file_quit (GtkCheckMenuItem *menuitem, gpointer data)
@@ -1158,6 +1221,7 @@ file_quit (GtkCheckMenuItem *menuitem, gpointer data)
   /* FIXME: Need to be more intelligent here.
      Give the user the opportunity to save any unsaved data.
   */
+  g_object_unref (the_data_store);
   gtk_main_quit ();
 }