Bug 40759 - Mail prefs dialog: implement mnemonics, patch by Stefan Borggraefe (Stefan.Borggraefe@gmx.de), r=neil, sr=bz

2004-02-29 18:48:11 +00:00 · 2004-02-29 18:48:11 +00:00 · 1a3205e7e5
--- a/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@ -38,6 +38,7 @@
    <hbox align="center">
      <checkbox id="emailCollectionOutgoing" 
        label="&emailCollectionPicker.label;"
+        accesskey="&emailCollectionPicker.accesskey;"
        prefstring="mail.collect_email_address_outgoing"/>
   <menulist id="localDirectoriesList" flex="1"
                  preftype="string" 
--- a/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
+++ b/mailnews/addrbook/prefs/resources/locale/en-US/pref-addressing.dtd
@ -18,32 +18,17 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 

-<!ENTITY window.title           "Addressing">
 <!ENTITY pane.title                            "Addressing">
-<!ENTITY pane.description       "Settings for addressing messages">
-<!ENTITY pinpoint.label         "Pinpoint Addressing">
-<!ENTITY lookFor.label          "Look for addresses in the following:">
-<!ENTITY padCheck.label         "Address Books">
-<!ENTITY padCheck.accesskey     "a">
-<!ENTITY dirCheck.label         "Directory Server">
-<!ENTITY dirCheck.accesskey     "d">
-<!ENTITY mulFound.label         "When there are multiple addresses found:">
-<!ENTITY showList.label         "Show me a list of choices">
-<!ENTITY showList.accesskey     "s">
-<!ENTITY acceptList.label       "Accept what I have typed">
-<!ENTITY acceptList.accesskey   "c">
-<!ENTITY oneMatch.label         "If there is one match in your personal address books:">
-<!ENTITY useAddress.label       "Use the address and do not search in the directory">
-<!ENTITY useAddress.accesskey   "u">
 <!ENTITY emailCollectiontitle.label            "Email Address Collection">
 <!ENTITY emailCollectionPicker.label           "Add email addresses to my:">
+<!ENTITY emailCollectionPicker.accesskey       "A">
 <!ENTITY emailCollectiontext.label             "Email addresses from outgoing messages can be automatically added to a local address book.">

 <!-- Autocompletion -->
 <!ENTITY addressingTitle.label                 "Address Autocompletion">
 <!-- LOCALIZATION NOTE (addressingText.label) : do not translate "LDAP" in below line -->
 <!ENTITY addressingEnable.label                "Local Address Books">
-<!ENTITY addressingEnable.accesskey            "A">
+<!ENTITY addressingEnable.accesskey            "L">
 <!ENTITY autocompleteText.label                "When addressing messages, look for matching entries in:">
 <!ENTITY directories.label                     "Directory Server:">
 <!ENTITY directories.accesskey                 "D">
--- a/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mailnews/base/prefs/resources/content/pref-mailnews.xul
@ -96,21 +96,21 @@ Contributor(s):
    <caption label="&toolbarIntro.label;"/>
    <vbox>
      <checkbox id="fileButton"
-                label="&fileButton.label;"
+                label="&fileButton.label;" accesskey="&fileButton.accesskey;"
                prefstring="mail.toolbars.showbutton.file"/>
      <checkbox id="nextButton"
-                label="&nextButton.label;"
+                label="&nextButton.label;" accesskey="&nextButton.accesskey;"
                prefstring="mail.toolbars.showbutton.next"/>
      <checkbox id="printButton"
-                label="&printButton.label;"
+                label="&printButton.label;" accesskey="&printButton.accesskey;"
                prefstring="mail.toolbars.showbutton.print"/>
    </vbox>
    <vbox>
      <checkbox id="stopButton"
-                label="&stopButton.label;"
+                label="&stopButton.label;" accesskey="&stopButton.accesskey;"
                prefstring="mail.toolbars.showbutton.stop"/>
      <checkbox id="junkMailButton"
-                label="&junkMailButton.label;"
+                label="&junkMailButton.label;" accesskey="&junkMailButton.accesskey;"
                prefstring="mail.toolbars.showbutton.junk"/>
    </vbox>
  </groupbox>
--- a/mailnews/base/prefs/resources/content/pref-notifications.xul
+++ b/mailnews/base/prefs/resources/content/pref-notifications.xul
@ -58,8 +58,10 @@ Contributor(s):

    <hbox align="center" class="indent">
      <radiogroup id="newMailNotificationType" prefstring="mail.biff.play_sound.type" orient="vertical">
