Bug 1118032 - adjust UI describing color behaviour, r=jaws

This commit is contained in:
Gijs Kruitbosch 2015-01-07 12:22:31 +00:00
parent 1ea5dd30a7
commit 1a9e27d280
2 changed files with 17 additions and 10 deletions

View File

@ -80,14 +80,21 @@
</hbox>
</groupbox>
</hbox>
#ifdef XP_WIN
<vbox align="start">
<label accesskey="&allowPagesToUseColors.accesskey;"
control="useDocumentColors">&allowPagesToUseColors.label;</label>
#else
<vbox>
#endif
<label accesskey="&overridePageColors.accesskey;"
control="useDocumentColors">&overridePageColors.label;</label>
<menulist id="useDocumentColors" preference="browser.display.document_color_use">
<menupopup>
<menuitem label="&allowPagesToUseColors.automatic.label;" value="0" id="documentColorAutomatic"/>
<menuitem label="&allowPagesToUseColors.always.label;" value="1" id="documentColorAlways"/>
<menuitem label="&allowPagesToUseColors.never.label;" value="2" id="documentColorNever"/>
<menuitem label="&overridePageColors.always.label;"
value="2" id="documentColorAlways"/>
<menuitem label="&overridePageColors.auto.label;"
value="0" id="documentColorAutomatic"/>
<menuitem label="&overridePageColors.never.label;"
value="1" id="documentColorNever"/>
</menupopup>
</menulist>
</vbox>

View File

@ -6,12 +6,12 @@
<!ENTITY window.width "38em">
<!ENTITY window.macWidth "41em">
<!ENTITY allowPagesToUseColors.label "Allow pages to choose their own colors, instead of my selections above:">
<!ENTITY allowPagesToUseColors.accesskey "A">
<!ENTITY overridePageColors.label "Override the colors specified by the page with my selections above:">
<!ENTITY overridePageColors.accesskey "O">
<!ENTITY allowPagesToUseColors.automatic.label "Automatic">
<!ENTITY allowPagesToUseColors.always.label "Always">
<!ENTITY allowPagesToUseColors.never.label "Never">
<!ENTITY overridePageColors.always.label "Always">
<!ENTITY overridePageColors.auto.label "Only with High Contrast themes">
<!ENTITY overridePageColors.never.label "Never">
<!ENTITY color "Text and Background">
<!ENTITY textColor.label "Text:">