[svn] GPGol - r130 - in trunk: . po src
svn author wk
cvs at cvs.gnupg.org
Fri Dec 2 18:39:28 CET 2005
Author: wk
Date: 2005-12-02 18:39:27 +0100 (Fri, 02 Dec 2005)
New Revision: 130
Modified:
trunk/ChangeLog
trunk/Makefile.am
trunk/NEWS
trunk/po/POTFILES.in
trunk/po/de.po
trunk/src/ChangeLog
trunk/src/config-dialog.c
trunk/src/gpgol-ids.h
trunk/src/gpgol-rsrcs.rc
trunk/src/intern.h
trunk/src/main.c
trunk/src/olflange-dlgs.cpp
trunk/src/olflange-ids.h
trunk/src/olflange-rsrcs.rc
trunk/src/olflange.cpp
trunk/src/olflange.h
trunk/src/passphrase-dialog.c
trunk/src/recipient-dialog.c
trunk/src/verify-dialog.c
Log:
i18n stuff, cleanups and made make distcheck work.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/ChangeLog 2005-12-02 17:39:27 UTC (rev 130)
@@ -1,3 +1,7 @@
+2005-12-02 Werner Koch <wk at g10code.com>
+
+ * Makefile.am (DISTCHECK_CONFIGURE_FLAGS): New.
+
2005-11-30 Werner Koch <wk at g10code.com>
* po/de.po: New.
Modified: trunk/Makefile.am
===================================================================
--- trunk/Makefile.am 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/Makefile.am 2005-12-02 17:39:27 UTC (rev 130)
@@ -13,6 +13,11 @@
ACLOCAL_AMFLAGS = -I m4
AUTOMAKE_OPTIONS = dist-bzip2
+# Because we can only build the w32 version e need to help automake here a bit.
+DISTCHECK_CONFIGURE_FLAGS = --host=i586-mingw32msvc --build=i686-pc-linux-gnu \
+ --prefix=@prefix@ \
+ --with-gpg-error-prefix=@prefix@ \
+ --with-gpgme-prefix=@prefix@
EXTRA_DIST = autogen.sh
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/NEWS 2005-12-02 17:39:27 UTC (rev 130)
@@ -3,7 +3,11 @@
* Added translation framework. Provided German translation.
+* New option to enable automatic decryption in the preview window.
+* Removed deprecated options to configure gpg path and homedir.
+
+
Noteworthy changes for version 0.9.3 (2005-09-29)
=================================================
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/po/POTFILES.in 2005-12-02 17:39:27 UTC (rev 130)
@@ -5,7 +5,6 @@
src/display.cpp
src/engine-gpgme.c
src/gpgmsg.cpp
-src/keylist.c
src/main.c
src/msgcache.c
src/olflange-dlgs.cpp
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/po/de.po 2005-12-02 17:39:27 UTC (rev 130)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: GPGol 0.9.4\n"
"Report-Msgid-Bugs-To: bug-gpgol at g10code.com\n"
-"POT-Creation-Date: 2005-11-30 17:02+0100\n"
+"POT-Creation-Date: 2005-12-02 17:48+0100\n"
"PO-Revision-Date: 2005-11-30 17:06+0100\n"
"Last-Translator: Werner Koch <wk at gnupg.org>\n"
"Language-Team: de\n"
@@ -15,62 +15,67 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: src/engine-gpgme.c:880
+#: src/config-dialog.c:298
+#, fuzzy
+msgid "Select GPG Key Manager"
+msgstr "Die GPG Schlüsselverwaltung öffnen"
+
+#: src/engine-gpgme.c:892
msgid "Fingerprint: "
msgstr "Fingerabdruck: "
-#: src/engine-gpgme.c:937
+#: src/engine-gpgme.c:949
msgid "This signature is valid\n"
msgstr "Diese Unterschrift ist korrekt\n"
-#: src/engine-gpgme.c:939
+#: src/engine-gpgme.c:951
msgid "signature state is \"green\"\n"
msgstr "Status der Unterschrift ist \"grün\"\n"
-#: src/engine-gpgme.c:941
+#: src/engine-gpgme.c:953
msgid "signature state is \"red\"\n"
msgstr "Status der Unterschrift ist \"rot\"\n"
-#: src/engine-gpgme.c:945
+#: src/engine-gpgme.c:957
msgid "Warning: One of the keys has been revoked\n"
msgstr "Warnung: Einer der Schlüssel wurde widerrufen\n"
-#: src/engine-gpgme.c:955
+#: src/engine-gpgme.c:967
msgid "Warning: The key used to create the signature expired at: "
msgstr ""
"Warnung: Der Schlüssel mit der diese Unterschrift erzeugt wurde verfiel am: "
-#: src/engine-gpgme.c:961
+#: src/engine-gpgme.c:973
msgid "Warning: At least one certification key has expired\n"
msgstr ""
"Warnung: Mindestens einer der Zertifizierungsschlüssel ist abgelaufen\n"
-#: src/engine-gpgme.c:967
+#: src/engine-gpgme.c:979
msgid "Warning: The signature expired at: "
msgstr "Die Unterschrift verfiel am: "
-#: src/engine-gpgme.c:973
+#: src/engine-gpgme.c:985
msgid "Can't verify due to a missing key or certificate\n"
msgstr ""
"Aufrund eines fehlenden Schlüssels ist eine Überprüfung nicht möglich\n"
-#: src/engine-gpgme.c:977
+#: src/engine-gpgme.c:989
msgid "The CRL is not available\n"
msgstr "Die CRL ist nicht verfügbar\n"
-#: src/engine-gpgme.c:983
+#: src/engine-gpgme.c:995
msgid "Available CRL is too old\n"
msgstr "Die vorhandene CRL ist zu alt\n"
-#: src/engine-gpgme.c:988
+#: src/engine-gpgme.c:1000
msgid "A policy requirement was not met\n"
msgstr "Eine Richtlinie wurde nicht erfüllt\n"
-#: src/engine-gpgme.c:994
+#: src/engine-gpgme.c:1006
msgid "A system error occured"
msgstr "Ein Systemfehler ist aufgetreten"
-#: src/engine-gpgme.c:1031
+#: src/engine-gpgme.c:1043
msgid ""
"WARNING: We have NO indication whether the key belongs to the person named "
"as shown above\n"
@@ -78,12 +83,12 @@
"WARNUNG: Es gibt keinen Hinweis darauf, ob der Schlüssel wirklich der Person "
"gehört, die oben angezeigt ist\n"
-#: src/engine-gpgme.c:1038
+#: src/engine-gpgme.c:1050
msgid "WARNING: The key does NOT BELONG to the person named as shown above\n"
msgstr ""
"WARNUNG: Der Schlüssel gehört NICHT der Person die oben angezeigt ist\n"
-#: src/engine-gpgme.c:1042
+#: src/engine-gpgme.c:1054
msgid ""
"WARNING: It is NOT certain that the key belongs to the person named as shown "
"above\n"
@@ -91,73 +96,78 @@
"WARNING: Es ist nicht sicher, daß der Schlüssel der Person gehört, die oben "
"angezeigt ist\n"
-#: src/engine-gpgme.c:1075
+#: src/engine-gpgme.c:1087
msgid "Verification started at: "
msgstr "Überprüfung begann am: "
-#: src/engine-gpgme.c:1080
+#: src/engine-gpgme.c:1092
msgid "Verification result for: "
msgstr "Prüfungsresultat für: "
-#: src/engine-gpgme.c:1081
+#: src/engine-gpgme.c:1093
msgid "[unnamed part]"
msgstr "[Unbenannter Teil]"
-#: src/engine-gpgme.c:1099 src/engine-gpgme.c:1129
+#: src/engine-gpgme.c:1111 src/engine-gpgme.c:1141
msgid "Good signature from: "
msgstr "Korrekte Unterschrift von: "
-#: src/engine-gpgme.c:1106
+#: src/engine-gpgme.c:1118
msgid " aka: "
msgstr " alias: "
-#: src/engine-gpgme.c:1110 src/engine-gpgme.c:1132
+#: src/engine-gpgme.c:1122 src/engine-gpgme.c:1144
msgid " created: "
msgstr " erzeugt: "
-#: src/engine-gpgme.c:1119
+#: src/engine-gpgme.c:1131
msgid "*BAD* signature claimed to be from: "
msgstr "*FALSCHE* Unterschrift, vorgeblich von: "
-#: src/engine-gpgme.c:1142
+#: src/engine-gpgme.c:1154
msgid "Error checking signature"
msgstr "Fehler beim Prüfen der Unetrschrift"
-#: src/engine-gpgme.c:1158
+#: src/engine-gpgme.c:1170
msgid "*** Begin Notation (signature by: "
msgstr "*** Anfang Notation (Unterschrift von: "
-#: src/engine-gpgme.c:1178
+#: src/engine-gpgme.c:1190
msgid "*** End Notation ***\n"
msgstr "*** Ende Notation ***\n"
-#: src/gpgmsg.cpp:804
+#: src/gpgmsg.cpp:767
msgid "[No attestation computed (e.g. messages was not signed)"
msgstr ""
"[Kein Testat berechnet (z.B. da die Nachricht nicht unterschrieben war)"
-#: src/gpgmsg.cpp:926
+#: src/gpgmsg.cpp:892
msgid "No valid OpenPGP data found."
msgstr "Keine gültigen OpenPGP Daten gefunden"
-#: src/gpgmsg.cpp:927 src/gpgmsg.cpp:962 src/gpgmsg.cpp:974 src/gpgmsg.cpp:988
-#: src/gpgmsg.cpp:1064
+#: src/gpgmsg.cpp:893 src/gpgmsg.cpp:937 src/gpgmsg.cpp:951 src/gpgmsg.cpp:967
+#: src/gpgmsg.cpp:1048
msgid "Decryption"
msgstr "Entschlüsselung"
-#: src/gpgmsg.cpp:961 src/gpgmsg.cpp:973 src/gpgmsg.cpp:987
+#: src/gpgmsg.cpp:928
+#, fuzzy
+msgid "[This is a PGP/MIME message]"
+msgstr "[PGP/MIME Nachricht]"
+
+#: src/gpgmsg.cpp:936 src/gpgmsg.cpp:950 src/gpgmsg.cpp:966
msgid "Problem decrypting PGP/MIME message"
msgstr "Problem bei Entschlüsseln einer PGP/MIME Nachricht"
-#: src/gpgmsg.cpp:1016
+#: src/gpgmsg.cpp:1001
msgid "Verification Failure"
msgstr "Überprüfungsfehler"
-#: src/gpgmsg.cpp:1019
+#: src/gpgmsg.cpp:1004
msgid "Decryption Failure"
msgstr "Entschlüsselungsfehler"
-#: src/gpgmsg.cpp:1058
+#: src/gpgmsg.cpp:1042
msgid ""
"The message text cannot be displayed.\n"
"You have to save the decrypted message to view it.\n"
@@ -173,7 +183,7 @@
#. TRANSLATORS: Keep the @LIST@ verbatim on a separate line; it
#. will be expanded to a list of atatchment names.
-#: src/gpgmsg.cpp:1085
+#: src/gpgmsg.cpp:1069
msgid ""
"Signed attachments found.\n"
"\n"
@@ -185,13 +195,13 @@
"@LIST@\n"
"Möchten Sie diese Unterschriften überprüfen?"
-#: src/gpgmsg.cpp:1093
+#: src/gpgmsg.cpp:1077
msgid "Attachment Verification"
msgstr "Überprüfung der Anhänge"
#. TRANSLATORS: Keep the @LIST@ verbatim on a separate line; it
#. will be expanded to a list of atatchment names.
-#: src/gpgmsg.cpp:1111
+#: src/gpgmsg.cpp:1095
msgid ""
"Encrypted attachments found.\n"
"\n"
@@ -203,35 +213,35 @@
"@LIST@\n"
"Möchten Sie diese entschlüsseln und abspeichern?"
-#: src/gpgmsg.cpp:1118
+#: src/gpgmsg.cpp:1102
msgid "Attachment Decryption"
msgstr "Entschlüsselung eines Anhangs"
-#: src/gpgmsg.cpp:1176
+#: src/gpgmsg.cpp:1166
msgid "Signing Failure"
msgstr "Unterschrifterstellungsfehler"
-#: src/gpgmsg.cpp:1321
+#: src/gpgmsg.cpp:1314
msgid "Encryption Failure"
msgstr "Verschlüsselungsfehler"
-#: src/gpgmsg.cpp:1357 src/gpgmsg.cpp:2651
+#: src/gpgmsg.cpp:1350 src/gpgmsg.cpp:2645
msgid "Attachment Encryption Failure"
msgstr "Verschlüsselungsfehler eines Anhangs"
-#: src/gpgmsg.cpp:2058
+#: src/gpgmsg.cpp:2052
msgid "Attachment Verification Failure"
msgstr "Überprüfungsfehler eines Anhangs"
-#: src/gpgmsg.cpp:2241 src/gpgmsg.cpp:2290
+#: src/gpgmsg.cpp:2235 src/gpgmsg.cpp:2284
msgid "Attachment Decryption Failure"
msgstr "Entschlüsselungsfehler eines Anhangs"
-#: src/gpgmsg.cpp:2460
+#: src/gpgmsg.cpp:2454
msgid "Attachment Signing Failure"
msgstr "Unterschrifterstellungsfehler eines Anhangs"
-#: src/olflange.cpp:883
+#: src/olflange.cpp:884
msgid ""
"Sorry, we can only encrypt plain text messages and\n"
"no RTF messages. Please make sure that only the text\n"
@@ -242,51 +252,51 @@
"Sie sicher, daß lediglich das Text Format ausgewählt wurde.\n"
"(In der Menüleiste: \"Format\" => \"Nur Text\")"
-#: src/olflange.cpp:1268
+#: src/olflange.cpp:1272
msgid "&Decrypt and verify message"
msgstr "Entschlüsseln/Prüfen der Nachricht"
-#: src/olflange.cpp:1306
+#: src/olflange.cpp:1310
msgid "GPG &encrypt message"
msgstr "Mit GPG &verschlüsseln"
-#: src/olflange.cpp:1312
+#: src/olflange.cpp:1316
msgid "GPG &sign message"
msgstr "Mit GPG unter&schreiben"
-#: src/olflange.cpp:1358
+#: src/olflange.cpp:1362
msgid "GPG Key &Manager"
msgstr "GPG Schlüssel&verwaltung"
-#: src/olflange.cpp:1491
+#: src/olflange.cpp:1494
msgid "Could not start Key-Manager"
msgstr "Dei Schlüsselverwaltung konnte nicht aufgerufen werden"
-#: src/olflange.cpp:1537
+#: src/olflange.cpp:1540
msgid "Decrypt and verify the message."
msgstr "Entschlüsseln und Prüfen der Nachricht."
-#: src/olflange.cpp:1545
+#: src/olflange.cpp:1548
msgid "Select this option to encrypt the message."
msgstr "Wählen Sie diese Option zum Verschlüsseln der Nachricht."
-#: src/olflange.cpp:1551
+#: src/olflange.cpp:1554
msgid "Select this option to sign the message."
msgstr "Wählen Sie diese Option zum Unterschreiben der Nachricht."
-#: src/olflange.cpp:1560 src/olflange.cpp:1621 src/olflange.cpp:1703
+#: src/olflange.cpp:1563 src/olflange.cpp:1624 src/olflange.cpp:1706
msgid "Open GPG Key Manager"
msgstr "Die GPG Schlüsselverwaltung öffnen"
-#: src/olflange.cpp:1590 src/olflange.cpp:1654
+#: src/olflange.cpp:1593 src/olflange.cpp:1657
msgid "Decrypt message and verify signature"
msgstr "Nachricht entschlüsseln und Unterschrift prüfen"
-#: src/olflange.cpp:1601 src/olflange.cpp:1672
+#: src/olflange.cpp:1604 src/olflange.cpp:1675
msgid "Encrypt message with GPG"
msgstr "Nachricht mit GPG verschlüsseln"
-#: src/olflange.cpp:1610 src/olflange.cpp:1687
+#: src/olflange.cpp:1613 src/olflange.cpp:1690
msgid "Sign message with GPG"
msgstr "Nachricht mit GPG unterschreiben"
@@ -334,7 +344,7 @@
"\n"
"Möchten Sie wirklich abbrechen?"
-#: src/pgpmime.c:418
+#: src/pgpmime.c:421
msgid ""
"Error creating file\n"
"Please select another one"
@@ -342,19 +352,19 @@
"Fehler bei der Erstellung der Datei.\n"
"Bitte wählen Sie eine anderen Namen."
-#: src/pgpmime.c:420 src/pgpmime.c:553
+#: src/pgpmime.c:423 src/pgpmime.c:557
msgid "I/O-Error"
msgstr "Ein-/Ausgabefehler"
-#: src/pgpmime.c:552
+#: src/pgpmime.c:556
msgid "Error writing file"
msgstr "Dateischreibfehler"
-#: src/pgpmime.c:607
+#: src/pgpmime.c:613
msgid "[PGP/MIME message]"
msgstr "[PGP/MIME Nachricht]"
-#: src/pgpmime.c:623
+#: src/pgpmime.c:630
msgid "[PGP/MIME message without plain text body]"
msgstr "[PGP/MIME Nachricht ohne reinen Textkörper]"
@@ -373,7 +383,7 @@
msgid "Recipient Dialog"
msgstr "Auswahl des Empfängerschlüssels"
-#: src/recipient-dialog.c:531 src/verify-dialog.c:152
+#: src/recipient-dialog.c:537 src/verify-dialog.c:152
msgid "User-ID not found"
msgstr "User-ID nicht gefunden"
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/ChangeLog 2005-12-02 17:39:27 UTC (rev 130)
@@ -1,3 +1,27 @@
+2005-12-02 Werner Koch <wk at g10code.com>
+
+ * verify-dialog.c (verify_dialog_box): Actually allow for German
+ dialog.
+ * recipient-dialog.c (recipient_dialog_box)
+ (recipient_dialog_box2): Ditto.
+ * passphrase-dialog.c (signer_dialog_box)
+ (passphrase_callback_box): Ditto.
+
+ * intern.h (struct): New field PREVIEW_DECRYPT. Use it instead os
+ the old compatibility flags.
+ * main.c (write_options, read_options): Store/load preview decrypt.
+ * config-dialog.c (config_dlg_proc): Removed homedir and gpgbinary
+ options as they are deprecated. Put logfile entry here.
+ * olflange-dlgs.cpp (GPGOptionsDlgProc): Remove logfile entry. Add
+ preview-decrypt checkbox.
+ * olflange.cpp (InstallCommands): Remove experimental preview
+ command.
+
+ * w32-gettext.c (gettext_localename): New.
+ * config-dialog.c (config_dialog_box): Use it here to match the
+ gettext behaviour.
+ (GetPages): Ditto.
+
2005-12-01 Werner Koch <wk at g10code.com>
* engine-gpgme.c (op_decrypt_stream_to_gpgme, decrypt_stream)
Modified: trunk/src/config-dialog.c
===================================================================
--- trunk/src/config-dialog.c 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/config-dialog.c 2005-12-02 17:39:27 UTC (rev 130)
@@ -61,6 +61,7 @@
}
+#if 0
static void
SHFree (void *p)
{
@@ -71,8 +72,9 @@
pm->lpVtbl->Release(pm);
}
}
+#endif
-
+#if 0
/* Open the common dialog to select a folder. Caller has to free the string. */
static char*
get_folder (const char *title)
@@ -95,8 +97,8 @@
}
return path;
}
+#endif
-
static int
load_config_value_ext (char **val)
{
@@ -198,6 +200,7 @@
}
+#if 0
static int
does_folder_exist (const char *path)
{
@@ -217,8 +220,8 @@
}
return err;
}
+#endif
-
static int
does_file_exist (const char *name, int is_file)
{
@@ -275,56 +278,29 @@
char *buf = NULL;
char name[MAX_PATH+1];
int n;
+ const char *s;
switch (msg) {
case WM_INITDIALOG:
center_window (dlg, 0);
- if (!load_config_value (NULL, REGPATH, "gpgProgram", &buf)) {
- SetDlgItemText (dlg, IDC_OPT_GPGPRG, buf);
- xfree (buf);
- buf=NULL;
- }
- if (!load_config_value (NULL, REGPATH, "HomeDir", &buf)) {
- SetDlgItemText (dlg, IDC_OPT_HOMEDIR, buf);
- xfree (buf);
- buf=NULL;
- }
if (!load_config_value (NULL, REGPATH, "keyManager", &buf)) {
SetDlgItemText (dlg, IDC_OPT_KEYMAN, buf);
xfree (buf);
buf=NULL;
}
+ s = get_log_file ();
+ SetDlgItemText (dlg, IDC_DEBUG_LOGFILE, s);
break;
case WM_COMMAND:
switch (LOWORD (wparam)) {
- case IDC_OPT_SELPRG:
- buf = get_open_file_name (NULL, "Select GnuPG Binary");
- if (buf && *buf)
- SetDlgItemText(dlg, IDC_OPT_GPGPRG, buf);
- break;
-
- case IDC_OPT_SELHOMEDIR:
- buf = get_folder ("Select GnuPG Home Directory");
- if (buf && *buf)
- SetDlgItemText(dlg, IDC_OPT_HOMEDIR, buf);
- xfree (buf);
- break;
-
case IDC_OPT_SELKEYMAN:
- buf = get_open_file_name (NULL, "Select GnuPG Key Manager");
+ buf = get_open_file_name (NULL, _("Select GPG Key Manager"));
if (buf && *buf)
SetDlgItemText (dlg, IDC_OPT_KEYMAN, buf);
break;
case IDOK:
- n = GetDlgItemText (dlg, IDC_OPT_GPGPRG, name, MAX_PATH-1);
- if (n > 0) {
- if (does_file_exist (name, 1))
- return FALSE;
- if (store_config_value (NULL, REGPATH, "gpgProgram", name))
- error_box ("GPG Config");
- }
n = GetDlgItemText (dlg, IDC_OPT_KEYMAN, name, MAX_PATH-1);
if (n > 0) {
if (does_file_exist (name, 1))
@@ -332,12 +308,9 @@
if (store_config_value (NULL, REGPATH, "keyManager", name))
error_box ("GPG Config");
}
- n = GetDlgItemText (dlg, IDC_OPT_HOMEDIR, name, MAX_PATH-1);
+ n = GetDlgItemText (dlg, IDC_DEBUG_LOGFILE, name, MAX_PATH-1);
if (n > 0) {
- if (does_folder_exist (name))
- return FALSE;
- if (store_config_value (NULL, REGPATH, "HomeDir", name))
- error_box ("GPG Config");
+ set_log_file (name);
}
EndDialog (dlg, TRUE);
break;
@@ -353,18 +326,16 @@
void
config_dialog_box (HWND parent)
{
- int resid=0;
+ int resid;
- switch (GetUserDefaultLangID ())
- {
- case 0x0407: resid = IDD_OPT_DE;break;
- default: resid = IDD_OPT; break;
- }
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_OPT_DE;
+ else
+ resid = IDD_OPT;
- if (parent == NULL)
+ if (!parent)
parent = GetDesktopWindow ();
- DialogBoxParam (glob_hinst, (LPCTSTR)resid, parent,
- config_dlg_proc, 0);
+ DialogBoxParam (glob_hinst, (LPCTSTR)resid, parent, config_dlg_proc, 0);
}
Modified: trunk/src/gpgol-ids.h
===================================================================
--- trunk/src/gpgol-ids.h 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/gpgol-ids.h 2005-12-02 17:39:27 UTC (rev 130)
@@ -65,6 +65,7 @@
#define IDC_DECEXT_PASS 1045
#define IDC_DECEXT_HINT 1046
#define IDC_DECEXT_PASSINF 1047
+#define IDC_DEBUG_LOGFILE 1048
#endif /*GPGOL_IDS_H*/
Modified: trunk/src/gpgol-rsrcs.rc
===================================================================
--- trunk/src/gpgol-rsrcs.rc 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/gpgol-rsrcs.rc 2005-12-02 17:39:27 UTC (rev 130)
@@ -80,19 +80,18 @@
IDD_OPT_DE DIALOG DISCARDABLE 0, 0, 167, 119
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION
-CAPTION "Konfigurations Dialog"
+CAPTION "Konfigurationsdialog"
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Pfad zur GnuPG EXE-Datei",IDC_STATIC,2,10,87,8
- EDITTEXT IDC_OPT_GPGPRG,2,22,145,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_OPT_SELPRG,149,21,11,14
- LTEXT "Heimatverzeichnis von GnuPG",IDC_STATIC,2,41,98,8
- EDITTEXT IDC_OPT_HOMEDIR,2,53,145,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_OPT_SELHOMEDIR,149,53,11,14
- LTEXT "Pfad zur EXE-Datei des Key Managers",IDC_STATIC,2,72,
+ LTEXT "Dateiname der Schlüsselverwaltung",IDC_STATIC,2,20,
122,8
- EDITTEXT IDC_OPT_KEYMAN,2,81,144,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_OPT_SELKEYMAN,148,80,11,14
+ EDITTEXT IDC_OPT_KEYMAN,2,34,144,12,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_OPT_SELKEYMAN,148,34,11,14
+
+ LTEXT "Debugausgabe (zur Problemanalyse)",IDC_STATIC,2,50,
+ 122,8
+ EDITTEXT IDC_DEBUG_LOGFILE,2,60,144,12,ES_AUTOHSCROLL
+
DEFPUSHBUTTON "&OK",IDOK,112,101,50,14
END
@@ -226,12 +225,6 @@
CAPTION "Configuration Dialog"
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Path to GnuPG binary",IDC_STATIC,2,10,70,8
- EDITTEXT IDC_OPT_GPGPRG,2,22,145,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_OPT_SELPRG,149,21,11,14
- LTEXT "GnuPG home directory",IDC_STATIC,2,41,72,8
- EDITTEXT IDC_OPT_HOMEDIR,2,53,145,12,ES_AUTOHSCROLL
- PUSHBUTTON "...",IDC_OPT_SELHOMEDIR,149,53,11,14
LTEXT "Path to key-manager binary",IDC_STATIC,2,72,87,8
EDITTEXT IDC_OPT_KEYMAN,2,81,144,12,ES_AUTOHSCROLL
PUSHBUTTON "...",IDC_OPT_SELKEYMAN,148,80,11,14
Modified: trunk/src/intern.h
===================================================================
--- trunk/src/intern.h 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/intern.h 2005-12-02 17:39:27 UTC (rev 130)
@@ -99,6 +99,7 @@
int enc_format; /* Encryption format for attachments. */
char *default_key; /* Malloced default key or NULL. */
int add_default_key; /* Always also encrypt to the default key. */
+ int preview_decrypt; /* Decrypt in preview window. */
/* The compatibility flags. */
struct
@@ -106,7 +107,6 @@
unsigned int no_msgcache:1;
unsigned int no_pgpmime:1;
unsigned int no_oom_write:1; /* Don't write using Outlooks object model. */
- unsigned int preview_decryption:1; /* Decrypt in preview window. */
unsigned int old_reply_hack: 1; /* See gpgmsg.cpp:decrypt. */
unsigned int auto_decrypt: 1; /* Try to decrypt when clicked. */
unsigned int no_attestation: 1; /* Don't create an attestation. */
Modified: trunk/src/main.c
===================================================================
--- trunk/src/main.c 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/main.c 2005-12-02 17:39:27 UTC (rev 130)
@@ -381,6 +381,10 @@
opt.sign_default = val == NULL || *val != '1'? 0 : 1;
xfree (val); val = NULL;
+ load_extension_value ("previewDecrypt", &val);
+ opt.preview_decrypt = val == NULL || *val != '1'? 0 : 1;
+ xfree (val); val = NULL;
+
load_extension_value ("addDefaultKey", &val);
opt.add_default_key = val == NULL || *val != '1' ? 0 : 1;
xfree (val); val = NULL;
@@ -419,7 +423,7 @@
case 0: opt.compat.no_msgcache = x; break;
case 1: opt.compat.no_pgpmime = x; break;
case 2: opt.compat.no_oom_write = x; break;
- case 3: opt.compat.preview_decryption = x; break;
+ case 3: /* Not used anymore */ break;
case 4: opt.compat.old_reply_hack = x; break;
case 5: opt.compat.auto_decrypt = x; break;
case 6: opt.compat.no_attestation = x; break;
@@ -447,6 +451,7 @@
{"addDefaultKey", 0, opt.add_default_key},
{"saveDecryptedAttachments", 0, opt.save_decrypted_attach},
{"autoSignAttachments", 0, opt.auto_sign_attach},
+ {"previewDecrypt", 0, opt.preview_decrypt},
{"storePasswdTime", 1, opt.passwd_ttl},
{"encodingFormat", 1, opt.enc_format},
{"logFile", 2, 0, logfile},
Modified: trunk/src/olflange-dlgs.cpp
===================================================================
--- trunk/src/olflange-dlgs.cpp 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/olflange-dlgs.cpp 2005-12-02 17:39:27 UTC (rev 130)
@@ -128,16 +128,12 @@
case PSN_SETACTIVE: {
TCHAR s[30];
- const char *f;
if (opt.default_key)
SetDlgItemText (hDlg, IDC_ENCRYPT_TO, opt.default_key);
wsprintf(s, "%d", opt.passwd_ttl);
SendDlgItemMessage(hDlg, IDC_TIME_PHRASES, WM_SETTEXT,
0, (LPARAM) s);
- f = get_log_file ();
- SendDlgItemMessage (hDlg, IDC_DEBUG_LOGFILE, WM_SETTEXT,
- 0, (LPARAM)f);
hWndPage = pnmhdr->hwndFrom; // to be used in WM_COMMAND
SendDlgItemMessage (hDlg, IDC_ENCRYPT_DEFAULT, BM_SETCHECK,
!!opt.encrypt_default, 0L);
@@ -150,6 +146,8 @@
!!opt.save_decrypted_attach, 0L);
SendDlgItemMessage (hDlg, IDC_SIGN_ATTACHMENTS, BM_SETCHECK,
!!opt.auto_sign_attach, 0L);
+ SendDlgItemMessage (hDlg, IDC_PREVIEW_DECRYPT, BM_SETCHECK,
+ !!opt.preview_decrypt, 0L);
bMsgResult = FALSE; /* accepts activation */
break; }
@@ -173,9 +171,6 @@
SendDlgItemMessage (hDlg, IDC_TIME_PHRASES, WM_GETTEXT,
20, (LPARAM)s);
opt.passwd_ttl = (int)atol (s);
- SendDlgItemMessage (hDlg, IDC_DEBUG_LOGFILE, WM_GETTEXT,
- 200, (LPARAM)s);
- set_log_file (s);
SendDlgItemMessage (hDlg, IDC_ENCRYPT_TO, WM_GETTEXT,
200, (LPARAM)s);
set_default_key (s);
@@ -187,7 +182,9 @@
opt.save_decrypted_attach = !!SendDlgItemMessage
(hDlg, IDC_SAVE_DECRYPTED, BM_GETCHECK, 0, 0L);
opt.auto_sign_attach = !!SendDlgItemMessage
- (hDlg, IDC_SIGN_ATTACHMENTS, BM_GETCHECK, 0, 0L);
+ (hDlg, IDC_SIGN_ATTACHMENTS, BM_GETCHECK, 0, 0L);
+ opt.preview_decrypt = !!SendDlgItemMessage
+ (hDlg, IDC_PREVIEW_DECRYPT, BM_GETCHECK, 0, 0L);
write_options ();
bMsgResult = PSNRET_NOERROR;
Modified: trunk/src/olflange-ids.h
===================================================================
--- trunk/src/olflange-ids.h 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/olflange-ids.h 2005-12-02 17:39:27 UTC (rev 130)
@@ -19,12 +19,12 @@
#define IDC_SAVE_DECRYPTED 4004
#define IDC_GPG_OPTIONS 4006
#define IDC_BITMAP 4007
-#define IDC_DEBUG_LOGFILE 4008
#define IDB_BANNER 4009
#define IDC_VERSION_INFO 4009
#define IDB_BANNER_HI 4010
#define IDC_ENCRYPT_TO 4010
#define IDC_SIGN_ATTACHMENTS 4011
#define IDD_GPG_OPTIONS_DE 4012
+#define IDC_PREVIEW_DECRYPT 4013
#endif /*OLFLANGE_IDS_H*/
Modified: trunk/src/olflange-rsrcs.rc
===================================================================
--- trunk/src/olflange-rsrcs.rc 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/olflange-rsrcs.rc 2005-12-02 17:39:27 UTC (rev 130)
@@ -56,7 +56,7 @@
CAPTION "GnuPG"
FONT 8, "MS Sans Serif"
BEGIN
- GROUPBOX "Optionen",IDC_STATIC,9,9,242,87
+ GROUPBOX "Optionen",IDC_STATIC,9,9,242,100
CONTROL "Neue Nachrichten per Voreinstellung verschlüsseln",
IDC_ENCRYPT_DEFAULT,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,24,19,177,10
@@ -72,14 +72,16 @@
IDC_ENCRYPT_WITH_STANDARD_KEY,"Button",BS_AUTOCHECKBOX |
WS_TABSTOP,24,67,215,10
EDITTEXT IDC_ENCRYPT_TO,36,79,133,12,ES_AUTOHSCROLL
- GROUPBOX "Passphrase",IDC_STATIC,9,100,242,31
- LTEXT "Passphrase speichern für",IDC_STATIC,24,114,80,8
- EDITTEXT IDC_TIME_PHRASES,107,113,39,14,ES_AUTOHSCROLL
- LTEXT "Sekunden",IDC_STATIC,151,115,34,8
- GROUPBOX "Debug (nur für erfahrene Benutzer)",IDC_STATIC,9,134,
- 242,28
- LTEXT "Logdatei",IDC_STATIC,18,146,28,8
- EDITTEXT IDC_DEBUG_LOGFILE,48,145,138,13,ES_AUTOHSCROLL
+
+ CONTROL "Auch im Vorschaufenster entschlüsseln",
+ IDC_PREVIEW_DECRYPT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,
+ 24,95,162,10
+
+ GROUPBOX "Passphrase",IDC_STATIC,9,110,242,31
+ LTEXT "Passphrase speichern für",IDC_STATIC,24,124,80,8
+ EDITTEXT IDC_TIME_PHRASES,107,123,39,14,ES_AUTOHSCROLL
+ LTEXT "Sekunden",IDC_STATIC,151,125,34,8
+
PUSHBUTTON "&Erweitert...",IDC_GPG_OPTIONS,202,166,50,14
LTEXT "GPGol by g10 Code GmbH", IDC_STATIC,8,185,100,8
LTEXT "Version x ",IDC_VERSION_INFO,150,185,200,9
@@ -148,9 +150,6 @@
LTEXT "Cache &passphrase for",IDC_STATIC,24,114,70,8
EDITTEXT IDC_TIME_PHRASES,107,113,39,14,ES_AUTOHSCROLL
LTEXT "seconds",IDC_STATIC,151,115,28,8
- GROUPBOX "Debug (advanced users only)",IDC_STATIC,9,134,242,28
- LTEXT "Logfile",IDC_STATIC,18,146,22,8
- EDITTEXT IDC_DEBUG_LOGFILE,48,145,138,13,ES_AUTOHSCROLL
PUSHBUTTON "Ad&vanced..",IDC_GPG_OPTIONS,202,166,50,14
LTEXT "GPGol by g10 Code GmbH", IDC_STATIC,8,185,100,8
LTEXT "Version x ",IDC_VERSION_INFO,150,185,200,9
Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/olflange.cpp 2005-12-02 17:39:27 UTC (rev 130)
@@ -779,7 +779,7 @@
ULONG lFlags)
{
log_debug ("%s:%s: received\n", SRCNAME, __func__);
- if (opt.compat.preview_decryption)
+ if (opt.preview_decrypt)
{
TRACEPOINT ();
HRESULT hr;
@@ -1052,7 +1052,6 @@
m_lContext = 0;
m_nCmdEncrypt = 0;
m_nCmdSign = 0;
- m_nCmdPreviewDecrypt = 0;
m_nToolbarButtonID1 = 0;
m_nToolbarButtonID2 = 0;
m_nToolbarBitmap1 = 0;
@@ -1365,13 +1364,6 @@
m_nCmdEncrypt = *pnCommandIDBase;
(*pnCommandIDBase)++;
- AppendMenu (hMenuTools, MF_STRING,
- *pnCommandIDBase, _("GPG decrypt preview"));
-
- m_nCmdPreviewDecrypt = *pnCommandIDBase;
- (*pnCommandIDBase)++;
- TRACEPOINT ();
-
for (nTBIndex = nTBECnt-1; nTBIndex > -1; --nTBIndex)
{
if (EETBID_STANDARD == pTBEArray[nTBIndex].tbid)
@@ -1460,12 +1452,6 @@
}
- if (nCommandID == m_nCmdPreviewDecrypt && m_lContext == EECONTEXT_VIEWER)
- {
- opt.compat.preview_decryption = !opt.compat.preview_decryption;
- return S_OK;
- }
-
if ((nCommandID != m_nCmdEncrypt)
&& (nCommandID != m_nCmdSign))
return S_FALSE;
@@ -1789,27 +1775,27 @@
// containing the number of property
// sheets actually used.
{
- int resid = 0;
+ int resid ;
- switch (GetUserDefaultLangID ()) {
- case 0x0407: resid = IDD_GPG_OPTIONS_DE;break;
- default: resid = IDD_GPG_OPTIONS; break;
- }
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_GPG_OPTIONS_DE;
+ else
+ resid = IDD_GPG_OPTIONS;
- pPSP[0].dwSize = sizeof (PROPSHEETPAGE);
- pPSP[0].dwFlags = PSP_DEFAULT | PSP_HASHELP;
- pPSP[0].hInstance = glob_hinst;
- pPSP[0].pszTemplate = MAKEINTRESOURCE (resid);
- pPSP[0].hIcon = NULL;
- pPSP[0].pszTitle = NULL;
- pPSP[0].pfnDlgProc = (DLGPROC) GPGOptionsDlgProc;
- pPSP[0].lParam = 0;
- pPSP[0].pfnCallback = NULL;
- pPSP[0].pcRefParent = NULL;
+ pPSP[0].dwSize = sizeof (PROPSHEETPAGE);
+ pPSP[0].dwFlags = PSP_DEFAULT | PSP_HASHELP;
+ pPSP[0].hInstance = glob_hinst;
+ pPSP[0].pszTemplate = MAKEINTRESOURCE (resid);
+ pPSP[0].hIcon = NULL;
+ pPSP[0].pszTitle = NULL;
+ pPSP[0].pfnDlgProc = (DLGPROC) GPGOptionsDlgProc;
+ pPSP[0].lParam = 0;
+ pPSP[0].pfnCallback = NULL;
+ pPSP[0].pcRefParent = NULL;
- *plPSP = 1;
+ *plPSP = 1;
- return S_OK;
+ return S_OK;
}
Modified: trunk/src/olflange.h
===================================================================
--- trunk/src/olflange.h 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/olflange.h 2005-12-02 17:39:27 UTC (rev 130)
@@ -132,7 +132,6 @@
UINT m_nCmdEncrypt;
UINT m_nCmdSign;
- UINT m_nCmdPreviewDecrypt;
UINT m_nToolbarButtonID1;
UINT m_nToolbarButtonID2;
Modified: trunk/src/passphrase-dialog.c
===================================================================
--- trunk/src/passphrase-dialog.c 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/passphrase-dialog.c 2005-12-02 17:39:27 UTC (rev 130)
@@ -563,14 +563,19 @@
{
struct dialog_context_s context;
struct decrypt_key_s dec;
-
+ int resid;
+
memset (&context, 0, sizeof context);
memset (&dec, 0, sizeof dec);
dec.hide_pwd = 1;
context.dec = &dec;
context.no_encrypt_warning = encrypting;
- DialogBoxParam (glob_hinst, (LPCTSTR)IDD_DEC, GetDesktopWindow (),
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_DEC_DE;
+ else
+ resid = IDD_DEC;
+ DialogBoxParam (glob_hinst, (LPCTSTR)resid, GetDesktopWindow (),
decrypt_key_dlg_proc, (LPARAM)&context);
if (dec.signer)
@@ -608,6 +613,7 @@
struct decrypt_key_s *dec = opaque;
DWORD nwritten = 0;
char keyidstr[16+1];
+ int resid;
log_debug ("passphrase_callback_box: enter (uh=`%s',pi=`%s')\n",
uid_hint?uid_hint:"(null)", pass_info?pass_info:"(null)");
@@ -727,13 +733,25 @@
dec->user_id = xstrdup (s);
dec->last_was_bad = prev_was_bad;
if (dec->flags & 0x01)
- rc = DialogBoxParam (glob_hinst, (LPCSTR)IDD_DEC,
- GetDesktopWindow (),
- decrypt_key_dlg_proc, (LPARAM)&context);
+ {
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_DEC_DE;
+ else
+ resid = IDD_DEC;
+ rc = DialogBoxParam (glob_hinst, (LPCSTR)resid,
+ GetDesktopWindow (),
+ decrypt_key_dlg_proc, (LPARAM)&context);
+ }
else
- rc = DialogBoxParam (glob_hinst, (LPCTSTR)IDD_DEC_EXT,
- GetDesktopWindow (),
- decrypt_key_ext_dlg_proc, (LPARAM)&context);
+ {
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_DEC_EXT_DE;
+ else
+ resid = IDD_DEC_EXT;
+ rc = DialogBoxParam (glob_hinst, (LPCTSTR)resid,
+ GetDesktopWindow (),
+ decrypt_key_ext_dlg_proc, (LPARAM)&context);
+ }
if (rc <= 0)
log_debug_w32 (-1, "%s: dialog failed (rc=%d)", __func__, rc);
release_keyarray (context.keyarray);
Modified: trunk/src/recipient-dialog.c
===================================================================
--- trunk/src/recipient-dialog.c 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/recipient-dialog.c 2005-12-02 17:39:27 UTC (rev 130)
@@ -482,11 +482,16 @@
recipient_dialog_box (gpgme_key_t **ret_rset)
{
struct recipient_cb_s cb;
+ int resid;
*ret_rset = NULL;
memset (&cb, 0, sizeof (cb));
- DialogBoxParam (glob_hinst, (LPCTSTR)IDD_ENC, GetDesktopWindow(),
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_ENC_DE;
+ else
+ resid = IDD_ENC;
+ DialogBoxParam (glob_hinst, (LPCTSTR)resid, GetDesktopWindow(),
recipient_dlg_proc, (LPARAM)&cb);
if (cb.opts & OPT_FLAG_CANCEL)
release_keyarray (cb.selected_keys, cb.selected_keys_count);
@@ -514,6 +519,7 @@
struct recipient_cb_s cb;
int i;
size_t n;
+ int resid;
*ret_rset = NULL;
@@ -533,7 +539,11 @@
cb.unknown_keys = unknown;
- DialogBoxParam (glob_hinst, (LPCTSTR)IDD_ENC, GetDesktopWindow (),
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_ENC_DE;
+ else
+ resid = IDD_ENC;
+ DialogBoxParam (glob_hinst, (LPCTSTR)resid, GetDesktopWindow (),
recipient_dlg_proc, (LPARAM)&cb);
if (cb.opts & OPT_FLAG_CANCEL)
Modified: trunk/src/verify-dialog.c
===================================================================
--- trunk/src/verify-dialog.c 2005-12-01 19:24:32 UTC (rev 129)
+++ trunk/src/verify-dialog.c 2005-12-02 17:39:27 UTC (rev 130)
@@ -231,12 +231,17 @@
verify_dialog_box (gpgme_verify_result_t res, const char *filename)
{
struct dialog_context ctx;
+ int resid;
memset (&ctx,0, sizeof ctx);
ctx.res = res;
ctx.filename = filename;
- DialogBoxParam (glob_hinst, (LPCTSTR)IDD_VRY, GetDesktopWindow (),
+ if (!strncmp (gettext_localename (), "de", 2))
+ resid = IDD_VRY_DE;
+ else
+ resid = IDD_VRY;
+ DialogBoxParam (glob_hinst, (LPCTSTR)resid, GetDesktopWindow (),
verify_dlg_proc, (LPARAM)&ctx);
return res->signatures->summary == GPGME_SIGSUM_GREEN? 0 : -1;
}
More information about the Gnupg-commits
mailing list