src/ui/gui/automake.mk | 3
src/ui/gui/data-editor.c | 15
src/ui/gui/data-editor.glade | 8
src/ui/gui/data-editor.h | 2
src/ui/gui/text-data-import-dialog.c | 2219 ++++++++++++++++++++++++++++++++++
src/ui/gui/text-data-import-dialog.h | 27
src/ui/gui/text-data-import.glade | 721 +++++++++++
7 files changed, 2995 insertions(+)
Index: b/src/ui/gui/automake.mk
===================================================================
--- a/src/ui/gui/automake.mk
+++ b/src/ui/gui/automake.mk
@@ -62,6 +62,7 @@ dist_src_ui_gui_psppire_DATA = \
$(top_srcdir)/src/ui/gui/recode.glade \
$(top_srcdir)/src/ui/gui/regression.glade \
$(top_srcdir)/src/ui/gui/syntax-editor.glade \
+ $(top_srcdir)/src/ui/gui/text-data-import.glade \
$(top_srcdir)/src/ui/gui/t-test.glade \
$(top_srcdir)/src/ui/gui/psppicon.png \
$(top_srcdir)/src/ui/gui/pspplogo.png \
@@ -167,6 +168,8 @@ src_ui_gui_psppire_SOURCES = \
src/ui/gui/syntax-editor.h \
src/ui/gui/syntax-editor-source.c \
src/ui/gui/syntax-editor-source.h \
+ src/ui/gui/text-data-import-dialog.c \
+ src/ui/gui/text-data-import-dialog.h \
src/ui/gui/transpose-dialog.c \
src/ui/gui/transpose-dialog.h \
src/ui/gui/t-test-independent-samples-dialog.c \
Index: b/src/ui/gui/data-editor.c
===================================================================
--- a/src/ui/gui/data-editor.c
+++ b/src/ui/gui/data-editor.c
@@ -48,6 +48,7 @@
#include "examine-dialog.h"
#include "dict-display.h"
#include "regression-dialog.h"
+#include "text-data-import-dialog.h"
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
@@ -702,6 +703,11 @@ new_data_editor (void)
G_CALLBACK (open_syntax_window),
e->window);
+ g_signal_connect_swapped (get_widget_assert (de->xml,"file_import-text"),
+ "activate",
+ G_CALLBACK (gtk_action_activate),
+ de->invoke_text_import_assistant);
+
g_signal_connect_swapped (get_widget_assert (de->xml,"file_save"),
"activate",
G_CALLBACK (gtk_action_activate),
@@ -1223,6 +1229,15 @@ register_data_editor_actions (struct dat
g_signal_connect (de->action_data_new, "activate",
G_CALLBACK (new_file), de);
+
+ de->invoke_text_import_assistant =
+ gtk_action_new ("file_import-text",
+ _("_Import Text Data"),
+ _("Import text data file"),
+ "");
+
+ g_signal_connect (de->invoke_text_import_assistant, "activate",
+ G_CALLBACK (text_data_import_assistant), de);
}
/* Returns true if NAME has a suffix which might denote a PSPP file */
Index: b/src/ui/gui/data-editor.glade
===================================================================
--- a/src/ui/gui/data-editor.glade
+++ b/src/ui/gui/data-editor.glade
@@ -72,6 +72,14 @@
+
+
+