зеркало из https://github.com/mozilla/gecko-dev.git
Bug 97571: Any <label> in <groupbox> becomes <caption> per XUL 1.0. r=ben, sr=hyatt
This commit is contained in:
Родитель
c22f9a60cf
Коммит
6c67a322c8
|
@ -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"/>
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -43,7 +43,7 @@
|
|||
<hbox class="box-smallheader" title="&lHeader;"/>
|
||||
|
||||
<groupbox orient="vertical">
|
||||
<label value="&cacheTitle.label;"/>
|
||||
<caption label="&cacheTitle.label;"/>
|
||||
|
||||
<html>&cachePara;</html>
|
||||
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"/>
|
||||
|
||||
|
|
|
@ -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"/>
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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">
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -96,7 +96,7 @@
|
|||
]]></script>
|
||||
|
||||
<groupbox>
|
||||
<label value="&autoCompleteAdvanced.title;"/>
|
||||
<caption label="&autoCompleteAdvanced.title;"/>
|
||||
<vbox>
|
||||
<checkbox id="cbxAutoFill" label="&autoCompleteAutoFill.label;"
|
||||
oncommand="updateImage('AutoFill')"/>
|
||||
|
|
|
@ -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;"
|
||||
|
|
|
@ -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[
|
||||
|
|
Загрузка…
Ссылка в новой задаче