From e4bdc1e6a762058e4e289d6d7710dcadda1caca1 Mon Sep 17 00:00:00 2001
From: Srinivasa Ragavan <sragavan@src.gnome.org>
Date: Fri, 2 Jun 2006 18:12:08 +0000
Subject: Added support for Vertical View in Evolution Mailer with custom
 message list.

svn path=/trunk/; revision=32071
---
 ui/ChangeLog                  |  8 ++++++++
 ui/evolution-mail-global.xml  | 16 +++++++++++++---
 ui/evolution-mail-list.xml    |  3 +--
 ui/evolution-mail-message.xml |  4 ++--
 ui/evolution.xml              |  8 +++++---
 5 files changed, 29 insertions(+), 10 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 267361de95..6e66fe9f9a 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,11 @@
+2006-06-02  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* evolution-mail-global.xml: Added menu item for wide view.
+	* evolution-mail-list.xml: Adjusted the separator for threads
+	* evolution-mail-message.xml: Combined the zoom option to a submenu.
+	* evolution.xml: Combined the side bar/toolbar/status bar to a submenu
+	to avoid the large growing View menu.
+
 2006-04-27  Rodney Dawes  <dobey@novell.com>
 
 	* evolution-mail-global.xml: Don't set gtk-delete as the stock icon
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 9626907c47..fd1d514167 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -35,6 +35,12 @@
      accel="*Control*m"
      type="toggle"/>
 
+    <cmd name="ViewBelow" _label="_Classic View" 
+      type="radio" group="preview_display" _tip="Show message preview below the message list"/>
+
+    <cmd name="ViewAfter" _label="_Vertical View" 
+     type="radio" group="preview_display" _tip="Show message preview side-by-side with the message list"/>
+
   </commands>
 
   <keybindings>
@@ -50,10 +56,14 @@
     </submenu>
 
     <submenu name="View" _label="_View">
-      <placeholder name="ViewPreview">
-        <menuitem name="ViewPreview" verb="" _label="Message _Preview"/>
+      <placeholder name="ViewPreview">	    
+      <submenu name="Preview" _label="_Preview">	    
+        <menuitem name="ViewPreview" verb="" _label="Show Message _Preview"/>
+	<separator name="previewsep"/>
+	<menuitem name="ViewBelow" id="ViewBelow" _label="_Classic View"/>
+	<menuitem name="ViewAfter" id="ViewAfter" _label="_Vertical View"/>
+      </submenu>
       </placeholder>
-
       <separator f="" name="emailglobal"/>
       <placeholder name="MailMessageFilter"/>
       <placeholder name="MailMessageView"/>
diff --git a/ui/evolution-mail-list.xml b/ui/evolution-mail-list.xml
index 5d75bb9d96..e95147510e 100644
--- a/ui/evolution-mail-list.xml
+++ b/ui/evolution-mail-list.xml
@@ -77,9 +77,8 @@
 	      <menuitem name="ViewThreaded" verb="" _label="_Group By Threads"/>
         <menuitem name="ViewThreadsExpandAll" verb="" _label="E_xpand All Threads"/>
         <menuitem name="ViewThreadsCollapseAll" verb="" _label="Collapse All _Threads"/>
-	      
-        <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
  	<separator f="" name="emaillist"/>
+        <menuitem name="HideDeleted" verb="" _label="Hide _Deleted Messages"/>
 	<menuitem name="ViewHideSelected" verb="" _label="Hide S_elected Messages"/>
 	<menuitem name="ViewHideRead" verb="" _label="Hide _Read Messages"/>
 	<menuitem name="ViewShowAll" verb="" _label="Sh_ow Hidden Messages"/>
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index e3003fa9d9..0bc0867aea 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -286,7 +286,7 @@
 
     <submenu name="View">
        <placeholder name="MailMessageZoom">
-	  <separator f="" name="emaillist"/>
+          <submenu name="zoom" _label="_Zoom">
  	  <menuitem name="TextZoomIn" verb="" _label="_Zoom In"
 		    pixtype="stock" pixname="gtk-zoom-in"/>
  	  <menuitem name="TextZoomOut" verb="" _label="Zoom _Out"
@@ -294,7 +294,7 @@
 
  	  <menuitem name="TextZoomReset" verb="" _label="_Normal Size"
 		    pixtype="stock" pixname="gtk-zoom-100"/>
-
+	  </submenu>
        </placeholder>
 
        <placeholder name="MailViewType">
diff --git a/ui/evolution.xml b/ui/evolution.xml
index d23903b4b4..18102e461a 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -25,13 +25,13 @@
     <cmd name="ViewButtonsHide" _label="_Hide buttons" 
       type="toggle" _tip="Hide window buttons"/>
 
-    <cmd name="ViewToolbar" _label="Tool_bar" type="toggle"
+    <cmd name="ViewToolbar" _label="Show _Toolbar" type="toggle"
       _tip="Change the visibility of the toolbar" state="1"/>
 
-    <cmd name="ViewStatusBar" _label="Status _Bar" type="toggle"
+    <cmd name="ViewStatusBar" _label="Show _Status Bar" type="toggle"
       _tip="View/Hide the Status Bar" state="1"/>
 
-    <cmd name="ViewSideBar" _label="Side _Bar" type="toggle"
+    <cmd name="ViewSideBar" _label="Show Side _Bar" type="toggle"
       _tip="View/Hide the Side Bar" state="1"/>
 
     <cmd name="HelpSubmitBug" _label="Submit Bug Report"
@@ -114,9 +114,11 @@
     <submenu name="View" _label="_View">
       <placeholder name="ViewBegin"/>
       <submenu name="Window" _label="_Window"/>
+      <submenu name="layout" _label="La_yout">
       <menuitem name="ViewToolbar" id="ViewToolbar" verb=""/>
       <menuitem name="ViewStatusBar" id="ViewStatusBar"/>
       <menuitem name="ViewSideBar" id="ViewSideBar"/>
+      </submenu>
       <placeholder name="ViewPreview"/>
       <submenu name="Buttons" _label="_Switcher Appearance">
             <menuitem name="ViewButtonsIconText" id="ViewButtonsIconText" verb=""/>
-- 
cgit v1.2.3