-        <radio class="iconic" value="0" oncommand="PlaySoundCheck()" label="&systemsound.label;" id="system"/>
-        <radio class="iconic" value="1" oncommand="PlaySoundCheck()" label="&customsound.label;" id="custom"/>
+        <radio id="system" class="iconic" value="0" oncommand="PlaySoundCheck()" 
+               label="&systemsound.label;" accesskey="&systemsound.accesskey;"/>
+        <radio id="custom" class="iconic" value="1" oncommand="PlaySoundCheck()"
+               label="&customsound.label;" accesskey="&customsound.accesskey;"/>
      </radiogroup>
    </hbox>

--- a/mailnews/base/prefs/resources/content/pref-offline.xul
+++ b/mailnews/base/prefs/resources/content/pref-offline.xul
@ -64,25 +64,33 @@
  <label value="&textStartUp;"/>
    <radiogroup id="whenStartingUp"
                prefstring="offline.startup_state">
-    <radio value="0" label="&radioRememberPrevState;"/>
-    <radio value="1" label="&radioAskMe;"/>
+      <radio value="0" label="&radioRememberPrevState;"
+             accesskey="&radioRememberPrevState.accesskey;"/>
+      <radio value="1" label="&radioAskMe;"
+             accesskey="&radioAskMe.accesskey;"/>
    </radiogroup>
  <separator class="thin"/>
  <label value="&textGoingOnline;"/>
    <radiogroup id="whengoingOnlinestate"
                prefstring="offline.send.unsent_messages">
-    <radio value="0" label="&radioAskUnsent;"/>
-    <radio value="1" label="&radioAutoSend;"/>
-    <radio value="2" label="&radioNotSend;"/>
+      <radio value="0" label="&radioAskUnsent;"
+             accesskey="&radioAskUnsent.accesskey;"/>
+      <radio value="1" label="&radioAutoSend;"
+             accesskey="&radioAutoSend.accesskey;"/>
+      <radio value="2" label="&radioNotSend;"
+             accesskey="&radioNotSend.accesskey;"/>
    </radiogroup>

  <separator class="thin"/>
  <label value="&textGoingOffline;"/>
    <radiogroup id="whengoingOfflinestate"
                prefstring="offline.download.download_messages">
-    <radio value="0" label="&radioAskDownload;"/>
-    <radio value="1" label="&radioAutoDownload;"/>
-    <radio value="2" label="&radioNotDownload;"/>
+      <radio value="0" label="&radioAskDownload;"
+             accesskey="&radioAskDownload.accesskey;"/>
+      <radio value="1" label="&radioAutoDownload;"
+             accesskey="&radioAutoDownload.accesskey;"/>
+      <radio value="2" label="&radioNotDownload;"
+             accesskey="&radioNotDownload.accesskey;"/>
    </radiogroup>

 </groupbox>
--- a/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-mailnews.dtd
@ -37,7 +37,12 @@ Rights Reserved.
 <!ENTITY rememberLastMsg.accesskey        "e">
 <!ENTITY toolbarIntro.label               "Select the buttons you want to see in the toolbar">
 <!ENTITY fileButton.label                 "File">
+<!ENTITY fileButton.accesskey             "F">
 <!ENTITY nextButton.label                 "Next">
+<!ENTITY nextButton.accesskey             "N">
 <!ENTITY junkMailButton.label             "Junk">
+<!ENTITY junkMailButton.accesskey         "J">
 <!ENTITY printButton.label                "Print">
+<!ENTITY printButton.accesskey            "P">
 <!ENTITY stopButton.label                 "Stop">
+<!ENTITY stopButton.accesskey             "S">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-notifications.dtd
@ -27,7 +27,9 @@ Rights Reserved.
 <!ENTITY preview.label                    "Preview">
 <!ENTITY preview.accesskey                "v">
 <!ENTITY systemsound.label                "System New Mail Sound">
+<!ENTITY systemsound.accesskey            "M">
 <!ENTITY customsound.label                "Custom .wav file">
+<!ENTITY customsound.accesskey            "C">
 <!ENTITY browse.label                     "Browse...">
 <!ENTITY browse.accesskey                 "B">
 <!ENTITY browse.title                     "Choose file">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-offline.dtd
@ -1,21 +1,28 @@
 <!-- extracted from content/pref-offline.xul -->

 <!--LOCALIZATION NOTE : FILE The 'Offline' preferences dialog -->
-<!ENTITY window.title  "Offline &amp; Disk Space">
 <!ENTITY boxHeader  "Offline &amp; Disk Space">
 <!ENTITY rHeader  "Offline">
 <!ENTITY textStartUp   "When starting up:">
 <!ENTITY radioRememberPrevState "Remember previous online state">
