mozilla
/
pjs
зеркало из https://github.com/mozilla/pjs.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Move the text zoom menu into its own overlay so it can be used by mail/news. Bug=64449, r=timeless,mao, a=ben

This commit is contained in:
disttsc%bart.nl 2001-01-12 10:35:49 +00:00
Родитель 5b78110bc2
Коммит b4347ac7e8
19 изменённых файлов: 612 добавлений и 362 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
xpfe/browser/jar.mn
Просмотреть файл

@ -13,8 +13,6 @@ comm.jar:
content/navigator/navigator.js (resources/content/navigator.js)
content/navigator/navigatorDD.js (resources/content/navigatorDD.js)
content/navigator/tooltip.js (resources/content/tooltip.js)
content/navigator/askViewZoom.xul (resources/content/askViewZoom.xul)
content/navigator/askViewZoom.js (resources/content/askViewZoom.js)
en-US.jar:
locale/en-US/navigator/contents.rdf (resources/locale/en-US/contents.rdf)
@ -24,4 +22,3 @@ en-US.jar:
locale/en-US/navigator/pageInfo.dtd (resources/locale/en-US/pageInfo.dtd)
locale/en-US/navigator/navigator.dtd (resources/locale/en-US/navigator.dtd)
locale/en-US/navigator/navigator.properties (resources/locale/en-US/navigator.properties)
locale/en-US/navigator/askViewZoom.dtd (resources/locale/en-US/askViewZoom.dtd)

0
xpfe/browser/resources/content/askViewZoom.js
Просмотреть файл

0
xpfe/browser/resources/content/askViewZoom.xul
Просмотреть файл

317
xpfe/browser/resources/content/navigator.js
Просмотреть файл

