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

Bug 252698 Use buttonlabel attributes in <dialog>s 

p=me r=neil.parkwaycc.co.uk sr=dveditz
This commit is contained in:
bugzilla%arlen.demon.co.uk 2005-02-21 00:57:10 +00:00
Родитель 52f88824ca
Коммит 94c34950ba
9 изменённых файлов: 23 добавлений и 349 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

120
extensions/cookie/resources/content/p3pDialog.xul
Просмотреть файл

@ -1,120 +0,0 @@
<?xml version="1.0"?>
<!--
- Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
- ***** 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.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2001
- 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 ***** -->
<!-- CHANGE THIS WHEN MOVING FILES -->
<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
<!-- CHANGE THIS WHEN MOVING FILES -->
<!DOCTYPE dialog SYSTEM "chrome://cookie/locale/p3p.dtd">
<dialog id="p3pDialog"
buttons="accept,cancel,extra1,extra2,help"
buttonalign="center"
acceptLabel="&p3pDialogOff.label;"
cancelLabel="&p3pDialogClose.label;"
extra1Label="&p3pDialogViewCookies.label;"
extra2Label="&p3pDialogViewLevels.label;"
title="&p3pDialogTitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="init();"
ondialogaccept="return P3POff();"
ondialogextra1="ViewCookieManager();"
ondialogextra2="ViewPrivacyLevels();"
ondialoghelp="return doHelpButton();"
style="width: 45em;">
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js" />
<script type="application/x-javascript">
<![CDATA[
function init()
{
window.arguments[0].gButtonPressed = "";
// label the buttons
var dialog = document.documentElement;
dialog.getButton("accept").label = dialog.getAttribute("acceptLabel");
dialog.getButton("cancel").label = dialog.getAttribute("cancelLabel");
dialog.getButton("extra1").label = dialog.getAttribute("extra1Label");
dialog.getButton("extra2").label = dialog.getAttribute("extra2Label");
// focus on the cancel button
dialog.getButton("cancel").focus();
}
function ViewCookieManager() {
window.arguments[0].gButtonPressed = "cookie";
window.close();
}
function ViewPrivacyLevels() {
window.arguments[0].gButtonPressed = "p3p";
window.close();
}
function P3POff() {
var pref = Components.classes['@mozilla.org/preferences-service;1'];
pref = pref.getService();
pref = pref.QueryInterface(Components.interfaces.nsIPrefBranch);
pref.setIntPref("network.cookie.cookieBehavior", 0);
return true;
}
function doHelpButton()
{
openHelp('cookie_notify');
}
]]>
</script>
<description>&p3pDialogMessage1.label;</description>
<separator class="thin"/>
<box>
<spacer flex="1"/>
<image src="chrome://communicator/skin/cookie/status-cookie.gif"/>
<spacer flex="1"/>
</box>
<separator class="thin"/>
<description>&p3pDialogMessage2.label;</description>
</dialog>

18
extensions/wallet/walletpreview/resources/content/WalletPreview.xul
Просмотреть файл

@ -43,11 +43,15 @@
<dialog title="&windowtitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
buttons="accept,cancel,help"
spacerflex="1"
buttons="accept,cancel,extra2,help"
buttonlabelextra2="&viewdata.label;"
buttonaccesskeyextra2="&viewdata.accesskey;"
ondialogextra2="formShow();"
ondialogaccept="return Save();"
ondialogcancel="return Cancel();"
ondialoghelp="return doHelpButton();"
onload="Startup()">
onload="Startup();">
<script type="application/x-javascript" src="chrome://global/content/strres.js" />
<script type="application/x-javascript" src="chrome://communicator/content/wallet/WalletPreview.js"/>
@ -71,14 +75,4 @@
<hbox>
<checkbox id="checkbox" label="&bypass.label;"/>
</hbox>
<hbox>
<button class="dialog-button"
label="&viewdata.label;"
oncommand="formShow();"/>
<spacer flex="1"/>
<button dlgtype="accept" class="dialog-button"/>
<button dlgtype="cancel" class="dialog-button"/>
<button dlgtype="help" class="dialog-button"/>
</hbox>
</dialog>

