From b06ab7819db306a6922dc6307dbff4a8bcc95043 Mon Sep 17 00:00:00 2001
From: "neil%parkwaycc.co.uk"
 <neil%parkwaycc.co.uk@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 29 Dec 2005 00:58:03 +0000
Subject: [PATCH] Print dialog access keys and cleanup b=277296
 p=stefanb/vhaarr r=timeless sr=me

git-svn-id: svn://10.0.0.236/trunk@186690 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../resources/content/printPageSetup.xul      | 104 ++++++++++++------
 .../global/resources/content/printdialog.js   |  84 +++++++-------
 .../global/resources/content/printdialog.xul  |  68 ++++++++----
 .../content/unix/printjoboptions.xul          |  60 +++++++---
 .../resources/locale/en-US/printPageSetup.dtd |  21 +++-
 .../resources/locale/en-US/printdialog.dtd    |  28 +++--
 .../locale/en-US/unix/printjoboptions.dtd     |  17 ++-
 7 files changed, 252 insertions(+), 130 deletions(-)

diff --git a/mozilla/xpfe/global/resources/content/printPageSetup.xul b/mozilla/xpfe/global/resources/content/printPageSetup.xul
index e4c29cdf80d..9c7e2b3bb3f 100644
--- a/mozilla/xpfe/global/resources/content/printPageSetup.xul
+++ b/mozilla/xpfe/global/resources/content/printPageSetup.xul
@@ -76,27 +76,39 @@
           <vbox>
             <hbox align="center">
               <label value="&orientation.label;"/>
-              <radiogroup id="orientation" oncommand="setOrientation()">
+              <radiogroup id="orientation" oncommand="setOrientation();">
                 <hbox align="center">
-                  <radio id="portrait"  class="portrait-page"  label="&portrait;"/>
-                  <radio id="landscape" class="landscape-page" label="&landscape;"/>
+                  <radio id="portrait" class="portrait-page"
+                         label="&portrait.label;"
+                         accesskey="&portrait.accesskey;"/>
+                  <radio id="landscape" class="landscape-page"
+                         label="&landscape.label;" 
+                         accesskey="&landscape.accesskey;"/>
                 </hbox>
               </radiogroup>
             </hbox>
             <separator/>
             <hbox align="center">
-              <label value="&scale.label;"/>
-              <textbox id="scalingInput" size="4" onfocus="this.select()" oninput="checkDouble(this)"/>
+              <label control="scalingInput"
+                     value="&scale.label;"
+                     accesskey="&scale.accesskey;"/>
+              <textbox id="scalingInput" size="4"
+                       onfocus="this.select();" oninput="checkDouble(this);"/>
               <label value="&scalePercent;"/>
               <separator/>
-              <checkbox id="shrinkToFit" label="&shrinkToFit.label;"
-                        oncommand="gDialog.scalingInput.disabled=gDialog.scalingLabel.disabled=this.checked"/>
+              <checkbox id="shrinkToFit"
+                        oncommand="gDialog.scalingInput.disabled =
+                                   gDialog.scalingLabel.disabled =
+                                   this.checked;"
+                        label="&shrinkToFit.label;"
+                        accesskey="&shrinkToFit.accesskey;"/>
             </hbox>
           </vbox>
         </groupbox>
         <groupbox>
           <caption label="&optionsGroup.label;"/>
-          <checkbox id="printBG" label="&printBG.label;"/>
+          <checkbox id="printBG" tabindex="1"
+                    label="&printBG.label;" accesskey="&printBG.accesskey;"/>
         </groupbox>
       </tabpanel>
       <tabpanel orient="vertical">
@@ -105,11 +117,15 @@
           <vbox>
             <hbox align="center">
               <spacer flex="1"/>
-              <label value="&marginTop.label;" control="topInput"/>
-              <textbox id="topInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
-              <!-- This invisible label (with same content as the visible one!) is used
-                   to ensure that the <textbox> is centered above the page.  The same
-                   technique is deployed for the bottom/left/right input fields, below. -->
+              <label control="topInput"
+                     value="&marginTop.label;"
+                     accesskey="&marginTop.accesskey;"/>
+              <textbox id="topInput" size="5"
+                       oninput="changeMargin(this);" onfocus="this.select();"/>
+              <!-- This invisible label (with same content as the visible one!)
+                   is used to ensure that the <textbox> is centered above the
+                   page. The same technique is deployed for the
+                   bottom/left/right input fields, below. -->
               <label value="&marginTop.label;" style="visibility: hidden;"/>
               <spacer flex="1"/>
             </hbox>
@@ -117,38 +133,54 @@
               <spacer flex="1"/>
               <vbox>
                 <spacer flex="1"/>
