Set it up to have an e-charset-picker bonobo-ui menu attached to the Edit

2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>

	* evolution-message-composer.xml: Set it up to have an
	e-charset-picker bonobo-ui menu attached to the Edit menu.

svn path=/trunk/; revision=10691

2 files changed, 48 insertions, 74 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index e4af740f02..32ea384cc0 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-02  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* evolution-message-composer.xml: Set it up to have an
+	e-charset-picker bonobo-ui menu attached to the Edit menu.
+
 2001-07-02  Ettore Perazzoli  <ettore@ximian.com>
 
 	* evolution.xml: Rename "New -> Evolution bar shortcut" into "New
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index 15292f5e82..2a0c11bf13 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -3,48 +3,48 @@
 
 	        <cmd name="FileOpen" _label="Open" hidden="1"
 		_tip="Open a file" pixtype="stock" pixname="Open" accel="*Control*o"/>
-	
+		
 	        <cmd name="FileSave" _label="Save"
 		_tip="Save the current file" pixtype="stock" pixname="Save"
 		accel="*Ctrl*s"/>
-	
+		
 	        <cmd name="FileSaveAs" _label="Save As"
-	          _tip="Save the current file with a different name"
-		  pixtype="stock" pixname="Save As"/>
-
+	        _tip="Save the current file with a different name"
+		pixtype="stock" pixname="Save As"/>
+		
 	        <cmd name="FileClose" _label="Close"
 		_tip="Close the current file" pixtype="stock" pixname="Close"
 		accel="*Ctrl*w"/>
-
+		
 		<cmd name="FileSaveInFolder" _label="Save in folder..."
 		_tip="Save the message in a specified folder"/>
-	
+		
 		<cmd name="FileInsertFile" _label="Insert text file..."
 		_tip="Insert a file as text into the message"/>
-
+		
 		<cmd name="FileSend" _label="Send" _tip="Send this message now"
 		accel="*Ctrl*Return"
                 pixtype="stock" pixname="Send Mail"/>
-
+		
 		<cmd name="FileSendLater" _label="Send _later" _tip="Send the message later"
 		pixtype="stock" pixname="Send Mail"/> 
-
+		
 		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
 		pixtype="pixbuf"/>
-
+		
 		<cmd name="DeleteAll" _label="_Delete all"
 		_tip="Delete all but signature"/>
-
+		
 		<cmd name="FormatHtml" _label="HTML" _tip="Send the mail in HTML format"
 		type="toggle" state="0"/> 
-
+		
 		<cmd name="ViewFrom" _label="_From Field"
 		_tip="Toggles whether the From chooser is displayed" type="toggle" state="0"/>
-
+		
                 <cmd name="ViewReplyTo" _label="_Reply-To Field"
 		_tip="Toggles whether the Reply-To field is displayed"
 		type="toggle" state="0"/>
-
+		
 		<cmd name="ViewCC" _label="_Cc Field"
 		_tip="Toggles whether the CC field is displayed"
 		type="toggle" state="0"/>
@@ -52,65 +52,49 @@
 		<cmd name="ViewBCC" _label="_Bcc Field"
 		_tip="Toggles whether the BCC field is displayed"
 		type="toggle" state="0"/>
-
+		
 		<cmd name="ViewAttach" _label="Show attachments" _tip="Show / hide attachments"
 		type="toggle" state="0"/> 
-	
+		
                 <cmd name="SecurityPGPSign" _label="PGP Sign" _tip="Sign this message with your PGP key"
 		type="toggle" state="0"/>
-
+		
                 <cmd name="SecurityPGPEncrypt" _label="PGP Encrypt" _tip="Encrypt this message with PGP"
 		type="toggle" state="0"/>
-
+		
                 <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>
-
+	
         </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"/>
-
 			<separator/>
-	    
 			<menuitem name="FileSave" verb="" _label="_Save"/>
-
 			<menuitem name="FileSaveAs" verb="" _label="Save _As..."/>
-
                         <menuitem name="FileSaveDraft" verb="" _label="Save _Draft"/>
-
 			<menuitem name="FileSaveInFolder" verb="" _label="Save in _folder... (FIXME)"/>
-
 			<placeholder name="Print" delimit="top"/>
 			<separator/>
-
 			<menuitem name="FileInsertFile" verb="" _label="_Insert text file..."/>
-
 			<separator/>
-
-
 			<menuitem name="FileClose" verb="" _label="_Close"/>
-
 		</submenu>
-
-
+		
 		<submenu name="Edit" _label="_Edit">
 			 <placeholder name="EditUndoRedo"/>
 			 <separator/>
@@ -121,64 +105,49 @@
 			 <separator/>
 			 <placeholder name="EditMisc"/>
 		</submenu>
-              
+		
 		<submenu name="View" _label="_View">
-
-			<menuitem name="ViewAttach" verb=""
-			_label="Show _attachments"/>
-	  
+			<menuitem name="ViewAttach" verb="" _label="Show _attachments"/>
 	                <separator/>
-	    
 	                <menuitem name="ViewFrom" verb=""/>
                         <menuitem name="ViewReplyTo" verb=""/>
 	                <menuitem name="ViewCC" verb=""/>
 	                <menuitem name="ViewBCC" verb=""/>
+			<separator/>
 		</submenu>
-
+		
                 <submenu name="Insert" _label="_Insert">
-	                <menuitem name="FileAttach" verb=""
-	                _label="_File"/>
-	  
-                	<placeholder name="Component">
-	                </placeholder>
+	                <menuitem name="FileAttach" verb="" _label="_File"/>
+                	<placeholder name="Component"/>
                 </submenu>
-      
+		
 		<submenu name="Format" _label="F_ormat">
-
 			<menuitem name="FormatHtml" verb=""/>
-
 		</submenu>
-
+		
 		<placeholder name="Component"/>
-
+		
                 <submenu name="Security" _label="_Security">
-
                         <menuitem name="SecurityPGPSign" verb="" _label="PGP Sign"/>
-
                         <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="Debug" _label="_Debug" hidden="1">
-
 			<menuitem name="DebugDumpXml" verb=""/>
-
 		</submenu>
-
+		
 	</menu>
-
+	
 	<dockitem name="Toolbar" behavior="exclusive" hlook="text" vlook="icon">
-
+	
 		<toolitem name="FileSend" verb="" priority="1"/>
-
+		
 		<toolitem name="FileAttach" verb="" pixtype="pixbuf" priority="1"/>
-
+		
 		<separator/>
-
+		
 	</dockitem>
-
+	
 </Root>