Bug 97571: Any <label> in <groupbox> becomes <caption> per XUL 1.0. r=ben, sr=hyatt

2024-10-16 23:05:42 +00:00 · 2006-05-17 02:31:17 +00:00 · 2006-05-17 02:31:17 +00:00 · 6c67a322c8
commit 6c67a322c8
parent c22f9a60cf
20 changed files with 43 additions and 43 deletions
--- a/suite/common/pref/pref-advanced.xul
+++ b/suite/common/pref/pref-advanced.xul
@ -135,7 +135,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox orient="vertical" id="advancedSettings" align="start">
-    <label value="&advancedTitle.label;"/>
+    <caption label="&advancedTitle.label;"/>
    <vbox align="start" id="contentEnablingBox">
      <checkbox id="advancedJavaAllow" label="&enbJavaCheck.label;" accesskey="&enbJavaCheck.accesskey;"
                pref="true" preftype="bool" prefstring="security.enable_java"
@ -164,7 +164,7 @@
    <separator/>
  </groupbox>
  <groupbox orient="vertical" id="perfSettings">
-   <label id="perfLabel" value="&perfTitle.label;"/>
+    <caption id="perfLabel" label="&perfTitle.label;"/>
    <vbox id="perfBox" align="start">
      <checkbox id="enableTurbo" label="&enableTurbo.label;" accesskey="&enableTurboCheck.accesskey;"
                pref="true" preftype="bool" prefstring="browser.turbo.enabled" prefattribute="checked"/>
--- a/suite/common/pref/pref-appearance.xul
+++ b/suite/common/pref/pref-appearance.xul
@ -81,7 +81,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox id="generalStartupPreferences" orient="vertical" align="start">
-    <label value="&onStartLegend.label;"/>
+    <caption label="&onStartLegend.label;"/>
    <!-- XXX remove when navigator overlays.rdf works -->
    <checkbox id="generalStartupBrowser" wsm_persist="true"
              label="&navCheck.label;" accesskey="&navCheck.accesskey;"
@ -91,7 +91,7 @@
  </groupbox>
  
  <groupbox id="toolbarStyleBox" orient="vertical" style="display: none;">
-    <label value="&showToolsLegend.label;"/>
+    <caption label="&showToolsLegend.label;"/>
    <radiogroup id="toolbarStyle" orient="vertical" align="start"
                pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"
                prefattribute="value" wsm_persist="true">
--- a/suite/common/pref/pref-applications-edit.xul
+++ b/suite/common/pref/pref-applications-edit.xul
@ -311,7 +311,7 @@
  <separator class="thin"/>

  <groupbox orient="vertical">
-    <label value="&handledby.label;"/>
+    <caption label="&handledby.label;"/>
    
    <radiogroup id="handler" orient="vertical">
      <vbox align="start">
--- a/suite/common/pref/pref-applications.xul
+++ b/suite/common/pref/pref-applications.xul
@ -42,7 +42,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox orient="vertical" flex="1">
-    <label value="&descript;"/>
+    <caption label="&descript;"/>
    <text class="label" value="&fileTypes.label;"/>
    <hbox flex="1">
      <vbox flex="1">
@ -123,7 +123,7 @@
    </hbox>
  </groupbox>
  <groupbox flex="1">
-    <label value="&fileOpening.label;"/>
+    <caption label="&fileOpening.label;"/>
    <html flex="1">&resetText.label;</html>
    <separator orient="vertical"/>
    <hbox align="center">
--- a/suite/common/pref/pref-cache.xul
+++ b/suite/common/pref/pref-cache.xul
@ -43,7 +43,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox orient="vertical">
-    <label value="&cacheTitle.label;"/>
+    <caption label="&cacheTitle.label;"/>
    
    <html>&cachePara;</html>

--- a/suite/common/pref/pref-colors.xul
+++ b/suite/common/pref/pref-colors.xul
@ -46,7 +46,7 @@

  <hbox>
    <groupbox orient="vertical" flex="1" id="pageColours">
-      <label value="&color;"/>
+      <caption label="&color;"/>
      <hbox>
        <text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/>
        <spring flex="1"/>