-                <label value="&marginLeft.label;" control="leftInput"/>
-                <textbox id="leftInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
-                <label value="&marginLeft.label;" style="visibility: hidden;"/>
+                <label control="leftInput"
+                       value="&marginLeft.label;"
+                       accesskey="&marginLeft.accesskey;"/>
+                <textbox id="leftInput" size="5"
+                         oninput="changeMargin(this);"
+                         onfocus="this.select();"/>
+                <label style="visibility: hidden;" value="&marginLeft.label;"/>
                 <spacer flex="1"/>
               </vbox>
-              <!-- The "margin page" draws a simulated printout page with dashed lines
-                   for the margins.  The height/width style attributes of the marginTop,
-                   marginBottom, marginLeft, and marginRight elements are set by
-                   the JS code dynamically based on the user input. -->
+              <!-- The "margin page" draws a simulated printout page with dashed
+                   lines for the margins. The height/width style attributes of
+                   the marginTop, marginBottom, marginLeft, and marginRight
+                   elements are set by the JS code dynamically based on the user
+                   input. -->
               <vbox id="marginPage" style="height:29.7mm;">
                 <box id="marginTop" style="height:0.05in;"/>
                 <hbox flex="1">
                   <box id="marginLeft" style="width:0.025in;"/>
-                  <box style="border: 1px; border-style: dashed; border-color: gray;" flex="1"/>
+                  <box style="border: 1px;
+                              border-style: dashed;
+                              border-color: gray;"
+                       flex="1"/>
                   <box id="marginRight" style="width:0.025in;"/>
                 </hbox>
                 <box id="marginBottom" style="height:0.05in;"/>
               </vbox>
               <vbox>
                 <spacer flex="1"/>
-                <label value="&marginRight.label;" control="rightInput"/>
-                <textbox id="rightInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
-                <label value="&marginRight.label;" style="visibility: hidden;"/>
+                <label control="rightInput"
+                       value="&marginRight.label;"
+                       accesskey="&marginRight.accesskey;"/>
+                <textbox id="rightInput" size="5"
+                         oninput="changeMargin(this);"
+                         onfocus="this.select();"/>
+                <label style="visibility: hidden;" value="&marginRight.label;"/>
                 <spacer flex="1"/>
               </vbox>
               <spacer flex="1"/>
             </hbox>
             <hbox align="center">
               <spacer flex="1"/>
-              <label value="&marginBottom.label;" control="bottomInput"/>
-              <textbox id="bottomInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
-              <label value="&marginBottom.label;" style="visibility: hidden;"/>
+              <label control="bottomInput"
+                     value="&marginBottom.label;"
+                     accesskey="&marginBottom.accesskey;"/>
+              <textbox id="bottomInput" size="5"
+                       oninput="changeMargin(this);"
+                       onfocus="this.select();"/>
+              <label style="visibility: hidden;" value="&marginBottom.label;" />
               <spacer flex="1"/>
             </hbox>
           </vbox>
@@ -163,7 +195,8 @@
             </columns>
             <rows>
               <row>
-                <menulist id="hLeftOption" oncommand="customize(this)" tooltiptext="&headerLeft.tip;">
+                <menulist id="hLeftOption" oncommand="customize(this);"
+                          tooltiptext="&headerLeft.tip;">
                   <menupopup>
                     <menuitem value="0" label="&hfBlank;"/>
                     <menuitem value="1" label="&hfTitle;"/>
@@ -174,7 +207,8 @@
                     <menuitem value="6" label="&hfCustom;"/>
                   </menupopup>
                 </menulist>
-                <menulist id="hCenterOption" oncommand="customize(this)" tooltiptext="&headerCenter.tip;">
+                <menulist id="hCenterOption" oncommand="customize(this);"
+                          tooltiptext="&headerCenter.tip;">
                   <menupopup>
                     <menuitem value="0" label="&hfBlank;"/>
                     <menuitem value="1" label="&hfTitle;"/>
@@ -185,7 +219,8 @@
                     <menuitem value="6" label="&hfCustom;"/>
                   </menupopup>
                 </menulist>
-                <menulist id="hRightOption" oncommand="customize(this)" tooltiptext="&headerRight.tip;">
+                <menulist id="hRightOption" oncommand="customize(this);"
+                          tooltiptext="&headerRight.tip;">
                   <menupopup>
                     <menuitem value="0" label="&hfBlank;"/>
                     <menuitem value="1" label="&hfTitle;"/>
@@ -209,7 +244,8 @@
                 </vbox>
               </row>
               <row>
-                <menulist id="fLeftOption" oncommand="customize(this)" tooltiptext="&footerLeft.tip;">
+                <menulist id="fLeftOption" oncommand="customize(this);"
+                          tooltiptext="&footerLeft.tip;">
                   <menupopup>
                     <menuitem value="0" label="&hfBlank;"/>
                     <menuitem value="1" label="&hfTitle;"/>
@@ -220,7 +256,8 @@
                     <menuitem value="6" label="&hfCustom;"/>
                   </menupopup>
                 </menulist>
