Moved the (un)select all menu items over to the Edit menu - this looks

2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>

	* ui/evolution-mail.xml: Moved the (un)select all menu items over
	to the Edit menu - this looks nicer.

svn path=/trunk/; revision=5588

2 files changed, 120 insertions, 113 deletions

diff --git a/ChangeLog b/ChangeLog
index 84fe982d2b..942cc3bbbd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
 
+	* ui/evolution-mail.xml: Moved the (un)select all menu items over
+	to the Edit menu - this looks nicer.
+
+2000-09-25  Jeffrey Stedfast  <fejj@helixcode.com>
+
 	* ui/evolution-mail.xml: Added some new menu items to the Message
 	menu like (un)select all and moved "mark as read" to the Message
 	menu.
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index f1870c6c91..412c0e5134 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -1,176 +1,178 @@
 <Root>
-	<menu>
-		<submenu name="File" _label="_File">
+  <menu>
+    <submenu name="File" _label="_File">
 
-			<placeholder name="Print">
+      <placeholder name="Print">
 
-				<menuitem name="Print" verb="PrintMessage"
-				_label="Print message..."
-				_descr="Print message to the printer"
-				pixtype="stock" pixname="Menu_Print"/>
+        <menuitem name="Print" verb="PrintMessage"
+        _label="Print message..."
+        _descr="Print message to the printer"
+        pixtype="stock" pixname="Menu_Print"/>
 <!-- do we need this separator ? -->
 
-				<menuitem/>
+        <menuitem/>
 
-			</placeholder>
+      </placeholder>
 
-		</submenu>
+    </submenu>
 
-		<submenu name="View" _label="_View">
+    <submenu name="Edit" _label="_Edit">
 
-			<menuitem/>
+        <menuitem name="EditSelectAll" verb=""
+        _label="Select _All"/>
 
-			<menuitem name="Threaded" verb="ViewThreaded"
-			_label="_Threaded" _descr="Threaded Message list"/>
+        <menuitem name="EditUnSelectAll" verb=""
+        _label="_Unselect All"/>
 
-		</submenu>
+    </submenu>
 
-		<submenu name="Settings" _label="_Settings">
+    <submenu name="View" _label="_View">
 
-			<menuitem name="MailFilters" verb="SetMailFilter"
-			_label="Mail _Filters..."/>
+      <menuitem/>
 
-			<menuitem name="VFolderEdit" verb="SetVFolder"
-			_label="_Virtual Folder Editor..."/>
+      <menuitem name="Threaded" verb="ViewThreaded"
+      _label="_Threaded" _descr="Threaded Message list"/>
 
-			<menuitem name="SetMailConfig" verb=""
-			_label="_Mail Configuration..."/>
+    </submenu>
 
-			<menuitem name="SetForgetPwd" verb=""
-			_label="Forget _Passwords"/>
+    <submenu name="Settings" _label="_Settings">
 
-		</submenu>
+      <menuitem name="MailFilters" verb="SetMailFilter"
+      _label="Mail _Filters..."/>
 
-		<placeholder name="Component">
+      <menuitem name="VFolderEdit" verb="SetVFolder"
+      _label="_Virtual Folder Editor..."/>
 
-			<submenu name="Message" _label="_Message">
+      <menuitem name="SetMailConfig" verb=""
+      _label="_Mail Configuration..."/>
 
-                                <menuitem name="MessageSelectAll" verb=""
-				_label="Select _All"/>
+      <menuitem name="SetForgetPwd" verb=""
+      _label="Forget _Passwords"/>
 
-                                <menuitem name="MessageUnSelectAll" verb=""
-				_label="_Unselect All"/>
+    </submenu>
 
-                                <menuitem/>
+    <placeholder name="Component">
 
-				<menuitem name="MessageOpenNewWnd" verb=""
-				_label="_Open in New Window"
-				accel="*Control*o"/>
+      <submenu name="Message" _label="_Message">
 
-				<menuitem name="MessageEdit" verb=""
-				_label="_Edit Message"/>
+        <menuitem name="MessageOpenNewWnd" verb=""
+        _label="_Open in New Window"
+        accel="*Control*o"/>
 
-				<menuitem name="MessagePrint" verb=""
-				_label="_Print Message"/>
+        <menuitem name="MessageEdit" verb=""
+        _label="_Edit Message"/>
 
-				<menuitem/>
+        <menuitem name="MessagePrint" verb=""
+        _label="_Print Message"/>
 
-				<menuitem name="MessageReplySndr" verb=""
-				_label="Reply to _Sender"/>
+        <menuitem/>
 
-				<menuitem name="MessageReplyAll" verb=""
-				_label="Reply to _All"/>
+        <menuitem name="MessageReplySndr" verb=""
+        _label="Reply to _Sender"/>
 
-				<menuitem name="MessageForward" verb=""
-				_label="_Forward"/>
+        <menuitem name="MessageReplyAll" verb=""
+        _label="Reply to _All"/>
 
-				<menuitem/>
+        <menuitem name="MessageForward" verb=""
+        _label="_Forward"/>
 
-                                <menuitem name="MessageMarkAsRead" verb=""
-				_label="Mar_k As Read"/>
+        <menuitem/>
 
-                                <menuitem name="MessageMarkAsUnRead" verb=""
-				_label="Mark As U_nread"/>
+        <menuitem name="MessageMarkAsRead" verb=""
+        _label="Mar_k As Read"/>
 
-				<menuitem name="MessageDelete" verb=""
-				_label="_Delete"/>
+        <menuitem name="MessageMarkAsUnRead" verb=""
+        _label="Mark As U_nread"/>
 
-				<menuitem name="MessageMove" verb=""
-				_label="_Move to Folder"/>
+        <menuitem name="MessageDelete" verb=""
+        _label="_Delete"/>
 
