Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixes for #21345 and #17090. remove the junk mail folder, since we

Browse Source 
don't support it yet.  and remove the message center prefs, since we
don't support that UI anymore.


git-svn-id: svn://10.0.0.236/trunk@56539 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
sspitzer%netscape.com 1999-12-24 09:18:36 +00:00
parent bb6bbc2a9d
commit 480b0800eb
8 changed files with 13 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mozilla/mailnews/base/prefs/resources/content/am-copies.js
View File

@ -25,7 +25,6 @@ function onInit() {
initFolderDisplay("identity.fccFolder", "msgFccFolderPicker");
initFolderDisplay("identity.draftFolder", "msgDraftsFolderPicker");
initFolderDisplay("identity.stationeryFolder", "msgStationeryFolderPicker");
initFolderDisplay("identity.junkMailFolder", "msgJunkMailFolderPicker");
initBccSelf();
//dump("document is " + document + "\n");
@ -57,7 +56,6 @@ function onSave()
SaveUriFromPicker("identity.fccFolder", "msgFccFolderPicker");
SaveUriFromPicker("identity.draftFolder", "msgDraftsFolderPicker");
SaveUriFromPicker("identity.stationeryFolder", "msgStationeryFolderPicker");
SaveUriFromPicker("identity.junkMailFolder", "msgJunkMailFolderPicker");
}
function SaveUriFromPicker(fieldName, pickerID)

9
mozilla/mailnews/base/prefs/resources/content/am-copies.xul
View File

@ -15,7 +15,6 @@
<html:input type="hidden" name="identity.fccFolder" id="identity.fccFolder"/>
<html:input type="hidden" name="identity.draftFolder" id="identity.draftFolder"/>
<html:input type="hidden" name="identity.stationeryFolder" id="identity.stationeryFolder"/>
<html:input type="hidden" name="identity.junkMailFolder" id="identity.junkMailFolder"/>
<html:input type="hidden" name="identity.email" id="identity.email"/>
<html:div>&copyAndFolderTitle.label;</html:div>
@ -63,14 +62,6 @@
<spring flex="100%"/>
</box>
</box>
<box align="horizontal">
<html:div flex="34%">&junkMailFolder.label;</html:div>
<!-- name="identity.junkMailFolder" -->
<box align="horizontal">
<menu id="msgJunkMailFolderPicker"/>
<spring flex="100%"/>
</box>
</box>
</box>
</window>

17
mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
View File

@ -46,21 +46,4 @@
&reuseExp.label;
</html:fieldset>
<html:fieldset>
<html:legend align="left">
<html:div>&newsOpt.label;</html:div>
</html:legend>
<html:div>
<html:input id="pref:0:int:news.use_message_center" name="opennews" type="radio" checked="true"/>
<html:label for="pref:0:int:news.use_message_center">&openMessenger.label;</html:label>
</html:div>
<html:div>
<html:input id="pref:1:int:news.use_message_center" name="opennews" type="radio"/>
<html:label for="pref:1:int:news.use_message_center">&openCenter.label;</html:label>
</html:div>
</html:fieldset>
</window>

1
mozilla/mailnews/base/prefs/resources/locale/en-US/am-copies.dtd
View File

@ -9,6 +9,5 @@
<!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
<!ENTITY bccAddress.label "Bcc these addresses:">
<!ENTITY specialFolderTitle.label "Special Folders">
<!ENTITY junkMailFolder.label "Keep junk mail in:">
<!ENTITY draftMailFolder.label "Keep message drafts in:">
<!ENTITY templateMailFolder.label "Keep message stationery in:">

4
mozilla/mailnews/base/prefs/resources/locale/en-US/pref-winsetting.dtd
View File

@ -28,7 +28,3 @@ Rights Reserved.
<!ENTITY reuseThread.label "Double-clicking a folder opens it in a new window">
<!ENTITY reuseMessage.label "Double-clicking a message opens it in a new window">
<!ENTITY reuseExp.label "If you prefer fewer windows, unselect these options, and Mail will open items into existing windows.">
<!ENTITY newsOpt.label "The Newsgroups menu item or button:">
<!-- LOCALIZATION NOTE openMessenger.label Never translate the product name "Messenger" -->
<!ENTITY openMessenger.label "Opens newsgroups in a Mail window">
<!ENTITY openCenter.label "Opens the Message Center">

28
mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.js
View File

@ -21,21 +21,19 @@ function MsgFolderPickerOnLoad(pickerID)
var verifyFunction = null;
if (pickerID == "msgSubscribeFolderPicker") {
verifyFunction = msgfolder.canSubscribe;
}
else if (pickerID == "msgNewFolderPicker") {
verifyFunction = msgfolder.canCreateSubfolders;
}
else if (pickerID == "msgRenameFolderPicker") {
verifyFunction = msgfolder.canRename;
}
else if ((pickerID == "msgFccFolderPicker") || (pickerID == "msgDraftsFolderPicker") || (pickerID == "msgStationeryFolderPicker") || (pickerID == "msgJunkMailFolderPicker")) {
verifyFunction = msgfolder.canFileMessages;
}
else {
dump("this should never happen\n");
return;
switch (pickerID) {
case "msgSubscribeFolderPicker":
verifyFunction = msgfolder.canSubscribe;
break;
case "msgNewFolderPicker":
verifyFunction = msgfolder.canCreateSubfolders;
break;
case "msgRenameFolderPicker":
verifyFunction = msgfolder.canRename;
break;
default:
verifyFunction = msgfolder.canFileMessages;
break;
}
if (verifyFunction) {

51
mozilla/mailnews/base/resources/content/msgFolderPickerOverlay.xul
View File

@ -316,55 +316,4 @@
</rule>
</template>
</menu>
<menu class="push" value="&filemessagesclickhere.label;" uri="" id="msgJunkMailFolderPicker" datasources="rdf:msgaccountmanager rdf:mailnewsfolders" rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
ref="msgaccounts:/">
<template>
<rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
<menupopup>
<menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
oncommand="PickedMsgFolder(event.target,'msgJunkMailFolderPicker')"
SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType">
<menupopup>
<menuitem uri="..." value="&filemessageschoosethis.label;"
oncommand="PickedMsgFolder(event.target,'msgJunkMailFolderPicker')"
SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType" />
<menuseparator/>
</menupopup>
</menu>
</menupopup>
</rule>
<rule nc:CanFileMessages="false" nc:ServerType="nntp">
<!-- don't show nntp servers in the file picker -->
</rule>
<rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
<!-- note, there is no "file here" -->
<menupopup>
<menu uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
oncommand="PickedMsgFolder(event.target,'msgJunkMailFolderPicker')"
SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType">
<menupopup/>
</menu>
</menupopup>
</rule>
<rule nc:CanFileMessages="true">
<menupopup>
<menuitem uri="..." class="folderMenuItem" value="rdf:http://home.netscape.com/NC-rdf#Name"
oncommand="PickedMsgFolder(event.target,'msgJunkMailFolderPicker')"
SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"/>
</menupopup>
</rule>
</template>
</menu>
</overlay>

1
mozilla/suite/locales/en-US/chrome/mailnews/pref/am-copies.dtd
View File

@ -9,6 +9,5 @@
<!-- LOCALIZATION NOTE (bccAddress.label): do not translate "Bcc" in below line -->
<!ENTITY bccAddress.label "Bcc these addresses:">
<!ENTITY specialFolderTitle.label "Special Folders">
<!ENTITY junkMailFolder.label "Keep junk mail in:">
<!ENTITY draftMailFolder.label "Keep message drafts in:">
<!ENTITY templateMailFolder.label "Keep message stationery in:">