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

fix for #197225, remove an unused xul/dtd (custreceipt.*) 

r=neil, sr=sspitzer.  thanks to Sebastian@SSpaeth.de for the fix.

fix for bug #195287,
Add a help button to the envelope that brings up the junk intro dialog
r/sr=bienvenu, a=jglick
This commit is contained in:
sspitzer%netscape.com 2003-03-16 21:49:40 +00:00
Родитель 09d3d85e3e
Коммит 60489ee74b
10 изменённых файлов: 93 добавлений и 96 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
mailnews/base/prefs/resources/content/MANIFEST
Просмотреть файл

@ -46,7 +46,6 @@ pref-mailnews.xul
pref-mailnews.js
pref-receipts.xul
pref-viewing_messages.xul
custreceipt.xul
AccountWizard.xul
AccountWizard.js
aw-wizardAdapter.js

55
mailnews/base/prefs/resources/content/custreceipt.xul
Просмотреть файл

@ -1,55 +0,0 @@
<?xml version="1.0"?>
<?xml-stylesheet href="chrome://messenger/skin/dialogs.css" type="text/css"?>
<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
<!DOCTYPE window SYSTEM "chrome://messenger/locale/custreceipt.dtd">
<window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&window.title;"
class="dialog">
<vbox style="width:100%">
<hbox style="width:100%">
<spacer flex="1"/>
<label value="&notInToCc.label;" accesskey="&notInToCc.accesskey;" control="NotInToCc"/>
<menulist id="NotInToCc" prefstring="mail.mdn.report.not_in_to_cc">
<menupopup>
<menuitem value="0" label="&neverSend.label;"/>
<menuitem value="1" label="&automatically.label;"/>
<menuitem value="2" label="&askMe.label;"/>
</menupopup>
</menulist>
</hbox>
<hbox style="width:100%">
<spacer flex="1"/>
<label value="&outside.label;" accesskey="&outside.accesskey;" control="OutsideDomain"/>
<menulist id="OutsideDomain" prefstring="mail.mdn.report.outside_domain">
<menupopup>
<menuitem value="0" label="&neverSend.label;"/>
<menuitem value="1" label="&automatically.label;"/>
<menuitem value="2" label="&askMe.label;"/>
</menupopup>
</menulist>
</hbox>
<hbox style="width:100%">
<spacer flex="1"/>
<label value="&other.label;" accesskey="&other.accesskey;" for="Other"/>
<menulist id="Other" prefstring="mail.mdn.report.other">
<menupopup>
<menuitem value="0" label="&neverSend.label;"/>
<menuitem value="1" label="&automatically.label;"/>
<menuitem value="2" label="&askMe.label;"/>
</menupopup>
</menulist>
</hbox>
</vbox>
<spacer style="height:1em"/>
<hbox id="okCancelButtons"/>
</window>

1
mailnews/base/prefs/resources/locale/en-US/MANIFEST
Просмотреть файл

@ -20,7 +20,6 @@
# This is a list of local files which get copied to the res\mailnews\messenger directory
#
custreceipt.dtd
pref-diskspace.dtd
pref-mailnews.dtd
pref-receipts.dtd

37
mailnews/base/prefs/resources/locale/en-US/custreceipt.dtd
Просмотреть файл

@ -1,37 +0,0 @@
<!--
The contents of this file are subject to the Netscape 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/NPL/
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-1999 Netscape Communications Corporation. All
Rights Reserved.
-->
<!ENTITY window.title "Customize Return Receipts">
<!ENTITY pane.title "Customize Return Receipts">
<!-- LOCALIZATION NOTE (sendReceipt.label) : Do not translate "MDN" in below line -->
<!ENTITY sendReceipt.label "When I receive a message and its sender requested a receipt(MDN), send one in the following cases:">
<!ENTITY notInToCc.label "If I'm not in the To or Cc list of the message (as for a message to a mailing list):">
<!ENTITY neverSend.label "Never Send">
<!ENTITY automatically.label "Automatically">
<!ENTITY askMe.label "Ask Me">
<!ENTITY outside.label "If the message comes from outside the domain:">
<!ENTITY other.label "In all other cases:">
<!ENTITY ok.label "Ok">
<!ENTITY cancel.label "Cancel">
<!ENTITY notInToCc.accesskey "t">
<!ENTITY outside.accesskey "o">
<!ENTITY other.accesskey "a">

72
mailnews/base/resources/content/junkMailInfo.xul Normal file
Просмотреть файл

@ -0,0 +1,72 @@
<?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.org code.
-
- The Initial Developer of the Original Code is
- Netscape Communications Corp.
- Portions created by the Initial Developer are Copyright (C) 2002
- the Initial Developer. All Rights Reserved.
-
- Contributor(s):
- 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 ***** -->
<!DOCTYPE window [
<!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
%brandDTD;
<!ENTITY % junkMailInfoDTD SYSTEM "chrome://messenger/locale/junkMailInfo.dtd" >
%junkMailInfoDTD;
]>
<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
<dialog id="junkMailInfo"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
title="&window.title;"
windowtype="mailnews:junkmailinfo"
buttons="accept,help"
width="&window.width;"
height="&window.height;"
ondialogaccept="return window.close()"
ondialoghelp="openHelp('mail-junk-controls'); return window.close();">
<script type="application/x-javascript" src="chrome://help/content/contextHelp.js"/>
<vbox flex="1">
<spacer/>
<description>&info1.label;</description>
<spacer/>
<description>&info2.label;</description>
<spacer/>
<description>&info3.label;</description>
<spacer/>
<description>&info4.label;</description>
<spacer/>
</vbox>
</dialog>

