[svn] GpgEX - r17 - in trunk: . po src
svn author marcus
cvs at cvs.gnupg.org
Tue Sep 11 16:29:27 CEST 2007
Author: marcus
Date: 2007-09-11 16:28:55 +0200 (Tue, 11 Sep 2007)
New Revision: 17
Modified:
trunk/ChangeLog
trunk/po/POTFILES.in
trunk/po/de.po
trunk/src/ChangeLog
trunk/src/client.cc
trunk/src/client.h
trunk/src/gpgex.cc
trunk/src/gpgex.h
Log:
po/
2007-09-11 Marcus Brinkmann <marcus at g10code.de>
* po/de.po: Update.
src/
2007-09-11 Marcus Brinkmann <marcus at g10code.de>
* client.h (class client_t): New members decrypt, verify, encrypt,
and sign.
* client.cc: Add implementations for these.
* gpgex.h: Move all ID_CMD_* macros to ...
* gpgex.cc: ... here. Add new macros for new commands.
(gpgex_t::InvokeCommand, gpgex_t::QueryContextMenu): Implement new
commands.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/ChangeLog 2007-09-11 14:28:55 UTC (rev 17)
@@ -1,6 +1,9 @@
2007-09-11 Marcus Brinkmann <marcus at g10code.de>
+ * po/de.po: Update.
+
* po/de.po: New file.
+
* po/LINGUAS: Add de.
* Makefile.am (DISTCHECK_CONFIGURE_FLAGS): Add
--with-libassuan-prefix and --with-gpg-error-prefix.
Modified: trunk/po/POTFILES.in
===================================================================
--- trunk/po/POTFILES.in 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/po/POTFILES.in 2007-09-11 14:28:55 UTC (rev 17)
@@ -1,4 +1,3 @@
src/main.cc
src/client.cc
-src/gpgex.h
src/gpgex.cc
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/po/de.po 2007-09-11 14:28:55 UTC (rev 17)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: gpgex 0.0.0-svn10\n"
"Report-Msgid-Bugs-To: bug-gpgex at g10code.com\n"
-"POT-Creation-Date: 2007-09-10 22:59+0200\n"
-"PO-Revision-Date: 2007-09-11 14:56+0200\n"
+"POT-Creation-Date: 2007-09-11 16:17+0200\n"
+"PO-Revision-Date: 2007-09-11 16:20+0200\n"
"Last-Translator: Marcus Brinkmann <marcus at g10code.com>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
@@ -16,26 +16,42 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: src/client.cc:136
+#: src/client.cc:135
msgid "Can not access Kleopatra, see log file for details"
-msgstr "Kann nicht auf Kleopatra zugreifen, siehe Protokolldatei fuer Details"
+msgstr "Kann nicht auf Kleopatra zugreifen, siehe Protokolldatei für Details"
-#: src/gpgex.h:42
+#: src/gpgex.cc:51
msgid "Help on GpgEX"
msgstr "Hilfe zu GpgEX"
-#: src/gpgex.h:43
+#: src/gpgex.cc:52
msgid "Decrypt and verify"
-msgstr "Entschlüsseln und verifizieren"
+msgstr "Entschlüsseln und verifizieren"
-#: src/gpgex.h:44
-msgid "Sign and encrypt"
-msgstr "Verschlüsseln und signieren"
+#: src/gpgex.cc:53
+msgid "Decrypt"
+msgstr "Entschlüsseln"
-#: src/gpgex.h:45
+#: src/gpgex.cc:54
+msgid "Verify"
+msgstr "Verifizieren"
+
+#: src/gpgex.cc:55
+msgid "Encrypt and sign"
+msgstr "Verschlüsseln und verifizieren"
+
+#: src/gpgex.cc:56
+msgid "Encrypt"
+msgstr "Verschlüsseln"
+
+#: src/gpgex.cc:57
+msgid "Sign"
+msgstr "Signieren"
+
+#: src/gpgex.cc:58
msgid "Import keys"
msgstr "Zertifikate importieren"
-#: src/gpgex.cc:274
+#: src/gpgex.cc:295
msgid "More GpgEX options"
msgstr "Mehr GpgEX Optionen"
Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/src/ChangeLog 2007-09-11 14:28:55 UTC (rev 17)
@@ -1,5 +1,13 @@
2007-09-11 Marcus Brinkmann <marcus at g10code.de>
+ * client.h (class client_t): New members decrypt, verify, encrypt,
+ and sign.
+ * client.cc: Add implementations for these.
+ * gpgex.h: Move all ID_CMD_* macros to ...
+ * gpgex.cc: ... here. Add new macros for new commands.
+ (gpgex_t::InvokeCommand, gpgex_t::QueryContextMenu): Implement new
+ commands.
+
* Makefile.am (libgpg-error.a, libassuan.a): Use -f flag with ln.
* registry.h (default_dir): New prototype.
* registry.c (default_dir, standard_homedir): New functions.
Modified: trunk/src/client.cc
===================================================================
--- trunk/src/client.cc 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/src/client.cc 2007-09-11 14:28:55 UTC (rev 17)
@@ -148,12 +148,41 @@
void
+client_t::verify (vector<string> &filenames)
+{
+ this->call_assuan ("VERIFY", filenames);
+}
+
+
+void
+client_t::decrypt (vector<string> &filenames)
+{
+ this->call_assuan ("DECRYPT", filenames);
+}
+
+
+void
client_t::encrypt_sign (vector<string> &filenames)
{
this->call_assuan ("ENCRPYT_SIGN", filenames);
}
+
void
+client_t::encrypt (vector<string> &filenames)
+{
+ this->call_assuan ("ENCRPYT", filenames);
+}
+
+
+void
+client_t::sign (vector<string> &filenames)
+{
+ this->call_assuan ("SIGN", filenames);
+}
+
+
+void
client_t::import (vector<string> &filenames)
{
this->call_assuan ("IMPORT", filenames);
Modified: trunk/src/client.h
===================================================================
--- trunk/src/client.h 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/src/client.h 2007-09-11 14:28:55 UTC (rev 17)
@@ -43,7 +43,11 @@
}
void decrypt_verify (vector<string> &filenames);
+ void decrypt (vector<string> &filenames);
+ void verify (vector<string> &filenames);
void encrypt_sign (vector<string> &filenames);
+ void encrypt (vector<string> &filenames);
+ void sign (vector<string> &filenames);
void import (vector<string> &filenames);
};
Modified: trunk/src/gpgex.cc
===================================================================
--- trunk/src/gpgex.cc 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/src/gpgex.cc 2007-09-11 14:28:55 UTC (rev 17)
@@ -37,6 +37,27 @@
#include "gpgex.h"
+/* For context menus. */
+#define ID_CMD_HELP 0
+#define ID_CMD_DECRYPT_VERIFY 1
+#define ID_CMD_DECRYPT 2
+#define ID_CMD_VERIFY 3
+#define ID_CMD_ENCRYPT_SIGN 4
+#define ID_CMD_ENCRYPT 5
+#define ID_CMD_SIGN 6
+#define ID_CMD_IMPORT 7
+#define ID_CMD_MAX 7
+
+#define ID_CMD_STR_HELP _("Help on GpgEX")
+#define ID_CMD_STR_DECRYPT_VERIFY _("Decrypt and verify")
+#define ID_CMD_STR_DECRYPT _("Decrypt")
+#define ID_CMD_STR_VERIFY _("Verify")
+#define ID_CMD_STR_ENCRYPT_SIGN _("Encrypt and sign")
+#define ID_CMD_STR_ENCRYPT _("Encrypt")
+#define ID_CMD_STR_SIGN _("Sign")
+#define ID_CMD_STR_IMPORT _("Import keys")
+
+
/* Reset the instance between operations. */
void
gpgex_t::reset (void)
@@ -246,8 +267,8 @@
if (this->all_files_gpg)
{
res = InsertMenu (hMenu, indexMenu++, MF_BYPOSITION | MF_STRING,
- idCmdFirst + ID_CMD_VERIFY_DECRYPT,
- ID_CMD_STR_VERIFY_DECRYPT);
+ idCmdFirst + ID_CMD_DECRYPT_VERIFY,
+ ID_CMD_STR_DECRYPT_VERIFY);
if (! res)
return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
}
@@ -255,8 +276,8 @@
{
/* FIXME: Check error. */
res = InsertMenu (hMenu, indexMenu++, MF_BYPOSITION | MF_STRING,
- idCmdFirst + ID_CMD_SIGN_ENCRYPT,
- ID_CMD_STR_SIGN_ENCRYPT);
+ idCmdFirst + ID_CMD_ENCRYPT_SIGN,
+ ID_CMD_STR_ENCRYPT_SIGN);
if (! res)
return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
}
@@ -292,15 +313,30 @@
return TRACE_RES (HRESULT_FROM_WIN32 (GetLastError ()));
res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
- idCmdFirst + ID_CMD_VERIFY_DECRYPT,
- ID_CMD_STR_VERIFY_DECRYPT);
-
+ idCmdFirst + ID_CMD_DECRYPT_VERIFY,
+ ID_CMD_STR_DECRYPT_VERIFY);
if (res)
res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
- idCmdFirst + ID_CMD_SIGN_ENCRYPT,
- ID_CMD_STR_SIGN_ENCRYPT);
+ idCmdFirst + ID_CMD_DECRYPT,
+ ID_CMD_STR_DECRYPT);
if (res)
res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
+ idCmdFirst + ID_CMD_VERIFY,
+ ID_CMD_STR_VERIFY);
+ if (res)
+ res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
+ idCmdFirst + ID_CMD_ENCRYPT_SIGN,
+ ID_CMD_STR_ENCRYPT_SIGN);
+ if (res)
+ res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
+ idCmdFirst + ID_CMD_ENCRYPT,
+ ID_CMD_STR_ENCRYPT);
+ if (res)
+ res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
+ idCmdFirst + ID_CMD_SIGN,
+ ID_CMD_STR_SIGN);
+ if (res)
+ res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_STRING,
idCmdFirst + ID_CMD_IMPORT, ID_CMD_STR_IMPORT);
if (res)
res = InsertMenu (popup, idx++, MF_BYPOSITION | MF_SEPARATOR, 0, NULL);
@@ -377,12 +413,24 @@
MessageBox (lpcmi->hwnd, msg.c_str (), "GpgEX", MB_ICONINFORMATION);
}
break;
- case ID_CMD_VERIFY_DECRYPT:
+ case ID_CMD_DECRYPT_VERIFY:
client.decrypt_verify (this->filenames);
break;
- case ID_CMD_SIGN_ENCRYPT:
+ case ID_CMD_DECRYPT:
+ client.decrypt (this->filenames);
+ break;
+ case ID_CMD_VERIFY:
+ client.verify (this->filenames);
+ break;
+ case ID_CMD_ENCRYPT_SIGN:
client.encrypt_sign (this->filenames);
break;
+ case ID_CMD_ENCRYPT:
+ client.encrypt (this->filenames);
+ break;
+ case ID_CMD_SIGN:
+ client.sign (this->filenames);
+ break;
case ID_CMD_IMPORT:
client.import (this->filenames);
break;
Modified: trunk/src/gpgex.h
===================================================================
--- trunk/src/gpgex.h 2007-09-11 13:52:39 UTC (rev 16)
+++ trunk/src/gpgex.h 2007-09-11 14:28:55 UTC (rev 17)
@@ -32,19 +32,6 @@
#include "bitmaps.h"
-/* For context menus. */
-#define ID_CMD_HELP 0
-#define ID_CMD_VERIFY_DECRYPT 1
-#define ID_CMD_SIGN_ENCRYPT 2
-#define ID_CMD_IMPORT 3
-#define ID_CMD_MAX 3
-
-#define ID_CMD_STR_HELP _("Help on GpgEX")
-#define ID_CMD_STR_VERIFY_DECRYPT _("Decrypt and verify")
-#define ID_CMD_STR_SIGN_ENCRYPT _("Sign and encrypt")
-#define ID_CMD_STR_IMPORT _("Import keys")
-
-
/* Our shell extension interface. We use multiple inheritance to
achieve polymorphy.
More information about the Gnupg-commits
mailing list