From d94bada0cc8f9feeb64d501dac85d70ca0b270e3 Mon Sep 17 00:00:00 2001
From: "aaronleventhal%moonset.net" <aaronleventhal%moonset.net>
Date: Fri, 5 Aug 2005 15:53:24 +0000
Subject: [PATCH] Bug 302646. Fix accessibility problems in printing dialogs.
 r+a=mconnor

---
 .../printing/content/printPageSetup.xul          | 12 ++++++------
 .../printing/content/printProgress.xul           |  2 +-
 .../components/printing/content/printdialog.xul  |  2 +-
 .../printing/content/printjoboptions.xul         | 16 ++++++++--------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/toolkit/components/printing/content/printPageSetup.xul b/toolkit/components/printing/content/printPageSetup.xul
index c869e88a0e07..ab5fdad3d9df 100644
--- a/toolkit/components/printing/content/printPageSetup.xul
+++ b/toolkit/components/printing/content/printPageSetup.xul
@@ -74,7 +74,7 @@
           <caption label="&formatGroup.label;"/>
           <vbox>
             <hbox align="center">
-              <label value="&orientation.label;"/>
+              <label control="orientation" value="&orientation.label;"/>
               <radiogroup id="orientation" oncommand="setOrientation()">
                 <hbox align="center">
                   <radio id="portrait"  class="portrait-page"  label="&portrait;"/>
@@ -84,7 +84,7 @@
             </hbox>
             <separator/>
             <hbox align="center">
-              <label value="&scale.label;"/>
+              <label control="scalingInput" value="&scale.label;"/>
               <textbox id="scalingInput" size="4" onfocus="this.select()" oninput="checkDouble(this)"/>
               <label value="&scalePercent;"/>
               <separator/>
@@ -104,7 +104,7 @@
           <vbox>
             <hbox align="center">
               <spacer flex="1"/>
-              <label value="&marginTop.label;"/>
+              <label control="topInput" value="&marginTop.label;"/>
               <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
@@ -116,7 +116,7 @@
               <spacer flex="1"/>
               <vbox>
                 <spacer flex="1"/>
-                <label value="&marginLeft.label;"/>
+                <label control="leftInput" value="&marginLeft.label;"/>
                 <textbox id="leftInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
                 <label value="&marginLeft.label;" style="visibility: hidden;"/>
                 <spacer flex="1"/>
@@ -136,7 +136,7 @@
               </vbox>
               <vbox>
                 <spacer flex="1"/>
-                <label value="&marginRight.label;"/>
+                <label control="rightInput" value="&marginRight.label;"/>
                 <textbox id="rightInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
                 <label value="&marginRight.label;" style="visibility: hidden;"/>
                 <spacer flex="1"/>
@@ -145,7 +145,7 @@
             </hbox>
             <hbox align="center">
               <spacer flex="1"/>
-              <label value="&marginBottom.label;"/>
+              <label control="bottomInput" value="&marginBottom.label;"/>
               <textbox id="bottomInput" size="5" oninput="changeMargin(this)" onfocus="this.select()"/>
               <label value="&marginBottom.label;" style="visibility: hidden;"/>
               <spacer flex="1"/>
diff --git a/toolkit/components/printing/content/printProgress.xul b/toolkit/components/printing/content/printProgress.xul
index a464d40a79ed..21cbaa83f308 100644
--- a/toolkit/components/printing/content/printProgress.xul
+++ b/toolkit/components/printing/content/printProgress.xul
@@ -82,7 +82,7 @@
         </row>
         <row class="thin-separator">             
           <hbox pack="end">
-            <label id="dialog.progressLabel" value="&progress;"/>
+            <label id="dialog.progressLabel" control="dialog.progress" value="&progress;"/>
           </hbox>
             <label id="dialog.tempLabel" value="&preparing;"/>
             <progressmeter id="dialog.progress" mode="normal" value="0"/>
