Added MailNextUnread, MailNextFlagged, MailPreviousUnread, and

2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>

	* evolution-mail.xml: Added MailNextUnread, MailNextFlagged,
	MailPreviousUnread, and MailPreviousFlagged commands. Also
	rearranged the View menu to be a bit more user-friendly.

	Now where should we put the next/previous menu items?

svn path=/trunk/; revision=10013

2 files changed, 43 insertions, 13 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index b6ca359ab1..8e70fd8695 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,11 @@
+2001-05-25  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* evolution-mail.xml: Added MailNextUnread, MailNextFlagged,
+	MailPreviousUnread, and MailPreviousFlagged commands. Also
+	rearranged the View menu to be a bit more user-friendly.
+
+	Now where should we put the next/previous menu items?
+
 2001-05-25  Christopher James Lahey  <clahey@ximian.com>
 
 	* evolution-addressbook.xml: Changed the tooltips here based on
diff --git a/ui/evolution-mail.xml b/ui/evolution-mail.xml
index ae115563a0..dacae7ce98 100644
--- a/ui/evolution-mail.xml
+++ b/ui/evolution-mail.xml
@@ -44,10 +44,28 @@
      _tip="Display the next message"
      accel="f"/>
 
+    <cmd name="MailNextUnread"
+     _tip="Display the next unread message"
+     accel="n"/>
+
+    <cmd name="MailNextFlagged"
+     _tip="Display the next important message"/>
+
+    <cmd name="MailNextThread"
+     _tip="Display the next unread thread"
+     accel="t"/>
+
     <cmd name="MailPrevious"
      _tip="Display the previous message"
      accel="b"/>
 
+    <cmd name="MailPreviousUnread"
+     _tip="Display the previous unread message"
+     accel="p"/>
+
+    <cmd name="MailPreviousFlagged"
+     _tip="Display the previous important message"/>
+
     <cmd name="MailStop"
      _tip="Cancel the current mail operation"
      pixtype="stock" pixname="Stop"/>
@@ -177,11 +195,11 @@
      _tip="Show message with all email headers"
      type="radio" group="message_display"/>
 
-    <cmd name="ViewHideRead"
+    <cmd name="HideRead"
      _tip="Temporarily hide all messages that have already been read"
      pixtype="pixbuf"/>
 
-    <cmd name="ViewHideSelected"
+    <cmd name="HideSelected"
      _tip="Temporarily hide the selected messages"
      pixtype="pixbuf"/>
 
@@ -266,24 +284,28 @@
     <submenu name="View">
       <separator/>
 
-      <menuitem name="ViewThreaded" verb="" _label="_Threaded Message List"/>
-      <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
+      <menuitem name="ViewSource" verb="" _label="_Source"/>      
 
-      <submenu name="MessageDisplay" _label="_Message Display">
-        <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
+      <menuitem name="ViewThreaded" verb="" _label="_Threaded"/>
 
-	<separator/>
+      <submenu name="ViewMessages" _label="Messages">
+        <menuitem name="ViewShowAll" verb="" _label="_All"/>
+        <menuitem name="HideRead" verb="" _label="_Unread"/>
+
+        <separator/>
+
+        <menuitem name="HideDeleted" verb="" _label="Hide _Deleted"/>
+        <menuitem name="HideSelected" verb="" _label="Hide S_elected"/>
+      </submenu>
 
-	<menuitem name="ViewNormal" verb="" _label="_Normal Display"/>
-	<menuitem name="ViewFullHeaders" verb="" _label="Show Full _Headers"/>
-	<menuitem name="ViewSource" verb="" _label="Show Email _Source"/>
+      <submenu name="ViewHeaders" _label="_Headers">
+	<menuitem name="ViewNormal" verb="" _label="_Normal"/>
+	<menuitem name="ViewFullHeaders" verb="" _label="_All"/>
       </submenu>
 
       <separator/>
 
-      <menuitem name="ViewShowAll" verb="" _label="Show _All"/>
-      <menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
-      <menuitem name="ViewHideRead" verb="" _label="Hide _Read messages"/>
+      <menuitem name="ViewLoadImages" verb="" _label="Load _Images"/>
     </submenu>
 
     <submenu name="Actions">