@ -67,7 +67,7 @@
    </groupbox>
      
    <groupbox orient="vertical" flex="1">
-      <label value="&links;"/>
+      <caption label="&links;"/>
      <hbox>
        <text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/>
        <spring flex="1"/>
@ -101,7 +101,7 @@
  </groupbox>

  <groupbox orient="vertical">
-      <label value="&viewsource;"/>
+      <caption label="&viewsource;"/>
      <hbox align="center">
        <checkbox id="syntaxHighlight" label="&syntaxHighlight.label;" accesskey="&syntaxHighlight.accesskey;"
                  pref="true" preftype="bool" prefstring="view_source.syntax_highlight" prefattribute="checked"/>
--- a/suite/common/pref/pref-debug.xul
+++ b/suite/common/pref/pref-debug.xul
@ -44,7 +44,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>
  
  <groupbox orient="vertical" align="start">
-    <label value="&widgetRendering.label;"/>
+    <caption label="&widgetRendering.label;"/>
    <checkbox id="nglayoutDebugWindow" label="&debugWindow.label;"
              pref="true" preftype="bool" prefstring="nglayout.widget.debugWindow"
              prefattribute="checked"/>
@ -56,7 +56,7 @@
  <!-- nothing on this page has accesskeys because this is a temporary debug
       panel and you can damn well click the widgets! -->
  <groupbox orient="vertical" align="start">
-    <label value="&debugMiscellaneous.label;"/>
+    <caption label="&debugMiscellaneous.label;"/>
    <checkbox id="browserDOMWindowDumpEnabled" label="&debugEnableDump.label;"
              pref="true" preftype="bool" prefstring="browser.dom.window.dump.enabled"
              prefattribute="checked"/>
@ -76,8 +76,8 @@


  <groupbox orient="vertical">
-    <label value="&accelerators.label;"/>
-    <label value="&acceleratorsBlurb.label;"/>
+    <caption label="&accelerators.label;"/>
+    <caption label="&acceleratorsBlurb.label;"/>

      <grid flex="1">
        <columns>
--- a/suite/common/pref/pref-debug1.xul
+++ b/suite/common/pref/pref-debug1.xul
@ -48,7 +48,7 @@

  <!-- Event Debugging -->  
  <groupbox orient="vertical">
-    <label value="&debugEventDebugging.label;"/>
+    <caption label="&debugEventDebugging.label;"/>
    <vbox align="start">
      <checkbox id="nglayoutDebugPaintFlashing" label="&debugPaintFlashing.label;"
                pref="true" preftype="bool" prefstring="nglayout.debug.paint_flashing"
@ -73,7 +73,7 @@

  <!-- Reflow events -->
  <groupbox orient="vertical">
-    <label value="&debugReflowEvents.label;"/>
+    <caption label="&debugReflowEvents.label;"/>
    <vbox align="start">
      <checkbox id="layoutReflowShowFrameCounts" label="&debugReflowShowFrameCounts.label;"
                pref="true" preftype="bool" prefstring="layout.reflow.showframecounts"
--- a/suite/common/pref/pref-debug2.xul
+++ b/suite/common/pref/pref-debug2.xul
@ -45,7 +45,7 @@
       panel and you can damn well click the widgets! -->

  <groupbox orient="vertical">
-    <label value="&debugNetworking.label;"/>
+    <caption label="&debugNetworking.label;"/>
    <vbox align="start">
      <checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;"
                pref="true" preftype="bool" prefstring="network.http.keep-alive"
@ -68,7 +68,7 @@
  </groupbox>

  <groupbox orient="vertical">
-    <label value="&debugCache.label;"/>
+    <caption label="&debugCache.label;"/>
    <vbox align="start">
    <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
              pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache"
--- a/suite/common/pref/pref-fonts.xul
+++ b/suite/common/pref/pref-fonts.xul
@ -44,7 +44,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>
  
  <groupbox orient="vertical">
-    <label>
+    <caption>
      <text class="label small-margin" 
            value="&language.label;" 
            accesskey="&language.accesskey;" 
