From 3e8b02fb9363320a8fc70a80654c59602380a4a9 Mon Sep 17 00:00:00 2001
From: Peter Williams <peterw@ximian.com>
Date: Tue, 24 Jul 2001 19:06:10 +0000
Subject: Move Insert File from the File menu into the Insert Menu. Change the

2001-07-24  Peter Williams  <peterw@ximian.com>

	* evolution-message-composer.xml: Move Insert File from the File
	menu into the Insert Menu. Change the accelerators to reflect
	what's being inserted and add ellipses.

svn path=/trunk/; revision=11349
---
 ui/ChangeLog                      | 4 ++++
 ui/evolution-message-composer.xml | 9 +++++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 1cb375e7f3..54c962bd59 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,5 +1,9 @@
 2001-07-24  Peter Williams  <peterw@ximian.com>
 
+	* evolution-message-composer.xml: Move Insert File from the File
+	menu into the Insert Menu. Change the accelerators to reflect
+	what's being inserted and add ellipses.
+
 	* evolution-mail-global.xml: Add "Compose New Message" to the
 	Actions menu as suggested in bug #866. Also fix it so that the
 	pixmaps for the Compose menu items are displayed.
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 7a1f56eef0..362881008d 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -20,6 +20,7 @@
 		_tip="Save the message in a specified folder"/>
 		
 		<cmd name="FileInsertFile" _label="Insert text file..."
+                accel="*Ctrl**Alt*f"
 		_tip="Insert a file as text into the message"/>
 		
 		<cmd name="FileSend" _label="Send" _tip="Send this message now"
@@ -30,7 +31,7 @@
 		pixtype="stock" pixname="Send Mail"/> 
 		
 		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		accel="*Ctrl**Alt*f"
+		accel="*Ctrl**Alt*a"
 		pixtype="pixbuf"/>
 		
 		<cmd name="DeleteAll" _label="_Delete all"
@@ -90,8 +91,6 @@
                         <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
 			<placeholder name="Print" delimit="top"/>
 			<separator/>
-			<menuitem name="FileInsertFile" verb="" _label="_Insert text file..."/>
-			<separator/>
 			<menuitem name="FileClose" verb="" _label="_Close"/>
 		</submenu>
 		
@@ -118,7 +117,9 @@
 		
                 <submenu name="Insert" _label="_Insert">
 	                <menuitem name="FileAttach" verb=""
-	                _label="_Attachment"/>
+	                _label="_Attachment..."/>
+			<menuitem name="FileInsertFile" verb="" 
+                        _label="Inline Text _File..."/>
                 	<placeholder name="Component"/>
                 </submenu>
 		
-- 
cgit v1.2.3