-                <menulist id="fCenterOption" oncommand="customize(this)" tooltiptext="&footerCenter.tip;">
+                <menulist id="fCenterOption" oncommand="customize(this);"
+                          tooltiptext="&footerCenter.tip;">
                   <menupopup>
                     <menuitem value="0" label="&hfBlank;"/>
                     <menuitem value="1" label="&hfTitle;"/>
@@ -231,7 +268,8 @@
                     <menuitem value="6" label="&hfCustom;"/>
                   </menupopup>
                 </menulist>
-                <menulist id="fRightOption" oncommand="customize(this)" tooltiptext="&footerRight.tip;">
+                <menulist id="fRightOption" oncommand="customize(this);"
+                          tooltiptext="&footerRight.tip;">
                   <menupopup>
                     <menuitem value="0" label="&hfBlank;"/>
                     <menuitem value="1" label="&hfTitle;"/>
diff --git a/mozilla/xpfe/global/resources/content/printdialog.js b/mozilla/xpfe/global/resources/content/printdialog.js
index 0525541ee38..6d4da3ce472 100644
--- a/mozilla/xpfe/global/resources/content/printdialog.js
+++ b/mozilla/xpfe/global/resources/content/printdialog.js
@@ -61,22 +61,22 @@ function initDialog()
   dialog.propertiesButton = document.getElementById("properties");
   dialog.descText         = document.getElementById("descText");
 
-  dialog.printrangeGroup = document.getElementById("printrangeGroup");
-  dialog.allpagesRadio   = document.getElementById("allpagesRadio");
+  dialog.printRangeGroup = document.getElementById("printRangeGroup");
+  dialog.allPagesRadio   = document.getElementById("allPagesRadio");
   dialog.rangeRadio      = document.getElementById("rangeRadio");
   dialog.selectionRadio  = document.getElementById("selectionRadio");
-  dialog.frompageInput   = document.getElementById("frompageInput");
-  dialog.frompageLabel   = document.getElementById("frompageLabel");
-  dialog.topageInput     = document.getElementById("topageInput");
-  dialog.topageLabel     = document.getElementById("topageLabel");
+  dialog.fromPageInput   = document.getElementById("fromPageInput");
+  dialog.fromPageLabel   = document.getElementById("fromPageLabel");
+  dialog.toPageInput     = document.getElementById("toPageInput");
+  dialog.toPageLabel     = document.getElementById("toPageLabel");
 
   dialog.numCopiesInput  = document.getElementById("numCopiesInput");  
 
-  dialog.printframeGroup      = document.getElementById("printframeGroup");
-  dialog.aslaidoutRadio       = document.getElementById("aslaidoutRadio");
-  dialog.selectedframeRadio   = document.getElementById("selectedframeRadio");
-  dialog.eachframesepRadio    = document.getElementById("eachframesepRadio");
-  dialog.printframeGroupLabel = document.getElementById("printframeGroupLabel");
+  dialog.printFrameGroup      = document.getElementById("printFrameGroup");
+  dialog.asLaidOutRadio       = document.getElementById("asLaidOutRadio");
+  dialog.selectedFrameRadio   = document.getElementById("selectedFrameRadio");
+  dialog.eachFrameSepRadio    = document.getElementById("eachFrameSepRadio");
+  dialog.printFrameGroupLabel = document.getElementById("printFrameGroupLabel");
 
   dialog.fileCheck       = document.getElementById("fileCheck");
   dialog.printerLabel    = document.getElementById("printerLabel");
@@ -236,15 +236,15 @@ function displayPropertiesDialog()
 function doPrintRange(inx)
 {
   if (inx == 1) {
-    dialog.frompageInput.removeAttribute("disabled");
-    dialog.frompageLabel.removeAttribute("disabled");
-    dialog.topageInput.removeAttribute("disabled");
-    dialog.topageLabel.removeAttribute("disabled");
+    dialog.fromPageInput.removeAttribute("disabled");
+    dialog.fromPageLabel.removeAttribute("disabled");
+    dialog.toPageInput.removeAttribute("disabled");
+    dialog.toPageLabel.removeAttribute("disabled");
   } else {
-    dialog.frompageInput.setAttribute("disabled","true");
-    dialog.frompageLabel.setAttribute("disabled","true");
-    dialog.topageInput.setAttribute("disabled","true");
-    dialog.topageLabel.setAttribute("disabled","true");
+    dialog.fromPageInput.setAttribute("disabled","true");
+    dialog.fromPageLabel.setAttribute("disabled","true");
+    dialog.toPageInput.setAttribute("disabled","true");
+    dialog.toPageLabel.setAttribute("disabled","true");
   }
 }
 
@@ -291,15 +291,15 @@ function loadDialog()
     dump("selection_radio_enabled "+print_selection_radio_enabled+"\n");
   }
 
