X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=6e57f5ba21f71acfc42bb97a638329e98321013c;hb=8fc40a26bebdae2b3e8870c42d2baa77680c3d36;hp=fe9f8df603251cd9e4938b4a6d6eac15a5776c89;hpb=3ca11d9dd35fd7a6f343e008724a7b245dc2e6e5;p=pspp-builds.git

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index fe9f8df6..6e57f5ba 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2008, 2009, 2010, 2011  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012  Free Software Foundation
 
    This program is free software: you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -27,13 +27,12 @@
 #include "ui/gui/aggregate-dialog.h"
 #include "ui/gui/autorecode-dialog.h"
 #include "ui/gui/binomial-dialog.h"
+#include "ui/gui/builder-wrapper.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"
 #include "ui/gui/examine-dialog.h"
 #include "ui/gui/executor.h"
@@ -43,7 +42,7 @@
 #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/helper.h"
 #include "ui/gui/k-related-dialog.h"
 #include "ui/gui/npar-two-sample-related.h"
 #include "ui/gui/oneway-anova-dialog.h"
@@ -53,6 +52,7 @@
 #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"
@@ -65,7 +65,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/variable-info-dialog.h"
+#include "ui/gui/univariate-dialog.h"
 #include "ui/gui/weight-cases-dialog.h"
 #include "ui/syntax-gen.h"
 
@@ -505,14 +505,12 @@ data_pick_filename (PsppireWindow *window)
   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");
+  gtk_file_filter_add_mime_type (filter, "application/x-spss-sav");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
   gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
-  gtk_file_filter_add_pattern (filter, "*.por");
-  gtk_file_filter_add_pattern (filter, "*.POR");
+  gtk_file_filter_add_mime_type (filter, "application/x-spss-por");
   gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
 
   filter = gtk_file_filter_new ();
@@ -599,7 +597,7 @@ confirm_delete_dataset (PsppireDataWindow *de,
                           GTK_STOCK_DELETE, GTK_RESPONSE_OK,
                           NULL);
 
-  g_object_set (dialog, "icon-name", "psppicon", NULL);
+  g_object_set (dialog, "icon-name", "pspp", NULL);
 
   result = gtk_dialog_run (GTK_DIALOG (dialog));
 
@@ -838,6 +836,7 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 }
 
 
+
 static void
 enable_delete_cases (GtkWidget *w, gint case_num, gpointer data)
 {
@@ -1081,9 +1080,6 @@ psppire_data_window_finish_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));
 
   connect_action (de, "indep-t-test", G_CALLBACK (t_test_independent_samples_dialog));
@@ -1102,8 +1098,6 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
  
   connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog));
 
-  connect_action (de, "analyze_descriptives", G_CALLBACK (descriptives_dialog));
- 
   connect_action (de, "analyze_frequencies", G_CALLBACK (frequencies_dialog));
  
   connect_action (de, "crosstabs", G_CALLBACK (crosstabs_dialog));
@@ -1116,15 +1110,16 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
  
   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, "analyze_explore", G_CALLBACK (examine_dialog));
 
-  connect_action (de, "k-means", G_CALLBACK (k_means_dialog));
+  connect_action (de, "univariate", G_CALLBACK (univariate_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));
   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));