From d814f34405079b350c1e8c8ac556e38b3f4f4df2 Mon Sep 17 00:00:00 2001
From: Christopher James Lahey <clahey@ximian.com>
Date: Tue, 14 May 2002 00:43:40 +0000
Subject: Replaced q binding with ` for hiding/showing the message view pane.

2002-05-13  Christopher James Lahey  <clahey@ximian.com>

	* evolution-mail-global.xml: Replaced q binding with ` for
	hiding/showing the message view pane.

	* evolution-mail-message.xml: Replace n/p with ,/. for doing
	previous/next unread messages.  Removed a few other bindings that
	interfere with alphanumeric characters.

svn path=/trunk/; revision=16772
---
 ui/ChangeLog                  |  9 +++++++++
 ui/evolution-mail-global.xml  |  7 +++++--
 ui/evolution-mail-message.xml | 29 ++++++++++++++++++++---------
 3 files changed, 34 insertions(+), 11 deletions(-)

diff --git a/ui/ChangeLog b/ui/ChangeLog
index dbf13a0a94..6de7a2cc2b 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,12 @@
+2002-05-13  Christopher James Lahey  <clahey@ximian.com>
+
+	* evolution-mail-global.xml: Replaced q binding with ` for
+	hiding/showing the message view pane.
+
+	* evolution-mail-message.xml: Replace n/p with ,/. for doing
+	previous/next unread messages.  Removed a few other bindings that
+	interfere with alphanumeric characters.
+
 2002-05-10  Ettore Perazzoli  <ettore@ximian.com>
 
 	* evolution.xml: Add FileOpenOtherUsersFolder.
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 42e631e7c5..7d237cbd89 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -27,12 +27,15 @@
 
     <cmd name="ViewPreview"
      _tip="Show message preview window"
-     accel="q"
-     type="toggle"  />
+     accel="grave"
+     type="toggle"/>
 
   </commands>
 
   <keybindings>
+    <accel name="*Shift*grave" verb="ViewPreview"/>
+    <accel name="asciitilde" verb="ViewPreview"/>
+    <accel name="*Shift*asciitilde" verb="ViewPreview"/>
 
   </keybindings>
 
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index a1d02b089a..47ae3a446f 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -6,30 +6,27 @@
      _tip="Add Sender to Addressbook"/>
 
     <cmd name="MailNext"
-     _tip="Display the next message"
-     accel="f"/>
+     _tip="Display the next message"/>
 
     <cmd name="MailNextFlagged"
      _tip="Display the next important message"/>
 
     <cmd name="MailNextUnread"
      _tip="Display the next unread message"
-     accel="n"/>
+     accel="period"/>
 
     <cmd name="MailNextThread"
-     _tip="Display the next unread thread"
-     accel="t"/>
+     _tip="Display the next unread thread"/>
 
     <cmd name="MailPrevious"
-     _tip="Display the previous message"
-     accel="b"/>
+     _tip="Display the previous message"/>
 
     <cmd name="MailPreviousFlagged"
      _tip="Display the previous important message"/>
 
     <cmd name="MailPreviousUnread"
      _tip="Display the previous unread message"
-     accel="p"/>
+     accel="comma"/>
 
     <cmd name="MessageApplyFilters"
      _tip="Apply filter rules to the selected messages"
@@ -196,7 +193,21 @@
   </commands>
 
   <keybindings>
-
+    <accel name="*Shift*comma"        verb="MailPreviousUnread"/>
+    <accel name="less"                verb="MailPreviousUnread"/>
+    <accel name="*Shift*less"         verb="MailPreviousUnread"/>
+    <accel name="bracketleft"         verb="MailPreviousUnread"/>
+    <accel name="*Shift*bracketleft"  verb="MailPreviousUnread"/>
+    <accel name="braceleft"           verb="MailPreviousUnread"/>
+    <accel name="*Shift*braceleft"    verb="MailPreviousUnread"/>
+
+    <accel name="*Shift*period"       verb="MailNextUnread"/>
+    <accel name="greater"             verb="MailNextUnread"/>
+    <accel name="*Shift*greater"      verb="MailNextUnread"/>
+    <accel name="bracketright"        verb="MailNextUnread"/>
+    <accel name="*Shift*bracketright" verb="MailNextUnread"/>
+    <accel name="braceright"          verb="MailNextUnread"/>
+    <accel name="*Shift*braceright"   verb="MailNextUnread"/>
   </keybindings>
 
   <menu>
-- 
cgit v1.2.3