Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-03 04:27:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[prefwindow] fixing regression, re-adding font scaling overlay.

Browse Source
This commit is contained in:
rgoodger%ihug.co.nz 2000-01-08 07:38:00 +00:00
parent af08de5713
commit 40ab108b09
3 changed files with 72 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xpfe/components/prefwindow/resources/content/fontScalingOverlay.xul
View File

@ -29,7 +29,7 @@ Contributor(s): ______________________________________. -->
>
<window id="fontPanel">
<html:fieldset style="height: 100%" flex="100%">
<html:fieldset style="height: 100%">
<html:legend>&fontScaling;</html:legend>
<html:div>&fontScalingIntro;</html:div>
<spring style="height: 10px;"/>

143
xpfe/components/prefwindow/resources/content/pref-fonts.xul
View File

@ -21,118 +21,93 @@
Contributor(s):
-->
<?xml-stylesheet href="chrome://pref/skin/" type="text/css"?>
<?xul-overlay href="chrome://pref/content/fontScalingOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://pref/locale/pref-fonts.dtd" >
<window xmlns:html="http://www.w3.org/TR/REC-html40"
<window id="fontPanel"
xmlns:html="http://www.w3.org/TR/REC-html40"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
class="dialog"
title="&window.title;" align="vertical"
onload="if( parent.handle ) parent.handle.onpageload( 'pref-fonts' ); else parent.queuedTag = 'pref-fonts';">
<html:script language="javascript" src="PrefsWindow.js"/>
<box class="header" align="horizontal">
<titledbutton class="left-header-text" value="&lHeader;"/>
<spring class="header-spring" flex="1"/>
<titledbutton class="right-header-text" value="&rHeader;"/>
</box>
<box class="header" align="horizontal">
<titledbutton class="left-header-text" value="&lHeader;"/>
<spring class="header-spring" flex="1"/>
<titledbutton class="right-header-text" value="&rHeader;"/>
</box>
<html:fieldset>
<html:table width="100%">
<html:tr>
<html:legend>&displayFonts;</html:legend>
<html:table width="100%">
<html:tr>
<html:td>&encod.select;</html:td>
<html:td>
&encod.select;
</html:td>
<html:td>
<html:select>
<html:option>&encod1.option;</html:option>
</html:select>
</html:td>
<html:td>
</html:td>
<html:td>
<html:select>
<html:option>&encod1.option;</html:option>
</html:select>
</html:td>
<html:td/>
<html:td/>
</html:tr>
<html:tr>
<html:tr>
<html:td>&varFont.select;</html:td>
<html:td>
&varFont.select;
<html:select id="fontVarSelect"
pref="true" preftype="string" prefstring="layout.variable_font">
<html:option value="0">Font</html:option>
<html:option value="1">Foo</html:option>
<html:option value="2">Bar</html:option>
</html:select>
</html:td>
<html:td>
<html:select id="fontVarSelect"
pref="true" preftype="string" prefstring="layout.variable_font">
<html:option value="0">Font</html:option>
<html:option value="1">Foo</html:option>
<html:option value="2">Bar</html:option>
</html:select>
</html:td>
<html:td>
&size.select;
</html:td>
<html:td>&size.select;</html:td>
<html:td>
<html:select>
<html:option>&varFont.option;</html:option>
<html:option>&varFont.option;</html:option>
</html:select>
</html:td>
</html:tr>
<html:tr>
<html:td>
&fixedFont.Select;
</html:td>
<html:td>
<html:tr>
<html:td>&fixedFont.Select;</html:td>
<html:td>
<html:select>
<html:option>&encod1.option;</html:option>
</html:select>
</html:td>
<html:td>
&size.select;
</html:td>
<html:td>&size.select;</html:td>
<html:td>
<html:select>
<html:option>&varFont.option;</html:option>
</html:select>
<html:option>&varFont.option;</html:option>
</html:select>
</html:td>
</html:tr>
</html:table>
<html:br />
<html:div>
&header2;
</html:div>
<html:div>
<html:input name="fonts" type="radio" id="browserUseDocumentFonts0"
pref="true" preftype="int" prefindex="0" prefstring="browser.use_document_fonts"/>
<html:label for="browserUseDocumentFonts0" accesskey="t" tabindex="0">
&useDefaultFont;
</html:label>
</html:div>
<html:div>
<html:input name="fonts" type="radio" id="browserUseDocumentFonts1"
pref="true" preftype="int" prefindex="1" prefstring="browser.use_document_fonts"/>
<html:label for="browserUseDocumentFonts1" accesskey="t" tabindex="0">
&useDocFontNonDynamic;
</html:label>
</html:div>
<html:div>
<html:input name="fonts" type="radio" id="browserUseDocumentFonts2"
pref="true" preftype="int" prefindex="2" prefstring="browser.use_document_fonts"/>
<html:label for="pref:2:int:browser.use_document_fonts" accesskey="t" tabindex="0">
&useDocFontDynamic;
</html:label>
</html:div>
</html:fieldset>
<!-- fonts with webpages -->
<html:fieldset>
<html:legend>&header2;</html:legend>
<html:div>
<html:input name="fonts" type="radio" id="browserUseDocumentFonts2"
pref="true" preftype="int" prefindex="2" prefstring="browser.use_document_fonts"/>
<html:label for="pref:2:int:browser.use_document_fonts" accesskey="t" tabindex="0">
&useDocFontDynamic;
</html:label>
</html:div>
<html:div>
<html:input name="fonts" type="radio" id="browserUseDocumentFonts1"
pref="true" preftype="int" prefindex="1" prefstring="browser.use_document_fonts"/>
<html:label for="browserUseDocumentFonts1" accesskey="t" tabindex="0">
&useDocFontNonDynamic;
</html:label>
</html:div>
<html:div>
<html:input name="fonts" type="radio" id="browserUseDocumentFonts0"
pref="true" preftype="int" prefindex="0" prefstring="browser.use_document_fonts"/>
<html:label for="browserUseDocumentFonts0" accesskey="t" tabindex="0">
&useDefaultFont;
</html:label>
</html:div>
</html:fieldset>
<!--