-  dialog.printrangeGroup.selectedItem = dialog.allpagesRadio;
+  dialog.printRangeGroup.selectedItem = dialog.allPagesRadio;
   if (print_selection_radio_enabled) {
     dialog.selectionRadio.removeAttribute("disabled");
   } else {
     dialog.selectionRadio.setAttribute("disabled","true");
   }
   doPrintRange(dialog.rangeRadio.selected);
-  dialog.frompageInput.value  = 1;
-  dialog.topageInput.value    = 1;
+  dialog.fromPageInput.value  = 1;
+  dialog.toPageInput.value    = 1;
   dialog.numCopiesInput.value = print_copies;
 
   if (doDebug) {
@@ -308,30 +308,30 @@ function loadDialog()
 
   // print frame
   if (print_howToEnableUI == gPrintSetInterface.kFrameEnableAll) {
-    dialog.aslaidoutRadio.removeAttribute("disabled");
+    dialog.asLaidOutRadio.removeAttribute("disabled");
 
-    dialog.selectedframeRadio.removeAttribute("disabled");
-    dialog.eachframesepRadio.removeAttribute("disabled");
-    dialog.printframeGroupLabel.removeAttribute("disabled");
+    dialog.selectedFrameRadio.removeAttribute("disabled");
+    dialog.eachFrameSepRadio.removeAttribute("disabled");
+    dialog.printFrameGroupLabel.removeAttribute("disabled");
 
     // initialize radio group
-    dialog.printframeGroup.selectedItem = dialog.selectedframeRadio;
+    dialog.printFrameGroup.selectedItem = dialog.selectedFrameRadio;
 
   } else if (print_howToEnableUI == gPrintSetInterface.kFrameEnableAsIsAndEach) {
-    dialog.aslaidoutRadio.removeAttribute("disabled");       //enable
+    dialog.asLaidOutRadio.removeAttribute("disabled");       //enable
 
-    dialog.selectedframeRadio.setAttribute("disabled","true"); // disable
-    dialog.eachframesepRadio.removeAttribute("disabled");       // enable
-    dialog.printframeGroupLabel.removeAttribute("disabled");    // enable
+    dialog.selectedFrameRadio.setAttribute("disabled","true"); // disable
+    dialog.eachFrameSepRadio.removeAttribute("disabled");       // enable
+    dialog.printFrameGroupLabel.removeAttribute("disabled");    // enable
 
     // initialize
-    dialog.printframeGroup.selectedItem = dialog.eachframesepRadio;
+    dialog.printFrameGroup.selectedItem = dialog.eachFrameSepRadio;
 
   } else {
-    dialog.aslaidoutRadio.setAttribute("disabled","true");
-    dialog.selectedframeRadio.setAttribute("disabled","true");
-    dialog.eachframesepRadio.setAttribute("disabled","true");
-    dialog.printframeGroupLabel.setAttribute("disabled","true");
+    dialog.asLaidOutRadio.setAttribute("disabled","true");
+    dialog.selectedFrameRadio.setAttribute("disabled","true");
+    dialog.eachFrameSepRadio.setAttribute("disabled","true");
+    dialog.printFrameGroupLabel.setAttribute("disabled","true");
   }
 }
 
@@ -369,24 +369,24 @@ function onAccept()
       if (!chooseFile())
         return false;
 
