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

This commit is contained in:
jaggernaut%netscape.com 2006-05-17 02:31:17 +00:00
Родитель c22f9a60cf
Коммит 6c67a322c8
20 изменённых файлов: 43 добавлений и 43 удалений

Просмотреть файл

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

Просмотреть файл

@ -81,7 +81,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox id="generalStartupPreferences" orient="vertical" align="start"> <groupbox id="generalStartupPreferences" orient="vertical" align="start">
<label value="&onStartLegend.label;"/> <caption label="&onStartLegend.label;"/>
<!-- XXX remove when navigator overlays.rdf works --> <!-- XXX remove when navigator overlays.rdf works -->
<checkbox id="generalStartupBrowser" wsm_persist="true" <checkbox id="generalStartupBrowser" wsm_persist="true"
label="&navCheck.label;" accesskey="&navCheck.accesskey;" label="&navCheck.label;" accesskey="&navCheck.accesskey;"
@ -91,7 +91,7 @@
</groupbox> </groupbox>
<groupbox id="toolbarStyleBox" orient="vertical" style="display: none;"> <groupbox id="toolbarStyleBox" orient="vertical" style="display: none;">
<label value="&showToolsLegend.label;"/> <caption label="&showToolsLegend.label;"/>
<radiogroup id="toolbarStyle" orient="vertical" align="start" <radiogroup id="toolbarStyle" orient="vertical" align="start"
pref="true" preftype="int" prefstring="browser.chrome.toolbar_style" pref="true" preftype="int" prefstring="browser.chrome.toolbar_style"
prefattribute="value" wsm_persist="true"> prefattribute="value" wsm_persist="true">

Просмотреть файл

@ -311,7 +311,7 @@
<separator class="thin"/> <separator class="thin"/>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&handledby.label;"/> <caption label="&handledby.label;"/>
<radiogroup id="handler" orient="vertical"> <radiogroup id="handler" orient="vertical">
<vbox align="start"> <vbox align="start">

Просмотреть файл

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

Просмотреть файл

@ -43,7 +43,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&cacheTitle.label;"/> <caption label="&cacheTitle.label;"/>
<html>&cachePara;</html> <html>&cachePara;</html>

Просмотреть файл

@ -46,7 +46,7 @@
<hbox> <hbox>
<groupbox orient="vertical" flex="1" id="pageColours"> <groupbox orient="vertical" flex="1" id="pageColours">
<label value="&color;"/> <caption label="&color;"/>
<hbox> <hbox>
<text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/> <text class="label" value="&textColor.label;" accesskey="&textColor.accesskey;" for="foregroundtextmenu"/>
<spring flex="1"/> <spring flex="1"/>
@ -67,7 +67,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical" flex="1"> <groupbox orient="vertical" flex="1">
<label value="&links;"/> <caption label="&links;"/>
<hbox> <hbox>
<text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/> <text class="label" value="&linkColor.label;" accesskey="&linkColor.accesskey;" for="unvisitedlinkmenu"/>
<spring flex="1"/> <spring flex="1"/>
@ -101,7 +101,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&viewsource;"/> <caption label="&viewsource;"/>
<hbox align="center"> <hbox align="center">
<checkbox id="syntaxHighlight" label="&syntaxHighlight.label;" accesskey="&syntaxHighlight.accesskey;" <checkbox id="syntaxHighlight" label="&syntaxHighlight.label;" accesskey="&syntaxHighlight.accesskey;"
pref="true" preftype="bool" prefstring="view_source.syntax_highlight" prefattribute="checked"/> pref="true" preftype="bool" prefstring="view_source.syntax_highlight" prefattribute="checked"/>

Просмотреть файл

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

Просмотреть файл

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

Просмотреть файл

@ -45,7 +45,7 @@
panel and you can damn well click the widgets! --> panel and you can damn well click the widgets! -->
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&debugNetworking.label;"/> <caption label="&debugNetworking.label;"/>
<vbox align="start"> <vbox align="start">
<checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;" <checkbox id="browserEnableKeepAlive" label="&debugEnableKeepAlive.label;"
pref="true" preftype="bool" prefstring="network.http.keep-alive" pref="true" preftype="bool" prefstring="network.http.keep-alive"
@ -68,7 +68,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&debugCache.label;"/> <caption label="&debugCache.label;"/>
<vbox align="start"> <vbox align="start">
<checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;" <checkbox id="nglayoutDebugDisableXULCache" label="&debugDisableXULCache.label;"
pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache" pref="true" preftype="bool" prefstring="nglayout.debug.disable_xul_cache"

Просмотреть файл

@ -44,7 +44,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label> <caption>
<text class="label small-margin" <text class="label small-margin"
value="&language.label;" value="&language.label;"
accesskey="&language.accesskey;" accesskey="&language.accesskey;"
@ -70,7 +70,7 @@
<menuitem value="ar" label="&font.langGroup.arabic;"/> <menuitem value="ar" label="&font.langGroup.arabic;"/>
</menupopup> </menupopup>
</menulist> </menulist>
</label> </caption>
<separator class="thin"/> <separator class="thin"/>

