projects / pspp / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Compute Dialog: Convert to PsppireDialogAction
[pspp] / 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 f36283289f324e7779b46f9175eee82b93013771..f756586a25bc9fe0c4c5d15f3ce33b6fdd79e9c8 100644 (file)
--- 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, 2012  Free Software Foundation
+   Copyright (C) 2008, 2009, 2010, 2011, 2012, 2013  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,16 +27,13 @@
 #include "ui/gui/aggregate-dialog.h"
 #include "ui/gui/autorecode-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/count-dialog.h"
 #include "ui/gui/entry-dialog.h"
 #include "ui/gui/executor.h"
 #include "ui/gui/help-menu.h"
 #include "ui/gui/helper.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"
 #include "ui/gui/psppire-data-window.h"
@@ -44,16 +41,11 @@
 #include "ui/gui/psppire-syntax-window.h"
 #include "ui/gui/psppire-window.h"
 #include "ui/gui/psppire.h"
-#include "ui/gui/runs-dialog.h"
-#include "ui/gui/ks-one-sample-dialog.h"
 #include "ui/gui/recode-dialog.h"
 #include "ui/gui/select-cases-dialog.h"
 #include "ui/gui/split-file-dialog.h"
-#include "ui/gui/t-test-one-sample.h"
 #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/univariate-dialog.h"
 #include "ui/gui/weight-cases-dialog.h"
 #include "ui/syntax-gen.h"
 
@@ -336,34 +328,46 @@ name_has_suffix (const gchar *name)
 }
 
 static gboolean
-load_file (PsppireWindow *de, const gchar *file_name)
+load_file (PsppireWindow *de, const gchar *file_name, gpointer syn)
 {
-  struct string filename;
-  gchar *utf8_file_name;
-  const char *mime_type;
-  gchar *syntax;
+  const char *mime_type = NULL;
+  gchar *syntax = NULL;
   bool ok;
 
-  ds_init_empty (&filename);
-
-  utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL);
-
-  syntax_gen_string (&filename, ss_cstr (utf8_file_name));
-
-  g_free (utf8_file_name);
+  if (syn == NULL)
+    {
+      gchar *utf8_file_name;
+      struct string filename;
+      ds_init_empty (&filename);
+      
+      utf8_file_name = g_filename_to_utf8 (file_name, -1, NULL, NULL, NULL);
+    
+      syntax_gen_string (&filename, ss_cstr (utf8_file_name));
+      
+      g_free (utf8_file_name);
+      
+      syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
+      ds_destroy (&filename);
 
-  syntax = g_strdup_printf ("GET FILE=%s.", ds_cstr (&filename));
-  ds_destroy (&filename);
+    }
+  else
+    {
+      syntax = syn;
+    }
 
   ok = execute_syntax (PSPPIRE_DATA_WINDOW (de),
                        lex_reader_for_string (syntax));
   g_free (syntax);
 
-  mime_type = (name_has_por_suffix (file_name)
-               ? "application/x-spss-por"
-               : "application/x-spss-sav");
-
-  add_most_recent (file_name, mime_type);
+  if (ok && syn == NULL)
+    {
+      if (name_has_por_suffix (file_name))
+       mime_type = "application/x-spss-por";
+      else if (name_has_sav_suffix (file_name))
+       mime_type = "application/x-spss-sav";
+      
+      add_most_recent (file_name, mime_type);
+    }
 
   return ok;
 }
@@ -701,7 +705,7 @@ on_recent_data_select (GtkMenuShell *menushell,
 
   g_free (uri);
 
-  open_data_window (window, file);
+  open_data_window (window, file, NULL);
 
   g_free (file);
 }
@@ -764,7 +768,7 @@ on_recent_files_select (GtkMenuShell *menushell,   gpointer user_data)
 
   free (encoding);
 
