[git] GpgOL - branch, master, updated. gpgol-1.4.0-214-gfff2ff1
by Andre Heinecke
cvs at cvs.gnupg.org
Fri Dec 9 15:25:26 CET 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, master has been updated
via fff2ff17e509ba9e73c13b4059d27f5c9f4be0f4 (commit)
via e2e7785efe1310b27fa902128c45db8ab987e475 (commit)
via 5444ba05ad530f9ab70fd3f7cd29a6c4767240ac (commit)
from 209490bfa1054e52ffed0a3fc01182ec213486a7 (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 fff2ff17e509ba9e73c13b4059d27f5c9f4be0f4
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 9 15:19:22 2016 +0100
Recuce Sign and Encrypt to single split button
* src/dialogs.h: Add new icon ids.
* src/ribbon-callbacks.h: Add new ids.
* src/ribbon-callbacks.cpp (GpgolRibbonExtender::GetIDsOfNames),
(GpgolRibbonExtender::Invoke): Handle new ids.
(GetCustomUI_MIME): Use split button.
* src/ribbon-callbacks.cpp (mark_mime_action): Invalidate ui.
(get_crypt_pressed): Handle queries for multiple flags.
diff --git a/src/dialogs.h b/src/dialogs.h
index 8e57468..54bbede 100644
--- a/src/dialogs.h
+++ b/src/dialogs.h
@@ -119,5 +119,8 @@
#define IDI_EMBLEM_INFORMATION_64_PNG 0x6073
#define IDI_EMBLEM_QUESTION_64_PNG 0x6074
#define IDI_EMBLEM_SUCCESS_YELLOW_64_PNG 0x6075
+#define IDI_SIGN_ENCRYPT_40_PNG 0x6075
+#define IDI_ENCRYPT_20_PNG 0x6076
+#define IDI_SIGN_20_PNG 0x6077
#endif /*DIALOGS_H*/
diff --git a/src/dialogs.rc b/src/dialogs.rc
index c20cb43..b51f556 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -58,7 +58,9 @@ IDI_EMBLEM_SUCCESS_YELLOW_64_PNG RCDATA "icons/emblem-success-yellow-64.p
IDI_EMBLEM_INFORMATION_64_PNG RCDATA "icons/emblem-information-64.png"
IDI_EMBLEM_QUESTION_64_PNG RCDATA "icons/emblem-question-64.png"
-
+IDI_SIGN_ENCRYPT_40_PNG RCDATA "icons/sing-enc-40.png"
+IDI_ENCRYPT_20_PNG RCDATA "icons/encrypt-20.png"
+IDI_SIGN_20_PNG RCDATA "icons/sign-20.png"
IDD_GPG_OPTIONS DIALOG DISCARDABLE 0, 0, 266, 274
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
diff --git a/src/gpgoladdin.cpp b/src/gpgoladdin.cpp
index 3b26107..a649ffe 100644
--- a/src/gpgoladdin.cpp
+++ b/src/gpgoladdin.cpp
@@ -613,6 +613,9 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
ID_MAPPER (L"btnDecryptLarge", ID_BTN_DECRYPT_LARGE)
ID_MAPPER (L"btnEncrypt", ID_BTN_ENCRYPT)
ID_MAPPER (L"btnEncryptLarge", ID_BTN_ENCRYPT_LARGE)
+ ID_MAPPER (L"btnEncryptSmall", IDI_ENCRYPT_20_PNG)
+ ID_MAPPER (L"btnSignSmall", IDI_SIGN_20_PNG)
+ ID_MAPPER (L"btnSignEncryptLarge", IDI_SIGN_ENCRYPT_40_PNG)
ID_MAPPER (L"btnEncryptFileLarge", ID_BTN_ENCSIGN_LARGE)
ID_MAPPER (L"btnSignLarge", ID_BTN_SIGN_LARGE)
ID_MAPPER (L"btnVerifyLarge", ID_BTN_VERIFY_LARGE)
@@ -626,13 +629,17 @@ GpgolRibbonExtender::GetIDsOfNames (REFIID riid, LPOLESTR *rgszNames,
/* MIME support: */
ID_MAPPER (L"encryptMime", ID_CMD_MIME_ENCRYPT)
- ID_MAPPER (L"signMime", ID_CMD_MIME_SIGN)
- ID_MAPPER (L"getEncryptPressed", ID_GET_ENCRYPT_PRESSED)
- ID_MAPPER (L"getSignPressed", ID_GET_SIGN_PRESSED)
ID_MAPPER (L"encryptMimeEx", ID_CMD_MIME_ENCRYPT_EX)
+ ID_MAPPER (L"signMime", ID_CMD_MIME_SIGN)
ID_MAPPER (L"signMimeEx", ID_CMD_MIME_SIGN_EX)
+ ID_MAPPER (L"encryptSignMime", ID_CMD_SIGN_ENCRYPT_MIME)
+ ID_MAPPER (L"encryptSignMimeEx", ID_CMD_SIGN_ENCRYPT_MIME_EX)
+ ID_MAPPER (L"getEncryptPressed", ID_GET_ENCRYPT_PRESSED)
ID_MAPPER (L"getEncryptPressedEx", ID_GET_ENCRYPT_PRESSED_EX)
+ ID_MAPPER (L"getSignPressed", ID_GET_SIGN_PRESSED)
ID_MAPPER (L"getSignPressedEx", ID_GET_SIGN_PRESSED_EX)
+ ID_MAPPER (L"getSignEncryptPressed", ID_GET_SIGN_ENCRYPT_PRESSED)
+ ID_MAPPER (L"getSignEncryptPressedEx", ID_GET_SIGN_ENCRYPT_PRESSED_EX)
ID_MAPPER (L"ribbonLoaded", ID_ON_LOAD)
ID_MAPPER (L"openOptions", ID_CMD_OPEN_OPTIONS)
ID_MAPPER (L"getSigLabel", ID_GET_SIG_LABEL)
@@ -690,10 +697,18 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
return signBody (parms->rgvarg[0].pdispVal);
case ID_CMD_VERIFY_BODY:
return verifyBody (parms->rgvarg[0].pdispVal);
- case ID_CMD_MIME_SIGN:
- return mark_mime_action (parms->rgvarg[1].pdispVal, OP_SIGN, false);
+ case ID_CMD_SIGN_ENCRYPT_MIME:
+ return mark_mime_action (parms->rgvarg[1].pdispVal,
+ OP_SIGN|OP_ENCRYPT, false);
+ case ID_CMD_SIGN_ENCRYPT_MIME_EX:
+ return mark_mime_action (parms->rgvarg[1].pdispVal,
+ OP_SIGN|OP_ENCRYPT, true);
case ID_CMD_MIME_ENCRYPT:
return mark_mime_action (parms->rgvarg[1].pdispVal, OP_ENCRYPT,
+
+ false);
+ case ID_CMD_MIME_SIGN:
+ return mark_mime_action (parms->rgvarg[1].pdispVal, OP_SIGN,
false);
case ID_GET_ENCRYPT_PRESSED:
return get_crypt_pressed (parms->rgvarg[0].pdispVal, OP_ENCRYPT,
@@ -701,6 +716,10 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
case ID_GET_SIGN_PRESSED:
return get_crypt_pressed (parms->rgvarg[0].pdispVal, OP_SIGN,
result, false);
+ case ID_GET_SIGN_ENCRYPT_PRESSED:
+ return get_crypt_pressed (parms->rgvarg[0].pdispVal,
+ OP_SIGN | OP_ENCRYPT,
+ result, false);
case ID_CMD_MIME_SIGN_EX:
return mark_mime_action (parms->rgvarg[1].pdispVal, OP_SIGN, true);
case ID_CMD_MIME_ENCRYPT_EX:
@@ -711,6 +730,9 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
case ID_GET_SIGN_PRESSED_EX:
return get_crypt_pressed (parms->rgvarg[0].pdispVal, OP_SIGN,
result, true);
+ case ID_GET_SIGN_ENCRYPT_PRESSED_EX:
+ return get_crypt_pressed (parms->rgvarg[0].pdispVal, OP_SIGN | OP_ENCRYPT,
+ result, true);
case ID_GET_SIG_STIP:
return get_sig_stip (parms->rgvarg[0].pdispVal, result);
case ID_GET_SIG_TTIP:
@@ -740,6 +762,9 @@ GpgolRibbonExtender::Invoke (DISPID dispid, REFIID riid, LCID lcid,
case ID_BTN_ENCSIGN_LARGE:
case ID_BTN_SIGN_LARGE:
case ID_BTN_VERIFY_LARGE:
+ case IDI_SIGN_ENCRYPT_40_PNG:
+ case IDI_ENCRYPT_20_PNG:
+ case IDI_SIGN_20_PNG:
return getIcon (dispid, result);
case ID_BTN_SIGSTATE_LARGE:
return get_sigstate_icon (parms->rgvarg[0].pdispVal, result);
@@ -777,6 +802,13 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
_("Sign the message.");
const char *signSTip =
_("Sign the message and all attachments before sending.");
+
+ const char *secureTTip =
+ _("Encrypt and sign the message.");
+ const char *secureSTip =
+ _("Encrypting and cryptographically signing a message means that the "
+ "recipient can be sure that no one modified the message and only the "
+ "recipients can read it.\nNot even the NSA.");
const char *optsSTip =
_("Open the settings dialog for GpgOL.");
log_debug ("%s:%s: GetCustomUI_MIME for id: %ls", SRCNAME, __func__, RibbonID);
@@ -794,22 +826,30 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
" <tab idMso=\"TabNewMailMessage\">"
" <group id=\"general\""
" label=\"%s\">"
- " <toggleButton id=\"mimeEncrypt\""
- " getImage=\"btnEncryptLarge\""
- " size=\"large\""
- " label=\"%s\""
- " screentip=\"%s\""
- " supertip=\"%s\""
- " onAction=\"encryptMime\""
- " getPressed=\"getEncryptPressed\"/>"
- " <toggleButton id=\"mimeSign\""
- " getImage=\"btnSignLarge\""
- " size=\"large\""
- " label=\"%s\""
- " screentip=\"%s\""
- " supertip=\"%s\""
- " onAction=\"signMime\""
- " getPressed=\"getSignPressed\"/>"
+ " <splitButton id=\"splitty\" size=\"large\">"
+ " <toggleButton id=\"mimeSignEncrypt\""
+ " label=\"%s\""
+ " screentip=\"%s\""
+ " supertip=\"%s\""
+ " getPressed=\"getSignEncryptPressed\""
+ " getImage=\"btnSignEncryptLarge\""
+ " onAction=\"encryptSignMime\"""/>"
+ " <menu id=\"encMenu\" showLabel=\"true\">"
+ " <toggleButton id=\"mimeSign\""
+ " getImage=\"btnSignSmall\""
+ " label=\"%s\""
+ " screentip=\"%s\""
+ " supertip=\"%s\""
+ " onAction=\"signMime\""
+ " getPressed=\"getSignPressed\"/>"
+ " <toggleButton id=\"mimeEncrypt\""
+ " getImage=\"btnEncryptSmall\""
+ " label=\"%s\""
+ " screentip=\"%s\""
+ " supertip=\"%s\""
+ " onAction=\"encryptMime\""
+ " getPressed=\"getEncryptPressed\"/>"
+ " </menu></splitButton>"
" <dialogBoxLauncher>"
" <button id=\"optsBtn\""
" onAction=\"openOptions\""
@@ -820,8 +860,9 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
" </tabs>"
" </ribbon>"
"</customUI>", _("GpgOL"),
- _("Encrypt"), encryptTTip, encryptSTip,
+ _("Sign Encrypt"), secureTTip, secureSTip,
_("Sign"), signTTip, signSTip,
+ _("Encrypt"), encryptTTip, encryptSTip,
optsSTip
);
}
@@ -899,28 +940,36 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
" <tab idMso=\"TabMessage\">"
" <group id=\"general\""
" label=\"%s\">"
- " <toggleButton id=\"mimeEncryptEx\""
- " getImage=\"btnEncryptLarge\""
- " size=\"large\""
- " label=\"%s\""
- " screentip=\"%s\""
- " supertip=\"%s\""
- " onAction=\"encryptMimeEx\""
- " getPressed=\"getEncryptPressedEx\"/>"
- " <toggleButton id=\"mimeSignEx\""
- " getImage=\"btnSignLarge\""
- " size=\"large\""
- " label=\"%s\""
- " screentip=\"%s\""
- " supertip=\"%s\""
- " onAction=\"signMimeEx\""
- " getPressed=\"getSignPressedEx\"/>"
+ " <splitButton id=\"splitty\" size=\"large\">"
+ " <toggleButton id=\"mimeSignEncrypt\""
+ " label=\"%s\""
+ " screentip=\"%s\""
+ " supertip=\"%s\""
+ " getPressed=\"getSignEncryptPressedEx\""
+ " getImage=\"btnSignEncryptLarge\""
+ " onAction=\"encryptSignMimeEx\"""/>"
+ " <menu id=\"encMenu\" showLabel=\"true\">"
+ " <toggleButton id=\"mimeSign\""
+ " getImage=\"btnSignSmall\""
+ " label=\"%s\""
+ " screentip=\"%s\""
+ " supertip=\"%s\""
+ " onAction=\"signMimeEx\""
+ " getPressed=\"getSignPressedEx\"/>"
+ " <toggleButton id=\"mimeEncrypt\""
+ " getImage=\"btnEncryptSmall\""
+ " label=\"%s\""
+ " screentip=\"%s\""
+ " supertip=\"%s\""
+ " onAction=\"encryptMimeEx\""
+ " getPressed=\"getEncryptPressedEx\"/>"
+ " </menu></splitButton>"
" <dialogBoxLauncher>"
" <button id=\"optsBtn\""
" onAction=\"openOptions\""
" screentip=\"%s\"/>"
" </dialogBoxLauncher>"
- " </group>"
+ " </group>"
" </tab>"
" </tabSet>"
" </contextualTabs>"
@@ -929,8 +978,9 @@ GetCustomUI_MIME (BSTR RibbonID, BSTR * RibbonXml)
_("GpgOL"),
optsSTip,
_("GpgOL"),
- _("Encrypt"), encryptTTip, encryptSTip,
+ _("Sign Encrypt"), secureTTip, secureSTip,
_("Sign"), signTTip, signSTip,
+ _("Encrypt"), encryptTTip, encryptSTip,
optsSTip
);
}
diff --git a/src/ribbon-callbacks.cpp b/src/ribbon-callbacks.cpp
index f14f43b..2dbe80e 100644
--- a/src/ribbon-callbacks.cpp
+++ b/src/ribbon-callbacks.cpp
@@ -1342,6 +1342,11 @@ mark_mime_action (LPDISPATCH ctrl, int flags, bool is_explorer)
rc = S_OK;
+ /* We need to invalidate the UI to update the toggle
+ states of the subbuttons and the top button. Yeah,
+ we invalidate a lot *sigh* */
+ gpgoladdin_invalidate_ui ();
+
done:
gpgol_release (context);
gpgol_release (mailitem);
@@ -1353,12 +1358,13 @@ done:
/* Get the state of encrypt / sign toggle buttons.
flag values: 1 get the state of the encrypt button.
2 get the state of the sign button.
- If is_explorer is set to true
- */
+ If is_explorer is set to true we look at the inline response.
+*/
HRESULT get_crypt_pressed (LPDISPATCH ctrl, int flags, VARIANT *result,
bool is_explorer)
{
HRESULT hr;
+ bool value;
LPDISPATCH context = NULL,
mailitem = NULL;
LPMESSAGE message = NULL;
@@ -1402,9 +1408,9 @@ HRESULT get_crypt_pressed (LPDISPATCH ctrl, int flags, VARIANT *result,
goto done;
}
- *(result->pboolVal) = get_gpgol_draft_info_flags (message) & flags ?
- VARIANT_TRUE :
- VARIANT_FALSE;
+ value = (get_gpgol_draft_info_flags (message) & flags) == flags;
+
+ *(result->pboolVal) = value ? VARIANT_TRUE : VARIANT_FALSE;
done:
gpgol_release (context);
diff --git a/src/ribbon-callbacks.h b/src/ribbon-callbacks.h
index be64eb5..f2a33f7 100644
--- a/src/ribbon-callbacks.h
+++ b/src/ribbon-callbacks.h
@@ -52,6 +52,10 @@
#define ID_GET_SIG_LABEL 27
#define ID_LAUNCH_CERT_DETAILS 28
#define ID_BTN_SIGSTATE_LARGE 29
+#define ID_GET_SIGN_ENCRYPT_PRESSED 30
+#define ID_GET_SIGN_ENCRYPT_PRESSED_EX 31
+#define ID_CMD_SIGN_ENCRYPT_MIME 32
+#define ID_CMD_SIGN_ENCRYPT_MIME_EX 33
#define ID_BTN_CERTMANAGER IDI_KEY_MANAGER_64_PNG
#define ID_BTN_DECRYPT IDI_DECRYPT_16_PNG
commit e2e7785efe1310b27fa902128c45db8ab987e475
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 9 15:17:13 2016 +0100
Improve messagelist icon
* encr-s.ico, encr-s.xcf: Imrpove 1bit alpha use by mixing more
white into the still transparent colors. Remove line in the middle
this was too small for 16x16
diff --git a/forms/encr-s.ico b/forms/encr-s.ico
index b143440..031a5b7 100755
Binary files a/forms/encr-s.ico and b/forms/encr-s.ico differ
diff --git a/forms/encr-s.xcf b/forms/encr-s.xcf
index 3d10ecc..b164371 100644
Binary files a/forms/encr-s.xcf and b/forms/encr-s.xcf differ
commit 5444ba05ad530f9ab70fd3f7cd29a6c4767240ac
Author: Andre Heinecke <aheinecke at intevation.de>
Date: Fri Dec 9 15:23:08 2016 +0100
Add new icons for sign / encrypt
* src/icons/Makefile.am (EXTRA_DIST): Update accordingly.
* encrypt-20.png, encrypt.svg, sign-20.png, sign-enc-40.png,
sign-enc.svg, sign.svg: New.
--
This is more in the visual language of Outlook with the ribbon
as a signature icon. It's also using the new lock of gpgol.
diff --git a/src/icons/Makefile.am b/src/icons/Makefile.am
index 6f06833..c65e707 100644
--- a/src/icons/Makefile.am
+++ b/src/icons/Makefile.am
@@ -31,4 +31,6 @@ EXTRA_DIST= \
emblem-question.svg \
emblem-warning.svg \
emblem-information.svg \
- emblem-success-yellow.svg
+ emblem-success-yellow.svg \
+ sign.svg sign-enc.svg enc.svg \
+ sign-enc-40.png sign-20.png encrypt-20.png
diff --git a/src/icons/encrypt-20.png b/src/icons/encrypt-20.png
new file mode 100644
index 0000000..b772255
Binary files /dev/null and b/src/icons/encrypt-20.png differ
diff --git a/src/icons/encrypt.svg b/src/icons/encrypt.svg
new file mode 100644
index 0000000..8257a0f
--- /dev/null
+++ b/src/icons/encrypt.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48px"
+ height="48px"
+ id="svg3020"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ inkscape:export-filename="/home/aheinecke/arbeit/kf5/src/gpgol/src/icons/secure-64.png"
+ inkscape:export-xdpi="120"
+ inkscape:export-ydpi="120"
+ sodipodi:docname="sign-enc.svg">
+ <defs
+ id="defs3022" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="-21.886084"
+ inkscape:cy="11.467242"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1920"
+ inkscape:window-height="1003"
+ inkscape:window-x="1918"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3025">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <polygon
+ id="polygon4191"
+ points="0,316.6 81.19,316.6 81.19,247.55 40.6,281.41 40.6,281.41 0,247.55 "
+ class="cls-4"
+ style="fill:#1f8ece"
+ transform="matrix(0.44696256,0,0,0.35766585,6.1519517,-65.132907)" />
+ <polygon
+ id="polygon4193"
+ points="0,242.65 40.6,276.5 81.19,242.65 0,242.65 "
+ class="cls-4"
+ style="fill:#1f8ece"
+ transform="matrix(0.44696256,0,0,0.35766585,6.1519517,-65.132907)" />
+ <path
+ id="path4195"
+ d="m 9.4684144,12.888323 v 7.353608 h 6.3200506 v -7.353608 c 0,-4.027318 3.81706,-7.3071137 8.492289,-7.3071137 4.675228,0 8.492289,3.2762188 8.492289,7.3071137 v 7.353608 h 6.32005 v -7.353608 c 0,-6.9101042 -6.646333,-12.51830551 -14.825748,-12.51830551 h 0 c -8.174945,0 -14.8257472,5.62250781 -14.8257472,12.51830551"
+ class="cls-3"
+ inkscape:connector-curvature="0"
+ style="fill:#3d3d3b" />
+ </g>
+</svg>
diff --git a/src/icons/sign-20.png b/src/icons/sign-20.png
new file mode 100644
index 0000000..26e6e07
Binary files /dev/null and b/src/icons/sign-20.png differ
diff --git a/src/icons/sign-enc-40.png b/src/icons/sign-enc-40.png
new file mode 100644
index 0000000..fb984fa
Binary files /dev/null and b/src/icons/sign-enc-40.png differ
diff --git a/src/icons/sign-enc.svg b/src/icons/sign-enc.svg
new file mode 100644
index 0000000..91d95d4
--- /dev/null
+++ b/src/icons/sign-enc.svg
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48px"
+ height="48px"
+ id="svg3020"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ inkscape:export-filename="/home/aheinecke/arbeit/kf5/src/gpgol/src/icons/secure-64.png"
+ inkscape:export-xdpi="120"
+ inkscape:export-ydpi="120"
+ sodipodi:docname="New document 2">
+ <defs
+ id="defs3022" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="4"
+ inkscape:cx="-21.886084"
+ inkscape:cy="11.467242"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1920"
+ inkscape:window-height="1003"
+ inkscape:window-x="1918"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata3025">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <polygon
+ id="polygon4191"
+ points="0,316.6 81.19,316.6 81.19,247.55 40.6,281.41 40.6,281.41 0,247.55 "
+ class="cls-4"
+ style="fill:#1f8ece"
+ transform="matrix(0.44696256,0,0,0.35766585,6.1519517,-65.132907)" />
+ <polygon
+ id="polygon4193"
+ points="0,242.65 40.6,276.5 81.19,242.65 0,242.65 "
+ class="cls-4"
+ style="fill:#1f8ece"
+ transform="matrix(0.44696256,0,0,0.35766585,6.1519517,-65.132907)" />
+ <path
+ id="path4195"
+ d="m 9.4684144,12.888323 v 7.353608 h 6.3200506 v -7.353608 c 0,-4.027318 3.81706,-7.3071137 8.492289,-7.3071137 4.675228,0 8.492289,3.2762188 8.492289,7.3071137 v 7.353608 h 6.32005 v -7.353608 c 0,-6.9101042 -6.646333,-12.51830551 -14.825748,-12.51830551 h 0 c -8.174945,0 -14.8257472,5.62250781 -14.8257472,12.51830551"
+ class="cls-3"
+ inkscape:connector-curvature="0"
+ style="fill:#3d3d3b" />
+ <polygon
+ transform="matrix(0.03995009,0,0,0.06006972,22.624966,15.642646)"
+ style="fill:#d65533;fill-opacity:1"
+ points="338.235,308.602 173.765,308.602 173.765,512 256.001,459.841 338.235,512 "
+ id="polygon3338" />
+ <polygon
+ transform="matrix(0.03995009,0,0,0.03995009,22.624966,21.851606)"
+ style="fill:#ff9070;fill-opacity:1"
+ points="415.425,92.01 408.732,143.13 440.064,184.064 408.732,224.999 415.425,276.119 367.779,295.844 348.053,343.49 296.935,336.796 256.001,368.129 215.065,336.796 163.945,343.488 144.221,295.843 96.575,276.119 103.268,224.999 71.936,184.064 103.268,143.13 96.575,92.01 144.221,72.285 163.946,24.639 215.065,31.333 256.001,0 296.935,31.333 348.055,24.639 367.779,72.286 "
+ id="polygon3340" />
+ <circle
+ transform="matrix(0.03995009,0,0,0.03995009,22.624966,21.851606)"
+ sodipodi:ry="112.206"
+ sodipodi:rx="112.206"
+ sodipodi:cy="184.06599"
+ sodipodi:cx="255.996"
+ style="fill:#d65533;fill-opacity:1"
+ cx="255.996"
+ cy="184.06599"
+ r="112.206"
+ id="circle3342" />
+ </g>
+</svg>
diff --git a/src/icons/sign.svg b/src/icons/sign.svg
new file mode 100644
index 0000000..35433fd
--- /dev/null
+++ b/src/icons/sign.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="48px"
+ height="48px"
+ id="svg4223"
+ version="1.1"
+ inkscape:version="0.48.5 r10040"
+ inkscape:export-filename="/home/aheinecke/arbeit/kf5/src/gpgol/src/icons/sign-20.png"
+ inkscape:export-xdpi="37.5"
+ inkscape:export-ydpi="37.5"
+ sodipodi:docname="New document 23">
+ <defs
+ id="defs4225" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="7"
+ inkscape:cx="24"
+ inkscape:cy="24"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1920"
+ inkscape:window-height="1003"
+ inkscape:window-x="1918"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4242" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4228">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <polygon
+ transform="matrix(0.07831286,0,0,0.11775271,4.9522209,-11.798783)"
+ style="fill:#d65533;fill-opacity:1"
+ points="338.235,308.602 173.765,308.602 173.765,512 256.001,459.841 338.235,512 "
+ id="polygon3338" />
+ <polygon
+ transform="matrix(0.07831286,0,0,0.07831286,4.9522209,0.3724384)"
+ style="fill:#ff9070;fill-opacity:1"
+ points="163.945,343.488 144.221,295.843 96.575,276.119 103.268,224.999 71.936,184.064 103.268,143.13 96.575,92.01 144.221,72.285 163.946,24.639 215.065,31.333 256.001,0 296.935,31.333 348.055,24.639 367.779,72.286 415.425,92.01 408.732,143.13 440.064,184.064 408.732,224.999 415.425,276.119 367.779,295.844 348.053,343.49 296.935,336.796 256.001,368.129 215.065,336.796 "
+ id="polygon3340" />
+ <circle
+ transform="matrix(0.07831286,0,0,0.07831286,4.9522209,0.3724384)"
+ sodipodi:ry="112.206"
+ sodipodi:rx="112.206"
+ sodipodi:cy="184.06599"
+ sodipodi:cx="255.996"
+ style="fill:#d65533;fill-opacity:1"
+ cx="255.996"
+ cy="184.06599"
+ r="112.206"
+ id="circle3342" />
+ </g>
+</svg>
-----------------------------------------------------------------------
Summary of changes:
forms/encr-s.ico | Bin 2238 -> 2238 bytes
forms/encr-s.xcf | Bin 1588 -> 1412 bytes
src/dialogs.h | 3 ++
src/dialogs.rc | 4 +-
src/gpgoladdin.cpp | 130 ++++++++++++++++++++++++++++++++--------------
src/icons/Makefile.am | 4 +-
src/icons/encrypt-20.png | Bin 0 -> 554 bytes
src/icons/encrypt.svg | 77 +++++++++++++++++++++++++++
src/icons/sign-20.png | Bin 0 -> 604 bytes
src/icons/sign-enc-40.png | Bin 0 -> 1303 bytes
src/icons/sign-enc.svg | 98 ++++++++++++++++++++++++++++++++++
src/icons/sign.svg | 84 ++++++++++++++++++++++++++++++
src/ribbon-callbacks.cpp | 16 ++++--
src/ribbon-callbacks.h | 4 ++
14 files changed, 373 insertions(+), 47 deletions(-)
create mode 100644 src/icons/encrypt-20.png
create mode 100644 src/icons/encrypt.svg
create mode 100644 src/icons/sign-20.png
create mode 100644 src/icons/sign-enc-40.png
create mode 100644 src/icons/sign-enc.svg
create mode 100644 src/icons/sign.svg
hooks/post-receive
--
GnuPG extension for MS Outlook
http://git.gnupg.org
More information about the Gnupg-commits
mailing list