gui: Redo var sheet, data sheet, text import with PsppSheetView.
[pspp] / src / ui / gui / automake.mk
index ac61a29e1eae0e894eb3ade01b51fdfc99e5f62a..2b01346bd82578926c70598920d8c535904a9f08 100644 (file)
@@ -11,6 +11,7 @@ UI_FILES = \
        src/ui/gui/count.ui \
        src/ui/gui/crosstabs.ui \
        src/ui/gui/chi-square.ui \
+       src/ui/gui/data-sheet.ui \
        src/ui/gui/descriptives.ui \
        src/ui/gui/entry-dialog.ui \
        src/ui/gui/examine.ui \
@@ -18,6 +19,7 @@ UI_FILES = \
        src/ui/gui/factor.ui \
        src/ui/gui/find.ui \
        src/ui/gui/frequencies.ui \
+       src/ui/gui/indep-samples.ui \
        src/ui/gui/k-means.ui \
        src/ui/gui/k-related.ui \
        src/ui/gui/ks-one-sample.ui \
@@ -41,7 +43,8 @@ UI_FILES = \
        src/ui/gui/variable-info.ui \
        src/ui/gui/data-editor.ui \
        src/ui/gui/output-viewer.ui \
-       src/ui/gui/syntax-editor.ui
+       src/ui/gui/syntax-editor.ui \
+       src/ui/gui/var-sheet.ui
 
 EXTRA_DIST += \
        src/ui/gui/OChangeLog \
@@ -74,6 +77,7 @@ src_ui_gui_psppire_LDADD = \
        src/libpspp.la \
        src/libpspp-core.la \
        $(GTK_LIBS) \
+       $(GTHREAD_LIBS) \
        $(GTKSOURCEVIEW_LIBS) \
        $(CAIRO_LIBS) \
        $(LIBINTL) \
@@ -129,10 +133,23 @@ dist_src_ui_gui_psppire_DATA = \
        $(top_srcdir)/src/ui/gui/icons/16x16/scale.png \
        $(top_srcdir)/src/ui/gui/icons/16x16/string.png \
        $(top_srcdir)/src/ui/gui/icons/16x16/date-scale.png \
-       $(top_srcdir)/src/ui/gui/icons/splash.png 
-
+       $(top_srcdir)/src/ui/gui/icons/splash.png \
+       $(top_srcdir)/src/ui/gui/psppire.gtkrc
 
 src_ui_gui_psppire_SOURCES = \
+       src/ui/gui/pspp-sheet-private.h \
+       src/ui/gui/pspp-sheet-selection.c \
+       src/ui/gui/pspp-sheet-selection.h \
+       src/ui/gui/pspp-sheet-view-column.c \
+       src/ui/gui/pspp-sheet-view-column.h \
+       src/ui/gui/pspp-sheet-view.c \
+       src/ui/gui/pspp-sheet-view.h \
+       src/ui/gui/pspp-widget-facade.c \
+       src/ui/gui/pspp-widget-facade.h \
+       src/ui/gui/psppire-button-editable.c \
+       src/ui/gui/psppire-button-editable.h \
+       src/ui/gui/psppire-cell-renderer-button.c \
+       src/ui/gui/psppire-cell-renderer-button.h \
        src/ui/gui/psppire-dialog.c \
        src/ui/gui/psppire-keypad.c \
        src/ui/gui/psppire-selector.c \
@@ -174,8 +191,6 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/executor.h \
        src/ui/gui/find-dialog.c \
        src/ui/gui/find-dialog.h \
-       src/ui/gui/factor-dialog.c \
-       src/ui/gui/factor-dialog.h \
        src/ui/gui/frequencies-dialog.c \
        src/ui/gui/frequencies-dialog.h \
        src/ui/gui/goto-case-dialog.c \
@@ -203,6 +218,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-conf.h \
        src/ui/gui/psppire-data-editor.c \
        src/ui/gui/psppire-data-editor.h \
