Bug 226956: </mailnews/*> files: Convert <window class="dialog"> to <dialog>

This patch removes superfluous references to dialogOverlay.* and converts the certFetchingStatus-dialog to <dialog>.
r=neil, sr=mscott
This commit is contained in:
Stefan.Borggraefe%gmx.de 2004-07-24 21:56:22 +00:00
Родитель 0319b80e0e
Коммит ed0bcbd91c
10 изменённых файлов: 7 добавлений и 107 удалений

Просмотреть файл

@ -47,7 +47,6 @@
<stringbundle id="bundle_addressBook" src="chrome://messenger/locale/addressbook/addressBook.properties"/>
</stringbundleset>
<script type="application/x-javascript" src="chrome://global/content/dialogOverlay.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCommon.js"/>
<script type="application/x-javascript" src="chrome://messenger/content/addressbook/abCardOverlay.js"/>

Просмотреть файл

@ -1,7 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/smtpEditOverlay.xul"?>
<!-- ***** BEGIN LICENSE BLOCK *****

Просмотреть файл

@ -1,82 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!-- ***** 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-1999
the Initial Developer. All Rights Reserved.
Contributor(s):
Alec Flett <alecf@netscape.com>
Alternatively, the contents of this file may be used under the terms of
either of 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 ***** -->
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/SmtpServerList.dtd">
<dialog title="&smtpListTitle.label;"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
onload="onLoad();"
ondialogaccept="return onOk();"
ondialogcancel="return onCancel();"
style="width: 30em;">
<stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
<script type="application/x-javascript" src="SmtpServerList.js"/>
<description flex="1">&smtpListDesc.label;</description>
<separator class="thin"/>
<hbox>
<listbox id="smtpList" onselect="onSelectionChange(event);" flex="1" style="height: 0px;"/>
<vbox>
<button id="addButton"
oncommand="onAdd(event);" label="&smtpListAdd.label;"
accesskey="&smtpListAdd.accesskey;"/>
<button id="editButton" disabled="true"
oncommand="onEdit(event);" label="&smtpListEdit.label;"
accesskey="&smtpListEdit.accesskey;"/>
<button id="deleteButton" disabled="true"
oncommand="onDelete(event);" label="&smtpListDelete.label;"
accesskey="&smtpListDelete.accesskey;"/>
<button id="setDefaultButton" disabled="true"
oncommand="onSetDefault(event);" label="&smtpListSetDefault.label;"
accesskey="&smtpListSetDefault.accesskey;"/>
</vbox>
</hbox>
<separator/>
</dialog>

Просмотреть файл

@ -1,7 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1

Просмотреть файл

@ -1,7 +1,6 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!-- ***** BEGIN LICENSE BLOCK *****
Version: MPL 1.1/GPL 2.0/LGPL 2.1

Просмотреть файл

@ -39,8 +39,6 @@
<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger/locale/markByDate.dtd">
<dialog

Просмотреть файл

@ -39,7 +39,6 @@
<?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/msgFolderPickerOverlay.xul"?>
<?xul-overlay href="chrome://messenger/content/searchTermOverlay.xul"?>

Просмотреть файл

@ -38,7 +38,6 @@
***** END LICENSE BLOCK ***** -->
<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE dialog [
<!ENTITY % mailViewLisDTD SYSTEM "chrome://messenger/locale/mailViewList.dtd">

Просмотреть файл

@ -112,7 +112,7 @@ function stopFetching()
catch (e) {
}
}
window.close();
return true;
}
function importCert(ber_value)

Просмотреть файл

@ -38,28 +38,18 @@
<?xml-sheet href="chrome://global/skin/" type="text/css"?>
<?xml-stylesheet href="chrome://messenger/skin/smime/certFetchingStatus.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE dialog SYSTEM "chrome://messenger-smime/locale/certFetchingStatus.dtd">
<!DOCTYPE window SYSTEM "chrome://messenger-smime/locale/certFetchingStatus.dtd">
<window id="certFetchingStatus" title="&title.label;"
class="dialog"
<dialog id="certFetchingStatus" title="&title.label;"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
style="width: 50em;"
buttons="cancel"
buttonlabelcancel="&stop.label;"
ondialogcancel="return stopFetching();"
onload="onLoad();">
<script type="application/x-javascript" src="chrome://messenger-smime/content/certFetchingStatus.js"/>
<vbox>
<description>&info.message;</description>
<separator class="thin"/>
<hbox align="center">
<button id="stopButton"
label="&stop.label;"
oncommand="stopFetching();"/>
</hbox>
</vbox>
</window>
</dialog>