@ -70,7 +70,7 @@
          <menuitem value="ar" label="&font.langGroup.arabic;"/>
        </menupopup>
      </menulist>
-    </label>
+    </caption>
    
    <separator class="thin"/>
    
--- a/suite/common/pref/pref-history.xul
+++ b/suite/common/pref/pref-history.xul
@ -105,7 +105,7 @@
  
  <!-- history -->
  <groupbox orient="vertical">
-    <label value="&header3.label;"/>
+    <caption label="&header3.label;"/>
    <html>&historyPages.label;</html>
    <hbox align="center">
      <text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
@ -123,7 +123,7 @@
  
  <!-- no honey, I haven't been viewing porn, honest! -->
  <groupbox orient="vertical">
-    <label value="&locationBarHistory.label;"/>
+    <caption label="&locationBarHistory.label;"/>
    <hbox align="center">
      <html flex="1">&clearLocationBar.label;</html>
      <hbox align="center" pack="end">
@ -138,7 +138,7 @@

  <!-- Session History -->
  <groupbox orient="vertical">
-    <label value="&shistory.label;"/>
+    <caption label="&shistory.label;"/>
    <html>&shistoryDescription1.label;</html>
    <hbox align="center">
      <text class="label" value="&shistoryDescription2.label;" accesskey="&shistory.accesskey;" for="shistMax"/>
--- a/suite/common/pref/pref-languages.xul
+++ b/suite/common/pref/pref-languages.xul
@ -50,7 +50,7 @@
    -->

  <groupbox orient="vertical" flex="1">
-    <label value="&langtitle.label;"/>
+    <caption label="&langtitle.label;"/>

    <html>&languages.customize.prefLangDescript;</html>

@ -90,7 +90,7 @@
    </hbox>
  </groupbox>
  <groupbox orient="vertical" align="start">
-    <label value="&languages.customize.Charset.grouplabel;"/>
+    <caption label="&languages.customize.Charset.grouplabel;"/>
    <text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
    <menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
        pref="true" preftype="localizedstring" prefstring="intl.charset.default"
--- a/suite/common/pref/pref-mousewheel.xul
+++ b/suite/common/pref/pref-mousewheel.xul
@ -95,7 +95,7 @@
    <separator class="thin"/>
  
    <groupbox orient="vertical">
-      <label>
+      <caption>
        <hbox> 
          <menulist id="mouseWheelMode" oncommand="switchPage(this);"
            pref="true" preftype="bool" prefstring="pref.mousewheel.disable_button.modifier" prefattribute="disabled">
@ -107,7 +107,7 @@
            </menupopup>
          </menulist>
        </hbox>
-      </label>
+      </caption>


    <deck id="modifierDeck" class="indent">
--- a/suite/common/pref/pref-navigator.xul
+++ b/suite/common/pref/pref-navigator.xul
@ -49,7 +49,7 @@

  <!-- navigator starts with -->  
  <groupbox>
-    <label value="&navRadio;"/>
+    <caption label="&navRadio;"/>
    
    <radiogroup id="startupPage" align="start" orient="vertical"
                pref="true" preftype="int" prefstring="browser.startup.page"
@ -63,7 +63,7 @@

  <!-- homepage specification -->
  <groupbox>
-    <label value="&header2.label;"/>
+    <caption label="&header2.label;"/>
    <vbox flex="1">
      <html>&homePageIntro.label;</html>
      <hbox align="center">
@ -89,7 +89,7 @@
  
  <!-- toolbar buttons customization -->
  <groupbox flex="1" id="prefShowButtons">
-    <label value="&toolbarIntro.label;"/>
+    <caption label="&toolbarIntro.label;"/>
    <vbox>

              <checkbox allowevents="true"
--- a/suite/common/pref/pref-offline.xul
+++ b/suite/common/pref/pref-offline.xul
@ -63,7 +63,7 @@
 <hbox class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/>

 <groupbox orient="vertical" class="small-margin">
