From ffb6a1d2292be2909273e276fba93951ee6276c5 Mon Sep 17 00:00:00 2001
From: Rodney Dawes <dobey@ximian.com>
Date: Mon, 26 Jan 2004 22:35:19 +0000
Subject: Get rid of all the *Shift*character keybindings, so people can
 actually

2004-01-26  Rodney Dawes  <dobey@ximian.com>

	* evolution-addressbook.xml:
	* evolution-mail-global.xml:
	* evolution-mail-message.xml: Get rid of all the *Shift*character
	keybindings, so people can actually type things in the search bar,
	Just use *Control*basekey instead

	Fixes #41769

svn path=/trunk/; revision=24451
---
 ui/ChangeLog                  | 10 ++++++++++
 ui/evolution-addressbook.xml  |  3 +--
 ui/evolution-mail-global.xml  |  9 +--------
 ui/evolution-mail-message.xml | 23 ++++-------------------
 4 files changed, 16 insertions(+), 29 deletions(-)

(limited to 'ui')

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 44ea306f5d..4318714395 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-26  Rodney Dawes  <dobey@ximian.com>
+
+	* evolution-addressbook.xml:
+	* evolution-mail-global.xml:
+	* evolution-mail-message.xml: Get rid of all the *Shift*character
+	keybindings, so people can actually type things in the search bar,
+	Just use *Control*basekey instead
+
+	Fixes #41769
+
 2004-01-23  Rodney Dawes  <dobey@ximian.com>
 
 	* evolution-mail-list.xml: Fix Folder submenu location
diff --git a/ui/evolution-addressbook.xml b/ui/evolution-addressbook.xml
index 0b81fdeb15..39b0d4f844 100644
--- a/ui/evolution-addressbook.xml
+++ b/ui/evolution-addressbook.xml
@@ -56,7 +56,7 @@
 
     <cmd name="ContactsViewPreview" _label="_Preview Pane"
 	 _tip="Show contact preview window"
-	 accel="grave"
+	 accel="*Control*grave"
 	 type="toggle"/>
   </commands>
 
@@ -152,7 +152,6 @@
   </dockitem>
 
   <keybindings>
-    <accel name="*Shift*grave" verb="ContactViewPreview"/>
     <accel name="Delete" verb="ContactDelete"/>
     <accel name="BackSpace" verb="ContactDelete"/>
   </keybindings>
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index 6c6716cfe6..8e2059d62b 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -27,18 +27,11 @@
 
     <cmd name="ViewPreview"
      _tip="Show message preview window"
-     accel="grave"
+     accel="*Control*grave"
      type="toggle"/>
 
   </commands>
 
-  <keybindings>
-    <accel name="*Shift*grave" verb="ViewPreview"/>
-    <accel name="asciitilde" verb="ViewPreview"/>
-    <accel name="*Shift*asciitilde" verb="ViewPreview"/>
-
-  </keybindings>
-
   <menu>
 
     <submenu name="View" _label="_View">
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index c4ac654b8f..bb6eef7b79 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -29,7 +29,7 @@
 
     <cmd name="MailNextUnread"
      _tip="Display the next unread message"
-     accel="bracketright"/>
+     accel="*Control*bracketright"/>
 
     <cmd name="MailNextThread"
      _tip="Display the next unread thread"/>
@@ -42,7 +42,7 @@
 
     <cmd name="MailPreviousUnread"
      _tip="Display the previous unread message"
-     accel="bracketleft"/>
+     accel="*Control*bracketleft"/>
 
     <cmd name="MessageApplyFilters"
      _tip="Apply filter rules to the selected messages"
@@ -220,23 +220,8 @@
   </commands>
 
   <keybindings>
-    <accel name="*Shift*comma"        verb="MailPreviousUnread"/>
-    <accel name="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="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"/>
+    <accel name="*Control*comma"        verb="MailPreviousUnread"/>
+    <accel name="*Control*period"       verb="MailNextUnread"/>
   </keybindings>
 
   <menu>
-- 
cgit