X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=63ad9fe1bdc0457644ff5c9865a7c9c7f3acab1e;hb=758bb90bac15899ca7f18a55dc4f90e1345c7179;hp=92c3e5990ab509e10381debf77c6c65e94a97b07;hpb=c913ef5de3be362272ac691e96c8eb8087095da3;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 92c3e599..63ad9fe1 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);
@@ -529,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));
     }
 
@@ -588,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);
     }
@@ -1081,6 +1082,8 @@ psppire_data_window_init (PsppireDataWindow *de)
  
   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));
@@ -1264,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));
 }