Merge commit 'origin/master' into sso

[pspp-builds.git] / 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 bcab4dc5a0a266fe8cf11705800f6262bd0347c0..aace66fa5a5947138087bd3656d6bc5c1741be77 100644 (file)
--- 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);
@@ -464,7 +465,7 @@ open_window (PsppireWindow *de)
        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);
@@ -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);
     }
@@ -852,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));
 
@@ -861,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)
 {
@@ -1077,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));
@@ -1087,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));
@@ -1118,7 +1118,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));
@@ -1261,6 +1261,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));
 }