Просмотреть файл

@ -105,7 +105,7 @@
<!-- history --> <!-- history -->
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&header3.label;"/> <caption label="&header3.label;"/>
<html>&historyPages.label;</html> <html>&historyPages.label;</html>
<hbox align="center"> <hbox align="center">
<text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/> <text class="label" value="&pageHis.label;" accesskey="&pageHis.accesskey;" for="histDay"/>
@ -123,7 +123,7 @@
<!-- no honey, I haven't been viewing porn, honest! --> <!-- no honey, I haven't been viewing porn, honest! -->
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&locationBarHistory.label;"/> <caption label="&locationBarHistory.label;"/>
<hbox align="center"> <hbox align="center">
<html flex="1">&clearLocationBar.label;</html> <html flex="1">&clearLocationBar.label;</html>
<hbox align="center" pack="end"> <hbox align="center" pack="end">
@ -138,7 +138,7 @@
<!-- Session History --> <!-- Session History -->
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&shistory.label;"/> <caption label="&shistory.label;"/>
<html>&shistoryDescription1.label;</html> <html>&shistoryDescription1.label;</html>
<hbox align="center"> <hbox align="center">
<text class="label" value="&shistoryDescription2.label;" accesskey="&shistory.accesskey;" for="shistMax"/> <text class="label" value="&shistoryDescription2.label;" accesskey="&shistory.accesskey;" for="shistMax"/>

Просмотреть файл

@ -50,7 +50,7 @@
--> -->
<groupbox orient="vertical" flex="1"> <groupbox orient="vertical" flex="1">
<label value="&langtitle.label;"/> <caption label="&langtitle.label;"/>
<html>&languages.customize.prefLangDescript;</html> <html>&languages.customize.prefLangDescript;</html>
@ -90,7 +90,7 @@
</hbox> </hbox>
</groupbox> </groupbox>
<groupbox orient="vertical" align="start"> <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"/> <text class="label" value="&languages.customize.DefaultCharset.label;" for="DefaultCharsetList"/>
<menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu" <menulist id="DefaultCharsetList" ref="NC:DecodersRoot" datasources="rdf:charset-menu"
pref="true" preftype="localizedstring" prefstring="intl.charset.default" pref="true" preftype="localizedstring" prefstring="intl.charset.default"

Просмотреть файл

@ -95,7 +95,7 @@
<separator class="thin"/> <separator class="thin"/>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label> <caption>
<hbox> <hbox>
<menulist id="mouseWheelMode" oncommand="switchPage(this);" <menulist id="mouseWheelMode" oncommand="switchPage(this);"
pref="true" preftype="bool" prefstring="pref.mousewheel.disable_button.modifier" prefattribute="disabled"> pref="true" preftype="bool" prefstring="pref.mousewheel.disable_button.modifier" prefattribute="disabled">
@ -107,7 +107,7 @@
</menupopup> </menupopup>
</menulist> </menulist>
</hbox> </hbox>
</label> </caption>
<deck id="modifierDeck" class="indent"> <deck id="modifierDeck" class="indent">

Просмотреть файл

@ -49,7 +49,7 @@
<!-- navigator starts with --> <!-- navigator starts with -->
<groupbox> <groupbox>
<label value="&navRadio;"/> <caption label="&navRadio;"/>
<radiogroup id="startupPage" align="start" orient="vertical" <radiogroup id="startupPage" align="start" orient="vertical"
pref="true" preftype="int" prefstring="browser.startup.page" pref="true" preftype="int" prefstring="browser.startup.page"
@ -63,7 +63,7 @@
<!-- homepage specification --> <!-- homepage specification -->
<groupbox> <groupbox>
<label value="&header2.label;"/> <caption label="&header2.label;"/>
<vbox flex="1"> <vbox flex="1">
<html>&homePageIntro.label;</html> <html>&homePageIntro.label;</html>
<hbox align="center"> <hbox align="center">
@ -89,7 +89,7 @@
<!-- toolbar buttons customization --> <!-- toolbar buttons customization -->
<groupbox flex="1" id="prefShowButtons"> <groupbox flex="1" id="prefShowButtons">
<label value="&toolbarIntro.label;"/> <caption label="&toolbarIntro.label;"/>
<vbox> <vbox>
<checkbox allowevents="true" <checkbox allowevents="true"

Просмотреть файл

