[git] GpgOL - branch, nomapi, updated. gpgol-1.4.0-92-g51f5a2d
by Andre Heinecke
cvs at cvs.gnupg.org
Tue Oct 18 10:27:56 CEST 2016
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, nomapi has been updated
via 51f5a2d9628c60ac490fbd5ee0c1511179ec74a0 (commit)
via 608ba6ac6170ff0e2bc8884a5a234d8775c1beb0 (commit)
from 5c7b1ba75cb929b9caa9b1805215eaf1768efc66 (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 51f5a2d9628c60ac490fbd5ee0c1511179ec74a0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Oct 18 10:27:14 2016 +0200
Move icons into subdir
--
diff --git a/configure.ac b/configure.ac
index e7e8f57..876977d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -311,6 +311,7 @@ fi
AC_CONFIG_FILES([ Makefile
src/Makefile
+src/icons/Makefile
src/versioninfo.rc
forms/Makefile
doc/Makefile
diff --git a/src/Makefile.am b/src/Makefile.am
index 6909886..4f242df 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
-# Makefile.am - main makefile for dialogs part of GPGol
+# Makefile.am - makefile for GPGol
# Copyright (C) 2005 g10 Code GmbH
-#
+# Copyright (C) 2016 Intevation GmbH
+#
# This file is free software; as a special exception the author gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
@@ -11,24 +12,15 @@
## Process this file with automake to produce Makefile.in
+
unused_sources = item-events.cpp
+SUBDIRS = icons
+
bin_PROGRAMS = gpgol
-#treeview
EXTRA_DIST = \
versioninfo.rc.in mapi32.def $(unused_sources) Outlook.gpl \
- encrypt-16.bmp encrypt-16m.bmp \
- sign-16.bmp sign-16m.bmp \
- key-manager-16.bmp key-manager-16m.bmp \
- decrypt-16.bmp decrypt-16m.bmp \
- verify-16.bmp verify-16m.bmp \
- decrypt-verify-16.bmp decrypt-verify-16m.bmp \
- encrypt-16.png encrypt-48.png \
- key-manager-64.png \
- decrypt-16.png decrypt-48.png \
- encrypt-sign-file-48.png \
- sign-48.png verify-48.png \
- dialogs.rc README.icons
+ dialogs.rc
EXEEXT = .dll
diff --git a/src/dialogs.rc b/src/dialogs.rc
index f233a9c..5c975ad 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -25,32 +25,32 @@
#include "afxres.h"
-IDB_ENCRYPT_16 BITMAP DISCARDABLE "encrypt-16.bmp"
-IDB_ENCRYPT_16M BITMAP DISCARDABLE "encrypt-16m.bmp"
-IDI_ENCRYPT_16_PNG RCDATA "encrypt-16.png"
-IDI_ENCRYPT_48_PNG RCDATA "encrypt-48.png"
+IDB_ENCRYPT_16 BITMAP DISCARDABLE "icons/encrypt-16.bmp"
+IDB_ENCRYPT_16M BITMAP DISCARDABLE "icons/encrypt-16m.bmp"
+IDI_ENCRYPT_16_PNG RCDATA "icons/encrypt-16.png"
+IDI_ENCRYPT_48_PNG RCDATA "icons/encrypt-48.png"
-IDB_SIGN_16 BITMAP DISCARDABLE "sign-16.bmp"
-IDB_SIGN_16M BITMAP DISCARDABLE "sign-16m.bmp"
-IDI_SIGN_48_PNG RCDATA "sign-48.png"
+IDB_SIGN_16 BITMAP DISCARDABLE "icons/sign-16.bmp"
+IDB_SIGN_16M BITMAP DISCARDABLE "icons/sign-16m.bmp"
+IDI_SIGN_48_PNG RCDATA "icons/sign-48.png"
-IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "key-manager-16.bmp"
-IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "key-manager-16m.bmp"
-IDI_KEY_MANAGER_64_PNG RCDATA "key-manager-64.png"
+IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "icons/key-manager-16.bmp"
+IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "icons/key-manager-16m.bmp"
+IDI_KEY_MANAGER_64_PNG RCDATA "icons/key-manager-64.png"
-IDB_DECRYPT_16 BITMAP DISCARDABLE "decrypt-16.bmp"
-IDB_DECRYPT_16M BITMAP DISCARDABLE "decrypt-16m.bmp"
-IDI_DECRYPT_16_PNG RCDATA "decrypt-16.png"
-IDI_DECRYPT_48_PNG RCDATA "decrypt-48.png"
+IDB_DECRYPT_16 BITMAP DISCARDABLE "icons/decrypt-16.bmp"
+IDB_DECRYPT_16M BITMAP DISCARDABLE "icons/decrypt-16m.bmp"
+IDI_DECRYPT_16_PNG RCDATA "icons/decrypt-16.png"
+IDI_DECRYPT_48_PNG RCDATA "icons/decrypt-48.png"
-IDB_VERIFY_16 BITMAP DISCARDABLE "verify-16.bmp"
-IDB_VERIFY_16M BITMAP DISCARDABLE "verify-16m.bmp"
-IDI_VERIFY_48_PNG RCDATA "verify-48.png"
+IDB_VERIFY_16 BITMAP DISCARDABLE "icons/verify-16.bmp"
+IDB_VERIFY_16M BITMAP DISCARDABLE "icons/verify-16m.bmp"
+IDI_VERIFY_48_PNG RCDATA "icons/verify-48.png"
-IDB_DECRYPT_VERIFY_16 BITMAP DISCARDABLE "decrypt-verify-16.bmp"
-IDB_DECRYPT_VERIFY_16M BITMAP DISCARDABLE "decrypt-verify-16m.bmp"
+IDB_DECRYPT_VERIFY_16 BITMAP DISCARDABLE "icons/decrypt-verify-16.bmp"
+IDB_DECRYPT_VERIFY_16M BITMAP DISCARDABLE "icons/decrypt-verify-16m.bmp"
-IDI_ENCSIGN_FILE_48_PNG RCDATA "encrypt-sign-file-48.png"
+IDI_ENCSIGN_FILE_48_PNG RCDATA "icons/encrypt-sign-file-48.png"
diff --git a/src/README.icons b/src/icons/README.icons
similarity index 93%
rename from src/README.icons
rename to src/icons/README.icons
index 3d55741..edf7fb8 100644
--- a/src/README.icons
+++ b/src/icons/README.icons
@@ -21,13 +21,13 @@ and those installed via the forms extensions from external files.
dialogs.rc to create the resource. This is all integtraged into the
Makefile. A sample entry in dialogs.rc looks like this:
- IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "key-manager-16.bmp"
- IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "key-manager-16m.bmp"
- IDB_KEY_MANAGER_32 BITMAP DISCARDABLE "key-manager-32.bmp"
- IDB_KEY_MANAGER_32M BITMAP DISCARDABLE "key-manager-32m.bmp"
+ IDB_KEY_MANAGER_16 BITMAP DISCARDABLE "icons/key-manager-16.bmp"
+ IDB_KEY_MANAGER_16M BITMAP DISCARDABLE "icons/key-manager-16m.bmp"
+ IDB_KEY_MANAGER_32 BITMAP DISCARDABLE "icons/key-manager-32.bmp"
+ IDB_KEY_MANAGER_32M BITMAP DISCARDABLE "icons/key-manager-32m.bmp"
//IDB_KEY_MANAGER_64 BITMAP DISCARDABLE
//IDB_KEY_MANAGER_64M BITMAP DISCARDABLE
- IDI_KEY_MANAGER_64_PNG RCDATA "key-manager-64.png"
+ IDI_KEY_MANAGER_64_PNG RCDATA "icons/key-manager-64.png"
This is the icon for the certificate manager. We provide two
resolutions: 16x16 and 32x32 pixel. I have not yet encountered the
@@ -62,7 +62,7 @@ and those installed via the forms extensions from external files.
6. Select Select->By_Color, click on the transparent area.
Change the background color to white (0xffffff) and run
Layer->Transparency->Remove_Alpha_Channel.
-
+
7. Select Select->Invert. Use "Bucket Fill" to fill the now
selected non-transparent area with black (0x000000). "Fill whole
selection" comes handy here. Make sure that you have a only
@@ -99,7 +99,7 @@ and those installed via the forms extensions from external files.
compression. Click "Save".
4. Load a 32x32 PNG version of the icon into The Gimp.
-
+
5. Select File->SaveAs and enter a file name with the suffix ".ico".
Click "Save" and you will be asked for the type. From the
drop-down box choose "8 bpp, 1-bit alpha, 256-slot palette", no
@@ -130,4 +130,3 @@ like this:
src/sign-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
src/verify-16.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 8
src/verify-16m.bmp: PC bitmap data, Windows 3.x format, 16 x 16 x 1
-
diff --git a/src/decrypt-16.bmp b/src/icons/decrypt-16.bmp
similarity index 100%
rename from src/decrypt-16.bmp
rename to src/icons/decrypt-16.bmp
diff --git a/src/decrypt-16.png b/src/icons/decrypt-16.png
similarity index 100%
rename from src/decrypt-16.png
rename to src/icons/decrypt-16.png
diff --git a/src/decrypt-16m.bmp b/src/icons/decrypt-16m.bmp
similarity index 100%
rename from src/decrypt-16m.bmp
rename to src/icons/decrypt-16m.bmp
diff --git a/src/decrypt-48.png b/src/icons/decrypt-48.png
similarity index 100%
rename from src/decrypt-48.png
rename to src/icons/decrypt-48.png
diff --git a/src/decrypt-verify-16.bmp b/src/icons/decrypt-verify-16.bmp
similarity index 100%
rename from src/decrypt-verify-16.bmp
rename to src/icons/decrypt-verify-16.bmp
diff --git a/src/decrypt-verify-16m.bmp b/src/icons/decrypt-verify-16m.bmp
similarity index 100%
rename from src/decrypt-verify-16m.bmp
rename to src/icons/decrypt-verify-16m.bmp
diff --git a/src/encrypt-16.bmp b/src/icons/encrypt-16.bmp
similarity index 100%
rename from src/encrypt-16.bmp
rename to src/icons/encrypt-16.bmp
diff --git a/src/encrypt-16.png b/src/icons/encrypt-16.png
similarity index 100%
rename from src/encrypt-16.png
rename to src/icons/encrypt-16.png
diff --git a/src/encrypt-16m.bmp b/src/icons/encrypt-16m.bmp
similarity index 100%
rename from src/encrypt-16m.bmp
rename to src/icons/encrypt-16m.bmp
diff --git a/src/encrypt-48.png b/src/icons/encrypt-48.png
similarity index 100%
rename from src/encrypt-48.png
rename to src/icons/encrypt-48.png
diff --git a/src/encrypt-sign-file-48.png b/src/icons/encrypt-sign-file-48.png
similarity index 100%
rename from src/encrypt-sign-file-48.png
rename to src/icons/encrypt-sign-file-48.png
diff --git a/src/key-manager-16.bmp b/src/icons/key-manager-16.bmp
similarity index 100%
rename from src/key-manager-16.bmp
rename to src/icons/key-manager-16.bmp
diff --git a/src/key-manager-16m.bmp b/src/icons/key-manager-16m.bmp
similarity index 100%
rename from src/key-manager-16m.bmp
rename to src/icons/key-manager-16m.bmp
diff --git a/src/key-manager-64.png b/src/icons/key-manager-64.png
similarity index 100%
rename from src/key-manager-64.png
rename to src/icons/key-manager-64.png
diff --git a/src/kleopatra.bmp b/src/icons/kleopatra.bmp
similarity index 100%
rename from src/kleopatra.bmp
rename to src/icons/kleopatra.bmp
diff --git a/src/sign-16.bmp b/src/icons/sign-16.bmp
similarity index 100%
rename from src/sign-16.bmp
rename to src/icons/sign-16.bmp
diff --git a/src/sign-16m.bmp b/src/icons/sign-16m.bmp
similarity index 100%
rename from src/sign-16m.bmp
rename to src/icons/sign-16m.bmp
diff --git a/src/sign-48.png b/src/icons/sign-48.png
similarity index 100%
rename from src/sign-48.png
rename to src/icons/sign-48.png
diff --git a/src/verify-16.bmp b/src/icons/verify-16.bmp
similarity index 100%
rename from src/verify-16.bmp
rename to src/icons/verify-16.bmp
diff --git a/src/verify-16m.bmp b/src/icons/verify-16m.bmp
similarity index 100%
rename from src/verify-16m.bmp
rename to src/icons/verify-16m.bmp
diff --git a/src/verify-48.png b/src/icons/verify-48.png
similarity index 100%
rename from src/verify-48.png
rename to src/icons/verify-48.png
commit 608ba6ac6170ff0e2bc8884a5a234d8775c1beb0
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Tue Oct 18 10:15:12 2016 +0200
Enable signature status in home tab
* src/gpgoladdin.cpp (GetCustomUI_MIME): Enable inline and
Status icons.
--
Inline editor support does not work yet but It's also part
of the explorer customui so it's enabled again.
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index ac5d399..e8c5bd8 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -759,7 +759,6 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
_("Decrypt")
);
}
-#if 0
/* We don't use this code currently because calling the send
event for Inline Response mailitems fails. */
else if (!wcscmp (RibbonID, L"Microsoft.Outlook.Explorer"))
@@ -768,6 +767,26 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
"<customUI xmlns=\"http://schemas.microsoft.com/office/2009/07/customui\""
" onLoad=\"ribbonLoaded\">"
" <ribbon>"
+ " <tabs>"
+ " <tab idMso=\"TabMail\">"
+ " <group id=\"general_read\""
+ " label=\"%s\">"
+ " <button id=\"idSigned\""
+ " getImage=\"btnSignLarge\""
+ " size=\"large\""
+ " getLabel=\"getSigLabel\""
+ " getScreentip=\"getSigTip\""
+ " getSupertip=\"getSigSTip\""
+ " onAction=\"launchDetails\""
+ " getEnabled=\"getIsSigned\"/>"
+ " <dialogBoxLauncher>"
+ " <button id=\"optsBtn_read\""
+ " onAction=\"openOptions\""
+ " screentip=\"%s\"/>"
+ " </dialogBoxLauncher>"
+ " </group>"
+ " </tab>"
+ " </tabs>"
" <contextualTabs>"
" <tabSet idMso=\"TabComposeTools\">"
" <tab idMso=\"TabMessage\">"
@@ -799,13 +818,15 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
" </tabSet>"
" </contextualTabs>"
" </ribbon>"
- "</customUI>", _("GpgOL"),
+ "</customUI>",
+ _("GpgOL"),
+ optsSTip,
+ _("GpgOL"),
_("Encrypt"), encryptTTip, encryptSTip,
_("Sign"), signTTip, signSTip,
optsSTip
);
}
-#endif
if (buffer)
{
-----------------------------------------------------------------------
Summary of changes:
configure.ac | 1 +
src/Makefile.am | 22 ++++++-----------
src/dialogs.rc | 40 +++++++++++++++----------------
src/gpgoladdin.cpp | 27 ++++++++++++++++++---
src/{ => icons}/README.icons | 15 ++++++------
src/{ => icons}/decrypt-16.bmp | Bin
src/{ => icons}/decrypt-16.png | Bin
src/{ => icons}/decrypt-16m.bmp | Bin
src/{ => icons}/decrypt-48.png | Bin
src/{ => icons}/decrypt-verify-16.bmp | Bin
src/{ => icons}/decrypt-verify-16m.bmp | Bin
src/{ => icons}/encrypt-16.bmp | Bin
src/{ => icons}/encrypt-16.png | Bin
src/{ => icons}/encrypt-16m.bmp | Bin
src/{ => icons}/encrypt-48.png | Bin
src/{ => icons}/encrypt-sign-file-48.png | Bin
src/{ => icons}/key-manager-16.bmp | Bin
src/{ => icons}/key-manager-16m.bmp | Bin
src/{ => icons}/key-manager-64.png | Bin
src/{ => icons}/kleopatra.bmp | Bin
src/{ => icons}/sign-16.bmp | Bin
src/{ => icons}/sign-16m.bmp | Bin
src/{ => icons}/sign-48.png | Bin
src/{ => icons}/verify-16.bmp | Bin
src/{ => icons}/verify-16m.bmp | Bin
src/{ => icons}/verify-48.png | Bin
26 files changed, 59 insertions(+), 46 deletions(-)
rename src/{ => icons}/README.icons (93%)
rename src/{ => icons}/decrypt-16.bmp (100%)
rename src/{ => icons}/decrypt-16.png (100%)
rename src/{ => icons}/decrypt-16m.bmp (100%)
rename src/{ => icons}/decrypt-48.png (100%)
rename src/{ => icons}/decrypt-verify-16.bmp (100%)
rename src/{ => icons}/decrypt-verify-16m.bmp (100%)
rename src/{ => icons}/encrypt-16.bmp (100%)
rename src/{ => icons}/encrypt-16.png (100%)
rename src/{ => icons}/encrypt-16m.bmp (100%)
rename src/{ => icons}/encrypt-48.png (100%)
rename src/{ => icons}/encrypt-sign-file-48.png (100%)
rename src/{ => icons}/key-manager-16.bmp (100%)
rename src/{ => icons}/key-manager-16m.bmp (100%)
rename src/{ => icons}/key-manager-64.png (100%)
rename src/{ => icons}/kleopatra.bmp (100%)
rename src/{ => icons}/sign-16.bmp (100%)
rename src/{ => icons}/sign-16m.bmp (100%)
rename src/{ => icons}/sign-48.png (100%)
rename src/{ => icons}/verify-16.bmp (100%)
rename src/{ => icons}/verify-16m.bmp (100%)
rename src/{ => icons}/verify-48.png (100%)
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list