10
mailnews/base/resources/content/mailWindowOverlay.js
Просмотреть файл

@ -1992,6 +1992,16 @@ function MsgJunkMail()
OpenOrFocusWindow(args, "mailnews:junk", "chrome://messenger/content/junkMail.xul");
}
function MsgJunkMailInfo()
{
var desiredWindow = GetWindowByWindowType("mailnews:junkmailinfo");
if (desiredWindow)
desiredWindow.focus();
else
window.openDialog("chrome://messenger/content/junkMailInfo.xul", "mailnews:junkmailinfo", "centerscreen,resizeable=no,titlebar,chrome", null);
}
function MsgSearchAddresses()
{
var args = { directory: null };

1
mailnews/base/resources/content/mailWindowOverlay.xul
Просмотреть файл

@ -1699,6 +1699,7 @@ Rights Reserved.
<label id="junkBarMessage" value="&junkBarMessage.label;"/>
</hbox>
<spacer flex="1"/>
<button label="&junkInfoButton.label;" oncommand="MsgJunkMailInfo()" />
<button label="&notJunkButton.label;" oncommand="JunkSelectedMessages(false)" />
</hbox>

7
mailnews/base/resources/locale/en-US/junkMailInfo.dtd Normal file
Просмотреть файл

@ -0,0 +1,7 @@
<!ENTITY window.title "Junk Mail">
<!ENTITY window.width "450">
<!ENTITY window.height "200">
<!ENTITY info1.label "&brandShortName; can analyze your incoming messages and identify those which are likely to be junk mail.">
<!ENTITY info2.label "You can train &brandShortName; to more accurately analyze incoming messages by using the junk toolbar button to mark messages as junk or not junk.">
<!ENTITY info3.label "Once &brandShortName; is correctly identifying your messages, incoming junk mail can automatically be moved to the Junk folder by going to the Tools menu and choosing Junk Mail Controls.">
<!ENTITY info4.label "For more information about Junk Mail Controls, click the Help button.">

1
mailnews/base/resources/locale/en-US/messenger.dtd
Просмотреть файл

@ -529,4 +529,5 @@ Rights Reserved.
<!-- junk bar -->
<!ENTITY junkBarMessage.label "&brandShortName; thinks this message is junk mail">
<!ENTITY notJunkButton.label "This is Not Junk">
<!ENTITY junkInfoButton.label "Help">

4
mailnews/jar.mn
Просмотреть файл

@ -70,7 +70,6 @@ messenger.jar:
content/messenger/pref-viewing_messages.xul (base/prefs/resources/content/pref-viewing_messages.xul)
content/messenger/pref-receipts.xul (base/prefs/resources/content/pref-receipts.xul)
content/messenger/pref-receipts.js (base/prefs/resources/content/pref-receipts.js)
content/messenger/custreceipt.xul (base/prefs/resources/content/custreceipt.xul)
content/messenger/AccountWizard.xul (base/prefs/resources/content/AccountWizard.xul)
content/messenger/AccountWizard.js (base/prefs/resources/content/AccountWizard.js)
content/messenger/aw-wizardAdapter.js (base/prefs/resources/content/aw-wizardAdapter.js)
@ -151,6 +150,7 @@ messenger.jar:
content/messenger/platformMailOverlay.xul (base/resources/content/win/platformMailOverlay.xul)
content/messenger/junkMail.xul (base/resources/content/junkMail.xul)
content/messenger/junkMail.js (base/resources/content/junkMail.js)
content/messenger/junkMailInfo.xul (base/resources/content/junkMailInfo.xul)
content/messenger/SearchDialog.xul (base/search/resources/content/SearchDialog.xul)
content/messenger/ABSearchDialog.xul (base/search/resources/content/ABSearchDialog.xul)
content/messenger/SearchDialog.js (base/search/resources/content/SearchDialog.js)
@ -228,6 +228,7 @@ en-US.jar:
locale/en-US/messenger/msgSynchronize.dtd (base/resources/locale/en-US/msgSynchronize.dtd)
locale/en-US/messenger/offline.properties (base/resources/locale/en-US/offline.properties)
locale/en-US/messenger/junkMail.dtd (base/resources/locale/en-US/junkMail.dtd)
locale/en-US/messenger/junkMailInfo.dtd (base/resources/locale/en-US/junkMailInfo.dtd)
locale/en-US/messenger/SearchDialog.dtd (base/search/resources/locale/en-US/SearchDialog.dtd)
locale/en-US/messenger/viewLog.dtd (base/search/resources/locale/en-US/viewLog.dtd)
locale/en-US/messenger/junkLog.dtd (base/resources/locale/en-US/junkLog.dtd)
@ -260,7 +261,6 @@ en-US.jar:
locale/en-US/messenger/localMsgs.properties (local/resources/locale/en-US/localMsgs.properties)
locale/en-US/messenger/downloadheaders.dtd (news/resources/locale/en-US/downloadheaders.dtd)
locale/en-US/messenger/news.properties (news/resources/locale/en-US/news.properties)
locale/en-US/messenger/custreceipt.dtd (base/prefs/resources/locale/en-US/custreceipt.dtd)
locale/en-US/messenger/pref-diskspace.dtd (base/prefs/resources/locale/en-US/pref-diskspace.dtd)
locale/en-US/messenger/pref-mailnews.dtd (base/prefs/resources/locale/en-US/pref-mailnews.dtd)
locale/en-US/messenger/pref-notifications.dtd (base/prefs/resources/locale/en-US/pref-notifications.dtd)