Changes accelerator assignment specified in

2006-01-12  Srinivasa Ragavan  <sragavan@novell.com>

	* evolution-mail-global.xml:
	* evolution-mail-message.xml:
	* evolution-message-composer.xml:
	* evolution.xml:

	Changes accelerator assignment specified in
	http://go-evolution.org/Shortcut_Keys_Review

svn path=/trunk/; revision=31148

5 files changed, 19 insertions, 12 deletions

diff --git a/ui/ChangeLog b/ui/ChangeLog
index 944f1767ac..1f90c128f0 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,13 @@
+2006-01-12  Srinivasa Ragavan  <sragavan@novell.com>
+
+	* evolution-mail-global.xml:
+	* evolution-mail-message.xml:
+	* evolution-message-composer.xml:
+	* evolution.xml:
+
+	Changes accelerator assignment specified in 
+	http://go-evolution.org/Shortcut_Keys_Review
+
 2006-01-12  Harish Krishnaswamy  <kharish@novell.com>
 
 	* evolution-editor.xml:
diff --git a/ui/evolution-mail-global.xml b/ui/evolution-mail-global.xml
index f4424986c2..c4c0e6bcaf 100644
--- a/ui/evolution-mail-global.xml
+++ b/ui/evolution-mail-global.xml
@@ -11,7 +11,6 @@
 
     <cmd name="FolderCreate"
      _tip="Create a new folder for storing mail"
-     accel="*Control**Shift*f"
      pixtype="pixbuf"/>
 
     <cmd name="FolderCopy"
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index f3183b68c8..d8984c549c 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -72,12 +72,10 @@
      pixtype="pixbuf"/>
 
     <cmd name="MessageForwardAttached"
-     _tip="Forward the selected message to someone as an attachment"
-     accel="*Control*j"/>
+     _tip="Forward the selected message to someone as an attachment"/>
 
     <cmd name="MessageForwardInline"
-     _tip="Forward the selected message in the body of a new message"
-     accel="*Control**Shift*j"/>
+     _tip="Forward the selected message in the body of a new message"/>
 
     <cmd name="MessageForwardQuoted"
      _tip="Forward the selected message quoted like a reply"/>
@@ -101,10 +99,12 @@
 
     <cmd name="MessageMarkAsJunk"
      _tip="Mark the selected message(s) as junk"
+     accel="*Control*j"
      pixtype="pixbuf"/>
 
     <cmd name="MessageMarkAsNotJunk"
      _tip="Mark the selected message(s) as not being junk"
+     accel="*Control**Shift*j"
      pixtype="pixbuf"/>
 
     <cmd name="MessageFilterJunk"
@@ -130,8 +130,7 @@
      pixtype="pixbuf"/>
 
     <cmd name="MailPost"
-     _tip="Post a message to a Public folder"
-     accel="*Control**Alt*m"/>
+     _tip="Post a message to a Public folder"/>
 
     <cmd name="MessagePostReply"
      _tip="Post a reply to a message in a Public folder"
@@ -162,7 +161,7 @@
 
     <cmd name="MessageSearch"
      _tip="Search for text in the body of the displayed message"
-     accel="*Control**Alt*f"
+     accel="*Control**Shift*f"
      pixtype="stock" pixname="gtk-find"/>
 
     <cmd name="MessageUndelete"
@@ -177,7 +176,6 @@
 
     <cmd name="PrintPreviewMessage"
      _tip="Preview the message to be printed"
-     accel="*Control**Shift*p"
      pixtype="stock" pixname="gtk-print-preview"/>
 
     <cmd name="PrintSetup"
@@ -186,7 +184,7 @@
 
     <cmd name="SelectAllText"
      _tip="Select all the text in a message"
-     accel="*Control**Alt*a"/>
+     accel="*Control**Shift*x"/>
 
     <cmd name="ToolsFilterMailingList"
      _tip="Create a rule to filter messages to this mailing list"/>
diff --git a/ui/evolution-message-composer.xml b/ui/evolution-message-composer.xml
index f468cf14b5..89667e778f 100644
--- a/ui/evolution-message-composer.xml
+++ b/ui/evolution-message-composer.xml
@@ -28,7 +28,7 @@
                 pixtype="pixbuf"/>
 		
 		<cmd name="FileAttach" _label="Attach" _tip="Attach a file"
-		accel="*Ctrl**Shift*a"
+		accel="*Ctrl*m"
 		pixtype="pixbuf"/>
 		
 		<cmd name="DeleteAll" _label="_Delete all"
diff --git a/ui/evolution.xml b/ui/evolution.xml
index 36502aacbd..28b27d53c6 100644
--- a/ui/evolution.xml
+++ b/ui/evolution.xml
@@ -111,7 +111,7 @@
     <submenu name="View" _label="_View">
       <placeholder name="ViewBegin"/>
       <submenu name="Window" _label="_Window"/>
-      <menuitem name="ViewToolbar" id="ViewToolbar" verb="" accel="*Control**Shift*o"/>
+      <menuitem name="ViewToolbar" id="ViewToolbar" verb=""/>
       <menuitem name="ViewStatusBar" id="ViewStatusBar"/>
       <placeholder name="ViewPreview"/>
       <submenu name="Buttons" _label="_Switcher Appearance">