1
extensions/wallet/walletpreview/resources/locale/en-US/WalletPreview.dtd
Просмотреть файл

@ -1,4 +1,5 @@
<!ENTITY windowtitle.label "Prefill Form Data">
<!ENTITY heading.label "Check the items that you would like to have prefilled">
<!ENTITY viewdata.label "View Stored Form Data">
<!ENTITY viewdata.accesskey "V">
<!ENTITY bypass.label "Bypass this screen when prefilling this form in the future">

12
xpfe/communicator/resources/content/aboutPopups.xul
Просмотреть файл

@ -45,7 +45,10 @@
]>
<dialog id="aboutPopups"
buttonpack="center"
buttons="accept,cancel,help"
buttonlabelaccept="&acceptButton.label;"
buttonlabelcancel="&cancelButton.label;"
title="&windowtitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 30em;"
@ -88,8 +91,6 @@
]]>
</script>
<keyset id="dialogKeys"/>
<description id="popupDesc">&popupDesc.label;</description>
<description id="popupDescAlt">&popupDescAlt.label;</description>
<vbox align="center">
@ -98,11 +99,4 @@
<description>&popupNote1.label;</description>
<separator class="thin"/>
<description>&popupNote2.label;</description>
<spacer flex="1"/>
<hbox class="dialog-button-box" pack="center">
<button dlgtype="accept" label="&acceptButton.label;"/>
<button dlgtype="cancel" label="&cancelButton.label;"/>
<button dlgtype="help"/>
</hbox>
</dialog>

12
xpfe/components/permissions/content/aboutPopups.xul
Просмотреть файл

@ -45,7 +45,10 @@
]>
<dialog id="aboutPopups"
buttonpack="center"
buttons="accept,cancel,help"
buttonlabelaccept="&acceptButton.label;"
buttonlabelcancel="&cancelButton.label;"
title="&windowtitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 30em;"
@ -88,8 +91,6 @@
]]>
</script>
<keyset id="dialogKeys"/>
<description id="popupDesc">&popupDesc.label;</description>
<description id="popupDescAlt">&popupDescAlt.label;</description>
<vbox align="center">
@ -98,11 +99,4 @@
<description>&popupNote1.label;</description>
<separator class="thin"/>
<description>&popupNote2.label;</description>
<spacer flex="1"/>
<hbox class="dialog-button-box" pack="center">
<button dlgtype="accept" label="&acceptButton.label;"/>
<button dlgtype="cancel" label="&cancelButton.label;"/>
<button dlgtype="help"/>
</hbox>
</dialog>

17
xpfe/components/permissions/content/cookieP3PDialog.xul
Просмотреть файл