diff --git a/toolkit/components/printing/content/printdialog.xul b/toolkit/components/printing/content/printdialog.xul
index 5b1b4f0cf21a..650223dc8f28 100644
--- a/toolkit/components/printing/content/printdialog.xul
+++ b/toolkit/components/printing/content/printdialog.xul
@@ -70,7 +70,7 @@
       <rows>
         <row align="center">
           <hbox align="center" pack="end">
-            <label id="printerLabel" value="&printerInput.label;"/>
+            <label id="printerLabel" control="printerList" value="&printerInput.label;"/>
           </hbox>
           <menulist id="printerList" flex="1" type="description" oncommand="setPrinterDefaultsForSelectedPrinter();"/>
           <button id="properties" label="&propertiesButton.label;"
diff --git a/toolkit/components/printing/content/printjoboptions.xul b/toolkit/components/printing/content/printjoboptions.xul
index 14c2f5592220..eb49aeda0059 100644
--- a/toolkit/components/printing/content/printjoboptions.xul
+++ b/toolkit/components/printing/content/printjoboptions.xul
@@ -64,14 +64,14 @@
     <rows>
       <row id="jobTitleGroup">
         <hbox align="center" pack="end">
-          <label id="jobTitleLabel" value="&jobTitleInput.label;"/>
+          <label id="jobTitleLabel" control="jobTitleInput" value="&jobTitleInput.label;"/>
         </hbox>
         <textbox id="jobTitleInput" flex="1"/>
       </row>
 
       <row id="paperGroup">
         <hbox align="center" pack="end">
-          <label id="paperLabel" value="&paperInput.label;"/>
+          <label id="paperLabel" control="paperList" value="&paperInput.label;"/>
         </hbox>
         <menulist id="paperList" flex="1">
           <menupopup/>
@@ -80,7 +80,7 @@
 
       <row id="plexGroup">
         <hbox align="center" pack="end">
-          <label id="plexLabel" value="&plexInput.label;"/>
+          <label id="plexLabel" control="plexList" value="&plexInput.label;"/>
         </hbox>
         <menulist id="plexList" flex="1">
           <menupopup/>
@@ -89,7 +89,7 @@
 
       <row id="resolutionGroup">
         <hbox align="center" pack="end">
-          <label id="resolutionLabel" value="&resolutionInput.label;"/>
+          <label id="resolutionLabel" control="resolutionList" value="&resolutionInput.label;"/>
         </hbox>
         <menulist id="resolutionList" flex="1">
           <menupopup/>
@@ -98,7 +98,7 @@
 
       <row id="colorspaceGroup">
         <hbox align="center" pack="end">
-          <label id="colorspaceLabel" value="&colorspaceInput.label;"/>
+          <label id="colorspaceLabel" control="colorspaceList" value="&colorspaceInput.label;"/>
         </hbox>
         <menulist id="colorspaceList" flex="1">
           <menupopup/>
@@ -106,13 +106,13 @@
       </row>
 
       <row id="cmdGroup">
-        <label id="cmdLabel" value="&cmdInput.label;"/>
+        <label id="cmdLabel" control="cmdInput" value="&cmdInput.label;"/>
         <textbox id="cmdInput" flex="1"/>
       </row>
 
       <row id="colorGroup">
         <hbox align="center" pack="end">
-          <label value="&colorGroup.label;"/>
+          <label control="colorRadioGroup" value="&colorGroup.label;"/>
         </hbox>
         <radiogroup id="colorRadioGroup" orient="horizontal">
           <radio id="grayRadio" label="&grayRadio.label;"/>
@@ -122,7 +122,7 @@
 
       <row id="fontsGroup">
         <hbox align="center" pack="end">
-          <label value="&fontsGroup.label;"/>
+          <label control="downloadFonts" value="&fontsGroup.label;"/>
         </hbox>
         <checkbox id="downloadFonts" label="&downloadFonts.label;" />
       </row>