-    if (dialog.allpagesRadio.selected) {
+    if (dialog.allPagesRadio.selected) {
       gPrintSettings.printRange = gPrintSetInterface.kRangeAllPages;
     } else if (dialog.rangeRadio.selected) {
       gPrintSettings.printRange = gPrintSetInterface.kRangeSpecifiedPageRange;
     } else if (dialog.selectionRadio.selected) {
       gPrintSettings.printRange = gPrintSetInterface.kRangeSelection;
     }
-    gPrintSettings.startPageRange = dialog.frompageInput.value;
-    gPrintSettings.endPageRange   = dialog.topageInput.value;
+    gPrintSettings.startPageRange = dialog.fromPageInput.value;
+    gPrintSettings.endPageRange   = dialog.toPageInput.value;
     gPrintSettings.numCopies      = dialog.numCopiesInput.value;
 
     var frametype = gPrintSetInterface.kNoFrames;
     if (print_howToEnableUI != gPrintSetInterface.kFrameEnableNone) {
-      if (dialog.aslaidoutRadio.selected) {
+      if (dialog.asLaidOutRadio.selected) {
         frametype = gPrintSetInterface.kFramesAsIs;
-      } else if (dialog.selectedframeRadio.selected) {
+      } else if (dialog.selectedFrameRadio.selected) {
         frametype = gPrintSetInterface.kSelectedFrame;
-      } else if (dialog.eachframesepRadio.selected) {
+      } else if (dialog.eachFrameSepRadio.selected) {
         frametype = gPrintSetInterface.kEachFrameSep;
       } else {
         frametype = gPrintSetInterface.kSelectedFrame;
diff --git a/mozilla/xpfe/global/resources/content/printdialog.xul b/mozilla/xpfe/global/resources/content/printdialog.xul
index 5dc512d54fe..0498a8b977a 100644
--- a/mozilla/xpfe/global/resources/content/printdialog.xul
+++ b/mozilla/xpfe/global/resources/content/printdialog.xul
@@ -72,17 +72,24 @@
       <rows>
         <row align="center">
           <hbox align="center" pack="end">
-            <label id="printerLabel" value="&printerInput.label;"/>
+            <label id="printerLabel" value="&printerInput.label;"
+                   accesskey="&printerInput.accesskey;" control="printerList"/>
           </hbox>
-          <menulist id="printerList" flex="1" type="description" oncommand="setPrinterDefaultsForSelectedPrinter();"/>
-          <button id="properties" label="&propertiesButton.label;" oncommand="displayPropertiesDialog();"/>
+          <menulist id="printerList" flex="1" type="description"
+                    oncommand="setPrinterDefaultsForSelectedPrinter();"/>
+          <button id="properties" oncommand="displayPropertiesDialog();"
+                  label="&propertiesButton.label;"
+                  accesskey="&propertiesButton.accesskey;"/>
         </row>
         <row align="center">
           <hbox align="center" pack="end">
-            <label id="descTextLabel" control="descText" value="&descText.label;"/>
+            <label id="descTextLabel" control="descText" 
+                   value="&descText.label;"/>
           </hbox>
           <label id="descText"/>
-          <checkbox id="fileCheck" checked="false" label="&fileCheck.label;" pack="end"/>
+          <checkbox id="fileCheck" checked="false" pack="end"
+                    label="&fileCheck.label;"
+                    accesskey="&fileCheck.accesskey;"/>
         </row>
       </rows>
     </grid>
@@ -90,36 +97,55 @@
 
   <hbox>
     <groupbox flex="1">
-      <caption label="&printrangeGroup.label;"/>
+      <caption label="&printRangeGroup.label;"/>
 
-      <radiogroup id="printrangeGroup">
-        <radio id="allpagesRadio" label="&allpagesRadio.label;" oncommand="doPrintRange(0)"/>
+      <radiogroup id="printRangeGroup">
+        <radio id="allPagesRadio" oncommand="doPrintRange(0);"
+               label="&allPagesRadio.label;"
+               accesskey="&allPagesRadio.accesskey;"/>
         <hbox align="center">
-          <radio id="rangeRadio" label="&rangeRadio.label;" oncommand="doPrintRange(1)"/>
-          <label id="frompageLabel" control="frompageInput" value="&frompageInput.label;" />
-          <textbox id="frompageInput" style="width:5em;" onkeyup="checkInteger(this)"/>
-          <label id="topageLabel" control="topageInput" value="&topageInput.label;" />
-          <textbox id="topageInput" style="width:5em;" onkeyup="checkInteger(this)"/>
+          <radio id="rangeRadio" oncommand="doPrintRange(1);"
+                 label="&rangeRadio.label;" accesskey="&rangeRadio.accesskey;"/>
+          <label id="fromPageLabel" control="fromPageInput"
+                 value="&fromPageInput.label;"
+                 accesskey="&fromPageInput.accesskey;"/>
+          <textbox id="fromPageInput" style="width:5em;"
+                   oninput="checkInteger(this);"/>
+          <label id="toPageLabel" control="toPageInput"
+                 value="&toPageInput.label;"
+                 accesskey="&toPageInput.accesskey;"/>
+          <textbox id="toPageInput" style="width:5em;"
+                   oninput="checkInteger(this);"/>
         </hbox>
-        <radio id="selectionRadio" label="&selectionRadio.label;" oncommand="doPrintRange(2)"/>
+        <radio id="selectionRadio" oncommand="doPrintRange(2)"
+               label="&selectionRadio.label;"
+               accesskey="&selectionRadio.accesskey;"/>
       </radiogroup>
     </groupbox>
 
     <groupbox flex="1">
       <caption label="&copies.label;"/>
       <hbox align="center">
-        <label control="numCopiesInput" value="&numCopies.label;"/>  
-        <textbox id="numCopiesInput" style="width:5em;" onkeyup="checkInteger(this)"/>
+        <label control="numCopiesInput"
+               value="&numCopies.label;" accesskey="&numCopies.accesskey;"/>
+        <textbox id="numCopiesInput" style="width:5em;"
+                 oninput="checkInteger(this);"/>
       </hbox>
     </groupbox>
   </hbox>
 
   <groupbox flex="1">
-    <caption label="&printframeGroup.label;" id="printframeGroupLabel"/>
-    <radiogroup id="printframeGroup">
-      <radio id="aslaidoutRadio" label="&aslaidoutRadio.label;" />
-      <radio id="selectedframeRadio" label="&selectedframeRadio.label;" />
-      <radio id="eachframesepRadio" label="&eachframesepRadio.label;" />
+    <caption label="&printFrameGroup.label;" id="printFrameGroupLabel"/>
+    <radiogroup id="printFrameGroup">
+      <radio id="asLaidOutRadio"
+             label="&asLaidOutRadio.label;"
+             accesskey="&asLaidOutRadio.accesskey;"/>
+      <radio id="selectedFrameRadio"
+             label="&selectedFrameRadio.label;"
+             accesskey="&selectedFrameRadio.accesskey;"/>
+      <radio id="eachFrameSepRadio"
+             label="&eachFrameSepRadio.label;"
+             accesskey="&eachFrameSepRadio.accesskey;"/>
     </radiogroup>
   </groupbox>
 
diff --git a/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul b/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
index 93b99fc347d..42c184fce3e 100644
--- a/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
+++ b/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
@@ -53,7 +53,7 @@
   screenX="24" screenY="24">
 
   <script type="application/x-javascript" src="chrome://global/content/printjoboptions.js"/>
-<script type="application/x-javascript" src="chrome://global/content/strres.js"/>
+  <script type="application/x-javascript" src="chrome://global/content/strres.js"/>
 
   <grid>
     <columns>
@@ -64,14 +64,17 @@
     <rows>
       <row id="jobTitleGroup">
         <hbox align="center" pack="end">
-          <label id="jobTitleLabel" value="&jobTitleInput.label;"/>
+          <label id="jobTitleLabel" control="jobTitleInput"
+                 value="&jobTitleInput.label;"
+                 accesskey="&jobTitleInput.accesskey;"/>
         </hbox>
         <textbox id="jobTitleInput" flex="1"/>
       </row>
 
       <row id="paperGroup">
         <hbox align="center" pack="end">
-          <label id="paperLabel" value="&paperInput.label;" control="paperList"/>
+          <label id="paperLabel" control="paperList"
+                 value="&paperInput.label;" accesskey="&paperInput.accesskey;"/>
         </hbox>
         <menulist id="paperList" flex="1">
           <menupopup/>
@@ -80,7 +83,8 @@
 
       <row id="plexGroup">
         <hbox align="center" pack="end">
-          <label id="plexLabel" value="&plexInput.label;"/>
+          <label id="plexLabel" control="plexList"
+                 value="&plexInput.label;" accesskey="plexInput.accesskey;"/>
         </hbox>
         <menulist id="plexList" flex="1">
           <menupopup/>
@@ -89,7 +93,9 @@
 
       <row id="resolutionGroup">
         <hbox align="center" pack="end">
-          <label id="resolutionLabel" value="&resolutionInput.label;"/>
+          <label id="resolutionLabel" control="resolutionList"
+                 value="&resolutionInput.label;"
+                 accesskey="&resolutionInput.accesskey;"/>
         </hbox>
         <menulist id="resolutionList" flex="1">
           <menupopup/>
@@ -98,7 +104,9 @@
 
       <row id="colorspaceGroup">
         <hbox align="center" pack="end">
-          <label id="colorspaceLabel" value="&colorspaceInput.label;"/>
+          <label id="colorspaceLabel" control="colorspaceList"
+                 value="&colorspaceInput.label;"
+                 accesskey="&colorspaceInput.accesskey;"/>
         </hbox>
         <menulist id="colorspaceList" flex="1">
           <menupopup/>
@@ -106,7 +114,10 @@
       </row>
 
       <row id="cmdGroup">
-        <label id="cmdLabel" value="&cmdInput.label;" control="cmdInput"/>
+        <hbox align="center" pack="end">
+          <label id="cmdLabel" control="cmdInput"
+                 value="&cmdInput.label;" accesskey="&cmdInput.accesskey;"/>
+        </hbox>
         <textbox id="cmdInput" flex="1"/>
       </row>
 
@@ -115,8 +126,10 @@
           <label value="&colorGroup.label;"/>
         </hbox>
         <radiogroup id="colorRadioGroup" orient="horizontal">
-          <radio id="grayRadio" label="&grayRadio.label;"/>
-          <radio id="colorRadio" label="&colorRadio.label;"/>
+          <radio id="grayRadio"
+                 label="&grayRadio.label;" accesskey="&grayRadio.accesskey;"/>
+          <radio id="colorRadio"
+                 label="&colorRadio.label;" accesskey="&colorRadio.accesskey;"/>
         </radiogroup>
       </row>
 
@@ -124,7 +137,8 @@
         <hbox align="center" pack="end">
           <label value="&fontsGroup.label;"/>
         </hbox>
-        <checkbox id="downloadFonts" label="&downloadFonts.label;" />
+        <checkbox id="downloadFonts" label="&downloadFonts.label;"
+                  accesskey="&downloadFonts.accesskey;"/>
       </row>
     </rows>
   </grid>
@@ -139,20 +153,30 @@
         <caption label="&edgeMarginInput.label;"/>
         <hbox>
           <hbox align="center">
-            <label id="topLabel" control="topInput" value="&topInput.label;"/>
-            <textbox id="topInput" style="width:5em;" onkeyup="checkDouble(this, 0.5)"/>
+            <label id="topLabel" control="topInput"
+                   value="&topInput.label;" accesskey="&topInput.accesskey;"/>
+            <textbox id="topInput" style="width:5em;"
+                     oninput="checkDouble(this, 0.5);"/>
           </hbox>
           <hbox align="center">
-            <label id="bottomLabel" control="bottomInput" value="&bottomInput.label;"/>
-            <textbox id="bottomInput" style="width:5em;" onkeyup="checkDouble(this, 0.5)"/>
+            <label id="bottomLabel" control="bottomInput"
+                   value="&bottomInput.label;"
+                   accesskey="&bottomInput.accesskey;"/>
+            <textbox id="bottomInput" style="width:5em;"
+                     oninput="checkDouble(this, 0.5);"/>
           </hbox>
           <hbox align="center">
-            <label id="leftLabel" control="leftInput" value="&leftInput.label;"/>
-            <textbox id="leftInput" style="width:5em;" onkeyup="checkDouble(this, 0.5)"/>
+            <label id="leftLabel" control="leftInput"
+                   value="&leftInput.label;" accesskey="&leftInput.accesskey;"/>
+            <textbox id="leftInput" style="width:5em;"
+                     oninput="checkDouble(this, 0.5);"/>
           </hbox>
           <hbox align="center">
-            <label id="rightLabel" control="rightInput" value="&rightInput.label;"/>
-            <textbox id="rightInput" style="width:5em;" onkeyup="checkDouble(this, 0.5)"/>
+            <label id="rightLabel" control="rightInput"
+                   value="&rightInput.label;"
+                   accesskey="&rightInput.accesskey;"/>
+            <textbox id="rightInput" style="width:5em;"
+                     oninput="checkDouble(this, 0.5);"/>
           </hbox>
         </hbox>
         </groupbox>
diff --git a/mozilla/xpfe/global/resources/locale/en-US/printPageSetup.dtd b/mozilla/xpfe/global/resources/locale/en-US/printPageSetup.dtd
index 890181ef3dc..31b0ea0291e 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/printPageSetup.dtd
+++ b/mozilla/xpfe/global/resources/locale/en-US/printPageSetup.dtd
@@ -7,17 +7,22 @@
 <!ENTITY formatGroup.label   "Format">
 
 <!ENTITY orientation.label   "Orientation:">
-<!ENTITY portrait            "Portrait">
-<!ENTITY landscape           "Landscape">
+<!ENTITY portrait.label      "Portrait">
+<!ENTITY portrait.accesskey  "P">
+<!ENTITY landscape.label     "Landscape">
+<!ENTITY landscape.accesskey "a">
 
 <!ENTITY scale.label         "Scale:">
+<!ENTITY scale.accesskey     "S">
 <!ENTITY scalePercent        "&#037;">
 
-<!ENTITY shrinkToFit.label   "Shrink To Fit Page Width">
+<!ENTITY shrinkToFit.label   "Shrink to fit Page Width">
+<!ENTITY shrinkToFit.accesskey "W">
 
 <!ENTITY optionsGroup.label  "Options">
 
 <!ENTITY printBG.label       "Print Background (colors &amp; images)">
+<!ENTITY printBG.accesskey   "n">
 
 <!ENTITY advanced.tab        "Margins &amp; Header/Footer">
 
@@ -25,15 +30,19 @@
 <!ENTITY marginUnits.inches  "inches">
 <!ENTITY marginUnits.metric  "millimeters">
 <!ENTITY marginTop.label     "Top:">
+<!ENTITY marginTop.accesskey "T">
 <!ENTITY marginBottom.label  "Bottom:">
+<!ENTITY marginBottom.accesskey "B">
 <!ENTITY marginLeft.label    "Left:">
+<!ENTITY marginLeft.accesskey "L">
 <!ENTITY marginRight.label   "Right:">
+<!ENTITY marginRight.accesskey "R">
 
 <!ENTITY headerFooter.label  "Headers &amp; Footers">
 
-<!ENTITY hfLeft.label        "Left:">
-<!ENTITY hfCenter.label      "Center:">
-<!ENTITY hfRight.label       "Right:">
+<!ENTITY hfLeft.label        "Left">
+<!ENTITY hfCenter.label      "Center">
+<!ENTITY hfRight.label       "Right">
 <!ENTITY headerLeft.tip      "Left header">
 <!ENTITY headerCenter.tip    "Center header">
 <!ENTITY headerRight.tip     "Right header">
diff --git a/mozilla/xpfe/global/resources/locale/en-US/printdialog.dtd b/mozilla/xpfe/global/resources/locale/en-US/printdialog.dtd
index 37cbb404996..9ff5c13643e 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/printdialog.dtd
+++ b/mozilla/xpfe/global/resources/locale/en-US/printdialog.dtd
@@ -7,24 +7,36 @@
 <!ENTITY fpDialog.title "Save File">
 
 <!ENTITY fileCheck.label "Print to File">
+<!ENTITY fileCheck.accesskey "F">
 
 <!ENTITY propertiesButton.label "Properties...">
+<!ENTITY propertiesButton.accesskey "o">
 <!ENTITY descText.label "Printer Description:">
 <!ENTITY printer.label "Printer">
 <!ENTITY printerInput.label "Printer Name:">
+<!ENTITY printerInput.accesskey "P">
 
-<!ENTITY printrangeGroup.label "Print Range">
-<!ENTITY allpagesRadio.label "All Pages">
+<!ENTITY printRangeGroup.label "Print Range">
+<!ENTITY allPagesRadio.label "All Pages">
+<!ENTITY allPagesRadio.accesskey "A">
 <!ENTITY rangeRadio.label  "Pages">
-<!ENTITY frompageInput.label  "from">
-<!ENTITY topageInput.label  "to">
+<!ENTITY rangeRadio.accesskey "e">
+<!ENTITY fromPageInput.label  "from">
+<!ENTITY fromPageInput.accesskey "r">
+<!ENTITY toPageInput.label  "to">
+<!ENTITY toPageInput.accesskey "t">
 <!ENTITY selectionRadio.label "Selection">
+<!ENTITY selectionRadio.accesskey "S">
 
 <!ENTITY copies.label "Copies">
 <!ENTITY numCopies.label "Number of copies:">
+<!ENTITY numCopies.accesskey "N">
 
-<!ENTITY printframeGroup.label "Print Frames">
-<!ENTITY aslaidoutRadio.label "As laid out on the screen">
-<!ENTITY selectedframeRadio.label  "The selected frame">
-<!ENTITY eachframesepRadio.label  "Each frame separately">
+<!ENTITY printFrameGroup.label "Print Frames">
+<!ENTITY asLaidOutRadio.label "As laid out on the screen">
+<!ENTITY asLaidOutRadio.accesskey "d">
+<!ENTITY selectedFrameRadio.label  "The selected frame">
+<!ENTITY selectedFrameRadio.accesskey "m">
+<!ENTITY eachFrameSepRadio.label  "Each frame separately">
+<!ENTITY eachFrameSepRadio.accesskey "c">
 
diff --git a/mozilla/xpfe/global/resources/locale/en-US/unix/printjoboptions.dtd b/mozilla/xpfe/global/resources/locale/en-US/unix/printjoboptions.dtd
index 973ed563f12..6cb7e0925e1 100644
--- a/mozilla/xpfe/global/resources/locale/en-US/unix/printjoboptions.dtd
+++ b/mozilla/xpfe/global/resources/locale/en-US/unix/printjoboptions.dtd
@@ -3,26 +3,39 @@
 <!ENTITY printJobOptions.title "Printer Properties">
 
 <!ENTITY paperInput.label "Paper Size:">
+<!ENTITY paperInput.accesskey "P">
 
 <!ENTITY plexInput.label "Plex mode:">
+<!ENTITY plexInput.accesskey "x">
 
 <!ENTITY resolutionInput.label "Resolution/Quality:">
+<!ENTITY resolutionInput.accesskey "Q">
 
 <!ENTITY cmdInput.label "Print Command:">
+<!ENTITY cmdInput.accesskey "o">
 
 <!ENTITY jobTitleInput.label "Job Title:">
+<!ENTITY jobTitleInput.accesskey "J">
 
 <!ENTITY colorGroup.label "Color:">
-<!ENTITY grayRadio.label "GrayScale">
+<!ENTITY grayRadio.label "Grayscale">
+<!ENTITY grayRadio.accesskey "G">
 <!ENTITY colorRadio.label "Color">
+<!ENTITY colorRadio.accesskey "C">
 
 <!ENTITY colorspaceInput.label "Colorspace:">
+<!ENTITY colorspaceInput.accesskey "s">
 
 <!ENTITY fontsGroup.label "Fonts:">
-<!ENTITY downloadFonts.label "Download fonts to printer?">
+<!ENTITY downloadFonts.label "Download fonts to printer">
+<!ENTITY downloadFonts.accesskey "D">
 
 <!ENTITY edgeMarginInput.label "Gap from edge of paper to Margin">
 <!ENTITY topInput.label "Top:">
+<!ENTITY topInput.accesskey "T">
 <!ENTITY bottomInput.label "Bottom:">
+<!ENTITY bottomInput.accesskey "B">
 <!ENTITY leftInput.label "Left:">
+<!ENTITY leftInput.accesskey "L">
 <!ENTITY rightInput.label "Right:">
+<!ENTITY rightInput.accesskey "R">