X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=src%2Fui%2Fgui%2Fpsppire-data-window.c;h=edf87831286f4a49b56cf093ee81958e0c8fc337;hb=5d085e3326530983f7c2f3843dd2a1eebc0a6e73;hp=73f8bbe8ba7de858ef937aa9ac6437f4be32911d;hpb=da08e8b9ea6bfa772b4daec4a944279267852515;p=pspp

diff --git a/src/ui/gui/psppire-data-window.c b/src/ui/gui/psppire-data-window.c
index 73f8bbe8ba..edf8783128 100644
--- a/src/ui/gui/psppire-data-window.c
+++ b/src/ui/gui/psppire-data-window.c
@@ -25,12 +25,12 @@
 #include "libpspp/message.h"
 #include "libpspp/str.h"
 #include "ui/gui/builder-wrapper.h"
-#include "ui/gui/comments-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/psppire-import-assistant.h"
 #include "ui/gui/psppire-data-window.h"
 #include "ui/gui/psppire-dialog-action.h"
 #include "ui/gui/psppire-encoding-selector.h"
@@ -40,8 +40,6 @@
 #include "ui/gui/recode-dialog.h"
 #include "ui/gui/select-cases-dialog.h"
 #include "ui/gui/split-file-dialog.h"
-#include "ui/gui/text-data-import-dialog.h"
-#include "ui/gui/weight-cases-dialog.h"
 #include "ui/syntax-gen.h"
 
 #include "gl/c-strcase.h"
@@ -924,6 +922,42 @@ psppire_data_window_init (PsppireDataWindow *de)
   de->merge_id = 0;
 }
 
+static void
+file_import (PsppireDataWindow *dw)
+{
+  GtkWidget *w = psppire_import_assistant_new (GTK_WINDOW (dw));
+  PsppireImportAssistant *asst = PSPPIRE_IMPORT_ASSISTANT (w);
+  gtk_widget_show_all (w);
+  
+  asst->main_loop = g_main_loop_new (NULL, TRUE);
+  g_main_loop_run (asst->main_loop);
+  g_main_loop_unref (asst->main_loop);
+
+  if (!asst->file_name)
+    goto end;
+  
+  switch (asst->response)
+    {
+    case GTK_RESPONSE_APPLY:
+      {
+	g_debug ("HERE");
+	gchar *fn = g_path_get_basename (asst->file_name);
+	open_data_window (PSPPIRE_WINDOW (dw), fn, NULL, psppire_import_assistant_generate_syntax (asst));
+	g_free (fn);
+      }
+      break;
+    case PSPPIRE_RESPONSE_PASTE:
+      g_debug ("THERE");
+      free (paste_syntax_to_window (psppire_import_assistant_generate_syntax (asst)));
+      break;
+    default:
+      break;
+    }
+    
+ end:  
+  gtk_widget_destroy (GTK_WIDGET (asst));
+}
+
 static void
 psppire_data_window_finish_init (PsppireDataWindow *de,
                                  struct dataset *ds)
@@ -998,7 +1032,8 @@ 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_import", G_CALLBACK (file_import));
+
   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));
@@ -1010,8 +1045,6 @@ psppire_data_window_finish_init (PsppireDataWindow *de,
 
   connect_action (de, "data_select-cases", G_CALLBACK (select_cases_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, "utilities_comments", G_CALLBACK (comments_dialog));
   connect_action (de, "transform_recode-same", G_CALLBACK (recode_same_dialog));
   connect_action (de, "transform_recode-different", G_CALLBACK (recode_different_dialog));