@ -47,10 +47,10 @@
<dialog id="p3pDialog"
buttons="accept,cancel,extra1,extra2,help"
buttonalign="center"
acceptLabel="&p3pDialogOff.label;"
cancelLabel="&p3pDialogClose.label;"
extra1Label="&p3pDialogViewCookies.label;"
extra2Label="&p3pDialogViewLevels.label;"
buttonlabelaccept="&p3pDialogOff.label;"
buttonlabelcancel="&p3pDialogClose.label;"
buttonlabelextra1="&p3pDialogViewCookies.label;"
buttonlabelextra2="&p3pDialogViewLevels.label;"
title="&p3pDialogTitle.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="init();"
@ -68,15 +68,8 @@
{
window.arguments[0].gButtonPressed = "";
// label the buttons
var dialog = document.documentElement;
dialog.getButton("accept").label = dialog.getAttribute("acceptLabel");
dialog.getButton("cancel").label = dialog.getAttribute("cancelLabel");
dialog.getButton("extra1").label = dialog.getAttribute("extra1Label");
dialog.getButton("extra2").label = dialog.getAttribute("extra2Label");
// focus on the cancel button
dialog.getButton("cancel").focus();
document.documentElement.getButton("cancel").focus();
}
function ViewCookieManager() {

15
xpfe/components/sidebar/resources/customize.xul
Просмотреть файл

@ -56,6 +56,11 @@
windowtype="sidebar:customize"
height="400"
persist="screenX screenY width height"
buttons="accept,cancel,extra2"
spacerflex="1"
buttonlabelextra2="&sidebar.more.label;"
buttonaccesskeyextra2="&sidebar.more.accesskey;"
ondialogextra2="BrowseMorePanels();"
ondialogaccept="return Save();">
<script type="application/x-javascript"
@ -161,15 +166,5 @@
</hbox>
<separator/>
<hbox>
<button id="more-panels-link" label="&sidebar.more.label;"
accesskey="&sidebar.more.accesskey;" oncommand="BrowseMorePanels()"/>
<spacer flex="1"/>
<button dlgtype="accept"/>
<button dlgtype="cancel"/>
</hbox>
</dialog>

83
xpfe/global/resources/content/fontpackage.js
Просмотреть файл

@ -1,83 +0,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.org code.
*
* The Initial Developer of the Original Code is
* Netscape Communications Corporation.
* Portions created by the Initial Developer are Copyright (C) 2003
* the Initial Developer. All Rights Reserved.
*
* Contributor(s):
* Frank Yung-Fong Tang <ftang@netscape.com>
* Simon Montagu <smontagu@netscape.com>
* Seth Spitzer <sspitzer@netscape.com>
*
* 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 gLangCode;
function onLoad()
{
var size = document.getElementById("size");
var downloadButton = document.getElementById("downloadButton");
var install = document.getElementById("install");
var fontPackageBundle = document.getElementById("fontPackageBundle");
// test if win2k (win nt 5.0) or winxp (win nt 5.1)
if (navigator.userAgent.toLowerCase().indexOf("windows nt 5") != -1)
{
downloadButton.setAttribute("hidden", "true");
size.setAttribute("hidden", "true");
// if no download button
// set title to "Install Font"
// and set cancel button to "OK"
document.title = fontPackageBundle.getString("windowTitleNoDownload");
var cancelButton = document.getElementById("cancelButton");
cancelButton.setAttribute("label", fontPackageBundle.getString("cancelButtonNoDownload"));
}
else
{
install.setAttribute("hidden", "true");
}
// argument is a lang code of the form xx or xx-yy
gLangCode = window.arguments[0];
var titleString = fontPackageBundle.getString("name_" + gLangCode);
var languageTitle = document.getElementById("languageTitle");
languageTitle.setAttribute("value", titleString);
var sizeString = fontPackageBundle.getString("size_" + gLangCode);
var sizeSpecification = document.getElementById("sizeSpecification");
sizeSpecification.setAttribute("value", sizeString);
}
function download()
{
window.open("http://www.mozilla.org/projects/intl/fonts/win/redirect/package_" + gLangCode + ".html");
}

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

@ -1,94 +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 Netscape are
- Copyright (C) 1998-2003 Netscape Communications Corporation. All
- Rights Reserved.
-
- Contributor(s):
- Frank Yung-Fong Tang <ftang@netscape.com>
- Simon Montagu <smontagu@netscape.com>
- Seth Spitzer <sspitzer@netscape.com>
-
- 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 LGPL or the GPL. 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://global/locale/fontpackage.dtd">
<dialog title="&window.title;"
id="downloadFontDialog"
buttons="accept,cancel"
ondialogaccept="download();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="onLoad();">
<stringbundle id="fontPackageBundle"
src="chrome://global/locale/fontpackage.properties"/>
<script type="application/x-javascript"
src="chrome://global/content/fontpackage.js"/>
<hbox>
<hbox align="start">
<image class="message-icon"/>
</hbox>
<separator orient="vertical" class="thin"/>
<vbox>
<description>&info.label;</description>
<separator orient="horizontal"/>
<description id="languageTitle"/>
<separator orient="horizontal"/>
<hbox id="size">
<description value="&size.label;"/>
<description id="sizeSpecification"/>
</hbox>
<description id="install" value="&install;"/>
<separator orient="horizontal"/>
<hbox>
<spacer flex="1"/>
<button dlgtype="accept" default="true"
label="&downloadButton.label;"
id="downloadButton"/>
<button dlgtype="cancel"
label="&cancelButton.label;"
id="cancelButton"/>
<spacer flex="1"/>
</hbox>
</vbox>
</hbox>
</dialog>