X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=a5cd15c0d5ba0dc5021d231b600bc7b8196371e9;hb=ca5f6bb9df6d4019d777b52da0419d917d4dfc52;hp=c17e6e794448005fdd4c16721230315340dd1127;hpb=54fb87790ec370ab2587e3cd3edd3ca12c044de3;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index c17e6e79..a5cd15c0 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -25,9 +25,11 @@
 #include "language/syntax-string-source.h"
 #include "libpspp/message.h"
 #include "ui/gui/help-menu.h"
+#include "ui/gui/binomial-dialog.h"
 #include "ui/gui/comments-dialog.h"
 #include "ui/gui/compute-dialog.h"
 #include "ui/gui/correlation-dialog.h"
+#include "ui/gui/chi-square-dialog.h"
 #include "ui/gui/crosstabs-dialog.h"
 #include "ui/gui/descriptives-dialog.h"
 #include "ui/gui/examine-dialog.h"
@@ -55,6 +57,7 @@
 #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/aggregate-dialog.h"
 #include "ui/gui/variable-info-dialog.h"
 #include "ui/gui/weight-cases-dialog.h"
 #include "ui/syntax-gen.h"
@@ -457,11 +460,14 @@ open_window (PsppireWindow *de)
 	gchar *name =
 	  gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
 
-	if (any_reader_may_open (name))
+	gchar *sysname = convert_glib_filename_to_system_filename (name, NULL);
+
+	if (any_reader_may_open (sysname))
 	  psppire_window_load (de, name);
 	else
-	  open_syntax_window (name);
+	  open_new_syntax_window (name);
 
+	g_free (sysname);
 	g_free (name);
       }
       break;
@@ -847,8 +853,6 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 {
   gchar *file;
 
-  GtkWidget *se ;
-
   gchar *uri =
     gtk_recent_chooser_get_current_uri (GTK_RECENT_CHOOSER (menushell));
 
@@ -856,17 +860,13 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 
   g_free (uri);
 
-  se = psppire_syntax_window_new ();
-
-  if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) 
-    gtk_widget_show (se);
-  else
-    gtk_widget_destroy (se);
+  open_new_syntax_window (file);
 
   g_free (file);
 }
 
 
+
 static void
 enable_delete_cases (GtkWidget *w, gint case_num, gpointer data)
 {
@@ -1072,8 +1072,12 @@ psppire_data_window_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, "edit_find", G_CALLBACK (find_dialog));
@@ -1082,6 +1086,7 @@ psppire_data_window_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));
@@ -1113,10 +1118,14 @@ psppire_data_window_init (PsppireDataWindow *de)
   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, "chi-square", G_CALLBACK (chisquare_dialog));
+
+  connect_action (de, "binomial", G_CALLBACK (binomial_dialog));
  
 
   {