aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/ChangeLog4
-rw-r--r--ui/evolution-message-composer.xml17
2 files changed, 18 insertions, 3 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 54ea489032..46261c4f49 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2001-05-16 Jeffrey Stedfast <fejj@ximian.com>
+
+ * evolution-message-composer.xml: Added S/MIME menu items.
+
2001-05-15 Ettore Perazzoli <ettore@ximian.com>
* evolution.xml: Add an "Evolution FAQ" entry to the "Help" menu.
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index ca24d313bf..0bff87f062 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -22,7 +22,7 @@
<cmd name="FileInsertFile" _label="Insert text file..."
_tip="Insert a file as text into the message"/>
- <cmd name="FileSend" _label="Send" _tip="Send the message now"
+ <cmd name="FileSend" _label="Send" _tip="Send this message now"
accel="*Ctrl*Return"
pixtype="stock" pixname="Send Mail"/>
@@ -59,8 +59,15 @@
<cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
type="toggle" state="0"/>
- </commands>
+ <cmd name="SecuritySMimeSign" _label="S/MIME Sign"
+ _tip="Sign this message with your S/MIME Signature Certificate"
+ type="toggle" state="0" hidden="1"/>
+
+ <cmd name="SecuritySMimeEncrypt" _label="S/MIME Encrypt"
+ _tip="Encrypt this message with your S/MIME Encryption Cetificate"
+ type="toggle" state="0" hidden="1"/>
+ </commands>
<keybindings>
@@ -138,6 +145,10 @@
<menuitem name="SecurityPGPEncrypt" verb="" _label="PGP Encrypt"/>
+ <menuitem name="SecuritySMimeSign" verb="" _label="S/MIME Sign"/>
+
+ <menuitem name="SecuritySMimeEncrypt" verb="" _label="S/MIME Encrypt"/>
+
</submenu>
<submenu name="Help" _label="_Help">
@@ -156,7 +167,7 @@
<dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon">
- <toolitem name="FileSend" verb="" _tip="Send this message now" priority="1"/>
+ <toolitem name="FileSend" verb="" priority="1"/>
<toolitem name="FileAttach" verb=""/>
&id=03a65560a147b33d4c99764251f722bad2cef4c1'>Upgrade to version 3.3.6jmz2000-01-122-26/+4 * Upgrade to version 3.3.6 (threads support is already included)jmz2000-01-122-4/+4 * Upgrade to version 3.3.6jmz2000-01-122-18/+18 * Pes a update patch for x11-servers/XttXF86srv-common.vanilla2000-01-022-0/+300 * Added Xatmtaoka1999-12-271-0/+1 * (no commit message)taoka1999-12-277-0/+106 * Update to version 1.0.steve1999-12-255-24/+28 * Remove the old KerberosIV stuff and PAM-ize.markm1999-12-254-92/+12 * Update to X-TT 1.3imura1999-12-1034-102/+116 * Add directives such as HasJpTk and HasJpTcl when compiling with japanese tcl/tkjmz1999-12-062-18/+70 * Allow building XF86Setp with japanese tcl/tkjmz1999-11-302-2/+22 * Bump freetype's lib numberjseger1999-11-251-1/+1 * Unbreak.jmz1999-11-252-10/+0 * Unbreak for pre-gcc 2.95 systemsjmz1999-11-232-2/+8 * Mark BROKEN, this defines putenv(), which has preprocessor #ifdef's wrappedbillf1999-11-172-0/+4 * Add support for threads (use at your own risk)jmz1999-11-132-0/+22 * Turn off NO_PACKAGE for the Alpha. XFree86 is not yet providing us bitsobrien1999-11-132-0/+4 * Pickup some missing files in PLIST.steve1999-11-012-0/+24 * Now that the port is no more marked broken, there is no need to include bsd.p...jmz1999-10-112-4/+0 * Unbreak for -current.marcel1999-10-102-6/+0 * Mark BROKEN for -current (signal.h)jmz1999-10-092-0/+10 * Use @exec/@unexec pairs for symlinks to directories. This should fixjmz1999-09-212-4/+8 * Add support for tk8.2jseger1999-09-072-2/+12 * Remove an extra blank line that I introduced a couple of revs ago.steve1999-09-072-2/+0 * Restore patches from rev. 1.18: add shlib minors to libraries with minors != 0jmz1999-09-032-12/+12 * Upgrade to 3.3.5jmz1999-09-022-4/+14 * Upgrade to 3.3.5jmz1999-09-024-22/+22 * FreeBSD.ORG -> FreeBSD.orgmharo1999-08-312-2/+2 * $Id$ -> $FreeBSD$peter1999-08-3132-32/+32 * $Id$ -> $FreeBSD$peter1999-08-312-2/+2 * grep -> ${GREP}mharo1999-08-232-4/+4 * Re-enforce caps, no period. An "exceptions" file has been createdhoek1999-08-031-1/+1 * Add Doug Rabson's patches for XFree86 on the FreeBSD/Alpha with minorsteve1999-07-274-4/+58 * Fix the xtt distribution master site and clean up somecpiazza1999-07-221-6/+6 * Use ${OSVERSION} instead of uname.asami1999-07-214-4/+6 * Upgrade to 3.3.4jmz1999-07-218-64/+72 * Add WWW:. This one exceeds 80 chars in length. I'm not sure what (if any)hoek1999-07-181-7/+3 * New ports/{java,irc,x11-servers} categories, Step #4 - Adjust new Makefiles.billf1999-06-2831-62/+62 * New category x11-servers. Here's the charter:asami1999-06-272-0/+37 * #4/4 enforcing Caps, no periodhoek1999-06-2730-30/+30 * Mark `only for i386'. These have i386 assembler code.simokawa1999-06-136-6/+18 * Updated checksum.asami1999-05-313-3/+3 * Change Mr.Nakaji's Email address.sada1999-05-1714-42/+42 * Add WWW:mharo1999-05-032-0/+4 * Alpha doesn't have JoystickSupport.simokawa1999-04-291-1/+1 * Add 'ONLY_FOR_ARCHS=i386'.simokawa1999-04-1314-14/+42 * Updated to version 1.2.1taoka1999-04-0232-120/+131 * Two more patches that were not intended for commit.asami1999-03-201-3/+3 * Back out two patches that were not intended for commit.asami1999-03-204-10/+4 * Fix to make ports work with bsd.port.mk rev. 1.306.asami1999-03-085-7/+13 * Fix up MASTER_SITES:fenner1999-01-282-10/+10 * Correct pkg/PLIST, maintainer forgot to add some entry.vanilla1999-01-171-0/+3 * Oops, forgot to add this file. Please mention additions in PRs please!asami1999-01-161-0/+23 * Submitted by: maintainerasami1999-01-1533-90/+124 * Upgrade to 3.3.3.1jmz1999-01-124-4/+20 * Activate RUN_DEPENDS to mkttfdir.sada1999-01-051-2/+2 * I've forgotton a file: host.def.XF86_3DLabs .sada1999-01-041-0/+23 * Fix for 3DLabs server's build.sada1999-01-043-46/+53 * A X True Type Server for 3DLabs Graphics Boards.sada1999-01-034-0/+38 * Update to 1.1sada1999-01-03