@ -63,7 +63,7 @@
<hbox class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/> <hbox class="box-smallheader" id="OfflineHeader" title="&boxHeader;"/>
<groupbox orient="vertical" class="small-margin"> <groupbox orient="vertical" class="small-margin">
<label value="&rHeader;"/> <caption label="&rHeader;"/>
<text value="&textStart;"/> <text value="&textStart;"/>
<radiogroup id="offlineStartupstate" orient="vertical" align="start" <radiogroup id="offlineStartupstate" orient="vertical" align="start"
@ -96,7 +96,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&Diskspace;"/> <caption label="&Diskspace;"/>
<hbox align="center"> <hbox align="center">
<checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;" <checkbox id="offlineCompactFolder" label="&offlineCompact.label;" accesskey="&offlineCompact.accesskey;"
pref="true" preftype="bool" prefstring="mail.prompt_purge_threshhold" prefattribute="checked" pref="true" preftype="bool" prefstring="mail.prompt_purge_threshhold" prefattribute="checked"

Просмотреть файл

@ -53,7 +53,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&proxyTitle.label;"/> <caption label="&proxyTitle.label;"/>
<radiogroup id="networkProxyType" orient="vertical" <radiogroup id="networkProxyType" orient="vertical"
pref="true" preftype="int" prefstring="network.proxy.type" pref="true" preftype="int" prefstring="network.proxy.type"

Просмотреть файл

@ -40,7 +40,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox> <groupbox>
<label value="&legendHeader;"/> <caption label="&legendHeader;"/>
<hbox align="center"> <hbox align="center">
<text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/> <text class="label" value="&defaultSearchEngine.label;" accesskey="&defaultSearchEngine.accesskey;" for="engineList"/>
@ -59,7 +59,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&searchResults.label;"/> <caption label="&searchResults.label;"/>
<!-- XXX - unfortunately we can't have an autostretch never box here <!-- XXX - unfortunately we can't have an autostretch never box here
because it causes the text not to wrap and the panel content because it causes the text not to wrap and the panel content
to go offscreen. We need to come up with a better solution to go offscreen. We need to come up with a better solution
@ -70,7 +70,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&sidebarSearchTabPref.label;"/> <caption label="&sidebarSearchTabPref.label;"/>
<radiogroup orient="vertical" align="start" <radiogroup orient="vertical" align="start"
id="sidebarSearchMode" id="sidebarSearchMode"
pref="true" pref="true"

Просмотреть файл

@ -96,7 +96,7 @@
]]></script> ]]></script>
<groupbox> <groupbox>
<label value="&autoCompleteAdvanced.title;"/> <caption label="&autoCompleteAdvanced.title;"/>
<vbox> <vbox>
<checkbox id="cbxAutoFill" label="&autoCompleteAutoFill.label;" <checkbox id="cbxAutoFill" label="&autoCompleteAutoFill.label;"
oncommand="updateImage('AutoFill')"/> oncommand="updateImage('AutoFill')"/>

Просмотреть файл

@ -57,7 +57,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox orient="vertical" flex="1"> <groupbox orient="vertical" flex="1">
<label value="&whatsRelated.label;"/> <caption label="&whatsRelated.label;"/>
<html class="small-margin" id="doNotAcceptText">&doNotDecp.label;</html> <html class="small-margin" id="doNotAcceptText">&doNotDecp.label;</html>
<separator class="thin"/> <separator class="thin"/>
@ -102,7 +102,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&internetKeywordsHeader.label;"/> <caption label="&internetKeywordsHeader.label;"/>
<html class="small-margin">&internetKeywordsDescription.label;</html> <html class="small-margin">&internetKeywordsDescription.label;</html>
@ -119,7 +119,7 @@
</groupbox> </groupbox>
<groupbox orient="vertical"> <groupbox orient="vertical">
<label value="&autoCompleteHeader.label;"/> <caption label="&autoCompleteHeader.label;"/>
<html class="small-margin">&autoCompleteDescription.label;</html> <html class="small-margin">&autoCompleteDescription.label;</html>
<hbox autostretch="never"> <hbox autostretch="never">
<checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;" <checkbox class="small-margin" id="browserAutoCompleteEnabled" label="&autoCompleteEnabled.label;" accesskey="&autoCompleteEnabled.accesskey;"

Просмотреть файл

@ -20,7 +20,7 @@
<hbox class="box-smallheader" title="&lHeader;"/> <hbox class="box-smallheader" title="&lHeader;"/>
<groupbox orient="vertical" align="start"> <groupbox orient="vertical" align="start">
<label value="&smartTitle.label;"/> <caption label="&smartTitle.label;"/>
<checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;" <checkbox id="XPInstallEnabled" label="&enableSU.label;" accesskey="&enableSU.accesskey;"
pref="true" preftype="bool" prefstring="xpinstall.enabled" pref="true" preftype="bool" prefstring="xpinstall.enabled"
prefattribute="checked"/> prefattribute="checked"/>
@ -28,7 +28,7 @@
<!-- <!--
<groupbox orient="vertical" align="start"> <groupbox orient="vertical" align="start">
<label value="Installed Packages"/> <caption label="Installed Packages"/>
<script> <script>
<![CDATA[ <![CDATA[