From 8cd8c70157a6f5dc3baae56a9563d147616a94fe Mon Sep 17 00:00:00 2001
From: "hewitt%netscape.com" <hewitt%netscape.com>
Date: Sat, 7 Oct 2000 08:35:03 +0000
Subject: [PATCH] on behalf of jglick, #54522 - mnemonics stuff, r=mcarlson,
 sr=mscott

---
 mailnews/addrbook/resources/content/addressbook.xul  | 12 ++++++++----
 .../addrbook/resources/locale/en-US/abMainWindow.dtd |  7 +++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/mailnews/addrbook/resources/content/addressbook.xul b/mailnews/addrbook/resources/content/addressbook.xul
index c15b5ad5f383..aefe59f6b73f 100644
--- a/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mailnews/addrbook/resources/content/addressbook.xul
@@ -109,9 +109,9 @@ Rights Reserved.
 				<menuseparator/>
 				<menuitem id="menu_close"/>
 				<menuseparator/>
-				<menuitem value="&importCmd.label;" oncommand="toImport()"/>
+				<menuitem value="&importCmd.label;" accesskey="&importCmd.accesskey;" oncommand="toImport()"/>
 				<menuseparator/>
-				<menuitem value="&printCardViewCmd.label;" key="key_PrintCard" observes="cmd_PrintCard"/>
+				<menuitem value="&printCardViewCmd.label;" accesskey="&printCardViewCmd.accesskey;" key="key_PrintCard" observes="cmd_PrintCard"/>
 				<menuseparator/>
 			</menupopup>
 		</menu>
@@ -162,23 +162,27 @@ Rights Reserved.
 								  oncommand="SetNameColumn('displayNameCmd')"/>
 					</menupopup>
 				</menu>
-				<menu value="&sortMenu.label;">
+				<menu value="&sortMenu.label;" accesskey="&sortMenu.accesskey;">
 				    <menupopup>
 						<menuitem value="&sortByNameCmd.label;"
 								  id="cmd_SortByName"
 								  disabled="true"
+								  accesskey="&SortByName.accesskey;"
 								  oncommand="top.SortResultPane('NameColumn', 'http://home.netscape.com/NC-rdf#DisplayName')" name="sortas" type="radio" checked="true"/>
 						<menuitem value="&sortByEmailCmd.label;"
 								  id="cmd_SortByEmail"
 								  disabled="true"
+								  accesskey="&SortByEmail.accesskey;"
 								  oncommand="top.SortResultPane('EmailColumn', 'http://home.netscape.com/NC-rdf#PrimaryEmail')" name="sortas" type="radio"/>
 						<menuitem value="&sortByWorkPhoneCmd.label;"
 								  id="cmd_SortByWorkPhone"
 								  disabled="true"
+								  accesskey="&SortByWorkPhone.accesskey;"
 								  oncommand="top.SortResultPane('WorkPhoneColumn', 'http://home.netscape.com/NC-rdf#WorkPhone')" name="sortas" type="radio"/>
 						<menuitem value="&sortByOrganizationCmd.label;"
 								  id="cmd_SortByOrganization"
 								  disabled="true"
+								  accesskey="&SortByOrganization.accesskey;"
 								  oncommand="top.SortResultPane('OrganizationColumn', 'http://home.netscape.com/NC-rdf#Company')" name="sortas" type="radio"/>
 					</menupopup>
 				</menu>
@@ -195,7 +199,7 @@ Rights Reserved.
 			<box id="toolbar_button_box">
 				<button class="button-toolbar-2 top" orient="vertical" id="button-newcard" value="&newcardButton.label;" tooltip="aTooltip" tooltiptext="&newcardButton.tooltip;" onclick="AbNewCard()"/>
 				<button class="button-toolbar-2 top" orient="vertical" id="button-newlist" value="&newlistButton.label;" tooltip="aTooltip" tooltiptext="&newlistButton.tooltip;" onclick="AbNewList()"/>
-            	<toolbarseparator/>
+            	<toolbarseparator class="toolbarseparator-primary"/>
 				<button class="button-toolbar-2 top" orient="vertical" id="button-editcard" value="&editButton.label;" tooltip="aTooltip" tooltiptext="&editButton.tooltip;" onclick="AbEditCard()"/>
 				<button class="button-toolbar-2 top" orient="vertical" id="button-newmessage" value="&newmsgButton.label;" tooltip="aTooltip" tooltiptext="&newmsgButton.tooltip;" onclick="AbNewMessage()"/>
 				<button class="button-toolbar-2 top" orient="vertical" id="button-delete" disabled="true" observes="button_delete" value="&deleteButton.label;" tooltip="aTooltip" tooltiptext="&deleteButton.tooltip;" onclick="goDoCommand('button_delete')"/>
diff --git a/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd b/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
index e195955e1285..bd691d345b54 100644
--- a/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
+++ b/mailnews/addrbook/resources/locale/en-US/abMainWindow.dtd
@@ -37,9 +37,11 @@ Rights Reserved.
 <!-- LOCALIZATION NOTE (newDirectoryCmd.accesskey) : DONT_TRANSLATE -->  
 <!ENTITY newDirectoryCmd.accesskey			"d">  
 <!ENTITY importCmd.label					"Import..."> 
+<!ENTITY importCmd.accesskey				"i"> 
 <!ENTITY exportCmd.label					".Export...">  
 <!ENTITY printPreviewCmd.label				".Print Preview">  
 <!ENTITY printCardViewCmd.label				"Print Card...">
+<!ENTITY printCardViewCmd.accesskey			"p">
 <!-- LOCALIZATION NOTE (printCardViewCmd.key) : DONT_TRANSLATE -->  
 <!ENTITY printCardViewCmd.key				"P">
 <!ENTITY printAddressBook.label				".Print Address Book...">  
@@ -66,10 +68,15 @@ Rights Reserved.
 <!ENTITY displayNameCmd.label				"Display Name">  
 <!ENTITY displayNameCmd.accesskey			"d"> 
 <!ENTITY sortMenu.label						"Sort by"> 
+<!ENTITY sortMenu.accesskey					"s"> 
 <!ENTITY sortByNameCmd.label					"Name">  
+<!ENTITY SortByName.accesskey					"n">  
 <!ENTITY sortByEmailCmd.label					"Email">  
+<!ENTITY SortByEmail.accesskey					"e">  
 <!ENTITY sortByWorkPhoneCmd.label				"Work Phone">  
+<!ENTITY SortByWorkPhone.accesskey				"w">  
 <!ENTITY sortByOrganizationCmd.label			"Organization">  
+<!ENTITY SortByOrganization.accesskey			"o">  
 <!ENTITY stopSearchingCmd.label				".Stop Searching"> 
 
 <!-- Toolbar items -->