17
xpfe/components/prefwindow/resources/locale/en-US/pref-fonts.dtd
View File

@ -3,7 +3,8 @@
<!--LOCALIZATION NOTE : FILE 'Fonts' prefs dialog -->
<!ENTITY window.title "Fonts">
<!ENTITY lHeader "Fonts">
<!ENTITY rHeader "Change the fonts in your display">
<!ENTITY rHeader "Font settings for webpage display">
<!ENTITY displayFonts "Default Fonts">
<!ENTITY encod.select "For the Encoding:">
<!ENTITY encod1.option "Western">
<!ENTITY size.select "Size">
@ -15,9 +16,15 @@
<!ENTITY fixedFont.Select "Fixed Width Font">
<!--LOCALIZATION NOTE (fixedFont.option): DONT_TRANSLATE -->
<!ENTITY fixedFont.option "Filler">
<!ENTITY header2 "Sometimes a document will provide its own fonts.">
<!ENTITY useDefaultFont "Use my default fonts, overriding document-specified fonts">
<!ENTITY header2 "When a webpage chooses its own fonts">
<!ENTITY useDefaultFont "Use my default fonts, ignoring the fonts the page has chosen">
<!--LOCALIZATION NOTE (useDocFontNonDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
<!ENTITY useDocFontNonDynamic "Use document-specified fonts, but disable Dynamic Fonts">
<!ENTITY useDocFontNonDynamic "Use the fonts chosen by the page, but ignore Dynamic Fonts">
<!--LOCALIZATION NOTE (useDocFontDynamic): Translate 'Dynamic Fonts' according to Netscape Glossary -->
<!ENTITY useDocFontDynamic "Use document-specified fonts, including Dynamic Fonts">
<!ENTITY useDocFontDynamic "Use all the fonts chosen by the page, including Dynamic Fonts">
<!-- font scaling -->
<!ENTITY fontScaling "Font Scaling">
<!ENTITY fontScalingIntro "Choose a resolution at which fonts will be displayed. A larger value can improve text visibility on some computers.">
<!ENTITY defaultScaling "96">
<!ENTITY fontScalingExample "dpi. (e.g. 96dpi)">
<!ENTITY resolution "Font display resolution:">