X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=63ad9fe1bdc0457644ff5c9865a7c9c7f3acab1e;hb=01b970b8972e4e457b1d8e3f5af350c325152942;hp=ec75e086b099bdec25e9a93597aa6152917d5a4d;hpb=006e4c8eef534aa82d28869a34c49a382076371d;p=pspp

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index ec75e086b0..63ad9fe1bd 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -57,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"
@@ -364,7 +365,7 @@ load_file (PsppireWindow *de, const gchar *file_name)
 
   g_free (native_file_name);
 
-  sss = create_syntax_string_source ("GET FILE=%s.",
+  sss = create_syntax_format_source ("GET FILE=%s.",
 				     ds_cstr (&filename));
 
   ds_destroy (&filename);
@@ -459,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);
 
+	g_free (sysname);
 	g_free (name);
       }
       break;
@@ -526,12 +530,12 @@ save_file (PsppireWindow *w)
 
   if ( de->save_as_portable )
     {
-      sss = create_syntax_string_source ("EXPORT OUTFILE=%s.",
+      sss = create_syntax_format_source ("EXPORT OUTFILE=%s.",
 					 ds_cstr (&filename));
     }
   else
     {
-      sss = create_syntax_string_source ("SAVE OUTFILE=%s.",
+      sss = create_syntax_format_source ("SAVE OUTFILE=%s.",
 					 ds_cstr (&filename));
     }
 
@@ -585,7 +589,7 @@ sysfile_info (PsppireDataWindow *de)
 
       g_free (native_file_name);
 
-      sss = create_syntax_string_source ("SYSFILE INFO %s.",
+      sss = create_syntax_format_source ("SYSFILE INFO %s.",
 					 ds_cstr (&filename));
       execute_syntax (sss);
     }
@@ -1074,8 +1078,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));
@@ -1084,6 +1092,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));
@@ -1115,7 +1124,7 @@ 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));
@@ -1258,6 +1267,8 @@ GtkWidget*
 psppire_data_window_new (void)
 {
   return GTK_WIDGET (g_object_new (psppire_data_window_get_type (),
+				   /* TRANSLATORS: This will form a filename.  Please avoid whitespace. */
+				   "filename", _("PSPP-data"),
 				   "description", _("Data Editor"),
 				   NULL));
 }