diff options
| -rw-r--r-- | ui/ChangeLog | 5 | ||||
| -rw-r--r-- | ui/evolution-message-composer.xml | 39 | ||||
| -rw-r--r-- | ui/evolution-signature-editor.xml | 12 |
3 files changed, 38 insertions, 18 deletions
diff --git a/ui/ChangeLog b/ui/ChangeLog index 4b7d22615e..8206d4d182 100644 --- a/ui/ChangeLog +++ b/ui/ChangeLog @@ -1,3 +1,8 @@ +2001-10-30 Larry Ewing <lewing@ximian.com> + + * evolution-signature-editor.xml: change Save into Save and close, + don't break the string freeze in the process. + 2001-10-29 Ettore Perazzoli <ettore@ximian.com> * evolution-message-composer.xml: Added an EncodingPlaceholder, diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml index 69afe09117..683ed463ad 100644 --- a/ui/evolution-message-composer.xml +++ b/ui/evolution-message-composer.xml @@ -71,6 +71,7 @@ <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> @@ -78,20 +79,21 @@ </keybindings> <menu> - <submenu name="File" _label="_File"> <menuitem name="FileOpen" verb="" _label="_Open..."/> <placeholder name="FileOps"/> - <menuitem name="FileSend" verb="" - _label="Send"/> - <menuitem name="FileSendLater" verb="" - _label="Send _Later"/> + <menuitem name="FileSend" verb="" _label="Send"/> + <menuitem name="FileSendLater" verb="" _label="Send _Later"/> + <separator/> + <menuitem name="FileSave" verb="" _label="_Save"/> <menuitem name="FileSaveAs" verb="" _label="Save _As..."/> <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/> <placeholder name="Print" delimit="top"/> + <separator/> + <menuitem name="FileClose" verb="" _label="_Close"/> </submenu> @@ -124,11 +126,12 @@ <placeholder name="Component"/> </submenu> - <submenu name="Format" _label="F_ormat"> + <submenu name="Format" _label="For_mat"> <menuitem name="FormatHtml" verb=""/> - </submenu> - <placeholder name="Component"/> + <separator/> + <placeholder name="FormatParagraph"/> + </submenu> <submenu name="Security" _label="_Security"> <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/> @@ -140,13 +143,21 @@ </menu> <dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon"> - <toolitem name="FileSend" verb="" pixtype="pixbuf" priority="1"/> - - <toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/> - + <toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/> + <separator/> - </dockitem> - + </dockitem> </Root> + + + + + + + + + + + diff --git a/ui/evolution-signature-editor.xml b/ui/evolution-signature-editor.xml index 185422f7b5..af8604d1e7 100644 --- a/ui/evolution-signature-editor.xml +++ b/ui/evolution-signature-editor.xml @@ -1,14 +1,17 @@ <Root> <commands> - +<!-- <cmd name="FileSave" _label="Save" _tip="Save the current file" pixtype="stock" pixname="Save" accel="*Ctrl*s"/> - +--> <cmd name="FileClose" _label="Close" _tip="Close the current file" pixtype="stock" pixname="Close" accel="*Ctrl*w"/> + <cmd name="FileSaveClose" _label="Save and Close" + pixtype="stock" pixname="Save"/> + </commands> <keybindings> @@ -21,15 +24,16 @@ <placeholder name="FileOps"/> +<!-- <menuitem name="FileSave" verb="" _label="_Save"/> +--> + <menuitem name="FileSaveClose" verb="" _label="Save and Close"/> <placeholder name="Print" delimit="top"/> <separator/> - <menuitem name="FileClose" verb="" _label="_Close"/> - </submenu> |