Merge remote branch 'origin/sourceview'

[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 be4702d34349ee65a1e4ca47726dc08c262a1c34..49438d6cff14f5af7a68150455de8a741aa13410 100644 (file)
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -25,11 +25,13 @@
 #include "libpspp/message.h"
 #include "libpspp/str.h"
 #include "ui/gui/aggregate-dialog.h"
+#include "ui/gui/autorecode-dialog.h"
 #include "ui/gui/binomial-dialog.h"
 #include "ui/gui/chi-square-dialog.h"
 #include "ui/gui/comments-dialog.h"
 #include "ui/gui/compute-dialog.h"
 #include "ui/gui/correlation-dialog.h"
+#include "ui/gui/count-dialog.h"
 #include "ui/gui/crosstabs-dialog.h"
 #include "ui/gui/descriptives-dialog.h"
 #include "ui/gui/entry-dialog.h"
@@ -41,13 +43,17 @@
 #include "ui/gui/goto-case-dialog.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.h"
+#include "ui/gui/k-means-dialog.h"
 #include "ui/gui/k-related-dialog.h"
+#include "ui/gui/npar-two-sample-related.h"
 #include "ui/gui/oneway-anova-dialog.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-syntax-window.h"
 #include "ui/gui/psppire-window.h"
 #include "ui/gui/psppire.h"
 #include "ui/gui/rank-dialog.h"
+#include "ui/gui/runs-dialog.h"
+#include "ui/gui/ks-one-sample-dialog.h"
 #include "ui/gui/recode-dialog.h"
 #include "ui/gui/regression-dialog.h"
 #include "ui/gui/reliability-dialog.h"
@@ -385,7 +391,8 @@ load_file (PsppireWindow *de, const gchar *file_name)
   mime_type = (name_has_por_suffix (file_name)
                ? "application/x-spss-por"
                : "application/x-spss-sav");
-  add_most_recent (ds_cstr (&filename), mime_type);
+
+  add_most_recent (file_name, mime_type);
 
   return ok;
 }
@@ -486,6 +493,7 @@ static void
 data_pick_filename (PsppireWindow *window)
 {
   PsppireDataWindow *de = PSPPIRE_DATA_WINDOW (window);
+  GtkFileFilter *filter = gtk_file_filter_new ();
   GtkWidget *button_sys;
   GtkWidget *dialog =
     gtk_file_chooser_dialog_new (_("Save"),
@@ -495,7 +503,8 @@ data_pick_filename (PsppireWindow *window)
                                 GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
                                 NULL);
 
-  GtkFileFilter *filter = gtk_file_filter_new ();
+  g_object_set (dialog, "local-only", FALSE, NULL);
+
   gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
   gtk_file_filter_add_pattern (filter, "*.sav");
   gtk_file_filter_add_pattern (filter, "*.SAV");
@@ -1066,6 +1075,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   connect_action (de, "transform_compute", G_CALLBACK (compute_dialog));
 
+  connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog));
+
   connect_action (de, "edit_find", G_CALLBACK (find_dialog));
 
   connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog));
@@ -1086,6 +1097,8 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog));
  
   connect_action (de, "transform_rank", G_CALLBACK (rank_dialog));
+
+  connect_action (de, "transform_count", G_CALLBACK (count_dialog));
  
   connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
  
@@ -1109,11 +1122,14 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
  
   connect_action (de, "factor-analysis", G_CALLBACK (factor_dialog));
 
-  connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog));
+  connect_action (de, "k-means", G_CALLBACK (k_means_dialog));
 
+  connect_action (de, "chi-square", G_CALLBACK (chisquare_dialog));
   connect_action (de, "binomial", G_CALLBACK (binomial_dialog));
-
+  connect_action (de, "runs", G_CALLBACK (runs_dialog));
+  connect_action (de, "ks-one-sample", G_CALLBACK (ks_one_sample_dialog));
   connect_action (de, "k-related-samples", G_CALLBACK (k_related_dialog));
+  connect_action (de, "two-related-samples", G_CALLBACK (two_related_dialog));
  
 
   {
@@ -1132,13 +1148,14 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
     GtkWidget *menu_files = gtk_recent_chooser_menu_new_for_manager (
       gtk_recent_manager_get_default ());
 
+    g_object_set (menu_data, "show-tips",  TRUE, NULL);
+    g_object_set (menu_files, "show-tips",  TRUE, NULL);
+
     {
       GtkRecentFilter *filter = gtk_recent_filter_new ();
 
-      gtk_recent_filter_add_pattern (filter, "*.sav");
-      gtk_recent_filter_add_pattern (filter, "*.SAV");
-      gtk_recent_filter_add_pattern (filter, "*.por");
-      gtk_recent_filter_add_pattern (filter, "*.POR");
+      gtk_recent_filter_add_mime_type (filter, "application/x-spss-sav");
+      gtk_recent_filter_add_mime_type (filter, "application/x-spss-por");
 
       gtk_recent_chooser_set_sort_type (GTK_RECENT_CHOOSER (menu_data), GTK_RECENT_SORT_MRU);