[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/en_GB.po src/ui/gui/ChangeLog ...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/en_GB.po src/ui/gui/ChangeLog ... |
|
Date: |
Tue, 29 Jan 2008 11:13:01 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 08/01/29 11:13:01
Modified files:
po : de.po en_GB.po
src/ui/gui : ChangeLog automake.mk compute-dialog.c
data-editor.c data-editor.h
descriptives-dialog.c dialog-common.c
dialog-common.h dict-display.c dict-display.h
find-dialog.c frequencies-dialog.c
oneway-anova-dialog.c psppire-dialog.c
psppire-selector.c psppire-selector.h
rank-dialog.c recode-dialog.c
select-cases-dialog.c sort-cases-dialog.c
split-file-dialog.c
t-test-independent-samples-dialog.c
t-test-one-sample.c t-test.glade
transpose-dialog.c weight-cases-dialog.c
Log message:
Implemented the paired samples t test dialog. Closes patch #6378
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/pspp/po/en_GB.po?cvsroot=pspp&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.102&r2=1.103
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/automake.mk?cvsroot=pspp&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/compute-dialog.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.57&r2=1.58
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.h?cvsroot=pspp&r1=1.27&r2=1.28
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/descriptives-dialog.c?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dialog-common.c?cvsroot=pspp&r1=1.6&r2=1.7
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dialog-common.h?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dict-display.c?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/dict-display.h?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/find-dialog.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/frequencies-dialog.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/oneway-anova-dialog.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-dialog.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-selector.c?cvsroot=pspp&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/psppire-selector.h?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/rank-dialog.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/recode-dialog.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/select-cases-dialog.c?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/sort-cases-dialog.c?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/split-file-dialog.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test-independent-samples-dialog.c?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test-one-sample.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/t-test.glade?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/transpose-dialog.c?cvsroot=pspp&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/weight-cases-dialog.c?cvsroot=pspp&r1=1.5&r2=1.6
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- po/de.po 22 Jan 2008 06:49:07 -0000 1.91
+++ po/de.po 29 Jan 2008 11:12:59 -0000 1.92
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-22 15:39+0900\n"
+"POT-Creation-Date: 2008-01-29 19:25+0900\n"
"PO-Revision-Date: 2006-07-28 19:32+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -47,12 +47,6 @@
msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
msgstr ""
-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative. These case(s) were ignored."
-msgstr ""
-
#: src/data/case-tmpfile.c:57
msgid "failed to create temporary file"
msgstr ""
@@ -73,6 +67,12 @@
msgid "writing to temporary file"
msgstr ""
+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative. These case(s) were ignored."
+msgstr ""
+
#: src/data/data-in.c:254 src/data/data-in.c:444
msgid "Field contents are not numeric."
msgstr ""
@@ -320,14 +320,14 @@
msgstr ""
#: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire.glade:2176
-#: src/ui/gui/psppire-var-store.c:493
+#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire-var-store.c:493
+#: src/ui/gui/psppire.glade:2176
msgid "String"
msgstr "Zeichenkette"
#: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire.glade:2131
-#: src/ui/gui/psppire-var-store.c:486
+#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire-var-store.c:486
+#: src/ui/gui/psppire.glade:2131
msgid "Numeric"
msgstr "Nummer"
@@ -1375,6 +1375,61 @@
msgid "Handle for %s not allowed here."
msgstr ""
+#: src/language/data-io/get-data.c:57
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:181
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:236
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:249
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:274
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:287
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:307
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:319
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:372
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:394
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d. "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:403
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
#: src/language/data-io/get.c:99
msgid "expecting COMM or TAPE"
msgstr ""
@@ -1464,61 +1519,6 @@
"variable in earlier file (%s)."
msgstr ""
-#: src/language/data-io/get-data.c:57
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:181
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:236
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:249
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:274
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:287
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:307
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:319
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:372
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:394
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d. "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:403
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
#: src/language/data-io/inpt-pgm.c:129
msgid "Unexpected end-of-file within INPUT PROGRAM."
msgstr ""
@@ -1608,6 +1608,20 @@
msgid "The ending column for a field must be greater than the starting column."
msgstr ""
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:265
#, c-format
msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1627,20 +1641,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:75
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3320,6 +3320,22 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+
#: src/language/stats/npar.q:98
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3344,22 +3360,6 @@
"not match the number following (%zu)."
msgstr ""
-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -5378,15 +5378,6 @@
msgid "Paste"
msgstr "Datum"
-#: src/ui/gui/psppire.c:198
-msgid "_Reset"
-msgstr "_Zurücksetzen"
-
-#: src/ui/gui/psppire.c:199
-#, fuzzy
-msgid "_Select"
-msgstr "Schriftwahlung"
-
#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
@@ -5396,6 +5387,33 @@
msgid "%ld"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
+msgid "None"
+msgstr "Keine"
+
+#: src/ui/gui/psppire-var-store.c:489
+msgid "Scientific"
+msgstr "Wissenschäflich"
+
+#: src/ui/gui/psppire-var-store.c:492
+msgid "Custom"
+msgstr "Spezial"
+
+#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
+#: src/ui/gui/psppire-var-store.c:583
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/ui/gui/psppire.c:198
+msgid "_Reset"
+msgstr "_Zurücksetzen"
+
+#: src/ui/gui/psppire.c:199
+#, fuzzy
+msgid "_Select"
+msgstr "Schriftwahlung"
+
#: src/ui/gui/psppire.glade:11
#, fuzzy
msgid "This is pre-alpha software. Use at your own risk."
@@ -5635,24 +5653,6 @@
msgid "Search backward"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
-msgid "None"
-msgstr "Keine"
-
-#: src/ui/gui/psppire-var-store.c:489
-msgid "Scientific"
-msgstr "Wissenschäflich"
-
-#: src/ui/gui/psppire-var-store.c:492
-msgid "Custom"
-msgstr "Spezial"
-
-#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
-#: src/ui/gui/psppire-var-store.c:583
-#, c-format
-msgid "%d"
-msgstr ""
-
#: src/ui/gui/rank.glade:111
msgid "By:"
msgstr ""
@@ -5932,6 +5932,11 @@
msgid "To End"
msgstr ""
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
#: src/ui/gui/t-test.glade:53 src/ui/gui/t-test.glade:161
msgid "Define Groups"
msgstr ""
@@ -5974,10 +5979,25 @@
msgid "Test Value: "
msgstr "Werte:"
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
-msgstr ""
+#: src/ui/gui/var-sheet.c:65
+msgid "Name"
+msgstr "Name"
+
+#: src/ui/gui/var-sheet.c:68
+msgid "Decimals"
+msgstr "Dezimalstellen"
+
+#: src/ui/gui/var-sheet.c:70
+msgid "Values"
+msgstr "Werten"
+
+#: src/ui/gui/var-sheet.c:73
+msgid "Align"
+msgstr "Einstellung"
+
+#: src/ui/gui/var-sheet.c:74
+msgid "Measure"
+msgstr "Messe"
#: src/ui/gui/variable-info-dialog.c:88
#, fuzzy, c-format
@@ -6009,26 +6029,6 @@
msgid "%s %s\n"
msgstr ""
-#: src/ui/gui/var-sheet.c:65
-msgid "Name"
-msgstr "Name"
-
-#: src/ui/gui/var-sheet.c:68
-msgid "Decimals"
-msgstr "Dezimalstellen"
-
-#: src/ui/gui/var-sheet.c:70
-msgid "Values"
-msgstr "Werten"
-
-#: src/ui/gui/var-sheet.c:73
-msgid "Align"
-msgstr "Einstellung"
-
-#: src/ui/gui/var-sheet.c:74
-msgid "Measure"
-msgstr "Messe"
-
#: src/ui/gui/weight-cases-dialog.c:88
#, c-format
msgid "Weight cases by %s"
Index: po/en_GB.po
===================================================================
RCS file: /sources/pspp/pspp/po/en_GB.po,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- po/en_GB.po 22 Jan 2008 06:49:08 -0000 1.107
+++ po/en_GB.po 29 Jan 2008 11:12:59 -0000 1.108
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.3\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2008-01-22 15:39+0900\n"
+"POT-Creation-Date: 2008-01-29 19:25+0900\n"
"PO-Revision-Date: 2007-09-15 08:29+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: John Darrington <address@hidden>\n"
@@ -44,12 +44,6 @@
msgid "Date %04d-%d-%d is before the earliest acceptable date of 1582-10-15."
msgstr ""
-#: src/data/casereader-filter.c:221
-msgid ""
-"At least one case in the data read had a weight value that was user-missing, "
-"system-missing, zero, or negative. These case(s) were ignored."
-msgstr ""
-
#: src/data/case-tmpfile.c:57
msgid "failed to create temporary file"
msgstr ""
@@ -70,6 +64,12 @@
msgid "writing to temporary file"
msgstr ""
+#: src/data/casereader-filter.c:221
+msgid ""
+"At least one case in the data read had a weight value that was user-missing, "
+"system-missing, zero, or negative. These case(s) were ignored."
+msgstr ""
+
#: src/data/data-in.c:254 src/data/data-in.c:444
msgid "Field contents are not numeric."
msgstr ""
@@ -315,14 +315,14 @@
msgstr ""
#: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire.glade:2176
-#: src/ui/gui/psppire-var-store.c:493
+#: src/ui/gui/data-editor.glade:1304 src/ui/gui/psppire-var-store.c:493
+#: src/ui/gui/psppire.glade:2176
msgid "String"
msgstr ""
#: src/data/format.c:330 src/data/sys-file-reader.c:639
-#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire.glade:2131
-#: src/ui/gui/psppire-var-store.c:486
+#: src/ui/gui/data-editor.glade:1193 src/ui/gui/psppire-var-store.c:486
+#: src/ui/gui/psppire.glade:2131
msgid "Numeric"
msgstr ""
@@ -1366,6 +1366,61 @@
msgid "Handle for %s not allowed here."
msgstr ""
+#: src/language/data-io/get-data.c:57
+#, c-format
+msgid "Unsupported TYPE %s"
+msgstr ""
+
+#: src/language/data-io/get-data.c:181
+#, c-format
+msgid ""
+"%s is allowed only with %s arrangement, but %s arrangement was stated or "
+"implied earlier in this command."
+msgstr ""
+
+#: src/language/data-io/get-data.c:236
+msgid "expecting FIXED or DELIMITED"
+msgstr ""
+
+#: src/language/data-io/get-data.c:249
+msgid "Value of FIRSTCASE must be 1 or greater."
+msgstr ""
+
+#: src/language/data-io/get-data.c:274
+msgid "expecting LINE or VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:287
+msgid "Value of FIXCASE must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:307
+msgid "Value of FIRST must be at least 1."
+msgstr ""
+
+#: src/language/data-io/get-data.c:319
+msgid "Value of PERCENT must be between 1 and 100."
+msgstr ""
+
+#: src/language/data-io/get-data.c:372
+msgid "expecting VARIABLES"
+msgstr ""
+
+#: src/language/data-io/get-data.c:394
+#: src/language/data-io/placement-parser.c:376
+#, c-format
+msgid ""
+"The record number specified, %ld, is at or before the previous record, %d. "
+"Data fields must be listed in order of increasing record number."
+msgstr ""
+
+#: src/language/data-io/get-data.c:403
+#, c-format
+msgid ""
+"The record number specified, %ld, exceeds the number of records per case "
+"specified on FIXCASE, %d."
+msgstr ""
+
#: src/language/data-io/get.c:99
msgid "expecting COMM or TAPE"
msgstr ""
@@ -1455,61 +1510,6 @@
"variable in earlier file (%s)."
msgstr ""
-#: src/language/data-io/get-data.c:57
-#, c-format
-msgid "Unsupported TYPE %s"
-msgstr ""
-
-#: src/language/data-io/get-data.c:181
-#, c-format
-msgid ""
-"%s is allowed only with %s arrangement, but %s arrangement was stated or "
-"implied earlier in this command."
-msgstr ""
-
-#: src/language/data-io/get-data.c:236
-msgid "expecting FIXED or DELIMITED"
-msgstr ""
-
-#: src/language/data-io/get-data.c:249
-msgid "Value of FIRSTCASE must be 1 or greater."
-msgstr ""
-
-#: src/language/data-io/get-data.c:274
-msgid "expecting LINE or VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:287
-msgid "Value of FIXCASE must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:307
-msgid "Value of FIRST must be at least 1."
-msgstr ""
-
-#: src/language/data-io/get-data.c:319
-msgid "Value of PERCENT must be between 1 and 100."
-msgstr ""
-
-#: src/language/data-io/get-data.c:372
-msgid "expecting VARIABLES"
-msgstr ""
-
-#: src/language/data-io/get-data.c:394
-#: src/language/data-io/placement-parser.c:376
-#, c-format
-msgid ""
-"The record number specified, %ld, is at or before the previous record, %d. "
-"Data fields must be listed in order of increasing record number."
-msgstr ""
-
-#: src/language/data-io/get-data.c:403
-#, c-format
-msgid ""
-"The record number specified, %ld, exceeds the number of records per case "
-"specified on FIXCASE, %d."
-msgstr ""
-
#: src/language/data-io/inpt-pgm.c:129
msgid "Unexpected end-of-file within INPUT PROGRAM."
msgstr ""
@@ -1599,6 +1599,20 @@
msgid "The ending column for a field must be greater than the starting column."
msgstr ""
+#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
+#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
+msgid "expecting end of command"
+msgstr ""
+
+#: src/language/data-io/print-space.c:116
+msgid "The expression on PRINT SPACE evaluated to the system-missing value."
+msgstr ""
+
+#: src/language/data-io/print-space.c:119
+#, c-format
+msgid "The expression on PRINT SPACE evaluated to %g."
+msgstr ""
+
#: src/language/data-io/print.c:265
#, c-format
msgid "Output calls for %d records but %zu specified on RECORDS subcommand."
@@ -1618,20 +1632,6 @@
msgstr[0] ""
msgstr[1] ""
-#: src/language/data-io/print-space.c:73 src/language/lexer/lexer.c:476
-#: src/language/stats/autorecode.c:154 src/language/xforms/select-if.c:60
-msgid "expecting end of command"
-msgstr ""
-
-#: src/language/data-io/print-space.c:116
-msgid "The expression on PRINT SPACE evaluated to the system-missing value."
-msgstr ""
-
-#: src/language/data-io/print-space.c:119
-#, c-format
-msgid "The expression on PRINT SPACE evaluated to %g."
-msgstr ""
-
#: src/language/dictionary/apply-dictionary.c:75
#, c-format
msgid "Variable %s is %s in target file, but %s in source file."
@@ -3311,6 +3311,22 @@
msgid "TABLES subcommand may not appear more than once."
msgstr ""
+#: src/language/stats/npar-summary.c:108
+msgid "Descriptive Statistics"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:145
+msgid "25th"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:148
+msgid "50th (Median)"
+msgstr ""
+
+#: src/language/stats/npar-summary.c:151
+msgid "75th"
+msgstr ""
+
#: src/language/stats/npar.q:98
msgid "NPAR subcommand not currently implemented."
msgstr ""
@@ -3335,22 +3351,6 @@
"not match the number following (%zu)."
msgstr ""
-#: src/language/stats/npar-summary.c:108
-msgid "Descriptive Statistics"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:145
-msgid "25th"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:148
-msgid "50th (Median)"
-msgstr ""
-
-#: src/language/stats/npar-summary.c:151
-msgid "75th"
-msgstr ""
-
#: src/language/stats/oneway.q:169
msgid "Number of contrast coefficients must equal the number of groups"
msgstr ""
@@ -5322,14 +5322,6 @@
msgid "Paste"
msgstr ""
-#: src/ui/gui/psppire.c:198
-msgid "_Reset"
-msgstr ""
-
-#: src/ui/gui/psppire.c:199
-msgid "_Select"
-msgstr ""
-
#: src/ui/gui/psppire-data-store.c:816
msgid "var"
msgstr ""
@@ -5339,6 +5331,32 @@
msgid "%ld"
msgstr ""
+#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
+msgid "None"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:489
+msgid "Scientific"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:492
+msgid "Custom"
+msgstr ""
+
+#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
+#: src/ui/gui/psppire-var-store.c:583
+#, c-format
+msgid "%d"
+msgstr ""
+
+#: src/ui/gui/psppire.c:198
+msgid "_Reset"
+msgstr ""
+
+#: src/ui/gui/psppire.c:199
+msgid "_Select"
+msgstr ""
+
#: src/ui/gui/psppire.glade:11
msgid "This is pre-alpha software. Use at your own risk."
msgstr ""
@@ -5563,24 +5581,6 @@
msgid "Search backward"
msgstr ""
-#: src/ui/gui/psppire-var-store.c:479 src/ui/gui/var-display.c:14
-msgid "None"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:489
-msgid "Scientific"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:492
-msgid "Custom"
-msgstr ""
-
-#: src/ui/gui/psppire-var-store.c:563 src/ui/gui/psppire-var-store.c:573
-#: src/ui/gui/psppire-var-store.c:583
-#, c-format
-msgid "%d"
-msgstr ""
-
#: src/ui/gui/rank.glade:111
msgid "By:"
msgstr ""
@@ -5837,6 +5837,11 @@
msgid "To End"
msgstr ""
+#: src/ui/gui/t-test-options.c:60
+#, c-format
+msgid "Confidence Interval: %2d %%"
+msgstr ""
+
#: src/ui/gui/t-test.glade:53 src/ui/gui/t-test.glade:161
msgid "Define Groups"
msgstr ""
@@ -5877,9 +5882,24 @@
msgid "Test Value: "
msgstr ""
-#: src/ui/gui/t-test-options.c:60
-#, c-format
-msgid "Confidence Interval: %2d %%"
+#: src/ui/gui/var-sheet.c:65
+msgid "Name"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:68
+msgid "Decimals"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:70
+msgid "Values"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:73
+msgid "Align"
+msgstr ""
+
+#: src/ui/gui/var-sheet.c:74
+msgid "Measure"
msgstr ""
#: src/ui/gui/variable-info-dialog.c:88
@@ -5911,26 +5931,6 @@
msgid "%s %s\n"
msgstr ""
-#: src/ui/gui/var-sheet.c:65
-msgid "Name"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:68
-msgid "Decimals"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:70
-msgid "Values"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:73
-msgid "Align"
-msgstr ""
-
-#: src/ui/gui/var-sheet.c:74
-msgid "Measure"
-msgstr ""
-
#: src/ui/gui/weight-cases-dialog.c:88
#, c-format
msgid "Weight cases by %s"
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.102
retrieving revision 1.103
diff -u -b -r1.102 -r1.103
--- src/ui/gui/ChangeLog 22 Jan 2008 06:49:08 -0000 1.102
+++ src/ui/gui/ChangeLog 29 Jan 2008 11:12:59 -0000 1.103
@@ -1,3 +1,16 @@
+2008-01-29 John Darrington <address@hidden>
+
+ * psppire-var-ptr.c psppire-var-ptr.h: New files
+
+ * t-test-paired-samples.c t-test-paired-samples.h: New files
+
+ * dialog-common.c dialog-common.h (append_variable_names): Add extra
+ argument to specify the column number containing the variables.
+
+ * psppire-selector.c psppire-selector.h: Add auxilliary data variable
+ to SelectItemsFunc. (is_item_in_dest) transform model value to
G_TYPE_INT
+ before using. Hence the model need not be of integer type.
+
2008-01-22 John Darrington <address@hidden>
* psppire-dict.c (psppire_dict_rename_var): Fixed bug where
Index: src/ui/gui/automake.mk
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/automake.mk,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- src/ui/gui/automake.mk 10 Dec 2007 10:21:05 -0000 1.43
+++ src/ui/gui/automake.mk 29 Jan 2008 11:12:59 -0000 1.44
@@ -137,6 +137,8 @@
src/ui/gui/psppire-keypad.h \
src/ui/gui/psppire-selector.c \
src/ui/gui/psppire-selector.h \
+ src/ui/gui/psppire-var-ptr.c \
+ src/ui/gui/psppire-var-ptr.h \
src/ui/gui/psppire-var-store.c \
src/ui/gui/psppire-var-store.h \
src/ui/gui/rank-dialog.c \
@@ -161,6 +163,8 @@
src/ui/gui/t-test-one-sample.h \
src/ui/gui/t-test-options.c \
src/ui/gui/t-test-options.h \
+ src/ui/gui/t-test-paired-samples.c \
+ src/ui/gui/t-test-paired-samples.h \
src/ui/gui/val-labs-dialog.c \
src/ui/gui/val-labs-dialog.h \
src/ui/gui/var-display.c \
Index: src/ui/gui/compute-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/compute-dialog.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/ui/gui/compute-dialog.c 23 Nov 2007 05:39:53 -0000 1.12
+++ src/ui/gui/compute-dialog.c 29 Jan 2008 11:12:59 -0000 1.13
@@ -34,12 +34,14 @@
static void insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
);
static void insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
);
@@ -401,6 +403,7 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (var_selector),
dict_view, syntax_area,
insert_source_row_into_text_view,
+ NULL,
NULL);
@@ -409,6 +412,7 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (func_selector),
functions, syntax_area,
insert_function_into_syntax_area,
+ NULL,
NULL);
@@ -527,7 +531,8 @@
static void
insert_function_into_syntax_area (GtkTreeIter iter,
GtkWidget *text_view,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GString *string;
@@ -590,7 +595,8 @@
static void
insert_source_row_into_text_view (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GtkTreePath *path;
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -b -r1.57 -r1.58
--- src/ui/gui/data-editor.c 10 Dec 2007 10:21:05 -0000 1.57
+++ src/ui/gui/data-editor.c 29 Jan 2008 11:12:59 -0000 1.58
@@ -50,6 +50,7 @@
#include "oneway-anova-dialog.h"
#include "t-test-independent-samples-dialog.h"
#include "t-test-one-sample.h"
+#include "t-test-paired-samples.h"
#define _(msgid) gettext (msgid)
#define N_(msgid) msgid
@@ -613,6 +614,16 @@
G_CALLBACK (t_test_independent_samples_dialog), de);
+ de->invoke_t_test_paired_samples_dialog =
+ gtk_action_new ("t-test-paired-samples",
+ _("_Paired Samples T Test"),
+ _("Calculate T Test for paired samples"),
+ NULL);
+
+ g_signal_connect (de->invoke_t_test_paired_samples_dialog, "activate",
+ G_CALLBACK (t_test_paired_samples_dialog), de);
+
+
de->invoke_t_test_one_sample_dialog =
gtk_action_new ("t-test-one-sample",
_("One _Sample T Test"),
@@ -829,6 +840,12 @@
);
+ gtk_action_connect_proxy (de->invoke_t_test_paired_samples_dialog,
+ get_widget_assert (de->xml,
+ "paired-t-test")
+ );
+
+
gtk_action_connect_proxy (de->invoke_t_test_one_sample_dialog,
get_widget_assert (de->xml,
"one-sample-t-test")
Index: src/ui/gui/data-editor.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- src/ui/gui/data-editor.h 10 Dec 2007 10:21:05 -0000 1.27
+++ src/ui/gui/data-editor.h 29 Jan 2008 11:12:59 -0000 1.28
@@ -50,6 +50,7 @@
GtkAction *invoke_frequencies_dialog;
GtkAction *invoke_t_test_independent_samples_dialog;
+ GtkAction *invoke_t_test_paired_samples_dialog;
GtkAction *invoke_oneway_anova_dialog;
GtkAction *invoke_t_test_one_sample_dialog;
Index: src/ui/gui/descriptives-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/descriptives-dialog.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/descriptives-dialog.c 1 Dec 2007 04:42:20 -0000 1.3
+++ src/ui/gui/descriptives-dialog.c 29 Jan 2008 11:12:59 -0000 1.4
@@ -118,7 +118,7 @@
string = g_string_new ("DESCRIPTIVES");
g_string_append (string, "\n /VARIABLES=");
- append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars));
+ append_variable_names (string, scd->dict, GTK_TREE_VIEW (scd->stat_vars), 0);
listwise = gtk_toggle_button_get_active (scd->exclude_missing_listwise);
include = gtk_toggle_button_get_active (scd->include_user_missing);
@@ -235,6 +235,7 @@
source,
dest,
insert_source_row_into_tree_view,
+ NULL,
NULL);
put_checkbox_items_in_treeview (GTK_TREE_VIEW (stats_treeview),
Index: src/ui/gui/dialog-common.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dialog-common.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- src/ui/gui/dialog-common.c 13 Dec 2007 23:20:28 -0000 1.6
+++ src/ui/gui/dialog-common.c 29 Jan 2008 11:12:59 -0000 1.7
@@ -15,18 +15,22 @@
along with this program. If not, see <http://www.gnu.org/licenses/>. */
#include <config.h>
+
#include "dialog-common.h"
+#include "psppire-var-ptr.h"
+
#include "helper.h"
/* Append the names of selected variables to STRING.
TREEVIEW is the treeview containing the variables.
+ COLUMN is the column in the treeview containing the variables.
DICT is the dictionary for those variables.
*/
gint
append_variable_names (GString *string,
- PsppireDict *dict, GtkTreeView *treeview)
+ PsppireDict *dict, GtkTreeView *treeview, gint column)
{
gint n_vars = 0;
GtkTreeIter iter;
@@ -39,12 +43,23 @@
do
{
GValue value = {0};
- struct variable *var;
+ struct variable *var = NULL;
GtkTreePath *path = gtk_tree_model_get_path (list_store, &iter);
- gtk_tree_model_get_value (list_store, &iter, 0, &value);
+ gtk_tree_model_get_value (list_store, &iter, column, &value);
+ /* FIXME: G_TYPE_INT should be deprecated.
+ As well as being simpler, it'd be unecessary to pass dict */
+ if ( G_VALUE_TYPE (&value) == G_TYPE_INT )
var = psppire_dict_get_variable (dict, g_value_get_int (&value));
+
+ else if ( G_VALUE_TYPE (&value) == PSPPIRE_VAR_PTR_TYPE)
+ var = g_value_get_boxed (&value);
+
+ else
+ g_critical ("Unsupported type \"%s\", in variable name treeview.",
+ G_VALUE_TYPE_NAME (&value));
+
g_value_unset (&value);
g_string_append (string, " ");
Index: src/ui/gui/dialog-common.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dialog-common.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/dialog-common.h 13 Dec 2007 07:58:20 -0000 1.4
+++ src/ui/gui/dialog-common.h 29 Jan 2008 11:12:59 -0000 1.5
@@ -25,9 +25,11 @@
/* Append the names of selected variables to STRING.
TREEVIEW is the treeview containing the variables.
+ COLUMN is column in treeview containing the variables.
DICT is the dictionary for those variables.
*/
-gint append_variable_names (GString *, PsppireDict *, GtkTreeView *);
+gint append_variable_names (GString *string, PsppireDict *dict,
+ GtkTreeView *treeview, gint column);
/* Returns the variable currently selected by the iterator
Index: src/ui/gui/dict-display.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/dict-display.c 7 Jul 2007 06:14:27 -0000 1.4
+++ src/ui/gui/dict-display.c 29 Jan 2008 11:12:59 -0000 1.5
@@ -225,7 +225,8 @@
void
insert_source_row_into_entry (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GtkTreePath *path;
@@ -257,7 +258,8 @@
void
insert_source_row_into_tree_view (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *model
+ GtkTreeModel *model,
+ gpointer data
)
{
GtkTreePath *path;
Index: src/ui/gui/dict-display.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/dict-display.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/dict-display.h 7 Jul 2007 06:14:27 -0000 1.3
+++ src/ui/gui/dict-display.h 29 Jan 2008 11:13:00 -0000 1.4
@@ -39,14 +39,16 @@
/* A SelectItemsFunc function for GtkTreeView widgets */
void insert_source_row_into_tree_view (GtkTreeIter source_iter,
GtkWidget *dest,
- GtkTreeModel *source_model
+ GtkTreeModel *source_model,
+ gpointer data
);
/* A SelectItemsFunc function for GtkEntry widgets */
void insert_source_row_into_entry (GtkTreeIter source_iter,
GtkWidget *dest,
- GtkTreeModel *source_model
+ GtkTreeModel *source_model,
+ gpointer data
);
Index: src/ui/gui/find-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/find-dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/find-dialog.c 24 Dec 2007 01:33:43 -0000 1.5
+++ src/ui/gui/find-dialog.c 29 Jan 2008 11:13:00 -0000 1.6
@@ -251,7 +251,8 @@
source,
fd.variable_entry,
insert_source_row_into_entry,
- is_currently_in_entry
+ is_currently_in_entry,
+ NULL
);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &fd);
Index: src/ui/gui/frequencies-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/frequencies-dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/gui/frequencies-dialog.c 7 Dec 2007 04:11:25 -0000 1.2
+++ src/ui/gui/frequencies-dialog.c 29 Jan 2008 11:13:00 -0000 1.3
@@ -148,7 +148,7 @@
GString *string = g_string_new ("FREQUENCIES");
g_string_append (string, "\n\t/VARIABLES=");
- append_variable_names (string, fd->dict, GTK_TREE_VIEW (fd->stat_vars));
+ append_variable_names (string, fd->dict, GTK_TREE_VIEW (fd->stat_vars), 0);
g_string_append (string, "\n\t/FORMAT=");
@@ -348,6 +348,7 @@
source,
dest,
insert_source_row_into_tree_view,
+ NULL,
NULL);
Index: src/ui/gui/oneway-anova-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/oneway-anova-dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/gui/oneway-anova-dialog.c 23 Nov 2007 10:34:54 -0000 1.2
+++ src/ui/gui/oneway-anova-dialog.c 29 Jan 2008 11:13:00 -0000 1.3
@@ -184,13 +184,15 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
dict_view, ow.vars_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
dict_view, ow.factor_entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
@@ -271,7 +273,7 @@
GString *str = g_string_new ("ONEWAY /VARIABLES=");
- append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview));
+ append_variable_names (str, ow->dict, GTK_TREE_VIEW (ow->vars_treeview), 0);
g_string_append (str, " BY ");
Index: src/ui/gui/psppire-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-dialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/psppire-dialog.c 23 Nov 2007 10:34:54 -0000 1.10
+++ src/ui/gui/psppire-dialog.c 29 Jan 2008 11:13:00 -0000 1.11
@@ -373,6 +373,8 @@
GtkTreeViewColumn *col;
GtkTreeModel *model = gtk_tree_view_get_model (tv);
+ if ( model)
+ {
g_signal_connect_swapped (model, "row-changed",
G_CALLBACK (psppire_dialog_notify_change),
dialog);
@@ -384,6 +386,7 @@
g_signal_connect_swapped (model, "row-inserted",
G_CALLBACK (psppire_dialog_notify_change),
dialog);
+ }
g_signal_connect_swapped (selection, "changed",
G_CALLBACK (psppire_dialog_notify_change),
Index: src/ui/gui/psppire-selector.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-selector.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- src/ui/gui/psppire-selector.c 8 Dec 2007 06:10:03 -0000 1.11
+++ src/ui/gui/psppire-selector.c 29 Jan 2008 11:13:00 -0000 1.12
@@ -465,7 +465,9 @@
selector->select_items (child_iter,
selector->dest,
- childmodel);
+ childmodel,
+ selector->select_user_data
+ );
}
g_list_foreach (selected_rows, (GFunc) gtk_tree_path_free, NULL);
@@ -549,10 +551,21 @@
do
{
+ int x;
GValue value = {0};
+ GValue int_value = {0};
gtk_tree_model_get_value (dest_model, &dest_iter, 0, &value);
- if ( g_value_get_int (&value) == index)
+ g_value_init (&int_value, G_TYPE_INT);
+
+ g_value_transform (&value, &int_value);
+
+ x = g_value_get_int (&int_value);
+
+ g_value_unset (&int_value);
+ g_value_unset (&value);
+
+ if ( x == index )
return TRUE;
}
while (gtk_tree_model_iter_next (dest_model, &dest_iter));
@@ -772,7 +785,8 @@
GtkWidget *source,
GtkWidget *dest,
SelectItemsFunc *select_func,
- FilterItemsFunc *filter_func )
+ FilterItemsFunc *filter_func,
+ gpointer user_data)
{
g_assert(selector);
@@ -780,6 +794,7 @@
selector->source = source;
selector->dest = dest;
+ selector->select_user_data = user_data;
if ( filter_func == NULL)
{
@@ -794,7 +809,9 @@
g_assert ( GTK_IS_TREE_MODEL_FILTER (selector->filtered_source));
- if ( GTK_IS_TREE_VIEW (dest))
+ if ( NULL == dest)
+ ;
+ else if ( GTK_IS_TREE_VIEW (dest))
set_tree_view_dest (selector, GTK_TREE_VIEW (dest));
else if ( GTK_IS_ENTRY (dest))
Index: src/ui/gui/psppire-selector.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/psppire-selector.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/psppire-selector.h 23 Nov 2007 10:34:54 -0000 1.5
+++ src/ui/gui/psppire-selector.h 29 Jan 2008 11:13:00 -0000 1.6
@@ -46,7 +46,8 @@
/* Function for appending selected items to the destination widget */
typedef void SelectItemsFunc (GtkTreeIter iter,
GtkWidget *dest,
- GtkTreeModel *source_model);
+ GtkTreeModel *source_model,
+ gpointer data);
/* Function to determine if items may be selected */
typedef gboolean AllowSelectionFunc (GtkWidget *src, GtkWidget *dest);
@@ -91,6 +92,8 @@
GtkTreeModelFilter *filtered_source;
SelectItemsFunc *select_items;
+ gpointer select_user_data;
+
FilterItemsFunc *filter;
AllowSelectionFunc *allow_selection;
@@ -111,7 +114,8 @@
GtkWidget *,
GtkWidget *,
SelectItemsFunc *,
- FilterItemsFunc * );
+ FilterItemsFunc *,
+ gpointer );
void psppire_selector_set_allow (PsppireSelector *,
AllowSelectionFunc *);
Index: src/ui/gui/rank-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/rank-dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/gui/rank-dialog.c 13 Oct 2007 07:22:56 -0000 1.1
+++ src/ui/gui/rank-dialog.c 29 Jan 2008 11:13:00 -0000 1.2
@@ -111,7 +111,7 @@
GString *str = g_string_new ("RANK VARIABLES=");
- append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars));
+ append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->rank_vars), 0);
g_string_append_printf (str, " (%c)",
gtk_toggle_button_get_active (rd->ascending_togglebutton)
@@ -121,7 +121,7 @@
{
g_string_append (str, "\n\tBY ");
- append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars));
+ append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->group_vars), 0);
}
g_string_append (str, "\n\t/PRINT = ");
@@ -320,6 +320,7 @@
vars,
rd.rank_vars,
insert_source_row_into_tree_view,
+ NULL,
NULL);
set_dest_model (GTK_TREE_VIEW (rd.group_vars), vs->dict);
@@ -328,6 +329,7 @@
vars,
rd.group_vars,
insert_source_row_into_tree_view,
+ NULL,
NULL);
Index: src/ui/gui/recode-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/recode-dialog.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/gui/recode-dialog.c 23 Nov 2007 10:34:54 -0000 1.1
+++ src/ui/gui/recode-dialog.c 29 Jan 2008 11:13:00 -0000 1.2
@@ -959,6 +959,7 @@
rd.dict_treeview,
rd.variable_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
psppire_selector_set_allow (PSPPIRE_SELECTOR (selector), homogeneous_types);
@@ -1443,7 +1444,7 @@
g_string_append (str, "\nRECODE ");
- append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->variable_treeview));
+ append_variable_names (str, rd->dict, GTK_TREE_VIEW (rd->variable_treeview),
0);
g_string_append (str, "\n\t");
Index: src/ui/gui/select-cases-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/select-cases-dialog.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/gui/select-cases-dialog.c 1 Aug 2007 23:30:37 -0000 1.2
+++ src/ui/gui/select-cases-dialog.c 29 Jan 2008 11:13:00 -0000 1.3
@@ -342,7 +342,8 @@
source,
entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
}
Index: src/ui/gui/sort-cases-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/sort-cases-dialog.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/sort-cases-dialog.c 7 Jul 2007 06:14:29 -0000 1.10
+++ src/ui/gui/sort-cases-dialog.c 29 Jan 2008 11:13:00 -0000 1.11
@@ -51,7 +51,7 @@
gchar *text;
GString *string = g_string_new ("SORT CASES BY ");
gint n_vars = append_variable_names (string,
- scd->dict, GTK_TREE_VIEW (scd->tv));
+ scd->dict, GTK_TREE_VIEW (scd->tv), 0);
if ( n_vars == 0 )
g_string_assign (string, "");
@@ -107,6 +107,7 @@
source,
dest,
insert_source_row_into_tree_view,
+ NULL,
NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), dest);
Index: src/ui/gui/split-file-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/split-file-dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/split-file-dialog.c 11 Oct 2007 12:31:39 -0000 1.5
+++ src/ui/gui/split-file-dialog.c 29 Jan 2008 11:13:00 -0000 1.6
@@ -71,7 +71,7 @@
GtkWidget *sort = get_widget_assert (sfd->xml, "split-radiobutton3");
GtkWidget *layered = get_widget_assert (sfd->xml, "split-radiobutton1");
gint n_vars = append_variable_names (varlist,
- sfd->dict, GTK_TREE_VIEW (vars));
+ sfd->dict, GTK_TREE_VIEW (vars), 0);
if ( n_vars > 0 )
{
@@ -211,6 +211,7 @@
source,
dest,
insert_source_row_into_tree_view,
+ NULL,
NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), &sfd);
Index: src/ui/gui/t-test-independent-samples-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test-independent-samples-dialog.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/ui/gui/t-test-independent-samples-dialog.c 13 Dec 2007 10:35:52
-0000 1.8
+++ src/ui/gui/t-test-independent-samples-dialog.c 29 Jan 2008 11:13:00
-0000 1.9
@@ -162,7 +162,7 @@
GString *str = g_string_new ("T-TEST /VARIABLES=");
- append_variable_names (str, d->dict, GTK_TREE_VIEW (tv));
+ append_variable_names (str, d->dict, GTK_TREE_VIEW (tv), 0);
g_string_append (str, "\n\t/GROUPS=");
@@ -443,6 +443,7 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
dict_view, test_variables_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
psppire_selector_set_allow (PSPPIRE_SELECTOR (selector1),
@@ -452,7 +453,8 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
dict_view, tt_d.groups_entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
g_signal_connect_swapped (tt_d.define_groups_button, "clicked",
G_CALLBACK (run_define_groups), &tt_d);
Index: src/ui/gui/t-test-one-sample.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test-one-sample.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/ui/gui/t-test-one-sample.c 10 Dec 2007 10:21:05 -0000 1.1
+++ src/ui/gui/t-test-one-sample.c 29 Jan 2008 11:13:01 -0000 1.2
@@ -60,7 +60,7 @@
g_string_append (str, "\n\t/VARIABLES=");
- append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview));
+ append_variable_names (str, d->dict, GTK_TREE_VIEW (d->vars_treeview), 0);
tt_options_dialog_append_syntax (d->opt, str);
@@ -164,6 +164,7 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector),
dict_view, tt_d.vars_treeview,
insert_source_row_into_tree_view,
+ NULL,
NULL);
Index: src/ui/gui/t-test.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/t-test.glade,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/t-test.glade 13 Dec 2007 07:58:20 -0000 1.3
+++ src/ui/gui/t-test.glade 29 Jan 2008 11:13:01 -0000 1.4
@@ -43,12 +43,15 @@
<property name="n_rows">3</property>
<property name="n_columns">2</property>
<child>
- <widget class="GtkVBox" id="vbox30">
+ <widget class="GtkHButtonBox" id="hbuttonbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property
name="layout_style">GTK_BUTTONBOX_SPREAD</property>
<child>
- <widget class="GtkLabel" id="label36">
+ <widget class="GtkButton" id="define-groups-button">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Define
Groups</property>
</widget>
@@ -58,21 +61,53 @@
</packing>
</child>
<child>
- <widget class="GtkEntry" id="indep-samples-t-test-entry">
+ <widget class="GtkButton" id="options-button">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label"
translatable="yes">Options...</property>
</widget>
<packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
- <property name="left_attach">1</property>
<property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options">GTK_FILL</property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="PsppireSelector"
id="indep-samples-t-test-selector1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ </widget>
+ <packing>
+ <property name="x_options"></property>
+ <property name="y_options">GTK_EXPAND</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="PsppireSelector"
id="indep-samples-t-test-selector2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="border_width">5</property>
+ </widget>
+ <packing>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
@@ -120,43 +155,12 @@
</packing>
</child>
<child>
- <widget class="PsppireSelector"
id="indep-samples-t-test-selector2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">5</property>
- </widget>
- <packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
- <child>
- <widget class="PsppireSelector"
id="indep-samples-t-test-selector1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="border_width">5</property>
- </widget>
- <packing>
- <property name="x_options"></property>
- <property name="y_options">GTK_EXPAND</property>
- </packing>
- </child>
- <child>
- <widget class="GtkHButtonBox" id="hbuttonbox1">
+ <widget class="GtkVBox" id="vbox30">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property
name="layout_style">GTK_BUTTONBOX_SPREAD</property>
<child>
- <widget class="GtkButton" id="define-groups-button">
+ <widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Define
Groups</property>
</widget>
@@ -166,26 +170,22 @@
</packing>
</child>
<child>
- <widget class="GtkButton" id="options-button">
+ <widget class="GtkEntry" id="indep-samples-t-test-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="label"
translatable="yes">Options...</property>
</widget>
<packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
<property name="position">1</property>
</packing>
</child>
</widget>
<packing>
+ <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
- <property name="y_padding">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -232,77 +232,63 @@
<placeholder/>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton4">
+ <widget class="GtkRadioButton" id="radiobutton3">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
- <property name="group">radiobutton3</property>
</widget>
<packing>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
<property name="x_options"></property>
- <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label4">
+ <widget class="GtkTable" id="table2">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Use specified
values:</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">5</property>
+ <property name="row_spacing">5</property>
+ <child>
+ <widget class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Group_2
value:</property>
<property name="use_underline">True</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"></property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options"></property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox1">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <child>
- <widget class="GtkLabel" id="label5">
+ <widget class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">_Cut
point:</property>
+ <property name="label" translatable="yes">Group_1
value:</property>
<property name="use_underline">True</property>
</widget>
+ <packing>
+ <property name="x_options"></property>
+ </packing>
</child>
<child>
- <widget class="GtkEntry" id="cut-point-entry">
+ <widget class="GtkEntry" id="group2-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
</widget>
<packing>
- <property name="position">1</property>
- </packing>
- </child>
- </widget>
- <packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options"></property>
- <property name="y_padding">5</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
</packing>
</child>
<child>
- <widget class="GtkTable" id="table2">
- <property name="visible">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">5</property>
- <property name="row_spacing">5</property>
- <child>
<widget class="GtkEntry" id="group1-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -313,62 +299,76 @@
<property name="right_attach">2</property>
</packing>
</child>
- <child>
- <widget class="GtkEntry" id="group2-entry">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
+ <property name="y_options">GTK_EXPAND</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label1">
+ <widget class="GtkHBox" id="hbox1">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Group_1
value:</property>
+ <child>
+ <widget class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Cut
point:</property>
<property name="use_underline">True</property>
</widget>
- <packing>
- <property name="x_options"></property>
- </packing>
</child>
<child>
- <widget class="GtkLabel" id="label2">
+ <widget class="GtkEntry" id="cut-point-entry">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Group_2
value:</property>
- <property name="use_underline">True</property>
</widget>
<packing>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_EXPAND</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="y_options"></property>
+ <property name="y_padding">5</property>
</packing>
</child>
<child>
- <widget class="GtkRadioButton" id="radiobutton3">
+ <widget class="GtkLabel" id="label4">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Use specified
values:</property>
+ <property name="use_underline">True</property>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkRadioButton" id="radiobutton4">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
+ <property name="group">radiobutton3</property>
</widget>
<packing>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
<property name="x_options"></property>
+ <property name="y_options"></property>
</packing>
</child>
</widget>
@@ -502,42 +502,82 @@
<property name="n_rows">2</property>
<property name="n_columns">4</property>
<child>
- <widget class="GtkAlignment" id="alignment3">
+ <widget class="PsppireVButtonBox" id="psppire-vbuttonbox5">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="yalign">0.059999998658895493</property>
- <property name="yscale">0</property>
+ <property name="border_width">5</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ </packing>
+ </child>
<child>
- <widget class="PsppireSelector" id="psppire-selector1">
+ <widget class="GtkFrame" id="frame2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="shadow_type">GTK_SHADOW_NONE</property>
+ <child>
+ <widget class="GtkAlignment" id="alignment2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="left_padding">12</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow3">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="no_show_all">True</property>
- <property name="border_width">5</property>
+ <property
name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkTreeView"
id="one-sample-t-test-treeview1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
</widget>
</child>
</widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkLabel" id="label6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Test
Variable(s):</property>
+ <property name="use_markup">True</property>
+ </widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="bottom_attach">2</property>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="right_attach">3</property>
</packing>
</child>
<child>
- <widget class="GtkButton" id="button1">
+ <widget class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="receives_default">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="label" translatable="yes">Options...</property>
+ <property name="hscrollbar_policy">GTK_POLICY_NEVER</property>
+ <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
+ <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
+ <child>
+ <widget class="GtkTreeView" id="one-sample-t-test-treeview2">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="headers_visible">False</property>
+ </widget>
+ </child>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
- <property name="top_attach">1</property>
<property name="bottom_attach">2</property>
- <property name="y_options"></property>
<property name="x_padding">5</property>
<property name="y_padding">5</property>
</packing>
@@ -581,7 +621,64 @@
</packing>
</child>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow4">
+ <widget class="GtkButton" id="button1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label" translatable="yes">Options...</property>
+ </widget>
+ <packing>
+ <property name="left_attach">3</property>
+ <property name="right_attach">4</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ <property name="x_padding">5</property>
+ <property name="y_padding">5</property>
+ </packing>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="yalign">0.059999998658895493</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="PsppireSelector" id="psppire-selector1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="no_show_all">True</property>
+ <property name="border_width">5</property>
+ </widget>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="bottom_attach">2</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+ </widget>
+ <widget class="PsppireDialog" id="t-test-paired-samples-dialog">
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="title">Paired Samples T Test</property>
+ <property name="modal">True</property>
+ <child internal-child="hbox">
+ <widget class="GtkHBox" id="dialog-hbox6">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">2</property>
+ <child>
+ <widget class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkScrolledWindow" id="scrolledwindow2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
@@ -589,32 +686,56 @@
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkTreeView" id="one-sample-t-test-treeview2">
+ <widget class="GtkTreeView"
id="paired-samples-t-test-treeview1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="headers_visible">False</property>
+ <property name="headers_clickable">True</property>
+ </widget>
+ </child>
+ </widget>
+ </child>
+ <child>
+ <widget class="GtkAlignment" id="alignment5">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="yalign">0.059999998658895493</property>
+ <property name="yscale">0</property>
+ <child>
+ <widget class="PsppireSelector" id="psppire-selector3">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="no_show_all">True</property>
+ <property name="border_width">5</property>
</widget>
</child>
</widget>
<packing>
- <property name="bottom_attach">2</property>
- <property name="x_padding">5</property>
- <property name="y_padding">5</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
</packing>
</child>
<child>
- <widget class="GtkFrame" id="frame2">
+ <widget class="GtkVBox" id="vbox3">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="spacing">5</property>
+ <child>
+ <widget class="GtkFrame" id="frame4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="shadow_type">GTK_SHADOW_NONE</property>
<child>
- <widget class="GtkAlignment" id="alignment2">
+ <widget class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="left_padding">12</property>
<child>
- <widget class="GtkScrolledWindow" id="scrolledwindow3">
+ <widget class="GtkScrolledWindow"
id="scrolledwindow1">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
@@ -622,11 +743,11 @@
<property
name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
<property
name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
<child>
- <widget class="GtkTreeView"
id="one-sample-t-test-treeview1">
+ <widget class="GtkTreeView"
id="paired-samples-t-test-treeview2">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
- <property name="headers_visible">False</property>
+ <property name="enable_search">False</property>
</widget>
</child>
</widget>
@@ -634,7 +755,7 @@
</widget>
</child>
<child>
- <widget class="GtkLabel" id="label6">
+ <widget class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="label" translatable="yes">Test
Variable(s):</property>
@@ -645,20 +766,45 @@
</packing>
</child>
</widget>
+ </child>
+ <child>
+ <widget class="GtkVButtonBox" id="vbuttonbox2">
+ <property name="visible">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <widget class="GtkButton" id="options-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">True</property>
+ <property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label"
translatable="yes">Options...</property>
+ </widget>
+ </child>
+ </widget>
<packing>
- <property name="left_attach">2</property>
- <property name="right_attach">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="position">2</property>
</packing>
</child>
+ </widget>
+ </child>
<child>
- <widget class="PsppireVButtonBox" id="psppire-vbuttonbox5">
+ <widget class="PsppireVButtonBox" id="psppire-vbuttonbox4">
<property name="visible">True</property>
<property name="events">GDK_POINTER_MOTION_MASK |
GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK</property>
<property name="border_width">5</property>
</widget>
<packing>
- <property name="left_attach">3</property>
- <property name="right_attach">4</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ <property name="position">1</property>
</packing>
</child>
</widget>
Index: src/ui/gui/transpose-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/transpose-dialog.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- src/ui/gui/transpose-dialog.c 11 Oct 2007 12:31:39 -0000 1.7
+++ src/ui/gui/transpose-dialog.c 29 Jan 2008 11:13:01 -0000 1.8
@@ -84,13 +84,15 @@
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector1),
source, dest,
insert_source_row_into_tree_view,
+ NULL,
NULL);
psppire_selector_set_subjects (PSPPIRE_SELECTOR (selector2),
source, new_name_entry,
insert_source_row_into_entry,
- is_currently_in_entry);
+ is_currently_in_entry,
+ NULL);
g_signal_connect (dialog, "refresh", G_CALLBACK (refresh), xml);
@@ -145,7 +147,7 @@
g_string_append (string, " /VARIABLES = ");
- append_variable_names (string, dict, GTK_TREE_VIEW (dest));
+ append_variable_names (string, dict, GTK_TREE_VIEW (dest), 0);
text = gtk_entry_get_text (GTK_ENTRY (entry));
Index: src/ui/gui/weight-cases-dialog.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/weight-cases-dialog.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/weight-cases-dialog.c 7 Jul 2007 06:14:30 -0000 1.5
+++ src/ui/gui/weight-cases-dialog.c 29 Jan 2008 11:13:01 -0000 1.6
@@ -144,7 +144,8 @@
source,
entry,
insert_source_row_into_entry,
- is_currently_in_entry
+ is_currently_in_entry,
+ NULL
);