+<!ENTITY radioRememberPrevState.accesskey "R">
 <!ENTITY radioAskMe "Ask me for online state at startup">
+<!ENTITY radioAskMe.accesskey "A">
 <!ENTITY textGoingOnline   "When going online:">
 <!ENTITY radioAskUnsent  "Ask me if I want to send my unsent messages">
+<!ENTITY radioAskUnsent.accesskey  "s">
 <!ENTITY radioAutoSend  "Automatically send my unsent messages">
+<!ENTITY radioAutoSend.accesskey  "u">
 <!ENTITY radioNotSend  "Do not send my unsent messages">
+<!ENTITY radioNotSend.accesskey  "D">
 <!ENTITY textGoingOffline   "When going offline:">
 <!ENTITY radioAskDownload  "Ask me if I want to download messages for offline use">
+<!ENTITY radioAskDownload.accesskey  "k">
 <!ENTITY radioAutoDownload  "Automatically download messages for offline use">
+<!ENTITY radioAutoDownload.accesskey  "o">
 <!ENTITY radioNotDownload  "Do not download messages for offline use">
+<!ENTITY radioNotDownload.accesskey  "n">
 <!ENTITY Diskspace "Disk Space">
 <!ENTITY offlineCompact.label "Compact folders when it will save over">
-<!ENTITY offlineCompact.accesskey "c">
+<!ENTITY offlineCompact.accesskey "C">
 <!ENTITY kb.label "KB">
--- a/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
+++ b/mailnews/base/prefs/resources/locale/en-US/pref-receipts.dtd
@ -24,31 +24,23 @@ Rights Reserved.
 <!ENTITY requestReceipt.label         "When sending messages, always request a return receipt">
 <!ENTITY requestReceipt.accesskey     "W">
 <!-- LOCALIZATION NOTE dsn.label: don't translate "DSN"  -->
-<!ENTITY dsn.label                    "A delivery receipt from the receiving server (DSN)">
-<!ENTITY dsn.accesskey                "d">
-<!ENTITY mdn.label                    "A read receipt, notifying me when recipients display the message (MDN)">
-<!ENTITY mdn.accesskey                "m">
-<!ENTITY both.label                   "Both types of receipt">
-<!ENTITY both.accesskey               "b">
 <!ENTITY receiptArrive.label          "When a receipt arrives:">
 <!ENTITY leaveIt.label                "Leave it in my Inbox">
-<!ENTITY leaveIt.accesskey            "i">
+<!ENTITY leaveIt.accesskey            "I">
 <!-- LOCALIZATION NOTE moveToSent.label Translate: 'Sent' according to Netscape glossary -->
 <!ENTITY moveToSent.label             "Move it to my &quot;Sent&quot; folder">
-<!ENTITY moveToSent.accesskey         "m">
+<!ENTITY moveToSent.accesskey         "M">
 <!ENTITY requestMDN.label             "When I receive a request for a return receipt:">
 <!ENTITY returnSome.label             "Allow return receipts for some messages">
-<!ENTITY returnSome.accesskey         "r">
+<!ENTITY returnSome.accesskey         "e">
 <!ENTITY never.label                  "Never send a return receipt">
-<!ENTITY never.accesskey              "n">
-<!ENTITY custom.label                 "Customize...">
-<!ENTITY custom.accesskey             "c">
+<!ENTITY never.accesskey              "N">
 <!ENTITY notInToCc.label              "If I'm not in the To or Cc of the message:">
-<!ENTITY notInToCc.accesskey          "f">
+<!ENTITY notInToCc.accesskey          "T">
 <!ENTITY outsideDomain.label          "If the sender is outside my domain:">
-<!ENTITY outsideDomain.accesskey      "t">
+<!ENTITY outsideDomain.accesskey      "s">
 <!ENTITY otherCases.label             "In all other cases:">
-<!ENTITY otherCases.accesskey         "a">
+<!ENTITY otherCases.accesskey         "o">
 <!ENTITY askMe.label                  "Ask me">
 <!ENTITY alwaysSend.label             "Always send">
 <!ENTITY neverSend.label              "Never send">
--- a/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@ -122,7 +122,7 @@
    <caption label="&defaultMessagesHeader.label;"/>  
    <vbox>
      <hbox align="center">
-        <label value="&font.label;"/>
+        <label control="FontSelect" value="&font.label;" accesskey="&font.accesskey;"/>
        <menulist id="FontSelect" preftype="string" prefstring="msgcompose.font_face">
          <menupopup>
            <menuitem value="" label="&fontVarWidth.label;"/>
@ -136,7 +136,7 @@
        </menulist>           
      </hbox>
      <hbox align="center">