-  if ( psppire_window_load (PSPPIRE_WINDOW (se), file) ) 
+  if ( psppire_window_load (PSPPIRE_WINDOW (se), file, NULL) ) 
     gtk_widget_show (se);
   else
     gtk_widget_destroy (se);
@@ -939,42 +943,27 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
   enable_save (de);
 
   connect_action (de, "file_new_data", G_CALLBACK (create_data_window));
-
   connect_action (de, "file_import", G_CALLBACK (text_data_import_assistant));
-
   connect_action (de, "file_save", G_CALLBACK (psppire_window_save));
- 
   connect_action (de, "file_open", G_CALLBACK (psppire_window_open));
-
   connect_action (de, "file_save_as", G_CALLBACK (psppire_window_save_as));
-
   connect_action (de, "rename_dataset", G_CALLBACK (on_rename_dataset));
-
   connect_action (de, "file_information_working-file", G_CALLBACK (display_dict));
-
   connect_action (de, "file_information_external-file", G_CALLBACK (sysfile_info));
 
   g_signal_connect_swapped (get_action_assert (de->builder, "view_value-labels"), "toggled", G_CALLBACK (toggle_value_labels), 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_aggregate", G_CALLBACK (aggregate_dialog));
-  connect_action (de, "transform_compute", G_CALLBACK (compute_dialog));
   connect_action (de, "transform_autorecode", G_CALLBACK (autorecode_dialog));
   connect_action (de, "data_split-file", G_CALLBACK (split_file_dialog));
   connect_action (de, "data_weight-cases", G_CALLBACK (weight_cases_dialog));
   connect_action (de, "oneway-anova", G_CALLBACK (oneway_anova_dialog));
   connect_action (de, "paired-t-test", G_CALLBACK (t_test_paired_samples_dialog));
-  connect_action (de, "one-sample-t-test", G_CALLBACK (t_test_one_sample_dialog));
   connect_action (de, "utilities_comments", G_CALLBACK (comments_dialog));
   connect_action (de, "transform_count", G_CALLBACK (count_dialog));
   connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
   connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog));
-  connect_action (de, "univariate", G_CALLBACK (univariate_dialog));
-  connect_action (de, "chi-square", G_CALLBACK (chisquare_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));
 
   {
@@ -1083,6 +1072,15 @@ psppire_data_window_dispose (GObject *object)
 
   if (dw->dict)
     {
+      g_signal_handlers_disconnect_by_func (dw->dict,
+                                            G_CALLBACK (enable_save), dw);
+      g_signal_handlers_disconnect_by_func (dw->dict,
+                                            G_CALLBACK (on_weight_change), dw);
+      g_signal_handlers_disconnect_by_func (dw->dict,
+                                            G_CALLBACK (on_filter_change), dw);
+      g_signal_handlers_disconnect_by_func (dw->dict,
+                                            G_CALLBACK (on_split_change), dw);
+
       g_object_unref (dw->dict);
       dw->dict = NULL;
     }
@@ -1227,7 +1225,7 @@ psppire_data_window_new (struct dataset *ds)
   GtkWidget *dw;
 
   if (the_session == NULL)
-    the_session = session_create ();
+    the_session = session_create (NULL);
 
   if (ds == NULL)
     {
@@ -1317,7 +1315,7 @@ create_data_window (void)
 }
 
 void
-open_data_window (PsppireWindow *victim, const char *file_name)
+open_data_window (PsppireWindow *victim, const char *file_name, gpointer hint)
 {
   GtkWidget *window;
 
@@ -1330,7 +1328,7 @@ open_data_window (PsppireWindow *victim, const char *file_name)
   else
     window = psppire_data_window_new (NULL);
 
-  psppire_window_load (PSPPIRE_WINDOW (window), file_name);
+  psppire_window_load (PSPPIRE_WINDOW (window), file_name, hint);
   gtk_widget_show_all (window);
 }
 
Unnamed repository; edit this file to name it for gitweb.