-				<menuitem name="MessageCopy" verb=""
-				_label="_Copy to Folder"/>
+        <menuitem name="MessageMove" verb=""
+        _label="_Move to Folder"/>
 
-				<menuitem/>
+        <menuitem name="MessageCopy" verb=""
+        _label="_Copy to Folder"/>
 
-				<menuitem name="MessageVFolderSubj" verb=""
-				_label="_VFolder on Subject"/>
+        <menuitem/>
 
-				<menuitem name="MessageVFolderSndr" verb=""
-				_label="VFolder on Se_nder"/>
+        <menuitem name="MessageVFolderSubj" verb=""
+        _label="_VFolder on Subject"/>
 
-				<menuitem name="MessageVFolderRecip" verb=""
-				_label="VFolder on _Recipients"/>
+        <menuitem name="MessageVFolderSndr" verb=""
+        _label="VFolder on Se_nder"/>
 
-				<menuitem/>
+        <menuitem name="MessageVFolderRecip" verb=""
+        _label="VFolder on _Recipients"/>
 
-				<menuitem name="MessageFilterSubj" verb=""
-				_label="_Filter on Subject"/>
+        <menuitem/>
 
-				<menuitem name="MessageFilterSndr" verb=""
-				_label="Fi_lter on Sender"/>
+        <menuitem name="MessageFilterSubj" verb=""
+        _label="_Filter on Subject"/>
 
-				<menuitem name="MessageFilterRecip" verb=""
-				_label="Filter on Rec_ipients"/>
+        <menuitem name="MessageFilterSndr" verb=""
+        _label="Fi_lter on Sender"/>
 
-			</submenu>
-			
-			<submenu name="Folder" _label="F_older">
+        <menuitem name="MessageFilterRecip" verb=""
+        _label="Filter on Rec_ipients"/>
 
-				<menuitem name="FolderExpunge" verb=""
-				_label="_Expunge"/>
+      </submenu>
+      
+      <submenu name="Folder" _label="F_older">
 
-				<menuitem name="FolderConfig" verb=""
-				_label="_Configure Folder"/>
+        <menuitem name="FolderExpunge" verb=""
+        _label="_Expunge"/>
 
-			</submenu>
+        <menuitem name="FolderConfig" verb=""
+        _label="_Configure Folder"/>
 
-		</placeholder>
-	</menu>
+      </submenu>
 
-	<dockitem name="Toolbar" relief="none">
+    </placeholder>
+  </menu>
 
-		<toolitem name="MailGet" verb=""
-		_label="Get Mail" _descr="Send queued mail and retrieve new mail"
-		pixtype="pixbuf"/>
+  <dockitem name="Toolbar" relief="none">
 
-		<toolitem name="MailCompose" verb=""
-		_label="Compose" _descr="Compose a new message"
-		pixtype="pixbuf"/>
+    <toolitem name="MailGet" verb=""
+    _label="Get Mail" _descr="Send queued mail and retrieve new mail"
+    pixtype="pixbuf"/>
 
-		<toolitem type="separator"/>
+    <toolitem name="MailCompose" verb=""
+    _label="Compose" _descr="Compose a new message"
+    pixtype="pixbuf"/>
 
-		<toolitem name="Reply" verb="MessageReplySndr"
-		_label="Reply" _descr="Reply to the sender of this message"
-		pixtype="pixbuf"/>
+    <toolitem type="separator"/>
 
-		<toolitem name="ReplyAll" verb="MessageReplyAll"
-		_label="Reply to All" _descr="Reply to all recipients of this message"
-		pixtype="pixbuf"/>
+    <toolitem name="Reply" verb="MessageReplySndr"
+    _label="Reply" _descr="Reply to the sender of this message"
+    pixtype="pixbuf"/>
 
-		<toolitem name="Forward" verb="MessageForward"
-		_label="Forward" _descr="Forward this message"
-		pixtype="pixbuf"/>
+    <toolitem name="ReplyAll" verb="MessageReplyAll"
+    _label="Reply to All" _descr="Reply to all recipients of this message"
+    pixtype="pixbuf"/>
 
-		<toolitem type="separator"/>
+    <toolitem name="Forward" verb="MessageForward"
+    _label="Forward" _descr="Forward this message"
+    pixtype="pixbuf"/>
 
-		<toolitem name="Move" verb="MessageMove"
-		_label="Move" _descr="Move message to a new folder"
-		pixtype="pixbuf"/>
+    <toolitem type="separator"/>
 
-		<toolitem name="Copy" verb="MessageCopy"
-		_label="Copy" _descr="Copy message to a new folder"
-		pixtype="pixbuf"/>
+    <toolitem name="Move" verb="MessageMove"
+    _label="Move" _descr="Move message to a new folder"
+    pixtype="pixbuf"/>
 
-		<toolitem type="separator"/>
+    <toolitem name="Copy" verb="MessageCopy"
+    _label="Copy" _descr="Copy message to a new folder"
+    pixtype="pixbuf"/>
 
-		<toolitem name="Print" verb="MessagePrint"
-		_label="Print" _descr="Print the selected message"
-		pixtype="stock" pixname="Print"/>
+    <toolitem type="separator"/>
 
-		<toolitem name="Delete" verb="MessageDelete"
-		_label="Delete" _descr="Delete this message"
-		pixtype="stock" pixname="Trash"/>
+    <toolitem name="Print" verb="MessagePrint"
+    _label="Print" _descr="Print the selected message"
+    pixtype="stock" pixname="Print"/>
 
-	</dockitem>
+    <toolitem name="Delete" verb="MessageDelete"
+    _label="Delete" _descr="Delete this message"
+    pixtype="stock" pixname="Trash"/>
+
+  </dockitem>
 </Root>