@ -340,6 +340,11 @@ function getWebNavigation()
}
}
function getMarkupDocumentViewer()
{
return getBrowser().markupDocumentViewer;
}
function getHomePage()
{
var url;
@ -765,318 +770,6 @@ function BrowserPrint()
_content.print();
}
function initViewMenu()
{
var viewPopup = document.getElementById("menu_View_Popup");
if (navigator.platform.indexOf("Mac") != -1) {
// only need to test once
viewPopup.removeAttribute("oncreate");
} else {
var textZoomMenu = document.getElementById("menu_TextZoom");
textZoomMenu.removeAttribute("hidden");
// next time, oncreate skips this check
viewPopup.setAttribute("oncreate", "updateTextSizeMenuLabel();");
updateTextSizeMenuLabel();
}
}
{
var zoomFactors; // array with factors
var zoomAccessKeys; // array with access keys
var zoomFactor = 100; // start value
var zoomLevel;
var zoomStep;
var zoomOther;
var zoomAnchor;
var zoomSteps = 0;
var zoomMenuLabel;
var zoomLabel;
var zoomLabelOther;
var zoomLabelOriginal;
try {
zoomMenuLabel = bundle.GetStringFromName("textZoomMenuLabel");
} catch (exception) {
zoomMenuLabel = "Text Size (%zoom% %)"; // better suggestion?
}
try {
zoomLabel = bundle.GetStringFromName("textZoomLabel");
} catch (exception) {
zoomLabel = "%zoom% %"; // better suggestion?
}
try {
zoomLabelOther = bundle.GetStringFromName("textZoomLabelOther");
} catch (exception) {
zoomLabelOther = "%zoom% % ..."; // better suggestion?
}
try {
var zoomFactorsString = bundle.GetStringFromName("textZoomValues");
var zoomAccessKeysString = bundle.GetStringFromName("textZoomAccessKeys");
var zoomStepString = bundle.GetStringFromName("textZoomStepFactor");
zoomLabelOriginal = bundle.GetStringFromName("textZoomLabelOriginal");
zoomOther = bundle.GetStringFromName("textZoomValueOther");
zoomOther = parseInt(zoomOther);
zoomStep = parseFloat(zoomStepString);
zoomFactors = zoomFactorsString.split(",");
for (var i=0; i<zoomFactors.length; i++) {
zoomFactors[i] = parseInt(zoomFactors[i]);
if (zoomFactors[i] == 100) zoomLevel = i;
}
zoomAccessKeys = zoomAccessKeysString.split(",");
if (zoomAccessKeys.length != zoomFactors.length)
throw "Different amount of text zoom access keys and text zoom values";
} catch (e) {
zoomLabelOriginal = "%zoom% % (Original size)";
zoomFactors = [ 50, 75, 90, 100, 120, 150, 200 ];
zoomAccessKeys = [ "5", "7", "9", "z", "1", "0", "2" ];
zoomOther = 300;
zoomStep = 1.5;
zoomLevel = 3;
}
zoomAnchor = zoomOther;
}
function setTextZoom() {
var markupDocumentViewer = getBrowser().markupDocumentViewer;
markupDocumentViewer.textZoom = zoomFactor / 100.0;
}
function initTextZoomMenu() {
var popup = document.getElementById("textZoomPopup");
var insertBefore = document.getElementById("textZoomInsertBefore");
if (!insertBefore || insertBefore.previousSibling.tagName != "menuseparator")
return; // nothing to be done
for (var i=0; i < zoomFactors.length; i++) {
var menuItem = document.createElement("menuitem");
menuItem.setAttribute("type", "radio");
menuItem.setAttribute("name", "textZoom");
var value;
if (zoomFactors[i] == 100) {
value = zoomLabelOriginal.replace(/%zoom%/, zoomFactors[i]);
} else {
value = zoomLabel.replace(/%zoom%/, zoomFactors[i]);
}
menuItem.setAttribute("value", value);
menuItem.setAttribute("accesskey", zoomAccessKeys[i]);
menuItem.setAttribute("oncommand","browserSetTextZoom(this.data);");
menuItem.setAttribute("data", zoomFactors[i].toString());
popup.insertBefore(menuItem, insertBefore);
}
updateTextZoomMenu();
updateTextZoomOtherMenu();
}
function isZoomLevelInRange(aZoomLevel) {
return aZoomLevel>=0 && aZoomLevel<=zoomFactors.length-1;
}
function isZoomFactorInRange(aZoomFactor) {
return aZoomFactor>=zoomFactors[0] && aZoomFactor<=zoomFactors[zoomFactors.length-1];
}
function findZoomLevel(aZoomFactor) {
var aZoomLevel = -1;
for (var i=0; i<zoomFactors.length && zoomFactors[i]<=aZoomFactor; i++) {
if (zoomFactors[i]==aZoomFactor) {
aZoomLevel = i;
}
}
return aZoomLevel;
}
function updateTextZoomMenu() {
var textZoomPopup = document.getElementById("textZoomPopup");
if (textZoomPopup) {
var item = textZoomPopup.firstChild;
var count = 0;
while (item) {
if (item.getAttribute("name")=="textZoom") {
if (count < zoomFactors.length) {
if (item.getAttribute("data") == zoomFactor) {
item.setAttribute("checked","true");
} else {
item.removeAttribute("checked");
}
} else {
if (!isZoomLevelInRange(zoomLevel)) {
item.setAttribute("checked","true");
} else {
item.removeAttribute("checked");
}
}
count++;
}
item = item.nextSibling;
}
}
}
function updateTextZoomOtherMenu() {
var textZoomOther = document.getElementById("textZoomOther");
if (textZoomOther) {
textZoomOther.setAttribute("value", zoomLabelOther.replace(/%zoom%/, zoomOther));
}
}
function updateTextSizeMenuLabel() {
var textSizeMenu = document.getElementById("menu_TextZoom");
if (textSizeMenu) {
textSizeMenu.setAttribute("value", zoomMenuLabel.replace(/%zoom%/, zoomFactor));
}
}
function setTextZoomOther() {
// open dialog and ask for new value
var o = { retvals: {zoom: zoomOther}, zoomMin: 1, zoomMax: 2000 };
window.openDialog( "chrome://navigator/content/askViewZoom.xul", "", "chrome,modal,titlebar", o);
if (o.retvals.zoomOK) {
zoomOther = o.retvals.zoom;
zoomAnchor = zoomOther;
zoomSteps = 0;
browserSetTextZoom(zoomOther);
updateTextZoomOtherMenu();
}
updateTextZoomMenu();
}
function browserSetTextZoom(aZoomFactor) {
if (aZoomFactor < 1 || aZoomFactor > 5000)
return;
zoomFactor = aZoomFactor;
if (isZoomFactorInRange(zoomFactor)) {
zoomLevel = findZoomLevel(zoomFactor);
} else {
zoomLevel = -1;
}
setTextZoom();
updateTextZoomMenu();
}
function textZoomSnap() {
zoomLevel = 0;
while (zoomFactors[zoomLevel]<zoomFactor) {
zoomLevel++;
}
if (zoomFactors[zoomLevel]!=zoomFactor) {
if ((zoomFactor-zoomFactors[zoomLevel])>(zoomFactors[zoomLevel+1]-zoomFactor)) {
zoomLevel++;
}
zoomFactor = zoomFactors[zoomLevel];
}
}
function enlargeTextZoom() {
if (isZoomLevelInRange(zoomLevel) || isZoomFactorInRange(zoomOther)) {
var insertLevel = -1;
if (isZoomFactorInRange(zoomOther)) { // add current zoom factor as step
insertLevel = 0;
while (zoomFactors[insertLevel]<zoomOther) {
insertLevel++;
}
if (zoomFactors[insertLevel] != zoomOther) {
zoomFactors.splice(insertLevel, 0, zoomOther);
if (!isZoomLevelInRange(zoomLevel)) {
zoomLevel = insertLevel;
} else if (zoomLevel >= insertLevel) {
zoomLevel++;
}
}
}
zoomLevel++;
if (zoomLevel==zoomFactors.length) {
zoomAnchor = zoomFactors[zoomFactors.length - 1];
zoomSteps = 1;
zoomFactor = Math.round(zoomAnchor * zoomStep);
zoomOther = zoomFactor;
} else {
zoomFactor = zoomFactors[zoomLevel];
}
if (insertLevel != -1) {
if (zoomLevel > insertLevel) {
zoomLevel--;
} else if (zoomLevel == insertLevel) {
zoomLevel = -1;
}
zoomFactors.splice(insertLevel, 1);
}
} else {
zoomSteps++;
zoomFactor = zoomAnchor * Math.pow(zoomStep,zoomSteps);
if (zoomFactor>5000) { // 5,000% zoom, get real
zoomSteps--;
zoomFactor = zoomAnchor * Math.pow(zoomStep,zoomSteps);
}
zoomFactor = Math.round(zoomFactor);
if (isZoomFactorInRange(zoomFactor)) {
textZoomSnap();
} else {
zoomOther = zoomFactor;
}
}
setTextZoom();
updateTextZoomMenu();
updateTextZoomOtherMenu();
}
function reduceTextZoom() {
if (isZoomLevelInRange(zoomLevel) || isZoomFactorInRange(zoomOther)) {
var insertLevel = -1;
if (isZoomFactorInRange(zoomOther)) { // add current zoom factor as step
insertLevel = 0;
while (zoomFactors[insertLevel]<zoomOther) {
insertLevel++;
}
if (zoomFactors[insertLevel] != zoomOther) {
zoomFactors.splice(insertLevel, 0, zoomOther);
if (!isZoomLevelInRange(zoomLevel)) {
zoomLevel = insertLevel;
} else if (zoomLevel >= insertLevel) {
zoomLevel++;
}
}
}
zoomLevel--;
if (zoomLevel==-1) {
zoomAnchor = zoomFactors[0];
zoomSteps = -1;
zoomFactor = Math.round(zoomAnchor / zoomStep);
zoomOther = zoomFactor;
} else {
zoomFactor = zoomFactors[zoomLevel];
}
if (insertLevel != -1) { // remove current zoom factor as step
if (zoomLevel > insertLevel) {
zoomLevel--;
} else if (zoomLevel == insertLevel) {
zoomLevel = -1;
}
zoomFactors.splice(insertLevel, 1);
}
} else {
zoomSteps--;
zoomFactor = zoomAnchor * Math.pow(zoomStep,zoomSteps);
if (zoomFactor<1) {
zoomSteps++;
zoomFactor = zoomAnchor * Math.pow(zoomStep,zoomSteps);
}
zoomFactor = Math.round(zoomFactor);
if (isZoomFactorInRange(zoomFactor)) {
textZoomSnap();
} else {
zoomOther = zoomFactor;
}
}
setTextZoom();
updateTextZoomMenu();
updateTextZoomOtherMenu();
}
function BrowserSetDefaultCharacterSet(aCharset)
{
appCore.SetDocumentCharset(aCharset);

3
xpfe/browser/resources/content/navigator.xul
Просмотреть файл

@ -72,6 +72,9 @@ Contributor(s): ______________________________________. -->
<!-- UI services -->
<script type="text/javascript" src="chrome://navigator/content/sessionHistoryUI.js"/>
<!-- hook for stringbundle overlays -->
<stringbundleset id="stringbundleset"/>
<commands id="commands">
<commandset id="globalEditMenuItems"/>
<commandset id="selectEditMenuItems"/>

24
xpfe/browser/resources/content/navigatorOverlay.xul
Просмотреть файл

@ -24,6 +24,7 @@
<?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
<?xul-overlay href="chrome://communicator/content/viewZoomOverlay.xul"?>
<?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
<?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
@ -41,6 +42,9 @@
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<!-- stringbundles, yay! -->
<stringbundleset id="stringbundleset"/>
<!-- Keysets -->
<keyset id="keyset">
<!-- File Menu -->
@ -69,11 +73,6 @@
<key id="key_viewSource" key="&pageSourceCmd.commandkey;" observes="View:PageSource" modifiers="accel"/>
<key id="key_viewInfo" key="&pageInfoCmd.commandkey;" observes="View:PageInfo" modifiers="accel"/>
<key id="key_textZoomReduce" key="&textZoomReduceCmd.commandkey;" observes="cmd_viewTextZoomReduce" modifiers="accel"/>
<key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;" observes="cmd_viewTextZoomEnlarge" modifiers="accel"/>
<key key="&textZoomEnlargeCmd.commandkey;" observes="cmd_viewTextZoomEnlarge" modifiers="accel,shift"/>
<key key="&textZoomEnlargeCmd.commandkey2;" observes="cmd_viewTextZoomEnlarge" modifiers="accel"/>
<!-- Search Menu -->
<key id="key_find" key="&findOnCmd.commandkey;" observes="Browser:Find" modifiers="accel"/>
<key id="key_findAgain" key="&findAgainCmd.commandkey;" observes="Browser:FindAgain" modifiers="accel"/>
@ -121,8 +120,6 @@
<broadcaster id="cmd_preferences"/>
<!-- View Menu -->
<broadcaster id="cmd_viewTextZoomReduce" value="&textZoomReduceCmd.label;" oncommand="reduceTextZoom();"/>
<broadcaster id="cmd_viewTextZoomEnlarge" value="&textZoomEnlargeCmd.label;" oncommand="enlargeTextZoom();"/>
<broadcaster id="cmd_viewnavbar" value="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar( 'nav-bar','cmd_viewnavbar');" checked="true"/>
<broadcaster id="cmd_viewpersonaltoolbar" value="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleToolbar('PersonalToolbar','cmd_viewpersonaltoolbar');" checked="true"/>
<broadcaster id="cmd_viewformtoolbar" value="&formbarCmd.label;" accesskey="&formbarCmd.accesskey;" class="menuitem-iconic" type="checkbox" oncommand="goToggleFormToolbar('FormToolbar','cmd_viewformtoolbar');" checked="false"/>
@ -199,7 +196,7 @@
</menu>
<menu id="menu_View" accesskey="&viewMenu.accesskey;" value="&viewMenu.label;">
<menupopup id="menu_View_Popup" oncreate="initViewMenu()">
<menupopup id="menu_View_Popup">
<menu value="&toolbarsCmd.label;" accesskey="&toolbarsCmd.accesskey;" id="view_toolbars">
<menupopup id="view_toolbars_popup">
<menuitem observes="cmd_viewnavbar" />
@ -210,15 +207,8 @@
</menu>
<menuseparator />
<menu id="menu_TextZoom" accesskey="&textZoomMenu.accesskey;" hidden="true">
<menupopup id="textZoomPopup" oncreate="initTextZoomMenu()">
<menuitem key="key_textZoomReduce" accesskey="&textZoomReduceCmd.accesskey;" observes="cmd_viewTextZoomReduce"/>
<menuitem key="key_textZoomEnlarge" accesskey="&textZoomEnlargeCmd.accesskey;" observes="cmd_viewTextZoomEnlarge"/>
<menuseparator/>
<menuseparator id="textZoomInsertBefore"/>
<menuitem id="textZoomOther" type="radio" name="textZoom" accesskey="&textZoomOtherCmd.accesskey;" oncommand="setTextZoomOther()"/>
</menupopup>
</menu>
<!-- overlayed from viewZoomOverlay.xul -->
<menu id="menu_textZoom"/>
<menu value="&useStyleSheetMenu.label;" accesskey="&useStyleSheetMenu.accesskey;" disabled="false">
<menupopup oncreate="stylesheetFillPopup(window._content.document, this, document.getElementById('authssnoopt'))">

0
xpfe/browser/resources/locale/en-US/askViewZoom.dtd
Просмотреть файл

12
xpfe/browser/resources/locale/en-US/navigator.dtd
Просмотреть файл

@ -51,18 +51,6 @@
<!ENTITY taskbarCmd.label "Taskbar">
<!ENTITY taskbarCmd.accesskey "t">
<!ENTITY textZoomEnlargeCmd.label "Larger">
<!ENTITY textZoomEnlargeCmd.accesskey "l">
<!ENTITY textZoomEnlargeCmd.commandkey "+">
<!-- + is above this key on many keyboards -->
<!ENTITY textZoomEnlargeCmd.commandkey2 "=">
<!ENTITY textZoomReduceCmd.label "Smaller">
<!ENTITY textZoomReduceCmd.accesskey "m">
<!ENTITY textZoomReduceCmd.commandkey "-">
<!-- see textZoomOtherLabel in navigator.properties -->
<!ENTITY textZoomMenu.accesskey "z">
<!ENTITY textZoomOtherCmd.accesskey "o">
<!ENTITY useStyleSheetMenu.label "Use Stylesheet">
<!ENTITY useStyleSheetMenu.accesskey "u">
<!ENTITY useStyleSheetNone.label "None">

14
xpfe/browser/resources/locale/en-US/navigator.properties
Просмотреть файл

@ -19,20 +19,6 @@ droponhomemsg_thedocument=this address
droponhomemsg2=to be your new home page?
droponhomeokbutton=Set Home Page
# navigator.js, font size submenu
#
# don't translate %zoom%
# textZoomValues must be in greater than 0, include 100 and be in natural order
# textZoomOtherValue must be greater than the largest in textZoomValues
textZoomMenuLabel=Text Size (%zoom% %)
textZoomValues=50,75,90,100,120,150,200
textZoomAccessKeys=5,7,9,z,1,0,2
textZoomStepFactor=1.5
textZoomLabel=%zoom% %
textZoomLabelOriginal=%zoom% % (Original size)
textZoomLabelOther=Other (%zoom% %) ...
textZoomValueOther=300
jserror=An error has occurred on this page. Double click here for details.
#

7
xpfe/communicator/jar.mn
Просмотреть файл

@ -19,6 +19,10 @@ comm.jar:
content/communicator/contentAreaClick.js (resources/content/contentAreaClick.js)
content/communicator/contentAreaContextOverlay.xul (resources/content/contentAreaContextOverlay.xul)
content/communicator/nsContextMenu.js (resources/content/nsContextMenu.js)
content/communicator/viewZoomOverlay.xul (resources/content/viewZoomOverlay.xul)
content/communicator/viewZoomOverlay.js (resources/content/viewZoomOverlay.js)
content/communicator/askViewZoom.xul (resources/content/askViewZoom.xul)
content/communicator/askViewZoom.js (resources/content/askViewZoom.js)
en-US.jar:
locale/en-US/communicator/contents.rdf (resources/locale/en-US/contents.rdf)
@ -28,3 +32,6 @@ en-US.jar:
locale/en-US/communicator/tasksOverlay.dtd (resources/locale/en-US/tasksOverlay.dtd)
locale/en-US/communicator/taskbarOverlay.dtd (resources/locale/en-US/taskbarOverlay.dtd)
locale/en-US/communicator/contentAreaCommands.dtd (resources/locale/en-US/contentAreaCommands.dtd)
locale/en-US/communicator/askViewZoom.dtd (resources/locale/en-US/askViewZoom.dtd)
locale/en-US/communicator/viewZoomOverlay.dtd (resources/locale/en-US/viewZoomOverlay.dtd)
locale/en-US/communicator/viewZoomOverlay.properties (resources/locale/en-US/viewZoomOverlay.properties)

75
xpfe/communicator/resources/content/askViewZoom.js Normal file
Просмотреть файл

@ -0,0 +1,75 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* 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 this file as it was released upon
* September 7, 2000.
*
* The Initial Developer of the Original Code is Peter Annema.
* Portions created by Peter Annema are Copyright (C) 2000
* Peter Annema. All Rights Reserved.
*
* Contributor(s):
* Peter Annema <disttsc@bart.nl> (Original Author)
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL"), in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your
* version of this file only under the terms of the GPL and not to
* allow others to use your version of this file under the MPL,
* indicate your decision by deleting the provisions above and
* replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient
* may use your version of this file under either the MPL or the
* GPL.
*/
var dialog;
var args;
function onLoad() {
args = window.arguments[0];
args.zoomOK = false;
dialog = {};
dialog.OKButton = document.getElementById("ok");
dialog.input = document.getElementById("zoomValue");
dialog.input.value = args.value;
dialog.input.select();
dialog.input.focus();
sizeToContent();
moveToAlertPosition();
doEnabling();
doSetOKCancel(onOK);
}
function onOK() {
var zoom = parseInt(dialog.input.value);
if (!isNaN(zoom) && zoom >= args.zoomMin && zoom <= args.zoomMax) {
args.value = zoom;
args.zoomOK = true;
}
return args.zoomOK;
}
function doEnabling() {
var enable = false;
if (dialog.input.value) {
var zoom = parseInt(dialog.input.value);
if (!isNaN(zoom) && zoom >= args.zoomMin && zoom <= args.zoomMax)
enable = true;
}
dialog.OKButton.disabled = !enable;
}

64
xpfe/communicator/resources/content/askViewZoom.xul Normal file
Просмотреть файл

@ -0,0 +1,64 @@
<?xml version="1.0"?>
<!--
- 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 this file as it was released on
- September 7, 2000.
-
- The Initial Developer of the Original Code is Peter Annema.
- Portions created by Peter Annema are Copyright (C) 2000
- Peter Annema. All Rights Reserved.
-
- Contributor(s):
- Peter Annema <disttsc@bart.nl> (Original Author)
-
- Alternatively, the contents of this file may be used under the
- terms of the GNU General Public License Version 2 or later (the
- "GPL"), in which case the provisions of the GPL are applicable
- instead of those above. If you wish to allow use of your
- version of this file only under the terms of the GPL and not to
- allow others to use your version of this file under the MPL,
- indicate your decision by deleting the provisions above and
- replace them with the notice and other provisions required by
- the GPL. If you do not delete the provisions above, a recipient
- may use your version of this file under either the MPL or the
- GPL.
-->
<?xml-stylesheet href="chrome://navigator/skin/navigator.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://communicator/locale/askViewZoom.dtd">
<window xmlns:html="http://www.w3.org/1999/xhtml"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
id="askViewZoom"
title="&askViewZoom.title;"
onload="onLoad();"
class="dialog"
align="vertical">
<script type="text/javascript" src="chrome://communicator/content/askViewZoom.js"/>
<box orient="horizontal">
<text class="label" value="&selectZoom.label;"/>
</box>
<box orient="horizontal">
<textfield id="zoomValue" oninput="doEnabling();"/>
</box>
<box id="okCancelButtons"/>
<keyset id="keyset"/>
</window>

296
xpfe/communicator/resources/content/viewZoomOverlay.js Normal file
Просмотреть файл

@ -0,0 +1,296 @@
/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
* 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 this file as it was released upon
* January 6, 2001.
*
* The Initial Developer of the Original Code is Peter Annema.
* Portions created by Peter Annema are Copyright (C) 2000
* Peter Annema. All Rights Reserved.
*
* Contributor(s):
* Peter Annema <disttsc@bart.nl> (Original Author)
* Jonas Sicking <sicking@bigfoot.com>
*
* Alternatively, the contents of this file may be used under the
* terms of the GNU General Public License Version 2 or later (the
* "GPL"), in which case the provisions of the GPL are applicable
* instead of those above. If you wish to allow use of your
* version of this file only under the terms of the GPL and not to
* allow others to use your version of this file under the MPL,
* indicate your decision by deleting the provisions above and
* replace them with the notice and other provisions required by
* the GPL. If you do not delete the provisions above, a recipient
* may use your version of this file under either the MPL or the
* GPL.
*/
/** Document Zoom Management Code
*
* To use this, you'll need to have a <menuitem id="view_textZoomMenu"/>
* and a getMarkupDocumentViewer() function which returns a
* nsIMarkupDocumentViewer.
*
**/
function ZoomManager() {
this.bundle = document.getElementById("bundle_viewZoom");
// factorAnchor starts on factorOther
this.factorOther = parseInt(this.bundle.getString("valueOther"));
this.factorAnchor = this.factorOther;
}
ZoomManager.prototype = {
instance : null,
getInstance : function() {
if (!ZoomManager.prototype.instance)
ZoomManager.prototype.instance = new ZoomManager();
return ZoomManager.prototype.instance;
},
MIN : 1,
MAX : 2000,
bundle : null,
zoomFactorsString : "", // cache
zoomFactors : null,
factorOther : 300,
factorAnchor : 300,
steps : 0,
get textZoom() {
var currentZoom = Math.round(getMarkupDocumentViewer().textZoom * 100);
if (this.indexOf(currentZoom) == -1) {
if (currentZoom != this.factorOther) {
this.factorOther = currentZoom;
this.factorAnchor = this.factorOther;
}
}
return currentZoom;
},
set textZoom(aZoom) {
if (aZoom < this.MIN || aZoom > this.MAX)
throw Components.results.NS_ERROR_INVALID_ARG;
getMarkupDocumentViewer().textZoom = aZoom / 100;
},
enlarge : function() {
this.jump(1);
},
reduce : function() {
this.jump(-1);
},
getZoomFactors : function() {
this.ensureZoomFactors();
return this.zoomFactors;
},
indexOf : function(aZoom) {
this.ensureZoomFactors();
var index = -1;
if (this.isZoomInRange(aZoom)) {
index = this.zoomFactors.length - 1;
while (index >= 0 && this.zoomFactors[index] != aZoom)
--index;
}
return index;
},
/***** internal helper functions below here *****/
ensureZoomFactors : function() {
var zoomFactorsString = this.bundle.getString("values");
if (this.zoomFactorsString != zoomFactorsString) {
this.zoomFactorsString = zoomFactorsString;
this.zoomFactors = zoomFactorsString.split(",");
for (var i = 0; i<this.zoomFactors.length; ++i)
this.zoomFactors[i] = parseInt(this.zoomFactors[i]);
}
},
isLevelInRange : function(aLevel) {
return (aLevel >= 0 && aLevel < this.zoomFactors.length);
},
isZoomInRange : function(aZoom) {
return (aZoom >= this.zoomFactors[0] && aZoom <= this.zoomFactors[this.zoomFactors.length - 1]);
},
jump : function(aDirection) {
if (aDirection != -1 && aDirection != 1)
throw Components.results.NS_ERROR_INVALID_ARG;
this.ensureZoomFactors();
var currentZoom = this.textZoom;
var insertIndex = -1;
var stepFactor = parseFloat(this.bundle.getString("stepFactor"));
// temporarily add factorOther to list
if (this.isZoomInRange(this.factorOther)) {
insertIndex = 0;
while (this.zoomFactors[insertIndex] < this.factorOther)
++insertIndex;
if (this.zoomFactors[insertIndex] != this.factorOther)
this.zoomFactors.splice(insertIndex, 0, this.factorOther);
}
var factor;
var done = false;
if (this.isZoomInRange(currentZoom)) {
var index = this.indexOf(currentZoom);
if (aDirection == -1 && index == 0 ||
aDirection == 1 && index == this.zoomFactors.length - 1) {
this.steps = 0;
this.factorAnchor = this.zoomFactors[index];
} else {
factor = this.zoomFactors[index + aDirection];
done = true;
}
}
if (!done) {
this.steps += aDirection;
factor = this.factorAnchor * Math.pow(stepFactor, this.steps);
if (factor < this.MIN || factor > this.MAX) {
this.steps -= aDirection;
factor = this.factorAnchor * Math.pow(stepFactor, this.steps);
}
factor = Math.round(factor);
if (this.isZoomInRange(factor))
factor = this.snap(factor);
else
this.factorOther = factor;
}
if (insertIndex != -1)
this.zoomFactors.splice(insertIndex, 1);
this.textZoom = factor;
},
snap : function(aZoom) {
if (this.isZoomInRange(aZoom)) {
var level = 0;
while (this.zoomFactors[level + 1] < aZoom)
++level;
// if aZoom closer to [level + 1] than [level], snap to [level + 1]
if ((this.zoomFactors[level + 1] - aZoom) < (aZoom - this.zoomFactors[level]))
++level;
aZoom = this.zoomFactors[level];
}
return aZoom;
}
}
/***** init and helper functions for viewZoomOverlay.xul *****/
window.addEventListener("load", registerZoomManager, false);
function registerZoomManager()
{
if (navigator.platform.indexOf("Mac") != -1)
return; // Macs suck ;-)
var zoom = ZoomManager.prototype.getInstance();
var textZoomMenu = document.getElementById("menu_textZoom");
if (textZoomMenu) {
textZoomMenu.removeAttribute("hidden");
var parentMenu = textZoomMenu.parentNode;
parentMenu.addEventListener("create", updateViewMenu, false);
}
var insertBefore = document.getElementById("menu_textZoomInsertBefore");
var popup = insertBefore.parentNode;
var accessKeys = zoom.bundle.getString("accessKeys").split(",");
var zoomFactors = zoom.getZoomFactors();
for (var i = 0; i < zoomFactors.length; ++i) {
var menuItem = document.createElement("menuitem");
menuItem.setAttribute("type", "radio");
menuItem.setAttribute("name", "textZoom");
var label;
if (zoomFactors[i] == 100)
label = zoom.bundle.getString("labelOriginal");
else
label = zoom.bundle.getString("label");
menuItem.setAttribute("value", label.replace(/%zoom%/, zoomFactors[i]));
menuItem.setAttribute("accesskey", accessKeys[i]);
menuItem.setAttribute("oncommand", "ZoomManager.prototype.getInstance().textZoom = this.data;");
menuItem.setAttribute("data", zoomFactors[i]);
popup.insertBefore(menuItem, insertBefore);
}
}
function updateViewMenu()
{
var zoom = ZoomManager.prototype.getInstance();
var textZoomMenu = document.getElementById("menu_textZoom");
var menuLabel = zoom.bundle.getString("menuLabel").replace(/%zoom%/, zoom.textZoom);
textZoomMenu.setAttribute("value", menuLabel);
}
function updateTextZoomMenu()
{
var zoom = ZoomManager.prototype.getInstance();
var currentZoom = zoom.textZoom;
var textZoomOther = document.getElementById("menu_textZoomOther");
var label = zoom.bundle.getString("labelOther");
textZoomOther.setAttribute("value", label.replace(/%zoom%/, zoom.factorOther));
textZoomOther.setAttribute("data", zoom.factorOther);
var popup = document.getElementById("menu_textZoomPopup");
var item = popup.firstChild;
while (item) {
if (item.getAttribute("name") == "textZoom") {
if (item.getAttribute("data") == currentZoom)
item.setAttribute("checked","true");
else
item.removeAttribute("checked");
}
item = item.nextSibling;
}
}
function setTextZoomOther()
{
var zoom = ZoomManager.prototype.getInstance();
// open dialog and ask for new value
var o = {value: zoom.factorOther, zoomMin: zoom.MIN, zoomMax: zoom.MAX};
window.openDialog("chrome://communicator/content/askViewZoom.xul", "AskViewZoom", "chrome,modal,titlebar", o);
if (o.zoomOK)
zoom.textZoom = o.value;
}

72
xpfe/communicator/resources/content/viewZoomOverlay.xul Normal file
Просмотреть файл

@ -0,0 +1,72 @@
<?xml version="1.0"?>
<!--
- 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 this file as it was released on
- January 6, 2001.
-
- The Initial Developer of the Original Code is Peter Annema.
- Portions created by Peter Annema are Copyright (C) 2000
- Peter Annema. All Rights Reserved.
-
- Contributor(s):
- Peter Annema <disttsc@bart.nl> (Original Author)
-
- Alternatively, the contents of this file may be used under the
- terms of the GNU General Public License Version 2 or later (the
- "GPL"), in which case the provisions of the GPL are applicable
- instead of those above. If you wish to allow use of your
- version of this file only under the terms of the GPL and not to
- allow others to use your version of this file under the MPL,
- indicate your decision by deleting the provisions above and
- replace them with the notice and other provisions required by
- the GPL. If you do not delete the provisions above, a recipient
- may use your version of this file under either the MPL or the
- GPL.
-->
<!DOCTYPE window SYSTEM "chrome://communicator/locale/viewZoomOverlay.dtd">
<overlay id="viewZoomOverlay"
xmlns:html="http://www.w3.org/1999/xhtml"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<script type="text/javascript" src="chrome://communicator/content/viewZoomOverlay.js"/>
<stringbundleset id="stringbundleset">
<stringbundle id="bundle_viewZoom" src="chrome://communicator/locale/viewZoomOverlay.properties"/>
</stringbundleset>
<keyset id="keyset">
<key id="key_textZoomReduce" key="&textZoomReduceCmd.commandkey;" observes="cmd_textZoomReduce" modifiers="accel"/>
<key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;" observes="cmd_textZoomEnlarge" modifiers="accel"/>
<key key="&textZoomEnlargeCmd.commandkey;" observes="cmd_textZoomEnlarge" modifiers="accel,shift"/>
<key key="&textZoomEnlargeCmd.commandkey2;" observes="cmd_textZoomEnlarge" modifiers="accel"/>
</keyset>
<broadcasterset id="broadcasterset">
<broadcaster id="cmd_textZoomReduce" oncommand="ZoomManager.prototype.getInstance().reduce();"/>
<broadcaster id="cmd_textZoomEnlarge" oncommand="ZoomManager.prototype.getInstance().enlarge();"/>
</broadcasterset>
<menu id="menu_textZoom" accesskey="&textZoomMenu.accesskey;" hidden="true">
<menupopup id="menu_textZoomPopup" oncreate="updateTextZoomMenu();">
<menuitem key="key_textZoomReduce" value="&textZoomReduceCmd.label;" accesskey="&textZoomReduceCmd.accesskey;" observes="cmd_textZoomReduce"/>
<menuitem key="key_textZoomEnlarge" value="&textZoomEnlargeCmd.label;" accesskey="&textZoomEnlargeCmd.accesskey;" observes="cmd_textZoomEnlarge"/>
<menuseparator/>
<menuseparator id="menu_textZoomInsertBefore"/>
<menuitem id="menu_textZoomOther" type="radio" name="textZoom" accesskey="&textZoomOtherCmd.accesskey;" oncommand="setTextZoomOther();"/>
</menupopup>
</menu>
</overlay>

37
xpfe/communicator/resources/locale/en-US/askViewZoom.dtd Normal file
Просмотреть файл

@ -0,0 +1,37 @@
<!--
- 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 this file as it was released on
- September 7, 2000.
-
- The Initial Developer of the Original Code is Peter Annema.
- Portions created by Peter Annema are Copyright (C) 2000
- Peter Annema. All Rights Reserved.
-
- Contributor(s):
- Peter Annema <disttsc@bart.nl> (Original Author)
-
- Alternatively, the contents of this file may be used under the
- terms of the GNU General Public License Version 2 or later (the
- "GPL"), in which case the provisions of the GPL are applicable
- instead of those above. If you wish to allow use of your
- version of this file only under the terms of the GPL and not to
- allow others to use your version of this file under the MPL,
- indicate your decision by deleting the provisions above and
- replace them with the notice and other provisions required by
- the GPL. If you do not delete the provisions above, a recipient
- may use your version of this file under either the MPL or the
- GPL.
-->
<!-- hopefully this will become view zoom, not just text zoom -->
<!ENTITY askViewZoom.title "Text Zoom">
<!ENTITY selectZoom.label "Select text zoom (&#37;):">

12
xpfe/communicator/resources/locale/en-US/viewZoomOverlay.dtd Normal file
Просмотреть файл

@ -0,0 +1,12 @@
<!ENTITY textZoomEnlargeCmd.label "Larger">
<!ENTITY textZoomEnlargeCmd.accesskey "l">
<!ENTITY textZoomEnlargeCmd.commandkey "+">
<!ENTITY textZoomEnlargeCmd.commandkey2 "="> <!-- + is above this key on many keyboards -->
<!ENTITY textZoomReduceCmd.label "Smaller">
<!ENTITY textZoomReduceCmd.accesskey "m">
<!ENTITY textZoomReduceCmd.commandkey "-">
<!-- see textZoomOtherLabel in navigator.properties -->
<!ENTITY textZoomMenu.accesskey "z">
<!ENTITY textZoomOtherCmd.accesskey "o">

25
xpfe/communicator/resources/locale/en-US/viewZoomOverlay.properties Normal file
Просмотреть файл

@ -0,0 +1,25 @@
# font size submenu
#
# don't translate %zoom%
menuLabel=Text Size (%zoom% %)
label=%zoom% %
labelOriginal=%zoom% % (Original size)
labelOther=Other (%zoom% %) ...
# {values} must be greater than 0, include 100 and be in natural order
# {accessKeys} correspond to {values}, where "z" matches the z in
# "Original size" in {labelOriginal}
values=50,75,90,100,120,150,200
accessKeys=5,7,9,z,1,0,2
# {valueOther} must be greater than the largest in values
valueOther=300
# {stepFactor} is the factor with which the zoom changes when you're
# below the lowest or above the highest value in {values}
stepFactor=1.5

2
xpfe/global/resources/content/stringbundleBindings.xml
Просмотреть файл

@ -4,6 +4,8 @@
xmlns="http://www.mozilla.org/xbl"
xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
<binding id="stringbundleset" extends="xul:box"/>
<binding id="stringbundle" extends="xul:spring">
<implementation name="XStringBundle">

7
xpfe/global/resources/content/xul.css
Просмотреть файл

@ -651,5 +651,8 @@ stringbundle
visibility : collapse;
}
stringbundleset
{
-moz-binding : url("chrome://global/content/stringbundleBindings.xml#stringbundleset");
visibility : collapse;
}