[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp/src/ui/gui data-editor.c automake.mk
From: |
Jason H Stover |
Subject: |
[Pspp-cvs] pspp/src/ui/gui data-editor.c automake.mk |
Date: |
Fri, 08 Feb 2008 16:10:12 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: Jason H Stover <jstover> 08/02/08 16:10:12
Modified files:
src/ui/gui : data-editor.c automake.mk
Log message:
oops
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.59&r2=1.60
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.46&r2=1.47
Patches:
Index: data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -b -r1.59 -r1.60
--- data-editor.c 3 Feb 2008 12:09:25 -0000 1.59
+++ data-editor.c 8 Feb 2008 16:10:12 -0000 1.60
@@ -42,11 +42,12 @@
#include "comments-dialog.h"
#include "variable-info-dialog.h"
#include "descriptives-dialog.h"
+#include "crosstabs-dialog.h"
#include "frequencies-dialog.h"
+#include "text-data-import-dialog.h"
#include "dict-display.h"
#include "clipboard.h"
-
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
#include "t-test-one-sample.h"
@@ -711,6 +712,15 @@
g_signal_connect (de->invoke_frequencies_dialog, "activate",
G_CALLBACK (frequencies_dialog), de);
+ de->invoke_crosstabs_dialog =
+ gtk_action_new ("crosstabs-dialog",
+ _("_Crosstabs"),
+ _("Generate crosstabulations"),
+ "pspp-crosstabs");
+
+ g_signal_connect (de->invoke_crosstabs_dialog, "activate",
+ G_CALLBACK (crosstabs_dialog), de);
+
e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
@@ -724,7 +734,6 @@
G_CALLBACK (gtk_action_activate),
de->action_data_open);
-
#if RECENT_LISTS_AVAILABLE
{
GtkRecentManager *rm = gtk_recent_manager_get_default ();
@@ -778,6 +787,11 @@
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),
@@ -870,6 +884,10 @@
get_widget_assert (de->xml, "analyze_descriptives")
);
+ gtk_action_connect_proxy (de->invoke_crosstabs_dialog,
+ get_widget_assert (de->xml, "crosstabs")
+ );
+
gtk_action_connect_proxy (de->invoke_frequencies_dialog,
get_widget_assert (de->xml, "analyze_frequencies")
);
@@ -1499,6 +1517,15 @@
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: automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- automake.mk 6 Feb 2008 10:33:05 -0000 1.46
+++ automake.mk 8 Feb 2008 16:10:12 -0000 1.47
@@ -51,6 +51,7 @@
dist_src_ui_gui_psppire_DATA = \
$(top_srcdir)/src/ui/gui/data-editor.glade \
$(top_srcdir)/src/ui/gui/descriptives-dialog.glade \
+ $(top_srcdir)/src/ui/gui/crosstabs.glade \
$(top_srcdir)/src/ui/gui/frequencies.glade \
$(top_srcdir)/src/ui/gui/oneway.glade \
$(top_srcdir)/src/ui/gui/output-viewer.glade \
@@ -58,6 +59,7 @@
$(top_srcdir)/src/ui/gui/rank.glade \
$(top_srcdir)/src/ui/gui/recode.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 \
@@ -88,6 +90,8 @@
src/ui/gui/compute-dialog.h \
src/ui/gui/comments-dialog.c \
src/ui/gui/comments-dialog.h \
+ src/ui/gui/crosstabs-dialog.c \
+ src/ui/gui/crosstabs-dialog.h \
src/ui/gui/customentry.c \
src/ui/gui/customentry.h \
src/ui/gui/frequencies-dialog.c \
@@ -157,6 +161,10 @@
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/text-data-import-model.c \
+ src/ui/gui/text-data-import-model.h \
src/ui/gui/transpose-dialog.c \
src/ui/gui/transpose-dialog.h \
src/ui/gui/t-test-independent-samples-dialog.c \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp/src/ui/gui data-editor.c automake.mk,
Jason H Stover <=