[git] GpgOL - branch, mime-addin, updated. gpgol-1.2.0-52-g5d62fdb
by Andre Heinecke
cvs at cvs.gnupg.org
Wed Oct 14 14:40:31 CEST 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".
The branch, mime-addin has been updated
via 5d62fdbfc5b0931080efda5aca1f52d18acbb7f1 (commit)
from 7bf40a952a1822cb42bebf866992d7a6eb9db4f6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 5d62fdbfc5b0931080efda5aca1f52d18acbb7f1
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Wed Oct 14 14:33:17 2015 +0200
Fix resource id's and remove unused resources.
* dialogs.h: Only use the upper 28 bit for id's. Remove 32/64px ids.
* oomhelp.cpp (put_oom_icon): Clarify comment and use new ids for mask.
* explorers.cpp (add_explorer_controls),
inspectors.cpp (add_inspector_controls, update_crypto_info):
Use _16 id directly.
* decrypt-32.bmp,
decrypt-32m.bmp,
decrypt-verify-32.bmp,
decrypt-verify-32m.bmp,
encrypt-32.bmp,
encrypt-32m.bmp,
key-manager-32.bmp,
key-manager-32m.bmp,
key-manager-64.bmp,
key-manager-64m.bmp,
sign-32.bmp,
sign-32m.bmp,
verify-32.bmp,
verify-32m.bmp: Removed
--
The binutils 2.25 complained about resource merge failures because
the upper 28 bits from some of our resoruce were identical and the
last four bits are appearently used by microsoft for some kind of
string table lookup.
While fixing this I've noticed that the 32 / 64 px size bitmap
resources were not used anywhere. So they are removed now.
diff --git a/src/decrypt-32.bmp b/src/decrypt-32.bmp
deleted file mode 100644
index f7d4405..0000000
Binary files a/src/decrypt-32.bmp and /dev/null differ
diff --git a/src/decrypt-32m.bmp b/src/decrypt-32m.bmp
deleted file mode 100644
index 47256be..0000000
Binary files a/src/decrypt-32m.bmp and /dev/null differ
diff --git a/src/decrypt-verify-32.bmp b/src/decrypt-verify-32.bmp
deleted file mode 100644
index 41e7040..0000000
Binary files a/src/decrypt-verify-32.bmp and /dev/null differ
diff --git a/src/decrypt-verify-32m.bmp b/src/decrypt-verify-32m.bmp
deleted file mode 100644
index ae9026a..0000000
Binary files a/src/decrypt-verify-32m.bmp and /dev/null differ
diff --git a/src/dialogs.h b/src/dialogs.h
index aec411c..cec97c5 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -7,141 +7,112 @@
#define DIALOGS_H
-/* Ids used for bitmaps. There is some magic in the identifiers: In
- the code we only use values like 3000, the icon code then uses the
- current system pixel size to the Id and tries to load this one.
- The mask is always the next id. */
-#define IDB_ENCRYPT 3000
-#define IDB_ENCRYPT_16 3016
-#define IDB_ENCRYPT_16M 3017
-#define IDB_ENCRYPT_32 3032
-#define IDB_ENCRYPT_32M 3033
-#define IDB_ENCRYPT_64 3064
-#define IDB_ENCRYPT_64M 3065
-
-#define IDB_SIGN 3100
-#define IDB_SIGN_16 3116
-#define IDB_SIGN_16M 3117
-#define IDB_SIGN_32 3132
-#define IDB_SIGN_32M 3133
-#define IDB_SIGN_64 3164
-#define IDB_SIGN_64M 3165
-
-#define IDB_KEY_MANAGER 3200
-#define IDB_KEY_MANAGER_16 3216
-#define IDB_KEY_MANAGER_16M 3217
-#define IDB_KEY_MANAGER_32 3232
-#define IDB_KEY_MANAGER_32M 3233
-#define IDB_KEY_MANAGER_64 3264
-#define IDB_KEY_MANAGER_64M 3265
-
-#define IDB_DECRYPT 3300
-#define IDB_DECRYPT_16 3316
-#define IDB_DECRYPT_16M 3317
-#define IDB_DECRYPT_32 3332
-#define IDB_DECRYPT_32M 3333
-#define IDB_DECRYPT_64 3364
-#define IDB_DECRYPT_64M 3365
-
-#define IDB_VERIFY 3400
-#define IDB_VERIFY_16 3416
-#define IDB_VERIFY_16M 3417
-#define IDB_VERIFY_32 3432
-#define IDB_VERIFY_32M 3433
-#define IDB_VERIFY_64 3464
-#define IDB_VERIFY_64M 3465
-
-#define IDB_DECRYPT_VERIFY 3500
-#define IDB_DECRYPT_VERIFY_16 3516
-#define IDB_DECRYPT_VERIFY_16M 3517
-#define IDB_DECRYPT_VERIFY_32 3532
-#define IDB_DECRYPT_VERIFY_32M 3533
-#define IDB_DECRYPT_VERIFY_64 3564
-#define IDB_DECRYPT_VERIFY_64M 3565
+/* Ids used for bitmaps. There is some magic in the identifiers: In
+ the code we only use the first ID value and add 16 to find the mask.
+ The last 4 bits should always be 0 to avoid problems with ld's resource merge
+ code which only uses the first 28 bits as the "name" of the resource
+ and tries to merge resource entries with the same name.
+ */
+#define IDB_ENCRYPT_16 0x1000
+#define IDB_ENCRYPT_16M 0x1010
+#define IDB_SIGN_16 0x1100
+#define IDB_SIGN_16M 0x1110
-/* Special */
-#define IDB_BANNER 3900 /* The g10 Code logo. */
+#define IDB_KEY_MANAGER_16 0x1200
+#define IDB_KEY_MANAGER_16M 0x1210
+#define IDB_DECRYPT_16 0x1300
+#define IDB_DECRYPT_16M 0x1310
+
+#define IDB_VERIFY_16 0x1400
+#define IDB_VERIFY_16M 0x1410
+
+#define IDB_DECRYPT_VERIFY_16 0x1500
+#define IDB_DECRYPT_VERIFY_16M 0x1510
+
+/* Special */
+#define IDB_BANNER 0x3900 /* The g10 Code logo. */
-/* Ids used for the main config dialog. */
-#define IDD_GPG_OPTIONS 4001
-#define IDC_TIME_PHRASES 4010
-#define IDC_ENCRYPT_DEFAULT 4011
-#define IDC_SIGN_DEFAULT 4012
-#define IDC_ENCRYPT_WITH_STANDARD_KEY 4013
-#define IDC_OPENPGP_DEFAULT 4014
-#define IDC_SMIME_DEFAULT 4015
-#define IDC_GPG_OPTIONS 4016
-#define IDC_BITMAP 4017
-#define IDC_VERSION_INFO 4018
-#define IDC_ENCRYPT_TO 4019
-#define IDC_ENABLE_SMIME 4020
-#define IDC_PREVIEW_DECRYPT 4021
-#define IDC_PREFER_HTML 4022
-#define IDC_G_GENERAL 4023
-#define IDC_G_SEND 4024
-#define IDC_G_RECV 4025
-#define IDC_BODY_AS_ATTACHMENT 4026
-#define IDC_GPG_CONF 4027
-#define IDC_G10CODE_STRING 4028
/* Ids for the extended options dialog. */
-#define IDD_EXT_OPTIONS 4101
-#define IDC_T_DEBUG_LOGFILE 4113
-#define IDC_DEBUG_LOGFILE 4114
+#define IDD_EXT_OPTIONS 0x4110
+#define IDC_T_DEBUG_LOGFILE 0x4120
+#define IDC_DEBUG_LOGFILE 0x4130
/* Ids for the recipient selection dialog. */
-#define IDD_ENC 4201
-#define IDC_ENC_RSET1 4210
-#define IDC_ENC_RSET2_T 4211
-#define IDC_ENC_RSET2 4212
-#define IDC_ENC_NOTFOUND_T 4213
-#define IDC_ENC_NOTFOUND 4214
+#define IDD_ENC 0x4210
+#define IDC_ENC_RSET1 0x4220
+#define IDC_ENC_RSET2_T 0x4230
+#define IDC_ENC_RSET2 0x4240
+#define IDC_ENC_NOTFOUND_T 0x4250
+#define IDC_ENC_NOTFOUND 0x4260
/* Ids for the two decryption dialogs. */
-#define IDD_DEC 4301
-#define IDD_DECEXT 4302
-#define IDC_DEC_KEYLIST 4310
-#define IDC_DEC_HINT 4311
-#define IDC_DEC_PASSINF 4312
-#define IDC_DEC_PASS 4313
-#define IDC_DEC_HIDE 4314
-#define IDC_DECEXT_RSET_T 4320
-#define IDC_DECEXT_RSET 4321
-#define IDC_DECEXT_KEYLIST 4322
-#define IDC_DECEXT_HINT 4323
-#define IDC_DECEXT_PASSINF 4324
-#define IDC_DECEXT_PASS 4325
-#define IDC_DECEXT_HIDE 4326
+#define IDD_DEC 0x4310
+#define IDD_DECEXT 0x4320
+#define IDC_DEC_KEYLIST 0x4330
+#define IDC_DEC_HINT 0x4340
+#define IDC_DEC_PASSINF 0x4350
+#define IDC_DEC_PASS 0x4360
+#define IDC_DEC_HIDE 0x4370
+#define IDC_DECEXT_RSET_T 0x4380
+#define IDC_DECEXT_RSET 0x4390
+#define IDC_DECEXT_KEYLIST 0x43A0
+#define IDC_DECEXT_HINT 0x43B0
+#define IDC_DECEXT_PASSINF 0x43C0
+#define IDC_DECEXT_PASS 0x43D0
+#define IDC_DECEXT_HIDE 0x43E0
/* Ids for the verification dialog. */
-#define IDD_VRY 4401
-#define IDC_VRY_TIME_T 4410
-#define IDC_VRY_TIME 4411
-#define IDC_VRY_PKALGO_T 4412
-#define IDC_VRY_PKALGO 4413
-#define IDC_VRY_KEYID_T 4414
-#define IDC_VRY_KEYID 4415
-#define IDC_VRY_STATUS 4416
-#define IDC_VRY_ISSUER_T 4417
-#define IDC_VRY_ISSUER 4418
-#define IDC_VRY_AKALIST_T 4419
-#define IDC_VRY_AKALIST 4420
-#define IDC_VRY_HINT 4421
+#define IDD_VRY 0x4410
+#define IDC_VRY_TIME_T 0x4420
+#define IDC_VRY_TIME 0x4430
+#define IDC_VRY_PKALGO_T 0x4440
+#define IDC_VRY_PKALGO 0x4450
+#define IDC_VRY_KEYID_T 0x4460
+#define IDC_VRY_KEYID 0x4470
+#define IDC_VRY_STATUS 0x4480
+#define IDC_VRY_ISSUER_T 0x4490
+#define IDC_VRY_ISSUER 0x44A0
+#define IDC_VRY_AKALIST_T 0x44B0
+#define IDC_VRY_AKALIST 0x44C0
+#define IDC_VRY_HINT 0x44D0
+
+/* Ids used for the main config dialog. */
+#define IDD_GPG_OPTIONS 0x5000
+#define IDC_TIME_PHRASES 0x5010
+#define IDC_ENCRYPT_DEFAULT 0x5020
+#define IDC_SIGN_DEFAULT 0x5030
+#define IDC_ENCRYPT_WITH_STANDARD_KEY 0x5040
+#define IDC_OPENPGP_DEFAULT 0x5050
+#define IDC_SMIME_DEFAULT 0x5060
+#define IDC_GPG_OPTIONS 0x5070
+#define IDC_BITMAP 0x5080
+#define IDC_VERSION_INFO 0x5090
+#define IDC_ENCRYPT_TO 0x50A0
+#define IDC_ENABLE_SMIME 0x50B0
+#define IDC_PREVIEW_DECRYPT 0x50C0
+#define IDC_PREFER_HTML 0x50D0
+#define IDC_G_GENERAL 0x50E0
+#define IDC_G_SEND 0x50F0
+#define IDC_G_RECV 0x5100
+#define IDC_BODY_AS_ATTACHMENT 0x5110
+#define IDC_GPG_CONF 0x5120
+#define IDC_G10CODE_STRING 0x5130
/* Ids for PNG Images */
-#define IDI_ENCRYPT_16_PNG 6000
-#define IDI_ENCRYPT_48_PNG 6001
-#define IDI_DECRYPT_16_PNG 6010
-#define IDI_DECRYPT_48_PNG 6011
-#define IDI_KEY_MANAGER_64_PNG 6020
-#define IDI_ENCSIGN_FILE_48_PNG 6030
-#define IDI_SIGN_48_PNG 6040
-#define IDI_VERIFY_48_PNG 6050
+#define IDI_ENCRYPT_16_PNG 0x6000
+#define IDI_ENCRYPT_48_PNG 0x6010
+#define IDI_DECRYPT_16_PNG 0x6020
+#define IDI_DECRYPT_48_PNG 0x6030
+#define IDI_KEY_MANAGER_64_PNG 0x6040
+#define IDI_ENCSIGN_FILE_48_PNG 0x6050
+#define IDI_SIGN_48_PNG 0x6060
+#define IDI_VERIFY_48_PNG 0x6070
#endif /*DIALOGS_H*/
diff --git a/src/encrypt-32.bmp b/src/encrypt-32.bmp
deleted file mode 100644
index b2c400e..0000000
Binary files a/src/encrypt-32.bmp and /dev/null differ
diff --git a/src/encrypt-32m.bmp b/src/encrypt-32m.bmp
deleted file mode 100644
index f4fc2dc..0000000
Binary files a/src/encrypt-32m.bmp and /dev/null differ
diff --git a/src/explorers.cpp b/src/explorers.cpp
index d1f7081..388fdff 100644
--- a/src/explorers.cpp
+++ b/src/explorers.cpp
@@ -124,7 +124,7 @@ add_explorer_controls (LPOOMEXPLORER explorer)
put_oom_bool (button, "BeginGroup", true);
put_oom_int (button, "Style", msoButtonIconAndCaption );
put_oom_string (button, "Caption", _("GnuPG Certificate &Manager"));
- put_oom_icon (button, IDB_KEY_MANAGER, 16);
+ put_oom_icon (button, IDB_KEY_MANAGER_16, 16);
install_GpgolCommandBarButtonEvents_sink (button);
/* Fixme: Save the returned object for an Unadvice. */
@@ -165,7 +165,7 @@ add_explorer_controls (LPOOMEXPLORER explorer)
put_oom_int (button, "Style", msoButtonIcon );
put_oom_string (button, "TooltipText",
_("Open the certificate manager"));
- put_oom_icon (button, IDB_KEY_MANAGER, 16);
+ put_oom_icon (button, IDB_KEY_MANAGER_16, 16);
install_GpgolCommandBarButtonEvents_sink (button);
/* Fixme: store the event sink object somewhere. */
diff --git a/src/inspectors.cpp b/src/inspectors.cpp
index 966df5b..626dc64 100644
--- a/src/inspectors.cpp
+++ b/src/inspectors.cpp
@@ -685,7 +685,7 @@ add_inspector_controls (LPOOMINSPECTOR inspector)
put_oom_int (button, "Style", msoButtonIconAndCaption );
put_oom_string (button, "Caption",
_("&encrypt message with GnuPG"));
- put_oom_icon (button, IDB_ENCRYPT, 16);
+ put_oom_icon (button, IDB_ENCRYPT_16, 16);
put_oom_int (button, "State",
opt.encrypt_default? msoButtonDown: msoButtonUp);
@@ -699,7 +699,7 @@ add_inspector_controls (LPOOMINSPECTOR inspector)
tag = add_tag (button, "GpgOL_Inspector_Sign");
put_oom_int (button, "Style", msoButtonIconAndCaption );
put_oom_string (button, "Caption", _("&sign message with GnuPG"));
- put_oom_icon (button, IDB_SIGN, 16);
+ put_oom_icon (button, IDB_SIGN_16, 16);
put_oom_int (button, "State",
opt.sign_default? msoButtonDown: msoButtonUp);
@@ -725,7 +725,7 @@ add_inspector_controls (LPOOMINSPECTOR inspector)
tag = add_tag (button, "GpgOL_Inspector_Verify");
put_oom_int (button, "Style", msoButtonIconAndCaption );
put_oom_string (button, "Caption", _("GpgOL Decrypt/Verify"));
- put_oom_icon (button, IDB_DECRYPT_VERIFY, 16);
+ put_oom_icon (button, IDB_DECRYPT_VERIFY_16, 16);
obj = install_GpgolCommandBarButtonEvents_sink (button);
move_to_button_list (&buttonlist, obj, button, tag);
@@ -786,7 +786,7 @@ add_inspector_controls (LPOOMINSPECTOR inspector)
tag = add_tag (button, "GpgOL_Inspector_Encrypt at t");
put_oom_int (button, "Style", msoButtonIcon );
put_oom_string (button, "Caption", _("Encrypt message with GnuPG"));
- put_oom_icon (button, IDB_ENCRYPT, 16);
+ put_oom_icon (button, IDB_ENCRYPT_16, 16);
put_oom_int (button, "State", msoButtonMixed );
put_oom_int (button, "State",
opt.encrypt_default? msoButtonDown: msoButtonUp);
@@ -802,7 +802,7 @@ add_inspector_controls (LPOOMINSPECTOR inspector)
tag = add_tag (button, "GpgOL_Inspector_Sign at t");
put_oom_int (button, "Style", msoButtonIcon);
put_oom_string (button, "Caption", _("Sign message with GnuPG"));
- put_oom_icon (button, IDB_SIGN, 16);
+ put_oom_icon (button, IDB_SIGN_16, 16);
put_oom_int (button, "State", msoButtonDown);
put_oom_int (button, "State",
opt.sign_default? msoButtonDown: msoButtonUp);
@@ -920,19 +920,19 @@ update_crypto_info (LPDISPATCH inspector)
{
tooltip = _("This is a signed and encrypted message.\n"
"Click for more information. ");
- iconrc = IDB_DECRYPT_VERIFY;
+ iconrc = IDB_DECRYPT_VERIFY_16;
}
else if (is_signed)
{
tooltip = _("This is a signed message.\n"
"Click for more information. ");
- iconrc = IDB_VERIFY;
+ iconrc = IDB_VERIFY_16;
}
else if (is_encrypted)
{
tooltip = _("This is an encrypted message.\n"
"Click for more information. ");
- iconrc = IDB_DECRYPT;
+ iconrc = IDB_DECRYPT_16;
}
message->Release ();
diff --git a/src/key-manager-32.bmp b/src/key-manager-32.bmp
deleted file mode 100644
index 4e97da0..0000000
Binary files a/src/key-manager-32.bmp and /dev/null differ
diff --git a/src/key-manager-32m.bmp b/src/key-manager-32m.bmp
deleted file mode 100644
index 9c4f21e..0000000
Binary files a/src/key-manager-32m.bmp and /dev/null differ
diff --git a/src/key-manager-64.bmp b/src/key-manager-64.bmp
deleted file mode 100644
index 036ac2d..0000000
Binary files a/src/key-manager-64.bmp and /dev/null differ
diff --git a/src/key-manager-64m.bmp b/src/key-manager-64m.bmp
deleted file mode 100644
index d79e998..0000000
Binary files a/src/key-manager-64m.bmp and /dev/null differ
diff --git a/src/oomhelp.cpp b/src/oomhelp.cpp
index dd12002..1d8f7da 100644
--- a/src/oomhelp.cpp
+++ b/src/oomhelp.cpp
@@ -375,15 +375,15 @@ put_oom_icon (LPDISPATCH pDisp, int resource_id, int size)
{
int rc;
- /* Fixme: For now we assume a system pixel size of 16. What we
- actually should do is to get the current value and then find the
- best matching icon. */
- resource_id += 16;
+ /* This code is only relevant for Outlook < 2010.
+ Ideally it should grab the system pixel size and use an
+ icon of the appropiate size (e.g. 32 or 64px)
+ */
rc = put_picture_or_mask (pDisp, resource_id, size, 0);
if (!rc)
- rc = put_picture_or_mask (pDisp, resource_id+1, size, 1);
-
+ rc = put_picture_or_mask (pDisp, resource_id + 16, size, 1);
+
return rc;
}
diff --git a/src/sign-32.bmp b/src/sign-32.bmp
deleted file mode 100644
index 5bb0784..0000000
Binary files a/src/sign-32.bmp and /dev/null differ
diff --git a/src/sign-32m.bmp b/src/sign-32m.bmp
deleted file mode 100644
index 0efcd7c..0000000
Binary files a/src/sign-32m.bmp and /dev/null differ
diff --git a/src/verify-32.bmp b/src/verify-32.bmp
deleted file mode 100644
index 45eea7e..0000000
Binary files a/src/verify-32.bmp and /dev/null differ
diff --git a/src/verify-32m.bmp b/src/verify-32m.bmp
deleted file mode 100644
index 7335023..0000000
Binary files a/src/verify-32m.bmp and /dev/null differ
-----------------------------------------------------------------------
Summary of changes:
src/decrypt-32.bmp | Bin 1726 -> 0 bytes
src/decrypt-32m.bmp | Bin 190 -> 0 bytes
src/decrypt-verify-32.bmp | Bin 2098 -> 0 bytes
src/decrypt-verify-32m.bmp | Bin 190 -> 0 bytes
src/dialogs.h | 207 +++++++++++++++++++--------------------------
src/encrypt-32.bmp | Bin 1846 -> 0 bytes
src/encrypt-32m.bmp | Bin 190 -> 0 bytes
src/explorers.cpp | 4 +-
src/inspectors.cpp | 16 ++--
src/key-manager-32.bmp | Bin 1898 -> 0 bytes
src/key-manager-32m.bmp | Bin 190 -> 0 bytes
src/key-manager-64.bmp | Bin 5170 -> 0 bytes
src/key-manager-64m.bmp | Bin 574 -> 0 bytes
src/oomhelp.cpp | 12 +--
src/sign-32.bmp | Bin 1766 -> 0 bytes
src/sign-32m.bmp | Bin 190 -> 0 bytes
src/verify-32.bmp | Bin 2098 -> 0 bytes
src/verify-32m.bmp | Bin 190 -> 0 bytes
18 files changed, 105 insertions(+), 134 deletions(-)
delete mode 100644 src/decrypt-32.bmp
delete mode 100644 src/decrypt-32m.bmp
delete mode 100644 src/decrypt-verify-32.bmp
delete mode 100644 src/decrypt-verify-32m.bmp
delete mode 100644 src/encrypt-32.bmp
delete mode 100644 src/encrypt-32m.bmp
delete mode 100644 src/key-manager-32.bmp
delete mode 100644 src/key-manager-32m.bmp
delete mode 100644 src/key-manager-64.bmp
delete mode 100644 src/key-manager-64m.bmp
delete mode 100644 src/sign-32.bmp
delete mode 100644 src/sign-32m.bmp
delete mode 100644 src/verify-32.bmp
delete mode 100644 src/verify-32m.bmp
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list