+       src/ui/gui/psppire-data-sheet.c \
+       src/ui/gui/psppire-data-sheet.h \
        src/ui/gui/psppire-data-store.c \
        src/ui/gui/psppire-data-store.h \
        src/ui/gui/psppire-data-window.c \
@@ -216,18 +233,26 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-dialog-action-descriptives.h \
        src/ui/gui/psppire-dialog-action-examine.c \
        src/ui/gui/psppire-dialog-action-examine.h \
+       src/ui/gui/psppire-dialog-action-factor.c \
+       src/ui/gui/psppire-dialog-action-factor.h \
+       src/ui/gui/psppire-dialog-action-indep-samps.c \
+       src/ui/gui/psppire-dialog-action-indep-samps.h \
        src/ui/gui/psppire-dialog-action-kmeans.c \
        src/ui/gui/psppire-dialog-action-kmeans.h \
        src/ui/gui/psppire-dialog-action-means.c \
        src/ui/gui/psppire-dialog-action-means.h \
+       src/ui/gui/psppire-dialog-action-rank.c \
+       src/ui/gui/psppire-dialog-action-rank.h \
+       src/ui/gui/psppire-dialog-action-regression.c \
+       src/ui/gui/psppire-dialog-action-regression.h \
        src/ui/gui/psppire-dialog-action-reliability.c \
        src/ui/gui/psppire-dialog-action-reliability.h \
+       src/ui/gui/psppire-dialog-action-roc.c \
+       src/ui/gui/psppire-dialog-action-roc.h \
        src/ui/gui/psppire-dialog-action-sort.c \
        src/ui/gui/psppire-dialog-action-sort.h \
        src/ui/gui/psppire-dialog-action-var-info.c \
        src/ui/gui/psppire-dialog-action-var-info.h \
-       src/ui/gui/psppire-dialog-action-roc.c \
-       src/ui/gui/psppire-dialog-action-roc.h \
        src/ui/gui/psppire-dict.c \
        src/ui/gui/psppire-dict.h \
        src/ui/gui/psppire-dictview.c \
@@ -255,6 +280,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-syntax-window.h \
        src/ui/gui/psppire-val-chooser.c \
        src/ui/gui/psppire-val-chooser.h \
+       src/ui/gui/psppire-value-entry.c \
+       src/ui/gui/psppire-value-entry.h \
        src/ui/gui/psppire-var-ptr.c \
        src/ui/gui/psppire-var-ptr.h \
        src/ui/gui/psppire-var-sheet.c \
@@ -268,12 +295,8 @@ src_ui_gui_psppire_SOURCES = \
        src/ui/gui/psppire-window-base.h \
        src/ui/gui/psppire-window-register.c \
        src/ui/gui/psppire-window-register.h \
-       src/ui/gui/rank-dialog.c \
-       src/ui/gui/rank-dialog.h \
        src/ui/gui/recode-dialog.c \
        src/ui/gui/recode-dialog.h \
-       src/ui/gui/regression-dialog.c \
-       src/ui/gui/regression-dialog.h \
        src/ui/gui/runs-dialog.c \
        src/ui/gui/runs-dialog.h \
        src/ui/gui/select-cases-dialog.c \
@@ -284,8 +307,6 @@ src_ui_gui_psppire_SOURCES = \
        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 \
-       src/ui/gui/t-test-independent-samples-dialog.h \
        src/ui/gui/t-test-one-sample.c \
        src/ui/gui/t-test-one-sample.h \
        src/ui/gui/t-test-options.c \
@@ -367,3 +388,4 @@ src/ui/gui/include/gtk/gtk.h: src/ui/gui/include/gtk/gtk.in.h
        mv $@-t $@
 CLEANFILES += src/ui/gui/include/gtk/gtk.h
 EXTRA_DIST += src/ui/gui/include/gtk/gtk.in.h
+