From dc78d7f05b4200ccf28d272e276fe759e1238e47 Mon Sep 17 00:00:00 2001
From: "ssu%netscape.com" <ssu%netscape.com>
Date: Tue, 9 Jul 2002 00:10:16 +0000
Subject: [PATCH] checking patch for walk84@yahoo.com. fixes bug 114464 - No
 (access keys) mnemonics in Subscribe dialog. r=ssu, sr=sspitzer

---
 mailnews/base/resources/content/subscribe.xul | 19 ++++++++++++-------
 .../base/resources/locale/en-US/subscribe.dtd |  6 ++++++
 2 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/mailnews/base/resources/content/subscribe.xul b/mailnews/base/resources/content/subscribe.xul
index 97647b7dbcb..f7f127a38a7 100644
--- a/mailnews/base/resources/content/subscribe.xul
+++ b/mailnews/base/resources/content/subscribe.xul
@@ -59,7 +59,7 @@ Rights Reserved.
           <rows>
             <row>
               <hbox pack="end" align="center">
-                <label value="&server.label;" control="serverMenu"/>
+                <label value="&server.label;" accesskey="&server.accesskey;" control="serverMenu"/>
               </hbox>
               <menulist oncommand="onServerClick(event);" id="serverMenu"
                         datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
@@ -75,8 +75,9 @@ Rights Reserved.
               </menulist>
             </row>
             <row align="center">
-          		<label value="&namefield.label;" id="namefieldlabel" control="namefield"/>
-          		<textbox id="namefield" flex="1" oninput="Search();"/>
+              <label value="&namefield.label;" accesskey="&namefield.accesskey;" 
+                     id="namefieldlabel" control="namefield"/>
+              <textbox id="namefield" flex="1" oninput="Search();"/>
             </row>
           </rows>
         </grid>
@@ -162,10 +163,14 @@ Rights Reserved.
      </hbox>
      </deck>
         <vbox>
-          <button id="subscribe" label="&subscribeButton.label;" oncommand="SetSubscribeState(true)"/>
-          <button id="unsubscribe" label="&unsubscribeButton.label;" oncommand="SetSubscribeState(false)"/>
-          <button id="refresh" label="&refreshButton.label;" oncommand="Refresh()"/>
-          <button id="stop" label="&stopButton.label;" oncommand="Stop()"/>
+          <button id="subscribe" label="&subscribeButton.label;" accesskey="&subscribeButton.accesskey;" 
+                  oncommand="SetSubscribeState(true)"/>
+          <button id="unsubscribe" label="&unsubscribeButton.label;" accesskey="&unsubscribeButton.accesskey;" 
+                  oncommand="SetSubscribeState(false)"/>
+          <button id="refresh" label="&refreshButton.label;" accesskey="&refreshButton.accesskey;" 
+                  oncommand="Refresh()"/>
+          <button id="stop" label="&stopButton.label;" accesskey="&stopButton.accesskey;" 
+                  oncommand="Stop()"/>
           <spacer flex="1"/>
         </vbox>
       </row>
diff --git a/mailnews/base/resources/locale/en-US/subscribe.dtd b/mailnews/base/resources/locale/en-US/subscribe.dtd
index df76999baee..4f93d0eeaf1 100644
--- a/mailnews/base/resources/locale/en-US/subscribe.dtd
+++ b/mailnews/base/resources/locale/en-US/subscribe.dtd
@@ -20,10 +20,16 @@ Rights Reserved.
 
 <!ENTITY subscribeDialog.title        "Subscribe">
 <!ENTITY subscribeButton.label        "Subscribe">
+<!ENTITY subscribeButton.accesskey    "S">
 <!ENTITY unsubscribeButton.label      "Unsubscribe">
+<!ENTITY unsubscribeButton.accesskey  "U">
 <!ENTITY refreshButton.label          "Refresh">
+<!ENTITY refreshButton.accesskey      "R">
 <!ENTITY stopButton.label             "Stop">
+<!ENTITY stopButton.accesskey         "T">
 <!ENTITY server.label                 "Account:">
+<!ENTITY server.accesskey             "A">
 <!ENTITY subscribedHeader.label       "Subscribe">
 <!ENTITY messagesHeader.label         "Messages">
 <!ENTITY namefield.label              "Show items that contain:">
+<!ENTITY namefield.accesskey          "O">