[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pspp-cvs] pspp po/de.po po/pspp.pot src/language/ChangeLo...
|
From: |
John Darrington |
|
Subject: |
[Pspp-cvs] pspp po/de.po po/pspp.pot src/language/ChangeLo... |
|
Date: |
Wed, 24 Jan 2007 08:30:23 +0000 |
CVSROOT: /sources/pspp
Module name: pspp
Changes by: John Darrington <jmd> 07/01/24 08:30:22
Modified files:
po : de.po pspp.pot
src/language : ChangeLog command.c command.h
syntax-string-source.c syntax-string-source.h
src/language/data-io: inpt-pgm.c
src/ui/gui : ChangeLog data-editor.c data-editor.glade
data-editor.h helper.c helper.h syntax-editor.c
syntax-editor.glade window-manager.c
window-manager.h
src/ui/terminal: main.c
Log message:
Enables Data Open/Save/New menuitems.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/pspp/po/de.po?cvsroot=pspp&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/pspp/po/pspp.pot?cvsroot=pspp&r1=1.118&r2=1.119
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/ChangeLog?cvsroot=pspp&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/command.c?cvsroot=pspp&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/command.h?cvsroot=pspp&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/syntax-string-source.c?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/syntax-string-source.h?cvsroot=pspp&r1=1.1&r2=1.2
http://cvs.savannah.gnu.org/viewcvs/pspp/src/language/data-io/inpt-pgm.c?cvsroot=pspp&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/ChangeLog?cvsroot=pspp&r1=1.37&r2=1.38
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.c?cvsroot=pspp&r1=1.12&r2=1.13
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.glade?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/data-editor.h?cvsroot=pspp&r1=1.3&r2=1.4
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/helper.h?cvsroot=pspp&r1=1.10&r2=1.11
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.c?cvsroot=pspp&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/syntax-editor.glade?cvsroot=pspp&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/window-manager.c?cvsroot=pspp&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/gui/window-manager.h?cvsroot=pspp&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/pspp/src/ui/terminal/main.c?cvsroot=pspp&r1=1.29&r2=1.30
Patches:
Index: po/de.po
===================================================================
RCS file: /sources/pspp/pspp/po/de.po,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- po/de.po 20 Jan 2007 00:02:13 -0000 1.34
+++ po/de.po 24 Jan 2007 08:30:22 -0000 1.35
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: PSPP 0.4.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-01-20 08:53+0900\n"
+"POT-Creation-Date: 2007-01-23 21:08+0900\n"
"PO-Revision-Date: 2006-05-26 17:49+0800\n"
"Last-Translator: John Darrington <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -309,13 +309,13 @@
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1086
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1084
#: src/ui/gui/psppire-var-store.c:482
msgid "String"
msgstr "Zeichenkette"
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:982
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:980
#: src/ui/gui/psppire-var-store.c:475
msgid "Numeric"
msgstr "Nummer"
@@ -824,98 +824,98 @@
msgid "scratch"
msgstr ""
-#: src/language/command.c:182
+#: src/language/command.c:194
#, c-format
msgid "%s is unimplemented."
msgstr ""
-#: src/language/command.c:187
+#: src/language/command.c:199
#, c-format
msgid "%s may be used only in testing mode."
msgstr ""
-#: src/language/command.c:192
+#: src/language/command.c:204
#, c-format
msgid "%s may be used only in enhanced syntax mode."
msgstr ""
-#: src/language/command.c:446
+#: src/language/command.c:458
msgid "expecting command name"
msgstr ""
-#: src/language/command.c:460
+#: src/language/command.c:472
#, c-format
msgid "Unknown command %s."
msgstr ""
-#: src/language/command.c:587
+#: src/language/command.c:599
msgid "before the active file has been defined"
msgstr ""
-#: src/language/command.c:589
+#: src/language/command.c:601
msgid "after the active file has been defined"
msgstr ""
-#: src/language/command.c:591
+#: src/language/command.c:603
msgid "inside INPUT PROGRAM"
msgstr ""
-#: src/language/command.c:593
+#: src/language/command.c:605
msgid "inside FILE TYPE"
msgstr ""
-#: src/language/command.c:598
+#: src/language/command.c:610
#, c-format
msgid "%s or %s"
msgstr ""
-#: src/language/command.c:600
+#: src/language/command.c:612
#, c-format
msgid "%s, %s, or %s"
msgstr ""
-#: src/language/command.c:604
+#: src/language/command.c:616
#, c-format
msgid "%s is allowed only %s."
msgstr ""
-#: src/language/command.c:609
+#: src/language/command.c:621
#, c-format
msgid "%s is not allowed inside INPUT PROGRAM."
msgstr ""
-#: src/language/command.c:611
+#: src/language/command.c:623
#, c-format
msgid "%s is not allowed inside FILE TYPE."
msgstr ""
-#: src/language/command.c:689 src/language/command.c:818
+#: src/language/command.c:701 src/language/command.c:830
#: src/language/utilities/permissions.c:101
msgid "This command not allowed when the SAFER option is set."
msgstr ""
-#: src/language/command.c:701
+#: src/language/command.c:713
#, c-format
msgid "Error removing `%s': %s."
msgstr ""
-#: src/language/command.c:751
+#: src/language/command.c:763
#, c-format
msgid "Couldn't fork: %s."
msgstr ""
-#: src/language/command.c:793
+#: src/language/command.c:805
#, c-format
msgid "Error executing command: %s."
msgstr ""
-#: src/language/command.c:802 src/language/data-io/print-space.c:75
+#: src/language/command.c:814 src/language/data-io/print-space.c:75
#: src/language/dictionary/vector.c:202 src/language/lexer/lexer.c:465
#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
msgid "expecting end of command"
msgstr ""
-#: src/language/command.c:839
+#: src/language/command.c:851
msgid "No operating system support for this command."
msgstr ""
@@ -4102,375 +4102,409 @@
msgid "Style of bevel around the custom entry button"
msgstr ""
-#: src/ui/gui/data-editor.c:154
+#: src/ui/gui/data-editor.c:158
#, fuzzy
msgid "Weights"
msgstr "Rechts"
-#: src/ui/gui/data-editor.c:155
+#: src/ui/gui/data-editor.c:159
msgid "Weight cases by variable"
msgstr ""
-#: src/ui/gui/data-editor.c:423 src/ui/gui/data-editor.glade:428
-msgid "Open"
-msgstr "Ãffen"
-
-#: src/ui/gui/data-editor.c:431
-msgid "System Files (*.sav)"
-msgstr "Systemedatein (*.sav)"
-
-#: src/ui/gui/data-editor.c:437
-msgid "Portable Files (*.por) "
-msgstr "Tragbardatein (*.por)"
-
-#: src/ui/gui/data-editor.c:443 src/ui/gui/syntax-editor.c:141
-#: src/ui/gui/syntax-editor.c:531
-msgid "All Files"
-msgstr "Alle Datei"
-
-#: src/ui/gui/data-editor.c:519
+#: src/ui/gui/data-editor.c:479
msgid "Font Selection"
msgstr "Schriftwahlung"
-#: src/ui/gui/data-editor.c:697
+#: src/ui/gui/data-editor.c:657
msgid "No Split"
msgstr ""
-#: src/ui/gui/data-editor.c:705
+#: src/ui/gui/data-editor.c:665
#, fuzzy
msgid "Split by "
msgstr "Alle Datei"
-#: src/ui/gui/data-editor.c:730
+#: src/ui/gui/data-editor.c:690
msgid "Filter off"
msgstr ""
-#: src/ui/gui/data-editor.c:743
+#: src/ui/gui/data-editor.c:703
#, c-format
msgid "Filter by %s"
msgstr ""
-#: src/ui/gui/data-editor.c:761
+#: src/ui/gui/data-editor.c:721
msgid "Weights off"
msgstr ""
-#: src/ui/gui/data-editor.c:774
+#: src/ui/gui/data-editor.c:734
#, c-format
msgid "Weight by %s"
msgstr ""
+#: src/ui/gui/data-editor.c:841 src/ui/gui/data-editor.c:1039
+#: src/ui/gui/data-editor.glade:426
+msgid "Open"
+msgstr "Ãffen"
+
+#: src/ui/gui/data-editor.c:842
+msgid "Open a data file"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:850 src/ui/gui/data-editor.c:951
+#: src/ui/gui/data-editor.glade:437
+msgid "Save"
+msgstr "Speichen"
+
+#: src/ui/gui/data-editor.c:851 src/ui/gui/data-editor.c:861
+#, fuzzy
+msgid "Save data to file"
+msgstr "Speichern unter"
+
+#: src/ui/gui/data-editor.c:860
+#, fuzzy
+msgid "Save As"
+msgstr "Speichern unter"
+
+#: src/ui/gui/data-editor.c:869
+msgid "New"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:870
+msgid "New data file"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:959 src/ui/gui/data-editor.c:1047
+msgid "System Files (*.sav)"
+msgstr "Systemedatein (*.sav)"
+
+#: src/ui/gui/data-editor.c:965 src/ui/gui/data-editor.c:1053
+msgid "Portable Files (*.por) "
+msgstr "Tragbardatein (*.por)"
+
+#: src/ui/gui/data-editor.c:971 src/ui/gui/data-editor.c:1059
+#: src/ui/gui/syntax-editor.c:141 src/ui/gui/syntax-editor.c:525
+msgid "All Files"
+msgstr "Alle Datei"
+
+#: src/ui/gui/data-editor.c:979
+#, fuzzy
+msgid "System File"
+msgstr "Systemedatein (*.sav)"
+
+#: src/ui/gui/data-editor.c:984
+#, fuzzy
+msgid "Portable File"
+msgstr "Tragbardatein (*.por)"
+
#: src/ui/gui/data-editor.glade:18 src/ui/gui/syntax-editor.glade:39
msgid "_File"
msgstr "_Datei"
#: src/ui/gui/data-editor.glade:33 src/ui/gui/data-editor.glade:59
-#: src/ui/gui/syntax-editor.glade:57 src/ui/gui/syntax-editor.glade:86
+#: src/ui/gui/syntax-editor.glade:57 src/ui/gui/syntax-editor.glade:87
msgid "_Syntax"
msgstr ""
#: src/ui/gui/data-editor.glade:40 src/ui/gui/data-editor.glade:66
-#: src/ui/gui/data-editor.glade:253 src/ui/gui/syntax-editor.glade:65
-#: src/ui/gui/syntax-editor.glade:95
+#: src/ui/gui/data-editor.glade:251 src/ui/gui/syntax-editor.glade:66
+#: src/ui/gui/syntax-editor.glade:97
#, fuzzy
msgid "_Data"
msgstr "Daten"
-#: src/ui/gui/data-editor.glade:115 src/ui/gui/syntax-editor.glade:142
+#: src/ui/gui/data-editor.glade:113 src/ui/gui/syntax-editor.glade:144
msgid "_Edit"
msgstr "_Bearbeiten"
-#: src/ui/gui/data-editor.glade:150
+#: src/ui/gui/data-editor.glade:148
#, fuzzy
msgid "Paste _Variables"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:158
+#: src/ui/gui/data-editor.glade:156
msgid "Cl_ear"
msgstr ""
-#: src/ui/gui/data-editor.glade:171
+#: src/ui/gui/data-editor.glade:169
#, fuzzy
msgid "_Find"
msgstr "_Datei"
-#: src/ui/gui/data-editor.glade:182
+#: src/ui/gui/data-editor.glade:180
msgid "_View"
msgstr "_Ansicht"
-#: src/ui/gui/data-editor.glade:189
+#: src/ui/gui/data-editor.glade:187
msgid "Status Bar"
msgstr "Statusleiste"
-#: src/ui/gui/data-editor.glade:196
+#: src/ui/gui/data-editor.glade:194
msgid "Toolbars"
msgstr "Werkzeugregal"
-#: src/ui/gui/data-editor.glade:208
+#: src/ui/gui/data-editor.glade:206
msgid "Fonts"
msgstr "Schrift"
-#: src/ui/gui/data-editor.glade:215
+#: src/ui/gui/data-editor.glade:213
msgid "Grid Lines"
msgstr "Glitten"
-#: src/ui/gui/data-editor.glade:223 src/ui/gui/data-editor.glade:633
-#: src/ui/gui/data-editor.glade:1345 src/ui/gui/data-editor.glade:1523
+#: src/ui/gui/data-editor.glade:221 src/ui/gui/data-editor.glade:631
+#: src/ui/gui/data-editor.glade:1343 src/ui/gui/data-editor.glade:1521
msgid "Value Labels"
msgstr "Werten"
-#: src/ui/gui/data-editor.glade:235
+#: src/ui/gui/data-editor.glade:233
msgid "Data"
msgstr "Daten"
-#: src/ui/gui/data-editor.glade:242 src/ui/gui/data-editor.glade:514
+#: src/ui/gui/data-editor.glade:240 src/ui/gui/data-editor.glade:512
msgid "Variables"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:261 src/ui/gui/data-editor.glade:568
+#: src/ui/gui/data-editor.glade:259 src/ui/gui/data-editor.glade:566
#, fuzzy
msgid "Insert Variable"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:270
+#: src/ui/gui/data-editor.glade:268
#, fuzzy
msgid "Insert Cases"
msgstr "_Stecken"
-#: src/ui/gui/data-editor.glade:279 src/ui/gui/data-editor.glade:502
-#: src/ui/gui/data-editor.glade:1893
+#: src/ui/gui/data-editor.glade:277 src/ui/gui/data-editor.glade:500
+#: src/ui/gui/data-editor.glade:1891
msgid "Go To Case"
msgstr ""
-#: src/ui/gui/data-editor.glade:294 src/ui/gui/data-editor.glade:1958
+#: src/ui/gui/data-editor.glade:292 src/ui/gui/data-editor.glade:1956
msgid "Sort Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:303
+#: src/ui/gui/data-editor.glade:301
msgid "Transpose"
msgstr ""
-#: src/ui/gui/data-editor.glade:311
+#: src/ui/gui/data-editor.glade:309
msgid "Restructure"
msgstr ""
-#: src/ui/gui/data-editor.glade:319
+#: src/ui/gui/data-editor.glade:317
#, fuzzy
msgid "Merge Files"
msgstr "Alle Datei"
-#: src/ui/gui/data-editor.glade:327
+#: src/ui/gui/data-editor.glade:325
msgid "Aggregate"
msgstr ""
-#: src/ui/gui/data-editor.glade:341 src/ui/gui/data-editor.glade:589
+#: src/ui/gui/data-editor.glade:339 src/ui/gui/data-editor.glade:587
#, fuzzy
msgid "Split File"
msgstr "Alle Datei"
-#: src/ui/gui/data-editor.glade:349 src/ui/gui/data-editor.glade:613
+#: src/ui/gui/data-editor.glade:347 src/ui/gui/data-editor.glade:611
msgid "Select Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:357 src/ui/gui/data-editor.glade:601
+#: src/ui/gui/data-editor.glade:355 src/ui/gui/data-editor.glade:599
msgid "Weight Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:368 src/ui/gui/syntax-editor.glade:232
+#: src/ui/gui/data-editor.glade:366 src/ui/gui/syntax-editor.glade:234
#, fuzzy
msgid "_Windows"
msgstr "_Datei"
-#: src/ui/gui/data-editor.glade:376 src/ui/gui/syntax-editor.glade:242
+#: src/ui/gui/data-editor.glade:374 src/ui/gui/syntax-editor.glade:244
msgid "_Minimise All Windows"
msgstr ""
-#: src/ui/gui/data-editor.glade:388 src/ui/gui/syntax-editor.glade:254
+#: src/ui/gui/data-editor.glade:386 src/ui/gui/syntax-editor.glade:256
msgid "_Help"
msgstr "_Hilfe"
-#: src/ui/gui/data-editor.glade:395 src/ui/gui/syntax-editor.glade:263
+#: src/ui/gui/data-editor.glade:393 src/ui/gui/syntax-editor.glade:265
msgid "_Reference Manual"
msgstr ""
-#: src/ui/gui/data-editor.glade:402 src/ui/gui/syntax-editor.glade:271
+#: src/ui/gui/data-editor.glade:400 src/ui/gui/syntax-editor.glade:273
msgid "_About"
msgstr "_Info"
-#: src/ui/gui/data-editor.glade:439
-msgid "Save"
-msgstr "Speichen"
-
-#: src/ui/gui/data-editor.glade:451
+#: src/ui/gui/data-editor.glade:449
msgid "Print"
msgstr "Drucken"
-#: src/ui/gui/data-editor.glade:471
+#: src/ui/gui/data-editor.glade:469
msgid "Undo"
msgstr ""
-#: src/ui/gui/data-editor.glade:482
+#: src/ui/gui/data-editor.glade:480
msgid "Redo"
msgstr ""
-#: src/ui/gui/data-editor.glade:535
+#: src/ui/gui/data-editor.glade:533
msgid "Find"
msgstr ""
-#: src/ui/gui/data-editor.glade:555
+#: src/ui/gui/data-editor.glade:553
#, fuzzy
msgid "Insert Case"
msgstr "_Stecken"
-#: src/ui/gui/data-editor.glade:646
+#: src/ui/gui/data-editor.glade:644
msgid "Use Sets"
msgstr ""
-#: src/ui/gui/data-editor.glade:728
+#: src/ui/gui/data-editor.glade:726
msgid "Data View"
msgstr "Datenansicht"
-#: src/ui/gui/data-editor.glade:755
+#: src/ui/gui/data-editor.glade:753
msgid "Variable View"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:785
+#: src/ui/gui/data-editor.glade:783
msgid "Information Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:804
+#: src/ui/gui/data-editor.glade:802
msgid "Processor Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:829
+#: src/ui/gui/data-editor.glade:827
msgid "OMS Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:854
+#: src/ui/gui/data-editor.glade:852
msgid "Case Counter Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:879
+#: src/ui/gui/data-editor.glade:877
msgid "Filter Use Status Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:905
+#: src/ui/gui/data-editor.glade:903
msgid "Weight Status Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:931
+#: src/ui/gui/data-editor.glade:929
#, fuzzy
msgid "Split File Status Area"
msgstr "Alle Datei"
-#: src/ui/gui/data-editor.glade:961
+#: src/ui/gui/data-editor.glade:959
msgid "Variable Type"
msgstr "Variableansicht"
-#: src/ui/gui/data-editor.glade:996 src/ui/gui/psppire-var-store.c:476
+#: src/ui/gui/data-editor.glade:994 src/ui/gui/psppire-var-store.c:476
msgid "Comma"
msgstr "Komma"
-#: src/ui/gui/data-editor.glade:1011 src/ui/gui/psppire-var-store.c:477
+#: src/ui/gui/data-editor.glade:1009 src/ui/gui/psppire-var-store.c:477
msgid "Dot"
msgstr "Punkt"
-#: src/ui/gui/data-editor.glade:1026
+#: src/ui/gui/data-editor.glade:1024
msgid "Scientific notation"
msgstr "Wissenschaftlichnotation"
-#: src/ui/gui/data-editor.glade:1041 src/ui/gui/psppire-var-store.c:479
+#: src/ui/gui/data-editor.glade:1039 src/ui/gui/psppire-var-store.c:479
msgid "Date"
msgstr "Datum"
-#: src/ui/gui/data-editor.glade:1056 src/ui/gui/psppire-var-store.c:480
+#: src/ui/gui/data-editor.glade:1054 src/ui/gui/psppire-var-store.c:480
msgid "Dollar"
msgstr "Euro"
-#: src/ui/gui/data-editor.glade:1071
+#: src/ui/gui/data-editor.glade:1069
msgid "Custom currency"
msgstr "Spezialwährung"
-#: src/ui/gui/data-editor.glade:1163
+#: src/ui/gui/data-editor.glade:1161
msgid "positive"
msgstr "positiv"
-#: src/ui/gui/data-editor.glade:1169
+#: src/ui/gui/data-editor.glade:1167
msgid "negative"
msgstr "negativ"
-#: src/ui/gui/data-editor.glade:1182
+#: src/ui/gui/data-editor.glade:1180
msgid "Sample"
msgstr "Muster"
-#: src/ui/gui/data-editor.glade:1232
+#: src/ui/gui/data-editor.glade:1230
msgid "Width:"
msgstr "GroÃe:"
-#: src/ui/gui/data-editor.glade:1276
+#: src/ui/gui/data-editor.glade:1274
msgid "Decimal Places:"
msgstr "Dezimalstellen:"
-#: src/ui/gui/data-editor.glade:1443
+#: src/ui/gui/data-editor.glade:1441
msgid "Value Label:"
msgstr "Kennsatz:"
-#: src/ui/gui/data-editor.glade:1456
+#: src/ui/gui/data-editor.glade:1454
msgid "Value:"
msgstr "Werte:"
-#: src/ui/gui/data-editor.glade:1589
+#: src/ui/gui/data-editor.glade:1587
msgid "Missing Values"
msgstr "Lösewerten"
-#: src/ui/gui/data-editor.glade:1607
+#: src/ui/gui/data-editor.glade:1605
msgid "_Range plus one optional discrete missing value"
msgstr "Wertebereich und ein optional Lösewert"
-#: src/ui/gui/data-editor.glade:1631
+#: src/ui/gui/data-editor.glade:1629
msgid "_Low:"
msgstr "_Tief:"
-#: src/ui/gui/data-editor.glade:1660
+#: src/ui/gui/data-editor.glade:1658
msgid "_High:"
msgstr "_Hoch:"
-#: src/ui/gui/data-editor.glade:1701
+#: src/ui/gui/data-editor.glade:1699
msgid "Di_screte value:"
msgstr "Di_skretwerte"
-#: src/ui/gui/data-editor.glade:1748
+#: src/ui/gui/data-editor.glade:1746
msgid "_No missing values"
msgstr "_Kein Lösewerten"
-#: src/ui/gui/data-editor.glade:1765
+#: src/ui/gui/data-editor.glade:1763
msgid "_Discrete missing values"
msgstr "_Diskret Lösewerten"
-#: src/ui/gui/data-editor.glade:1910
+#: src/ui/gui/data-editor.glade:1908
msgid "Case Number:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2019
+#: src/ui/gui/data-editor.glade:2017
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2068 src/ui/gui/sort-cases-dialog.c:279
+#: src/ui/gui/data-editor.glade:2066 src/ui/gui/sort-cases-dialog.c:279
msgid "Ascending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2081 src/ui/gui/sort-cases-dialog.c:281
+#: src/ui/gui/data-editor.glade:2079 src/ui/gui/sort-cases-dialog.c:281
msgid "Descending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2097
+#: src/ui/gui/data-editor.glade:2095
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/helper.c:113
+#: src/ui/gui/helper.c:115
msgid "Sorry. The help system hasn't yet been implemented."
msgstr "Es gibt noch nicht kein Helpsysteme. Schade!"
-#: src/ui/gui/helper.c:136
+#: src/ui/gui/helper.c:138
#, c-format
msgid "Cannot open reference manual: %s"
msgstr ""
@@ -4597,12 +4631,12 @@
msgid "Save Syntax"
msgstr "Speichern unter"
-#: src/ui/gui/syntax-editor.c:135 src/ui/gui/syntax-editor.c:525
+#: src/ui/gui/syntax-editor.c:135 src/ui/gui/syntax-editor.c:519
#, fuzzy
msgid "Syntax Files (*.sps) "
msgstr "Systemedatein (*.sav)"
-#: src/ui/gui/syntax-editor.c:517
+#: src/ui/gui/syntax-editor.c:511
msgid "Open Syntax"
msgstr ""
@@ -4610,24 +4644,24 @@
msgid "Psppire Syntax Editor"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:187
+#: src/ui/gui/syntax-editor.glade:189
msgid "_Run"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:196
+#: src/ui/gui/syntax-editor.glade:198
msgid "All"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:204
+#: src/ui/gui/syntax-editor.glade:206
#, fuzzy
msgid "Selection"
msgstr "Schriftwahlung"
-#: src/ui/gui/syntax-editor.glade:212
+#: src/ui/gui/syntax-editor.glade:214
msgid "Current Line"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:220
+#: src/ui/gui/syntax-editor.glade:222
msgid "To End"
msgstr ""
@@ -4679,22 +4713,22 @@
msgid "Scale"
msgstr "Skalwert"
-#: src/ui/gui/window-manager.c:131
+#: src/ui/gui/window-manager.c:136
#, fuzzy, c-format
msgid "Syntax%d"
msgstr "Speichern unter"
-#: src/ui/gui/window-manager.c:132 src/ui/gui/window-manager.c:160
+#: src/ui/gui/window-manager.c:137 src/ui/gui/window-manager.c:165
#, fuzzy, c-format
msgid "%s --- PSPP Syntax Editor"
msgstr "PSPP Dateiaufbereiter"
-#: src/ui/gui/window-manager.c:135
+#: src/ui/gui/window-manager.c:140
#, fuzzy, c-format
msgid "Untitled%d"
msgstr "Unbetitelt"
-#: src/ui/gui/window-manager.c:136 src/ui/gui/window-manager.c:163
+#: src/ui/gui/window-manager.c:141 src/ui/gui/window-manager.c:168
#, fuzzy, c-format
msgid "%s --- PSPP Data Editor"
msgstr "PSPP Dateiaufbereiter"
@@ -4752,7 +4786,7 @@
"Report bugs to <%s>.\n"
msgstr ""
-#: src/ui/terminal/main.c:129
+#: src/ui/terminal/main.c:128
msgid ""
"Stopping syntax file processing here to avoid a cascade of dependent command "
"failures."
@@ -4791,8 +4825,5 @@
#~ msgid "PSPP Data Editor"
#~ msgstr "PSPP Dateiaufbereiter"
-#~ msgid "Save Data As"
-#~ msgstr "Speichern unter"
-
#~ msgid "_Insert"
#~ msgstr "_Stecken"
Index: po/pspp.pot
===================================================================
RCS file: /sources/pspp/pspp/po/pspp.pot,v
retrieving revision 1.118
retrieving revision 1.119
diff -u -b -r1.118 -r1.119
--- po/pspp.pot 20 Jan 2007 00:02:13 -0000 1.118
+++ po/pspp.pot 24 Jan 2007 08:30:22 -0000 1.119
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2007-01-20 08:53+0900\n"
+"POT-Creation-Date: 2007-01-23 21:08+0900\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -308,13 +308,13 @@
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1086
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:1084
#: src/ui/gui/psppire-var-store.c:482
msgid "String"
msgstr ""
#: src/data/format.c:310 src/data/por-file-reader.c:489
-#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:982
+#: src/data/sys-file-reader.c:602 src/ui/gui/data-editor.glade:980
#: src/ui/gui/psppire-var-store.c:475
msgid "Numeric"
msgstr ""
@@ -819,98 +819,98 @@
msgid "scratch"
msgstr ""
-#: src/language/command.c:182
+#: src/language/command.c:194
#, c-format
msgid "%s is unimplemented."
msgstr ""
-#: src/language/command.c:187
+#: src/language/command.c:199
#, c-format
msgid "%s may be used only in testing mode."
msgstr ""
-#: src/language/command.c:192
+#: src/language/command.c:204
#, c-format
msgid "%s may be used only in enhanced syntax mode."
msgstr ""
-#: src/language/command.c:446
+#: src/language/command.c:458
msgid "expecting command name"
msgstr ""
-#: src/language/command.c:460
+#: src/language/command.c:472
#, c-format
msgid "Unknown command %s."
msgstr ""
-#: src/language/command.c:587
+#: src/language/command.c:599
msgid "before the active file has been defined"
msgstr ""
-#: src/language/command.c:589
+#: src/language/command.c:601
msgid "after the active file has been defined"
msgstr ""
-#: src/language/command.c:591
+#: src/language/command.c:603
msgid "inside INPUT PROGRAM"
msgstr ""
-#: src/language/command.c:593
+#: src/language/command.c:605
msgid "inside FILE TYPE"
msgstr ""
-#: src/language/command.c:598
+#: src/language/command.c:610
#, c-format
msgid "%s or %s"
msgstr ""
-#: src/language/command.c:600
+#: src/language/command.c:612
#, c-format
msgid "%s, %s, or %s"
msgstr ""
-#: src/language/command.c:604
+#: src/language/command.c:616
#, c-format
msgid "%s is allowed only %s."
msgstr ""
-#: src/language/command.c:609
+#: src/language/command.c:621
#, c-format
msgid "%s is not allowed inside INPUT PROGRAM."
msgstr ""
-#: src/language/command.c:611
+#: src/language/command.c:623
#, c-format
msgid "%s is not allowed inside FILE TYPE."
msgstr ""
-#: src/language/command.c:689 src/language/command.c:818
+#: src/language/command.c:701 src/language/command.c:830
#: src/language/utilities/permissions.c:101
msgid "This command not allowed when the SAFER option is set."
msgstr ""
-#: src/language/command.c:701
+#: src/language/command.c:713
#, c-format
msgid "Error removing `%s': %s."
msgstr ""
-#: src/language/command.c:751
+#: src/language/command.c:763
#, c-format
msgid "Couldn't fork: %s."
msgstr ""
-#: src/language/command.c:793
+#: src/language/command.c:805
#, c-format
msgid "Error executing command: %s."
msgstr ""
-#: src/language/command.c:802 src/language/data-io/print-space.c:75
+#: src/language/command.c:814 src/language/data-io/print-space.c:75
#: src/language/dictionary/vector.c:202 src/language/lexer/lexer.c:465
#: src/language/stats/autorecode.c:153 src/language/xforms/select-if.c:61
msgid "expecting end of command"
msgstr ""
-#: src/language/command.c:839
+#: src/language/command.c:851
msgid "No operating system support for this command."
msgstr ""
@@ -4097,363 +4097,393 @@
msgid "Style of bevel around the custom entry button"
msgstr ""
-#: src/ui/gui/data-editor.c:154
+#: src/ui/gui/data-editor.c:158
msgid "Weights"
msgstr ""
-#: src/ui/gui/data-editor.c:155
+#: src/ui/gui/data-editor.c:159
msgid "Weight cases by variable"
msgstr ""
-#: src/ui/gui/data-editor.c:423 src/ui/gui/data-editor.glade:428
-msgid "Open"
-msgstr ""
-
-#: src/ui/gui/data-editor.c:431
-msgid "System Files (*.sav)"
-msgstr ""
-
-#: src/ui/gui/data-editor.c:437
-msgid "Portable Files (*.por) "
-msgstr ""
-
-#: src/ui/gui/data-editor.c:443 src/ui/gui/syntax-editor.c:141
-#: src/ui/gui/syntax-editor.c:531
-msgid "All Files"
-msgstr ""
-
-#: src/ui/gui/data-editor.c:519
+#: src/ui/gui/data-editor.c:479
msgid "Font Selection"
msgstr ""
-#: src/ui/gui/data-editor.c:697
+#: src/ui/gui/data-editor.c:657
msgid "No Split"
msgstr ""
-#: src/ui/gui/data-editor.c:705
+#: src/ui/gui/data-editor.c:665
msgid "Split by "
msgstr ""
-#: src/ui/gui/data-editor.c:730
+#: src/ui/gui/data-editor.c:690
msgid "Filter off"
msgstr ""
-#: src/ui/gui/data-editor.c:743
+#: src/ui/gui/data-editor.c:703
#, c-format
msgid "Filter by %s"
msgstr ""
-#: src/ui/gui/data-editor.c:761
+#: src/ui/gui/data-editor.c:721
msgid "Weights off"
msgstr ""
-#: src/ui/gui/data-editor.c:774
+#: src/ui/gui/data-editor.c:734
#, c-format
msgid "Weight by %s"
msgstr ""
+#: src/ui/gui/data-editor.c:841 src/ui/gui/data-editor.c:1039
+#: src/ui/gui/data-editor.glade:426
+msgid "Open"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:842
+msgid "Open a data file"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:850 src/ui/gui/data-editor.c:951
+#: src/ui/gui/data-editor.glade:437
+msgid "Save"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:851 src/ui/gui/data-editor.c:861
+msgid "Save data to file"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:860
+msgid "Save As"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:869
+msgid "New"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:870
+msgid "New data file"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:959 src/ui/gui/data-editor.c:1047
+msgid "System Files (*.sav)"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:965 src/ui/gui/data-editor.c:1053
+msgid "Portable Files (*.por) "
+msgstr ""
+
+#: src/ui/gui/data-editor.c:971 src/ui/gui/data-editor.c:1059
+#: src/ui/gui/syntax-editor.c:141 src/ui/gui/syntax-editor.c:525
+msgid "All Files"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:979
+msgid "System File"
+msgstr ""
+
+#: src/ui/gui/data-editor.c:984
+msgid "Portable File"
+msgstr ""
+
#: src/ui/gui/data-editor.glade:18 src/ui/gui/syntax-editor.glade:39
msgid "_File"
msgstr ""
#: src/ui/gui/data-editor.glade:33 src/ui/gui/data-editor.glade:59
-#: src/ui/gui/syntax-editor.glade:57 src/ui/gui/syntax-editor.glade:86
+#: src/ui/gui/syntax-editor.glade:57 src/ui/gui/syntax-editor.glade:87
msgid "_Syntax"
msgstr ""
#: src/ui/gui/data-editor.glade:40 src/ui/gui/data-editor.glade:66
-#: src/ui/gui/data-editor.glade:253 src/ui/gui/syntax-editor.glade:65
-#: src/ui/gui/syntax-editor.glade:95
+#: src/ui/gui/data-editor.glade:251 src/ui/gui/syntax-editor.glade:66
+#: src/ui/gui/syntax-editor.glade:97
msgid "_Data"
msgstr ""
-#: src/ui/gui/data-editor.glade:115 src/ui/gui/syntax-editor.glade:142
+#: src/ui/gui/data-editor.glade:113 src/ui/gui/syntax-editor.glade:144
msgid "_Edit"
msgstr ""
-#: src/ui/gui/data-editor.glade:150
+#: src/ui/gui/data-editor.glade:148
msgid "Paste _Variables"
msgstr ""
-#: src/ui/gui/data-editor.glade:158
+#: src/ui/gui/data-editor.glade:156
msgid "Cl_ear"
msgstr ""
-#: src/ui/gui/data-editor.glade:171
+#: src/ui/gui/data-editor.glade:169
msgid "_Find"
msgstr ""
-#: src/ui/gui/data-editor.glade:182
+#: src/ui/gui/data-editor.glade:180
msgid "_View"
msgstr ""
-#: src/ui/gui/data-editor.glade:189
+#: src/ui/gui/data-editor.glade:187
msgid "Status Bar"
msgstr ""
-#: src/ui/gui/data-editor.glade:196
+#: src/ui/gui/data-editor.glade:194
msgid "Toolbars"
msgstr ""
-#: src/ui/gui/data-editor.glade:208
+#: src/ui/gui/data-editor.glade:206
msgid "Fonts"
msgstr ""
-#: src/ui/gui/data-editor.glade:215
+#: src/ui/gui/data-editor.glade:213
msgid "Grid Lines"
msgstr ""
-#: src/ui/gui/data-editor.glade:223 src/ui/gui/data-editor.glade:633
-#: src/ui/gui/data-editor.glade:1345 src/ui/gui/data-editor.glade:1523
+#: src/ui/gui/data-editor.glade:221 src/ui/gui/data-editor.glade:631
+#: src/ui/gui/data-editor.glade:1343 src/ui/gui/data-editor.glade:1521
msgid "Value Labels"
msgstr ""
-#: src/ui/gui/data-editor.glade:235
+#: src/ui/gui/data-editor.glade:233
msgid "Data"
msgstr ""
-#: src/ui/gui/data-editor.glade:242 src/ui/gui/data-editor.glade:514
+#: src/ui/gui/data-editor.glade:240 src/ui/gui/data-editor.glade:512
msgid "Variables"
msgstr ""
-#: src/ui/gui/data-editor.glade:261 src/ui/gui/data-editor.glade:568
+#: src/ui/gui/data-editor.glade:259 src/ui/gui/data-editor.glade:566
msgid "Insert Variable"
msgstr ""
-#: src/ui/gui/data-editor.glade:270
+#: src/ui/gui/data-editor.glade:268
msgid "Insert Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:279 src/ui/gui/data-editor.glade:502
-#: src/ui/gui/data-editor.glade:1893
+#: src/ui/gui/data-editor.glade:277 src/ui/gui/data-editor.glade:500
+#: src/ui/gui/data-editor.glade:1891
msgid "Go To Case"
msgstr ""
-#: src/ui/gui/data-editor.glade:294 src/ui/gui/data-editor.glade:1958
+#: src/ui/gui/data-editor.glade:292 src/ui/gui/data-editor.glade:1956
msgid "Sort Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:303
+#: src/ui/gui/data-editor.glade:301
msgid "Transpose"
msgstr ""
-#: src/ui/gui/data-editor.glade:311
+#: src/ui/gui/data-editor.glade:309
msgid "Restructure"
msgstr ""
-#: src/ui/gui/data-editor.glade:319
+#: src/ui/gui/data-editor.glade:317
msgid "Merge Files"
msgstr ""
-#: src/ui/gui/data-editor.glade:327
+#: src/ui/gui/data-editor.glade:325
msgid "Aggregate"
msgstr ""
-#: src/ui/gui/data-editor.glade:341 src/ui/gui/data-editor.glade:589
+#: src/ui/gui/data-editor.glade:339 src/ui/gui/data-editor.glade:587
msgid "Split File"
msgstr ""
-#: src/ui/gui/data-editor.glade:349 src/ui/gui/data-editor.glade:613
+#: src/ui/gui/data-editor.glade:347 src/ui/gui/data-editor.glade:611
msgid "Select Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:357 src/ui/gui/data-editor.glade:601
+#: src/ui/gui/data-editor.glade:355 src/ui/gui/data-editor.glade:599
msgid "Weight Cases"
msgstr ""
-#: src/ui/gui/data-editor.glade:368 src/ui/gui/syntax-editor.glade:232
+#: src/ui/gui/data-editor.glade:366 src/ui/gui/syntax-editor.glade:234
msgid "_Windows"
msgstr ""
-#: src/ui/gui/data-editor.glade:376 src/ui/gui/syntax-editor.glade:242
+#: src/ui/gui/data-editor.glade:374 src/ui/gui/syntax-editor.glade:244
msgid "_Minimise All Windows"
msgstr ""
-#: src/ui/gui/data-editor.glade:388 src/ui/gui/syntax-editor.glade:254
+#: src/ui/gui/data-editor.glade:386 src/ui/gui/syntax-editor.glade:256
msgid "_Help"
msgstr ""
-#: src/ui/gui/data-editor.glade:395 src/ui/gui/syntax-editor.glade:263
+#: src/ui/gui/data-editor.glade:393 src/ui/gui/syntax-editor.glade:265
msgid "_Reference Manual"
msgstr ""
-#: src/ui/gui/data-editor.glade:402 src/ui/gui/syntax-editor.glade:271
+#: src/ui/gui/data-editor.glade:400 src/ui/gui/syntax-editor.glade:273
msgid "_About"
msgstr ""
-#: src/ui/gui/data-editor.glade:439
-msgid "Save"
-msgstr ""
-
-#: src/ui/gui/data-editor.glade:451
+#: src/ui/gui/data-editor.glade:449
msgid "Print"
msgstr ""
-#: src/ui/gui/data-editor.glade:471
+#: src/ui/gui/data-editor.glade:469
msgid "Undo"
msgstr ""
-#: src/ui/gui/data-editor.glade:482
+#: src/ui/gui/data-editor.glade:480
msgid "Redo"
msgstr ""
-#: src/ui/gui/data-editor.glade:535
+#: src/ui/gui/data-editor.glade:533
msgid "Find"
msgstr ""
-#: src/ui/gui/data-editor.glade:555
+#: src/ui/gui/data-editor.glade:553
msgid "Insert Case"
msgstr ""
-#: src/ui/gui/data-editor.glade:646
+#: src/ui/gui/data-editor.glade:644
msgid "Use Sets"
msgstr ""
-#: src/ui/gui/data-editor.glade:728
+#: src/ui/gui/data-editor.glade:726
msgid "Data View"
msgstr ""
-#: src/ui/gui/data-editor.glade:755
+#: src/ui/gui/data-editor.glade:753
msgid "Variable View"
msgstr ""
-#: src/ui/gui/data-editor.glade:785
+#: src/ui/gui/data-editor.glade:783
msgid "Information Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:804
+#: src/ui/gui/data-editor.glade:802
msgid "Processor Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:829
+#: src/ui/gui/data-editor.glade:827
msgid "OMS Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:854
+#: src/ui/gui/data-editor.glade:852
msgid "Case Counter Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:879
+#: src/ui/gui/data-editor.glade:877
msgid "Filter Use Status Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:905
+#: src/ui/gui/data-editor.glade:903
msgid "Weight Status Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:931
+#: src/ui/gui/data-editor.glade:929
msgid "Split File Status Area"
msgstr ""
-#: src/ui/gui/data-editor.glade:961
+#: src/ui/gui/data-editor.glade:959
msgid "Variable Type"
msgstr ""
-#: src/ui/gui/data-editor.glade:996 src/ui/gui/psppire-var-store.c:476
+#: src/ui/gui/data-editor.glade:994 src/ui/gui/psppire-var-store.c:476
msgid "Comma"
msgstr ""
-#: src/ui/gui/data-editor.glade:1011 src/ui/gui/psppire-var-store.c:477
+#: src/ui/gui/data-editor.glade:1009 src/ui/gui/psppire-var-store.c:477
msgid "Dot"
msgstr ""
-#: src/ui/gui/data-editor.glade:1026
+#: src/ui/gui/data-editor.glade:1024
msgid "Scientific notation"
msgstr ""
-#: src/ui/gui/data-editor.glade:1041 src/ui/gui/psppire-var-store.c:479
+#: src/ui/gui/data-editor.glade:1039 src/ui/gui/psppire-var-store.c:479
msgid "Date"
msgstr ""
-#: src/ui/gui/data-editor.glade:1056 src/ui/gui/psppire-var-store.c:480
+#: src/ui/gui/data-editor.glade:1054 src/ui/gui/psppire-var-store.c:480
msgid "Dollar"
msgstr ""
-#: src/ui/gui/data-editor.glade:1071
+#: src/ui/gui/data-editor.glade:1069
msgid "Custom currency"
msgstr ""
-#: src/ui/gui/data-editor.glade:1163
+#: src/ui/gui/data-editor.glade:1161
msgid "positive"
msgstr ""
-#: src/ui/gui/data-editor.glade:1169
+#: src/ui/gui/data-editor.glade:1167
msgid "negative"
msgstr ""
-#: src/ui/gui/data-editor.glade:1182
+#: src/ui/gui/data-editor.glade:1180
msgid "Sample"
msgstr ""
-#: src/ui/gui/data-editor.glade:1232
+#: src/ui/gui/data-editor.glade:1230
msgid "Width:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1276
+#: src/ui/gui/data-editor.glade:1274
msgid "Decimal Places:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1443
+#: src/ui/gui/data-editor.glade:1441
msgid "Value Label:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1456
+#: src/ui/gui/data-editor.glade:1454
msgid "Value:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1589
+#: src/ui/gui/data-editor.glade:1587
msgid "Missing Values"
msgstr ""
-#: src/ui/gui/data-editor.glade:1607
+#: src/ui/gui/data-editor.glade:1605
msgid "_Range plus one optional discrete missing value"
msgstr ""
-#: src/ui/gui/data-editor.glade:1631
+#: src/ui/gui/data-editor.glade:1629
msgid "_Low:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1660
+#: src/ui/gui/data-editor.glade:1658
msgid "_High:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1701
+#: src/ui/gui/data-editor.glade:1699
msgid "Di_screte value:"
msgstr ""
-#: src/ui/gui/data-editor.glade:1748
+#: src/ui/gui/data-editor.glade:1746
msgid "_No missing values"
msgstr ""
-#: src/ui/gui/data-editor.glade:1765
+#: src/ui/gui/data-editor.glade:1763
msgid "_Discrete missing values"
msgstr ""
-#: src/ui/gui/data-editor.glade:1910
+#: src/ui/gui/data-editor.glade:1908
msgid "Case Number:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2019
+#: src/ui/gui/data-editor.glade:2017
msgid "Sort by:"
msgstr ""
-#: src/ui/gui/data-editor.glade:2068 src/ui/gui/sort-cases-dialog.c:279
+#: src/ui/gui/data-editor.glade:2066 src/ui/gui/sort-cases-dialog.c:279
msgid "Ascending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2081 src/ui/gui/sort-cases-dialog.c:281
+#: src/ui/gui/data-editor.glade:2079 src/ui/gui/sort-cases-dialog.c:281
msgid "Descending"
msgstr ""
-#: src/ui/gui/data-editor.glade:2097
+#: src/ui/gui/data-editor.glade:2095
msgid "Sort Order"
msgstr ""
-#: src/ui/gui/helper.c:113
+#: src/ui/gui/helper.c:115
msgid "Sorry. The help system hasn't yet been implemented."
msgstr ""
-#: src/ui/gui/helper.c:136
+#: src/ui/gui/helper.c:138
#, c-format
msgid "Cannot open reference manual: %s"
msgstr ""
@@ -4576,11 +4606,11 @@
msgid "Save Syntax"
msgstr ""
-#: src/ui/gui/syntax-editor.c:135 src/ui/gui/syntax-editor.c:525
+#: src/ui/gui/syntax-editor.c:135 src/ui/gui/syntax-editor.c:519
msgid "Syntax Files (*.sps) "
msgstr ""
-#: src/ui/gui/syntax-editor.c:517
+#: src/ui/gui/syntax-editor.c:511
msgid "Open Syntax"
msgstr ""
@@ -4588,23 +4618,23 @@
msgid "Psppire Syntax Editor"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:187
+#: src/ui/gui/syntax-editor.glade:189
msgid "_Run"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:196
+#: src/ui/gui/syntax-editor.glade:198
msgid "All"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:204
+#: src/ui/gui/syntax-editor.glade:206
msgid "Selection"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:212
+#: src/ui/gui/syntax-editor.glade:214
msgid "Current Line"
msgstr ""
-#: src/ui/gui/syntax-editor.glade:220
+#: src/ui/gui/syntax-editor.glade:222
msgid "To End"
msgstr ""
@@ -4656,22 +4686,22 @@
msgid "Scale"
msgstr ""
-#: src/ui/gui/window-manager.c:131
+#: src/ui/gui/window-manager.c:136
#, c-format
msgid "Syntax%d"
msgstr ""
-#: src/ui/gui/window-manager.c:132 src/ui/gui/window-manager.c:160
+#: src/ui/gui/window-manager.c:137 src/ui/gui/window-manager.c:165
#, c-format
msgid "%s --- PSPP Syntax Editor"
msgstr ""
-#: src/ui/gui/window-manager.c:135
+#: src/ui/gui/window-manager.c:140
#, c-format
msgid "Untitled%d"
msgstr ""
-#: src/ui/gui/window-manager.c:136 src/ui/gui/window-manager.c:163
+#: src/ui/gui/window-manager.c:141 src/ui/gui/window-manager.c:168
#, c-format
msgid "%s --- PSPP Data Editor"
msgstr ""
@@ -4729,7 +4759,7 @@
"Report bugs to <%s>.\n"
msgstr ""
-#: src/ui/terminal/main.c:129
+#: src/ui/terminal/main.c:128
msgid ""
"Stopping syntax file processing here to avoid a cascade of dependent command "
"failures."
Index: src/language/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/language/ChangeLog,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- src/language/ChangeLog 22 Dec 2006 04:38:22 -0000 1.18
+++ src/language/ChangeLog 24 Jan 2007 08:30:22 -0000 1.19
@@ -1,3 +1,8 @@
+Sun Jan 21 15:31:52 WST 2007 John Darrington <address@hidden>
+
+ * command.c command.h: Renamed cmd_parse to cmd_parse_in_state.
+ New function cmd_parse.
+
Wed Dec 13 21:02:51 2006 Ben Pfaff <address@hidden>
* command.def: Add DELETE VARS.
Index: src/language/command.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/command.c,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/language/command.c 15 Dec 2006 00:16:02 -0000 1.21
+++ src/language/command.c 24 Jan 2007 08:30:22 -0000 1.22
@@ -136,7 +136,8 @@
dot. On failure, skips to the terminating dot.
Returns the command's success or failure result. */
enum cmd_result
-cmd_parse (struct lexer *lexer, struct dataset *ds, enum cmd_state state)
+cmd_parse_in_state (struct lexer *lexer, struct dataset *ds,
+ enum cmd_state state)
{
int result;
@@ -152,6 +153,17 @@
return result;
}
+enum cmd_result
+cmd_parse (struct lexer *lexer, struct dataset *ds)
+{
+ const struct dictionary *dict = dataset_dict (ds);
+ return cmd_parse_in_state (lexer, ds,
+ proc_has_source (ds) &&
+ dict_get_var_cnt (dict) > 0 ?
+ CMD_STATE_DATA : CMD_STATE_INITIAL);
+}
+
+
/* Parses an entire command, from command name to terminating
dot. */
static enum cmd_result
Index: src/language/command.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/command.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- src/language/command.h 15 Dec 2006 00:16:02 -0000 1.8
+++ src/language/command.h 24 Jan 2007 08:30:22 -0000 1.9
@@ -56,7 +56,10 @@
struct dataset;
struct lexer;
-enum cmd_result cmd_parse (struct lexer *lexer, struct dataset *ds, enum
cmd_state);
+enum cmd_result cmd_parse_in_state (struct lexer *lexer, struct dataset *ds,
+ enum cmd_state);
+
+enum cmd_result cmd_parse (struct lexer *lexer, struct dataset *ds);
struct command;
const char *cmd_complete (const char *, const struct command **);
Index: src/language/syntax-string-source.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/syntax-string-source.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/language/syntax-string-source.c 20 Jan 2007 07:09:13 -0000 1.1
+++ src/language/syntax-string-source.c 24 Jan 2007 08:30:22 -0000 1.2
@@ -123,3 +123,11 @@
return (struct getl_interface *) sss;
}
+
+/* Return the syntax currently contained in S.
+ Primarily usefull for debugging */
+const char *
+syntax_string_source_get_syntax (const struct syntax_string_source *s)
+{
+ return ds_cstr (&s->buffer);
+}
Index: src/language/syntax-string-source.h
===================================================================
RCS file: /sources/pspp/pspp/src/language/syntax-string-source.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/language/syntax-string-source.h 20 Jan 2007 07:09:13 -0000 1.1
+++ src/language/syntax-string-source.h 24 Jan 2007 08:30:22 -0000 1.2
@@ -22,8 +22,11 @@
struct getl_interface;
-struct getl_interface *
-create_syntax_string_source (const char *fmt, ...);
+struct syntax_string_source;
+
+struct getl_interface * create_syntax_string_source (const char *fmt, ...);
+
+const char * syntax_string_source_get_syntax (const struct
syntax_string_source *s);
#endif
Index: src/language/data-io/inpt-pgm.c
===================================================================
RCS file: /sources/pspp/pspp/src/language/data-io/inpt-pgm.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- src/language/data-io/inpt-pgm.c 19 Dec 2006 14:21:53 -0000 1.22
+++ src/language/data-io/inpt-pgm.c 24 Jan 2007 08:30:22 -0000 1.23
@@ -119,7 +119,7 @@
inside_input_program = true;
for (;;)
{
- enum cmd_result result = cmd_parse (lexer, ds, CMD_STATE_INPUT_PROGRAM);
+ enum cmd_result result = cmd_parse_in_state (lexer, ds,
CMD_STATE_INPUT_PROGRAM);
if (result == CMD_END_INPUT_PROGRAM)
break;
else if (result == CMD_END_CASE)
Index: src/ui/gui/ChangeLog
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/ChangeLog,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- src/ui/gui/ChangeLog 12 Jan 2007 22:50:14 -0000 1.37
+++ src/ui/gui/ChangeLog 24 Jan 2007 08:30:22 -0000 1.38
@@ -1,3 +1,16 @@
+Tue Jan 23 21:10:01 WST 2007 John Darrington <address@hidden>
+
+ * helper.c helper.h: New function execute_syntax.
+
+ * syntax-editor.c syntax-editor.glade: Disabled data open/save menu
+ items.
+
+ * data-editor.c data-editor.glade data-editor.h: Enabled data
+ open/save/save_as menu-items.
+
+ * window-manager.h window-manager.c (default_window_name) : New
+ function.
+
Sat Jan 13 07:47:26 WST 2007 John Darrington <address@hidden>
* psppire-case-file.c psppire-data-store.c psppire-dialog.c
Index: src/ui/gui/data-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- src/ui/gui/data-editor.c 20 Jan 2007 00:02:13 -0000 1.12
+++ src/ui/gui/data-editor.c 24 Jan 2007 08:30:22 -0000 1.13
@@ -45,6 +45,7 @@
#include "weight-cases-dialog.h"
+static void register_data_editor_actions (struct data_editor *de);
static void insert_variable (GtkCheckMenuItem *m, gpointer data);
@@ -124,7 +125,7 @@
GtkSheet *var_sheet ;
PsppireVarStore *vs;
- de = g_malloc (sizeof (*de));
+ de = g_malloc0 (sizeof (*de));
e = (struct editor_window *) de;
@@ -149,6 +150,9 @@
connect_help (de->xml);
+
+ register_data_editor_actions (de);
+
de->invoke_weight_cases_dialog =
gtk_action_new ("weight-cases-dialog",
_("Weights"),
@@ -161,15 +165,15 @@
e->window = GTK_WINDOW (get_widget_assert (de->xml, "data_editor"));
- g_signal_connect (get_widget_assert (de->xml,"file_new_data"),
+ g_signal_connect_swapped (get_widget_assert (de->xml,"file_new_data"),
"activate",
- G_CALLBACK (new_data_window),
- e->window);
+ G_CALLBACK (gtk_action_activate),
+ de->action_data_new);
- g_signal_connect (get_widget_assert (de->xml,"file_open_data"),
+ g_signal_connect_swapped (get_widget_assert (de->xml,"file_open_data"),
"activate",
- G_CALLBACK (open_data_window),
- e->window);
+ G_CALLBACK (gtk_action_activate),
+ de->action_data_open);
g_signal_connect (get_widget_assert (de->xml,"file_new_syntax"),
"activate",
@@ -181,6 +185,16 @@
G_CALLBACK (open_syntax_window),
e->window);
+ g_signal_connect_swapped (get_widget_assert (de->xml,"file_save"),
+ "activate",
+ G_CALLBACK (gtk_action_activate),
+ de->action_data_save);
+
+ g_signal_connect_swapped (get_widget_assert (de->xml,"file_save_as"),
+ "activate",
+ G_CALLBACK (gtk_action_activate),
+ de->action_data_save_as);
+
g_signal_connect (get_widget_assert (de->xml,"edit_clear"),
"activate",
@@ -197,13 +211,6 @@
get_widget_assert (de->xml, "data_weight-cases")
);
- /*
- g_signal_connect (get_widget_assert (de->xml,"data_weight-cases"),
- "activate",
- G_CALLBACK (weight_cases_dialog),
- de);
- */
-
g_signal_connect (get_widget_assert (de->xml,"help_about"),
"activate",
@@ -283,6 +290,13 @@
"toggled",
G_CALLBACK (value_labels_toggled), de);
+ gtk_action_connect_proxy (de->action_data_open,
+ get_widget_assert (de->xml, "button-open")
+ );
+
+ gtk_action_connect_proxy (de->action_data_save,
+ get_widget_assert (de->xml, "button-save")
+ );
gtk_action_connect_proxy (de->invoke_weight_cases_dialog,
get_widget_assert (de->xml, "button-weight-cases")
@@ -298,7 +312,6 @@
G_CALLBACK (minimise_all_windows), NULL);
-
select_sheet (de, PAGE_DATA_SHEET);
return de;
@@ -411,59 +424,6 @@
}
-void
-open_data_window (GtkMenuItem *menuitem, gpointer parent)
-{
- bool finished = FALSE;
-
- GtkWidget *dialog;
-
- GtkFileFilter *filter ;
-
- dialog = gtk_file_chooser_dialog_new (_("Open"),
- GTK_WINDOW (parent),
- GTK_FILE_CHOOSER_ACTION_OPEN,
- GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
- GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
- NULL);
-
- filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
- gtk_file_filter_add_pattern (filter, "*.sav");
- gtk_file_filter_add_pattern (filter, "*.SAV");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
- filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
- gtk_file_filter_add_pattern (filter, "*.por");
- gtk_file_filter_add_pattern (filter, "*.POR");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
- filter = gtk_file_filter_new ();
- gtk_file_filter_set_name (filter, _("All Files"));
- gtk_file_filter_add_pattern (filter, "*");
- gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
-
- do {
-
- if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT)
- {
- gchar *file_name =
- gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-
- g_free (file_name);
- }
- else
- finished = TRUE;
-
- } while ( ! finished ) ;
-
- gtk_widget_destroy (dialog);
-}
-
-
-
-
static void
status_bar_activate (GtkCheckMenuItem *menuitem, gpointer data)
{
@@ -864,3 +824,266 @@
}
+
+
+static void data_save_as_dialog (GtkAction *, struct data_editor *de);
+static void new_file (GtkAction *, struct editor_window *de);
+static void open_data_dialog (GtkAction *, struct editor_window *de);
+static void data_save (GtkAction *action, struct data_editor *e);
+
+
+/* Create the GtkActions and connect to their signals */
+static void
+register_data_editor_actions (struct data_editor *de)
+{
+ de->action_data_open =
+ gtk_action_new ("data-open-dialog",
+ _("Open"),
+ _("Open a data file"),
+ "gtk-open");
+
+ g_signal_connect (de->action_data_open, "activate",
+ G_CALLBACK (open_data_dialog), de);
+
+
+ de->action_data_save = gtk_action_new ("data-save",
+ _("Save"),
+ _("Save data to file"),
+ "gtk-save");
+
+ g_signal_connect (de->action_data_save, "activate",
+ G_CALLBACK (data_save), de);
+
+
+
+ de->action_data_save_as = gtk_action_new ("data-save-as-dialog",
+ _("Save As"),
+ _("Save data to file"),
+ "gtk-save");
+
+ g_signal_connect (de->action_data_save_as, "activate",
+ G_CALLBACK (data_save_as_dialog), de);
+
+ de->action_data_new =
+ gtk_action_new ("data-new",
+ _("New"),
+ _("New data file"),
+ NULL);
+
+ g_signal_connect (de->action_data_new, "activate",
+ G_CALLBACK (new_file), de);
+}
+
+/* Returns true if NAME has a suffix which might denote a PSPP file */
+static gboolean
+name_has_suffix (const gchar *name)
+{
+ if ( g_str_has_suffix (name, ".sav"))
+ return TRUE;
+ if ( g_str_has_suffix (name, ".SAV"))
+ return TRUE;
+ if ( g_str_has_suffix (name, ".por"))
+ return TRUE;
+ if ( g_str_has_suffix (name, ".POR"))
+ return TRUE;
+
+ return FALSE;
+}
+
+/* Append SUFFIX to the filename of DE */
+static void
+append_filename_suffix (struct data_editor *de, const gchar *suffix)
+{
+ if ( ! name_has_suffix (de->file_name))
+ {
+ gchar *s = de->file_name;
+ de->file_name = g_strconcat (de->file_name, suffix, NULL);
+ g_free (s);
+ }
+}
+
+/* Save DE to file */
+static void
+save_file (struct data_editor *de)
+{
+ struct getl_interface *sss;
+
+ g_assert (de->file_name);
+
+ if ( de->save_as_portable )
+ {
+ append_filename_suffix (de, ".por");
+ sss = create_syntax_string_source ("EXPORT OUTFILE='%s'.",
+ de->file_name);
+ }
+ else
+ {
+ append_filename_suffix (de, ".sav");
+ sss = create_syntax_string_source ("SAVE OUTFILE='%s'.",
+ de->file_name);
+ }
+
+ execute_syntax (sss);
+}
+
+
+/* Callback for data_save action.
+ If there's an existing file name, then just save,
+ otherwise prompt for a file name, then save */
+static void
+data_save (GtkAction *action, struct data_editor *de)
+{
+ if ( de->file_name)
+ save_file (de);
+ else
+ data_save_as_dialog (action, de);
+}
+
+
+/* Callback for data_save_as action. Prompt for a filename and save */
+static void
+data_save_as_dialog (GtkAction *action, struct data_editor *de)
+{
+ struct editor_window *e = (struct editor_window *) de;
+
+ GtkWidget *button_sys;
+ GtkWidget *dialog =
+ gtk_file_chooser_dialog_new (_("Save"),
+ GTK_WINDOW (e->window),
+ GTK_FILE_CHOOSER_ACTION_SAVE,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ GtkFileFilter *filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
+ gtk_file_filter_add_pattern (filter, "*.sav");
+ gtk_file_filter_add_pattern (filter, "*.SAV");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
+ gtk_file_filter_add_pattern (filter, "*.por");
+ gtk_file_filter_add_pattern (filter, "*.POR");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("All Files"));
+ gtk_file_filter_add_pattern (filter, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ {
+ GtkWidget *button_por;
+ GtkWidget *vbox = gtk_vbox_new (TRUE, 5);
+ button_sys =
+ gtk_radio_button_new_with_label (NULL, _("System File"));
+
+ button_por =
+ gtk_radio_button_new_with_label
+ (gtk_radio_button_get_group (GTK_RADIO_BUTTON(button_sys)),
+ _("Portable File"));
+
+ gtk_box_pack_start_defaults (GTK_BOX (vbox), button_sys);
+ gtk_box_pack_start_defaults (GTK_BOX (vbox), button_por);
+
+ gtk_widget_show_all (vbox);
+
+ gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER(dialog), vbox);
+ }
+
+ switch (gtk_dialog_run (GTK_DIALOG (dialog)))
+ {
+ case GTK_RESPONSE_ACCEPT:
+ {
+ g_free (de->file_name);
+
+ de->file_name =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+ de->save_as_portable =
+ ! gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button_sys));
+
+ save_file (de);
+
+ window_set_name_from_filename (e, de->file_name);
+ }
+ break;
+ default:
+ break;
+ }
+
+ gtk_widget_destroy (dialog);
+}
+
+
+/* Callback for data_new action.
+ Performs the NEW FILE command */
+static void
+new_file (GtkAction *action, struct editor_window *de)
+{
+ struct getl_interface *sss =
+ create_syntax_string_source ("NEW FILE.");
+
+ execute_syntax (sss);
+
+ default_window_name (de);
+}
+
+
+/* Callback for the data_open action.
+ Prompts for a filename and opens it */
+static void
+open_data_dialog (GtkAction *action, struct editor_window *de)
+{
+ GtkWidget *dialog =
+ gtk_file_chooser_dialog_new (_("Open"),
+ GTK_WINDOW (de->window),
+ GTK_FILE_CHOOSER_ACTION_OPEN,
+ GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT,
+ NULL);
+
+ GtkFileFilter *filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("System Files (*.sav)"));
+ gtk_file_filter_add_pattern (filter, "*.sav");
+ gtk_file_filter_add_pattern (filter, "*.SAV");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("Portable Files (*.por) "));
+ gtk_file_filter_add_pattern (filter, "*.por");
+ gtk_file_filter_add_pattern (filter, "*.POR");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ filter = gtk_file_filter_new ();
+ gtk_file_filter_set_name (filter, _("All Files"));
+ gtk_file_filter_add_pattern (filter, "*");
+ gtk_file_chooser_add_filter (GTK_FILE_CHOOSER (dialog), filter);
+
+ switch (gtk_dialog_run (GTK_DIALOG (dialog)))
+ {
+ case GTK_RESPONSE_ACCEPT:
+ {
+ struct getl_interface *sss;
+ gchar *file_name =
+ gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
+
+ sss = create_syntax_string_source ("GET FILE='%s'.", file_name);
+
+ execute_syntax (sss);
+
+ window_set_name_from_filename (de, file_name);
+
+ g_free (file_name);
+ }
+ break;
+ default:
+ break;
+ }
+
+ gtk_widget_destroy (dialog);
+}
+
+
+
+
Index: src/ui/gui/data-editor.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.glade,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/data-editor.glade 7 Jan 2007 04:04:00 -0000 1.10
+++ src/ui/gui/data-editor.glade 24 Jan 2007 08:30:22 -0000 1.11
@@ -72,23 +72,21 @@
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="save1">
+ <widget class="GtkImageMenuItem" id="file_save">
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="sensitive">True</property>
<property name="label">gtk-save</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate" handler="on_save1_activate"/>
</widget>
</child>
<child>
- <widget class="GtkImageMenuItem" id="save_as1">
+ <widget class="GtkImageMenuItem" id="file_save_as">
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="sensitive">True</property>
<property name="label">gtk-save-as</property>
<property name="use_underline">True</property>
<property name="use_stock">True</property>
- <signal name="activate"
handler="on_save_as1_activate"/>
</widget>
</child>
<child>
@@ -424,7 +422,7 @@
<child>
<widget class="GtkToolButton" id="button-open">
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="sensitive">True</property>
<property name="tooltip" translatable="yes">Open</property>
<property name="stock_id">gtk-open</property>
</widget>
@@ -435,7 +433,7 @@
<child>
<widget class="GtkToolButton" id="button-save">
<property name="visible">True</property>
- <property name="sensitive">False</property>
+ <property name="sensitive">True</property>
<property name="tooltip" translatable="yes">Save</property>
<property name="stock_id">gtk-save</property>
<signal name="clicked" handler="on_save1_activate"/>
Index: src/ui/gui/data-editor.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/data-editor.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- src/ui/gui/data-editor.h 4 Jan 2007 08:15:27 -0000 1.3
+++ src/ui/gui/data-editor.h 24 Jan 2007 08:30:22 -0000 1.4
@@ -28,8 +28,18 @@
struct data_editor
{
struct editor_window parent;
+
+ GtkAction *action_data_new;
+ GtkAction *action_data_open;
+ GtkAction *action_data_save_as;
+ GtkAction *action_data_save;
+
GtkAction *invoke_weight_cases_dialog;
+
GladeXML *xml;
+
+ gboolean save_as_portable;
+ gchar *file_name;
};
@@ -37,8 +47,6 @@
void new_data_window (GtkMenuItem *, gpointer);
-void open_data_window (GtkMenuItem *, gpointer);
-
void data_editor_select_sheet (struct data_editor *de, gint page);
Index: src/ui/gui/helper.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/ui/gui/helper.c 20 Jan 2007 00:02:13 -0000 1.14
+++ src/ui/gui/helper.c 24 Jan 2007 08:30:22 -0000 1.15
@@ -9,6 +9,7 @@
#include <data/data-in.h>
#include <data/data-out.h>
#include <data/dictionary.h>
+#include <data/storage-stream.h>
#include <libpspp/message.h>
#include <libpspp/i18n.h>
@@ -20,6 +21,7 @@
#include <language/command.h>
#include <data/procedure.h>
#include <language/lexer/lexer.h>
+#include "psppire-data-store.h"
#include <gettext.h>
@@ -141,12 +143,14 @@
extern struct dataset *the_dataset;
extern struct source_stream *the_source_stream;
+extern PsppireDataStore *the_data_store;
-void
+gboolean
execute_syntax (struct getl_interface *sss)
{
struct lexer *lexer;
- g_return_if_fail (proc_has_source (the_dataset));
+
+ g_return_val_if_fail (proc_has_source (the_dataset), FALSE);
lexer = lex_create (the_source_stream);
@@ -154,11 +158,7 @@
for (;;)
{
- const struct dictionary *dict = dataset_dict (the_dataset);
-
- int result = cmd_parse (lexer, the_dataset,
- dict_get_var_cnt (dict) > 0 ?
- CMD_STATE_DATA : CMD_STATE_INITIAL);
+ int result = cmd_parse (lexer, the_dataset);
if (result == CMD_EOF || result == CMD_FINISH)
break;
@@ -167,6 +167,19 @@
getl_abort_noninteractive (the_source_stream);
lex_destroy (lexer);
+
+ /* The GUI must *always* have a data source, even if it's an empty one.
+ Therefore, we find that there is none, (for example NEW FILE was the last
+ item in the syntax) then we create a new one. */
+ if ( ! proc_has_source (the_dataset))
+ proc_set_source (the_dataset,
+ storage_source_create
(the_data_store->case_file->flexifile)
+ );
+
+ /* GUI syntax needs this implicit EXECUTE command at the end of
+ every script. Otherwise commands like GET could leave the GUI without
+ a casefile. */
+ return procedure (the_dataset, NULL, NULL);
}
Index: src/ui/gui/helper.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/helper.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- src/ui/gui/helper.h 20 Jan 2007 00:02:13 -0000 1.10
+++ src/ui/gui/helper.h 24 Jan 2007 08:30:22 -0000 1.11
@@ -46,7 +46,7 @@
void reference_manual (GtkMenuItem *, gpointer);
struct getl_interface;
-void execute_syntax (struct getl_interface *sss);
+gboolean execute_syntax (struct getl_interface *sss);
#endif
Index: src/ui/gui/syntax-editor.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/syntax-editor.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- src/ui/gui/syntax-editor.c 20 Jan 2007 00:02:13 -0000 1.14
+++ src/ui/gui/syntax-editor.c 24 Jan 2007 08:30:22 -0000 1.15
@@ -341,12 +341,6 @@
G_CALLBACK (new_data_window),
e->window);
- g_signal_connect (get_widget_assert (xml,"file_open_data"),
- "activate",
- G_CALLBACK (open_data_window),
- e->window);
-
-
g_signal_connect (get_widget_assert (xml,"help_about"),
"activate",
G_CALLBACK (about_new),
Index: src/ui/gui/syntax-editor.glade
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/syntax-editor.glade,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- src/ui/gui/syntax-editor.glade 28 Dec 2006 00:44:45 -0000 1.4
+++ src/ui/gui/syntax-editor.glade 24 Jan 2007 08:30:22 -0000 1.5
@@ -62,6 +62,7 @@
<child>
<widget class="GtkMenuItem" id="file_new_data">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label"
translatable="yes">_Data</property>
<property name="use_underline">True</property>
</widget>
@@ -92,6 +93,7 @@
<child>
<widget class="GtkMenuItem" id="file_open_data">
<property name="visible">True</property>
+ <property name="sensitive">False</property>
<property name="label"
translatable="yes">_Data</property>
<property name="use_underline">True</property>
</widget>
Index: src/ui/gui/window-manager.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/window-manager.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- src/ui/gui/window-manager.c 20 Jan 2007 00:02:13 -0000 1.5
+++ src/ui/gui/window-manager.c 24 Jan 2007 08:30:22 -0000 1.6
@@ -110,6 +110,11 @@
return e;
}
+void
+default_window_name (struct editor_window *w)
+{
+ set_window_name (w, NULL);
+}
static void
set_window_name (struct editor_window *e,
Index: src/ui/gui/window-manager.h
===================================================================
RCS file: /sources/pspp/pspp/src/ui/gui/window-manager.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- src/ui/gui/window-manager.h 28 Dec 2006 00:44:45 -0000 1.2
+++ src/ui/gui/window-manager.h 24 Jan 2007 08:30:22 -0000 1.3
@@ -25,6 +25,8 @@
void window_set_name_from_filename (struct editor_window *e,
const gchar *filename);
+void default_window_name (struct editor_window *w);
+
void minimise_all_windows (void);
Index: src/ui/terminal/main.c
===================================================================
RCS file: /sources/pspp/pspp/src/ui/terminal/main.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- src/ui/terminal/main.c 1 Jan 2007 01:44:33 -0000 1.29
+++ src/ui/terminal/main.c 24 Jan 2007 08:30:22 -0000 1.30
@@ -118,9 +118,8 @@
for (;;)
{
- int result = cmd_parse (the_lexer, the_dataset,
- proc_has_source (the_dataset)
- ? CMD_STATE_DATA : CMD_STATE_INITIAL);
+ int result = cmd_parse (the_lexer, the_dataset);
+
if (result == CMD_EOF || result == CMD_FINISH)
break;
if (result == CMD_CASCADING_FAILURE &&
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pspp-cvs] pspp po/de.po po/pspp.pot src/language/ChangeLo...,
John Darrington <=