-    <label value="&rHeader;"/>
+    <caption label="&rHeader;"/>

  <text value="&textStart;"/>
    <radiogroup id="offlineStartupstate" orient="vertical" align="start"
@ -96,7 +96,7 @@
 </groupbox>

 <groupbox orient="vertical">
-    <label value="&Diskspace;"/>	    
+    <caption label="&Diskspace;"/>	    
    <hbox align="center">
        <checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
            pref="true" preftype="bool" prefstring="mail.prompt_purge_threshhold" prefattribute="checked"
--- a/suite/common/pref/pref-proxies.xul
+++ b/suite/common/pref/pref-proxies.xul
@ -53,7 +53,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox orient="vertical">
-    <label value="&proxyTitle.label;"/>
+    <caption label="&proxyTitle.label;"/>

    <radiogroup id="networkProxyType" orient="vertical"
                pref="true" preftype="int" prefstring="network.proxy.type"
--- a/suite/common/pref/pref-search.xul
+++ b/suite/common/pref/pref-search.xul
@ -40,7 +40,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox>
-    <label value="&legendHeader;"/>
+    <caption label="&legendHeader;"/>

    <hbox align="center">
      <text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/>
@ -59,7 +59,7 @@
  </groupbox>

  <groupbox orient="vertical">
-    <label value="&searchResults.label;"/>
+    <caption label="&searchResults.label;"/>
    <!-- XXX - unfortunately we can't have an autostretch never box here
               because it causes the text not to wrap and the panel content
               to go offscreen. We need to come up with a better solution
@ -70,7 +70,7 @@
  </groupbox>

  <groupbox orient="vertical">
-    <label value="&sidebarSearchTabPref.label;"/>
+    <caption label="&sidebarSearchTabPref.label;"/>
    <radiogroup orient="vertical" align="start"
        id="sidebarSearchMode"
        pref="true"
--- a/suite/common/pref/pref-smart_browsing-ac.xul
+++ b/suite/common/pref/pref-smart_browsing-ac.xul
@ -96,7 +96,7 @@
  ]]></script>
  
  <groupbox>
-    <label value="&autoCompleteAdvanced.title;"/>
+    <caption label="&autoCompleteAdvanced.title;"/>
    <vbox>
      <checkbox id="cbxAutoFill" label="&autoCompleteAutoFill.label;" 
                oncommand="updateImage('AutoFill')"/>
--- a/suite/common/pref/pref-smart_browsing.xul
+++ b/suite/common/pref/pref-smart_browsing.xul
@ -57,7 +57,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>

  <groupbox orient="vertical" flex="1">
-    <label value="&whatsRelated.label;"/>
+    <caption label="&whatsRelated.label;"/>

    <html class="small-margin" id="doNotAcceptText">&doNotDecp.label;</html>
    <separator class="thin"/>
@ -102,7 +102,7 @@
  </groupbox>

  <groupbox orient="vertical">
-    <label value="&internetKeywordsHeader.label;"/>
+    <caption label="&internetKeywordsHeader.label;"/>

    <html class="small-margin">&internetKeywordsDescription.label;</html>
    
@ -119,7 +119,7 @@
  </groupbox>

  <groupbox orient="vertical">
-    <label value="&autoCompleteHeader.label;"/>
+    <caption label="&autoCompleteHeader.label;"/>
      <html class="small-margin">&autoCompleteDescription.label;</html>
      <hbox autostretch="never">
        <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"
--- a/suite/common/pref/pref-smartupdate.xul
+++ b/suite/common/pref/pref-smartupdate.xul
@ -20,7 +20,7 @@
  <hbox class="box-smallheader" title="&lHeader;"/>
    
  <groupbox orient="vertical" align="start">
-    <label value="&smartTitle.label;"/>
+    <caption label="&smartTitle.label;"/>
    <checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;"
              pref="true" preftype="bool" prefstring="xpinstall.enabled"
              prefattribute="checked"/>
@ -28,7 +28,7 @@

 <!--
  <groupbox orient="vertical" align="start">
-    <label value="Installed Packages"/>
+    <caption label="Installed Packages"/>
  
    <script>
    <![CDATA[