зеркало из https://github.com/mozilla/gecko-dev.git
Remove supporting code for UI for DPI preference. b=326329 r=mconnor
This commit is contained in:
dbaron%dbaron.org
Родитель
f2f00feb16
Коммит
b90fd9bfa4
|
|
@ -1,6 +0,0 @@
|
|||
<!-- screen calibration dialog -->
|
||||
<!ENTITY calibrateDialog.title "Calibrate Resolution">
|
||||
<!ENTITY calibrate.instructions "The length of the line above is:">
|
||||
<!ENTITY units.inches "inches">
|
||||
<!ENTITY units.centimetres "centimeters">
|
||||
|
||||
|
|
@ -79,7 +79,6 @@
|
|||
locale/@AB_CD@/mozapps/plugins/plugins.dtd (%chrome/mozapps/plugins/plugins.dtd)
|
||||
locale/@AB_CD@/mozapps/plugins/plugins.properties (%chrome/mozapps/plugins/plugins.properties)
|
||||
locale/@AB_CD@/mozapps/preferences/ocsp.dtd (%chrome/mozapps/preferences/ocsp.dtd)
|
||||
locale/@AB_CD@/mozapps/preferences/fontscaling.dtd (%chrome/mozapps/preferences/fontscaling.dtd)
|
||||
locale/@AB_CD@/mozapps/preferences/changemp.dtd (%chrome/mozapps/preferences/changemp.dtd)
|
||||
locale/@AB_CD@/mozapps/preferences/removemp.dtd (%chrome/mozapps/preferences/removemp.dtd)
|
||||
locale/@AB_CD@/mozapps/preferences/preferences.properties (%chrome/mozapps/preferences/preferences.properties)
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@ toolkit.jar:
|
|||
* content/mozapps/preferences/ocsp.js (preferences/ocsp.js)
|
||||
* content/mozapps/preferences/ocsp.xul (preferences/ocsp.xul)
|
||||
* content/mozapps/preferences/fontbuilder.js (preferences/fontbuilder.js)
|
||||
* content/mozapps/preferences/fontscaling.js (preferences/fontscaling.js)
|
||||
* content/mozapps/preferences/fontscaling.xul (preferences/fontscaling.xul)
|
||||
* content/mozapps/preferences/changemp.js (preferences/changemp.js)
|
||||
* content/mozapps/preferences/changemp.xul (preferences/changemp.xul)
|
||||
* content/mozapps/preferences/removemp.js (preferences/removemp.js)
|
||||
|
|
|
|||
|
|
@ -1,74 +0,0 @@
|
|||
# -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is the Firefox Preferences System.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Ben Goodger.
|
||||
# Portions created by the Initial Developer are Copyright (C) 2005
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
# Gervase Markham <gerv@gerv.net> (Logic)
|
||||
# Ben Goodger <ben@mozilla.org>
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
var gFontScalingDialog = {
|
||||
init: function ()
|
||||
{
|
||||
sizeToContent();
|
||||
},
|
||||
|
||||
onAccept: function ()
|
||||
{
|
||||
// Get value from the dialog to work out dpi
|
||||
var horizSize = parseFloat(document.getElementById("horizSize").value);
|
||||
var units = document.getElementById("units").value;
|
||||
|
||||
if (!horizSize || horizSize < 0) {
|
||||
// We can't calculate anything without a proper value
|
||||
window.arguments[0].newdpi = -1;
|
||||
return true;
|
||||
}
|
||||
|
||||
// Convert centimetres to inches.
|
||||
// The magic number is allowed because it's a fundamental constant :-)
|
||||
if (units == "centimetres")
|
||||
horizSize /= 2.54;
|
||||
|
||||
// These shouldn't change, but you can't be too careful.
|
||||
var horizBarLengthPx = document.getElementById("horizRuler").boxObject.width;
|
||||
var horizDPI = parseInt(horizBarLengthPx) / horizSize;
|
||||
|
||||
// Average the two <shrug>.
|
||||
window.arguments[0].newdpi = Math.round(horizDPI);
|
||||
dump("*** intergoat = " + window.arguments[0].toSource() + "\n");
|
||||
|
||||
return true;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -1,72 +0,0 @@
|
|||
<?xml version="1.0"?>
|
||||
# ***** BEGIN LICENSE BLOCK *****
|
||||
# Version: MPL 1.1/GPL 2.0/LGPL 2.1
|
||||
#
|
||||
# The contents of this file are subject to the Mozilla Public License Version
|
||||
# 1.1 (the "License"); you may not use this file except in compliance with
|
||||
# the License. You may obtain a copy of the License at
|
||||
# http://www.mozilla.org/MPL/
|
||||
#
|
||||
# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
# for the specific language governing rights and limitations under the
|
||||
# License.
|
||||
#
|
||||
# The Original Code is Mozilla Communicator client code, released
|
||||
# March 31, 1998.
|
||||
#
|
||||
# The Initial Developer of the Original Code is
|
||||
# Netscape Communications Corporation.
|
||||
# Portions created by the Initial Developer are Copyright (C) 1998-2000
|
||||
# the Initial Developer. All Rights Reserved.
|
||||
#
|
||||
# Contributor(s):
|
||||
#
|
||||
# Alternatively, the contents of this file may be used under the terms of
|
||||
# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
# of those above. If you wish to allow use of your version of this file only
|
||||
# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
# use your version of this file under the terms of the MPL, indicate your
|
||||
# decision by deleting the provisions above and replace them with the notice
|
||||
# and other provisions required by the GPL or the LGPL. If you do not delete
|
||||
# the provisions above, a recipient may use your version of this file under
|
||||
# the terms of any one of the MPL, the GPL or the LGPL.
|
||||
#
|
||||
# ***** END LICENSE BLOCK *****
|
||||
|
||||
<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
|
||||
|
||||
<!DOCTYPE dialog SYSTEM "chrome://mozapps/locale/preferences/fontscaling.dtd" >
|
||||
|
||||
<dialog id="FontScalingDialog"
|
||||
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
|
||||
title="&calibrateDialog.title;"
|
||||
onload="gFontScalingDialog.init();"
|
||||
ondialogaccept="gFontScalingDialog.onAccept();">
|
||||
|
||||
<script type="application/x-javascript" src="chrome://mozapps/content/preferences/fontscaling.js"/>
|
||||
|
||||
<vbox id="horizRuler" width="300" height="30" style="margin: 10px; margin-bottom: 0px">
|
||||
<hbox height="10px" style="border-bottom: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
|
||||
<hbox height="10px" style="border-top: 1px solid black; border-left: 1px solid black; border-right: 1px solid black;"/>
|
||||
</vbox>
|
||||
|
||||
<vbox align="center">
|
||||
<description control="horizSize">&calibrate.instructions;</description>
|
||||
<separator class="thin"/>
|
||||
<hbox align="center">
|
||||
<textbox id="horizSize" size="5"/>
|
||||
<menulist id="units" persist="value">
|
||||
<menupopup>
|
||||
<menuitem value="inches" label="&units.inches;"/>
|
||||
<menuitem value="centimetres" label="&units.centimetres;"/>
|
||||
</menupopup>
|
||||
</menulist>
|
||||
</hbox>
|
||||
</vbox>
|
||||
|
||||
<separator/>
|
||||
|
||||
</dialog>
|
||||
Загрузка…
Ссылка в новой задаче