-        <label value="&size.label;"/>
+        <label control="fontSizeSelect" value="&size.label;" accesskey="&size.accesskey;"/>
        <menulist id="fontSizeSelect" preftype="string" prefstring="msgcompose.font_size">
          <menupopup>
            <menuitem value="x-small" label="&size-x-smallCmd.label;"/>
@ -147,10 +147,10 @@
            <menuitem value="xx-large" label="&size-xx-largeCmd.label;"/>
          </menupopup>
        </menulist>
-        <label value="&fontColor.label;"/>        
+        <label control="textColorButton" value="&fontColor.label;" accesskey="&fontColor.accesskey;"/>
        <colorpicker type="button" id="textColorButton" onchange="setColorWell(this)"/>
        <data id="textColor" preftype="color" prefstring="msgcompose.text_color" prefattribute="value" wsm_attributes="value"/>
-        <label value="&bgColor.label;"/>      
+        <label control="backgroundColorButton" value="&bgColor.label;" accesskey="&bgColor.accesskey;"/>      
        <colorpicker type="button" id="backgroundColorButton" onchange="setColorWell(this)"/>
        <data id="backgroundColor" preftype="color" prefstring="msgcompose.background_color" prefattribute="value" wsm_attributes="value"/>
      </hbox>
--- a/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
+++ b/mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd
@ -19,47 +19,39 @@ Rights Reserved.
 --> 

 <!ENTITY pane.title                           "Composition">
-<!ENTITY pane.description                     "Composing mail messages">
 <!ENTITY forwardReply.label                   "Forwarding Messages">
 <!ENTITY forwardMsg.label                     "Forward messages:">
-<!ENTITY forwardMsg.accesskey                 "f">
+<!ENTITY forwardMsg.accesskey                 "F">
 <!ENTITY inline.label                         "Inline">
 <!ENTITY inline.accesskey                     "I">
-<!ENTITY quoted.label                         "Quoted">
-<!ENTITY quoted.accesskey                     "q">
 <!ENTITY asAttachment.label                   "As Attachment">
 <!ENTITY asAttachment.accesskey               "A">

 <!ENTITY warnOnSendAccelKey.label             "Confirm when using keyboard shortcut to send message">
-<!ENTITY warnOnSendAccelKey.accesskey         "C">
-
-<!ENTITY readingMessagesHeader.label          "For incoming messages">
-<!ENTITY messageWrapping.label                "Message Wrapping">
-<!ENTITY wrapInMsg.label                      "Wrap plain text messages to fit window width">
-<!ENTITY wrapInMsg.accesskey                  "w">
+<!ENTITY warnOnSendAccelKey.accesskey         "k">

 <!ENTITY sendingMessagesHeader.label          "Composing Messages">
 <!ENTITY spellCheck.label                     "Check spelling before sending">
-<!ENTITY spellCheck.accesskey                 "c">
+<!ENTITY spellCheck.accesskey                 "C">
 <!-- LOCALIZATION NOTE (wrapOutMsg.label): This will concatenate with "xxx characters", using a number and (char.label). -->
 <!ENTITY wrapOutMsg.label                     "Wrap plain text messages at">
-<!ENTITY wrapOutMsg.accesskey                 "l">
+<!ENTITY wrapOutMsg.accesskey                 "W">
 <!ENTITY char.label                           "characters">
-<!ENTITY use8Bits.label                       "Send messages that use 8-bit characters">
-<!ENTITY asIs.label                           "As is (does not work well with some mail servers)">
-<!ENTITY asIs.accesskey                       "t">
 <!ENTITY useMIME.label                        "For messages that contain 8-bit characters, use 'quoted printable' MIME encoding. Leave unchecked to send the messages as is.">
 <!ENTITY useMIME.accesskey                    "o">

 <!ENTITY sendDefaultCharset.label             "Character Encoding:">
-<!ENTITY sendDefaultCharset.accesskey         "h">
+<!ENTITY sendDefaultCharset.accesskey         "r">
 <!ENTITY languagesTitle.label                 "Languages">
-<!ENTITY languagesText.label				  "Use the following character encoding as the default for composing messages:">

 <!ENTITY defaultMessagesHeader.label          "Defaults for HTML Messages">
 <!ENTITY font.label                           "Font:">
+<!ENTITY font.accesskey                       "n">
 <!ENTITY size.label                           "Size:">
+<!ENTITY size.accesskey                       "S">
 <!ENTITY fontColor.label                      "Text:">
+<!ENTITY fontColor.accesskey                  "T">
 <!ENTITY bgColor.label                        "Background:">
+<!ENTITY bgColor.accesskey                    "B">

 <!-- Tooltips -->